fine-tuned logging

stroeer · Jul 12, 2024 · 25c281c · 25c281c
1 parent 33af85f
commit 25c281c
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 29 deletions.
diff --git a/source/image-handler/src/image-request.ts b/source/image-handler/src/image-request.ts
@@ -15,13 +15,7 @@ import {
 import { ThumborMapper } from './thumbor-mapper';
 import { GetObjectCommand, GetObjectCommandInput, GetObjectCommandOutput, S3 } from '@aws-sdk/client-s3';
 import { APIGatewayProxyEventV2 } from 'aws-lambda';
-import { Logger } from '@aws-lambda-powertools/logger';
-import { LogStashFormatter } from './lib/LogstashFormatter';
-
-const logger = new Logger({
-  serviceName: process.env.AWS_LAMBDA_FUNCTION_NAME ?? '',
-  logFormatter: new LogStashFormatter(),
-});
+import { logger } from './index';
 
 type OriginalImageInfo = Partial<{
   contentType: string;

diff --git a/source/image-handler/src/index.ts b/source/image-handler/src/index.ts
@@ -11,7 +11,7 @@ import { LogStashFormatter } from './lib/LogstashFormatter';
 
 const s3Client = new S3();
 
-const logger = new Logger({
+export const logger = new Logger({
   serviceName: process.env.AWS_LAMBDA_FUNCTION_NAME ?? '',
   logFormatter: new LogStashFormatter(),
 });

diff --git a/source/image-handler/src/lib/LogstashFormatter.ts b/source/image-handler/src/lib/LogstashFormatter.ts
@@ -5,6 +5,9 @@ type LogStashLog = LogAttributes & {
   '@timestamp': string;
 };
 
+const allowed_keys = ['rawPath', 'headers', 'http'];
+const allowed_headers = ['accept', 'x-amz-cf-id', 'user-agent', 'host', 'origin', 'x-amzn-trace-id'];
+
 class LogStashFormatter extends LogFormatter {
   public formatAttributes(attributes: UnformattedAttributes, additionalLogAttributes: LogAttributes): LogItem {
     const baseAttributes: LogStashLog = {
@@ -24,7 +27,26 @@ class LogStashFormatter extends LogFormatter {
       },
     };
     const logItem = new LogItem({ attributes: baseAttributes });
-    logItem.addAttributes(additionalLogAttributes); // add any attributes not explicitly defined
+    if (additionalLogAttributes) {
+      if (additionalLogAttributes.hasOwnProperty('imageRequestInfo')) {
+        let additionalLogAttribute = additionalLogAttributes['imageRequestInfo'];
+        additionalLogAttribute['originalImage'] = undefined;
+      }
+      if (additionalLogAttributes.hasOwnProperty('headers')) {
+        let headers = additionalLogAttributes['headers'];
+        additionalLogAttributes['headers'] = allowed_headers.reduce((acc, key) => {
+          acc[key] = headers[key];
+          return acc;
+        }, {});
+      }
+
+      additionalLogAttributes = allowed_keys.reduce((acc, key) => {
+        acc[key] = additionalLogAttributes[key];
+        return acc;
+      }, {});
+
+      logItem.addAttributes(additionalLogAttributes); // add any attributes not explicitly defined
+    }
 
     return logItem;
   }

diff --git a/source/image-handler/terraform/.terraform.lock.hcl b/source/image-handler/terraform/.terraform.lock.hcl
diff --git a/source/image-handler/terraform/main.tf b/source/image-handler/terraform/main.tf
@@ -125,7 +125,7 @@ resource "aws_lambda_layer_version" "sharp" {
   s3_key            = aws_s3_bucket_object.sharp.key
   s3_object_version = aws_s3_bucket_object.sharp.version_id
   skip_destroy      = true
-  source_code_hash  = aws_s3_bucket_object.sharp.etag
+  source_code_hash  = filebase64sha256("${path.module}/lambda-layer.zip")
 
   compatible_runtimes = ["nodejs16.x", "nodejs18.x", "nodejs20.x"]
   compatible_architectures = ["arm64"]