build: set lambda to log as JSON

linz · Oct 21, 2024 · 45e0b51 · 45e0b51
1 parent 6655441
commit 45e0b51
Show file tree

Hide file tree

Showing 4 changed files with 102 additions and 68 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/_infra/package.json b/packages/_infra/package.json
@@ -29,8 +29,8 @@
     "@basemaps/lambda-tiler": "^7.11.0",
     "@basemaps/shared": "^7.11.0",
     "@linzjs/cdk-tags": "^1.7.0",
-    "aws-cdk": "2.114.x",
-    "aws-cdk-lib": "2.114.x",
-    "constructs": "^10.3.0"
+    "aws-cdk": "2.162.x",
+    "aws-cdk-lib": "2.162.x",
+    "constructs": "^10.4.2"
   }
 }
diff --git a/packages/_infra/src/analytics/edge.analytics.ts b/packages/_infra/src/analytics/edge.analytics.ts
@@ -2,7 +2,7 @@ import { Env } from '@basemaps/shared';
 import { Duration, Stack, StackProps } from 'aws-cdk-lib';
 import { Rule, Schedule } from 'aws-cdk-lib/aws-events';
 import { LambdaFunction } from 'aws-cdk-lib/aws-events-targets';
-import lf from 'aws-cdk-lib/aws-lambda';
+import lambda from 'aws-cdk-lib/aws-lambda';
 import { RetentionDays } from 'aws-cdk-lib/aws-logs';
 import { BlockPublicAccess, Bucket } from 'aws-cdk-lib/aws-s3';
 import { Construct } from 'constructs';
@@ -18,7 +18,7 @@ export interface EdgeAnalyticsProps extends StackProps {
  * Every hour create analytics based off the logs given to us from cloudwatch
  */
 export class EdgeAnalytics extends Stack {
-  public lambda: lf.Function;
+  public lambda: lambda.Function;
 
   public constructor(scope: Construct, id: string, props: EdgeAnalyticsProps) {
     super(scope, id, props);
@@ -31,19 +31,20 @@ export class EdgeAnalytics extends Stack {
       blockPublicAccess: BlockPublicAccess.BLOCK_ALL,
     });
 
-    this.lambda = new lf.Function(this, 'AnalyticLambda', {
-      runtime: lf.Runtime.NODEJS_18_X,
+    this.lambda = new lambda.Function(this, 'AnalyticLambda', {
+      runtime: lambda.Runtime.NODEJS_18_X,
       memorySize: 2048,
       timeout: Duration.minutes(10),
       handler: 'index.handler',
-      code: lf.Code.fromAsset(CODE_PATH),
+      code: lambda.Code.fromAsset(CODE_PATH),
       environment: {
         [Env.Analytics.CloudFrontId]: distributionId,
         [Env.Analytics.CacheBucket]: `s3://${cacheBucket.bucketName}`,
         [Env.Analytics.CloudFrontSourceBucket]: `s3://${logBucket.bucketName}`,
         AWS_NODEJS_CONNECTION_REUSE_ENABLED: '1',
       },
       logRetention: RetentionDays.ONE_MONTH,
+      loggingFormat: lambda.LoggingFormat.JSON,
     });
 
     cacheBucket.grantReadWrite(this.lambda);

diff --git a/packages/_infra/src/serve/lambda.tiler.ts b/packages/_infra/src/serve/lambda.tiler.ts
@@ -54,6 +54,7 @@ export class LambdaTiler extends Construct {
       architecture: lambda.Architecture.ARM_64,
       environment,
       logRetention: RetentionDays.ONE_MONTH,
+      loggingFormat: lambda.LoggingFormat.JSON,
     });
 
     this.functionUrl = new lambda.FunctionUrl(this, 'LambdaCogUrl', {