skuba 12.1.0-hoist-less-20250722131939 → 12.1.0-main-20250812041011

package/template/lambda-sqs-worker-cdk/src/framework/logging.ts

@@ -1,17 +1,22 @@
 import { AsyncLocalStorage } from 'async_hooks';
 
-import createLogger, { createDestination } from '@seek/logger';
+import { createDestination, createLogger } from '@seek/logger';
 
 import { config } from 'src/config.js';
 
-interface LoggerContext {
+interface LambdaContext {
   awsRequestId: string;
 }
 
-export const loggerContext = new AsyncLocalStorage<LoggerContext>();
+interface RecordContext {
+  sqsMessageId: string;
+}
+
+export const lambdaContext = new AsyncLocalStorage<LambdaContext>();
+export const recordContext = new AsyncLocalStorage<RecordContext>();
 
 const { destination, stdoutMock } = createDestination({
-  mock: config.environment === 'test' && {
+  mock: config.deployment === 'test' && {
     redact: ['awsRequestId'],
   },
 });
@@ -20,19 +25,26 @@ export { stdoutMock };
 
 export const logger = createLogger(
   {
-    base: {
-      environment: config.environment,
-      version: config.version,
+    eeeoh: {
+      /**
+       * TODO: choose an appropriate Datadog log tier.
+       *
+       * https://github.com/seek-oss/logger/blob/master/docs/eeeoh.md#datadog-log-tiers
+       */
+      datadog: 'tin',
+      team: '<%- teamName %>',
+      use: 'environment',
     },
 
     level: config.logLevel,
 
-    mixin: () => ({ ...loggerContext.getStore() }),
-
-    name: config.name,
+    mixin: () => ({
+      ...lambdaContext.getStore(),
+      ...recordContext.getStore(),
+    }),
 
     transport:
-      config.environment === 'local' ? { target: 'pino-pretty' } : undefined,
+      config.deployment === 'local' ? { target: 'pino-pretty' } : undefined,
   },
   destination,
 );

package/template/lambda-sqs-worker-cdk/src/framework/metrics.ts

@@ -7,8 +7,5 @@ const prefix = `${config.name}.`;
 export const metricsClient = {
   distribution: (
     ...[name, ...rest]: Parameters<typeof sendDistributionMetric>
-  ) =>
-    config.metrics
-      ? sendDistributionMetric(`${prefix}${name}`, ...rest)
-      : undefined,
+  ) => sendDistributionMetric(`${prefix}${name}`, ...rest),
 };

package/template/lambda-sqs-worker-cdk/src/testing/handler.ts

@@ -9,5 +9,8 @@ export const createCtx = () =>
 
 export const createSqsEvent = (bodies: string[]) =>
   ({
-    Records: bodies.map((body) => ({ body })),
+    Records: bodies.map((body) => ({
+      body,
+      messageId: chance.guid({ version: 4 }),
+    })),
   }) as SQSEvent;

package/template/oss-npm-package/.github/workflows/release.yml

@@ -18,7 +18,7 @@ jobs:
     timeout-minutes: 20
     steps:
       - name: Check out repo
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           fetch-depth: 0
 

package/template/oss-npm-package/.github/workflows/validate.yml

@@ -16,7 +16,7 @@ jobs:
     timeout-minutes: 20
     steps:
       - name: Check out repo
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Set up Node.js
         uses: actions/setup-node@v4