skuba 12.1.0-no-sync-in-promise-iterable-20250801105434 → 12.1.0

package/template/lambda-sqs-worker-cdk/infra/__snapshots__/appStack.test.ts.snap

@@ -180,28 +180,29 @@ exports[`returns expected CloudFormation stack for dev 1`] = `
               "Ref": "datadogapikeysecret046FEF06",
             },
             "DD_CAPTURE_LAMBDA_PAYLOAD": "false",
+            "DD_ENV": "development",
             "DD_FLUSH_TO_LOG": "false",
             "DD_LAMBDA_HANDLER": "index.handler",
             "DD_LOGS_INJECTION": "false",
             "DD_MERGE_XRAY_TRACES": "false",
             "DD_SERVERLESS_APPSEC_ENABLED": "false",
             "DD_SERVERLESS_LOGS_ENABLED": "false",
+            "DD_SERVICE": "serviceName",
             "DD_SITE": "datadoghq.com",
             "DD_TRACE_CLOUD_REQUEST_PAYLOAD_TAGGING": "$.*",
             "DD_TRACE_CLOUD_RESPONSE_PAYLOAD_TAGGING": "$.*",
             "DD_TRACE_ENABLED": "true",
+            "DD_VERSION": "local",
+            "DEPLOYMENT": "dev",
             "DESTINATION_SNS_TOPIC_ARN": {
               "Ref": "destinationtopicDCE2E0B8",
             },
-            "ENVIRONMENT": "dev",
             "NODE_ENV": "production",
             "NODE_OPTIONS": "--enable-source-maps",
-            "SERVICE": "serviceName",
-            "VERSION": "local",
           },
         },
         "FunctionName": "serviceName",
-        "Handler": "node_modules/datadog-lambda-js/dist/handler.handler",
+        "Handler": "/opt/nodejs/node_modules/datadog-lambda-js/handler.handler",
         "KmsKeyArn": {
           "Fn::GetAtt": [
             "kmskey49FBC3B3",
@@ -209,6 +210,18 @@ exports[`returns expected CloudFormation stack for dev 1`] = `
           ],
         },
         "Layers": [
+          {
+            "Fn::Join": [
+              "",
+              [
+                "arn:aws:lambda:",
+                {
+                  "Ref": "AWS::Region",
+                },
+                ":464622532012:layer:Datadog-Node22-x:x",
+              ],
+            ],
+          },
           {
             "Fn::Join": [
               "",
@@ -222,7 +235,7 @@ exports[`returns expected CloudFormation stack for dev 1`] = `
             ],
           },
         ],
-        "ReservedConcurrentExecutions": 2,
+        "ReservedConcurrentExecutions": 3,
         "Role": {
           "Fn::GetAtt": [
             "workerServiceRole2130CC7F",
@@ -920,28 +933,29 @@ exports[`returns expected CloudFormation stack for prod 1`] = `
               "Ref": "datadogapikeysecret046FEF06",
             },
             "DD_CAPTURE_LAMBDA_PAYLOAD": "false",
+            "DD_ENV": "production",
             "DD_FLUSH_TO_LOG": "false",
             "DD_LAMBDA_HANDLER": "index.handler",
             "DD_LOGS_INJECTION": "false",
             "DD_MERGE_XRAY_TRACES": "false",
             "DD_SERVERLESS_APPSEC_ENABLED": "false",
             "DD_SERVERLESS_LOGS_ENABLED": "false",
+            "DD_SERVICE": "serviceName",
             "DD_SITE": "datadoghq.com",
             "DD_TRACE_CLOUD_REQUEST_PAYLOAD_TAGGING": "$.*",
             "DD_TRACE_CLOUD_RESPONSE_PAYLOAD_TAGGING": "$.*",
             "DD_TRACE_ENABLED": "true",
+            "DD_VERSION": "local",
+            "DEPLOYMENT": "prod",
             "DESTINATION_SNS_TOPIC_ARN": {
               "Ref": "destinationtopicDCE2E0B8",
             },
-            "ENVIRONMENT": "prod",
             "NODE_ENV": "production",
             "NODE_OPTIONS": "--enable-source-maps",
-            "SERVICE": "serviceName",
-            "VERSION": "local",
           },
         },
         "FunctionName": "serviceName",
-        "Handler": "node_modules/datadog-lambda-js/dist/handler.handler",
+        "Handler": "/opt/nodejs/node_modules/datadog-lambda-js/handler.handler",
         "KmsKeyArn": {
           "Fn::GetAtt": [
             "kmskey49FBC3B3",
@@ -949,6 +963,18 @@ exports[`returns expected CloudFormation stack for prod 1`] = `
           ],
         },
         "Layers": [
+          {
+            "Fn::Join": [
+              "",
+              [
+                "arn:aws:lambda:",
+                {
+                  "Ref": "AWS::Region",
+                },
+                ":464622532012:layer:Datadog-Node22-x:x",
+              ],
+            ],
+          },
           {
             "Fn::Join": [
               "",
@@ -1104,7 +1130,7 @@ exports[`returns expected CloudFormation stack for prod 1`] = `
           "ReportBatchItemFailures",
         ],
         "ScalingConfig": {
-          "MaximumConcurrency": 20,
+          "MaximumConcurrency": 19,
         },
         "Tags": [
           {

package/template/lambda-sqs-worker-cdk/infra/appStack.test.ts

@@ -15,11 +15,11 @@ jest.useFakeTimers({
   now: new Date(currentDate),
 });
 
-const originalEnv = process.env.ENVIRONMENT;
+const originalDeployment = process.env.DEPLOYMENT;
 const originalVersion = process.env.VERSION;
 
 afterAll(() => {
-  process.env.ENVIRONMENT = originalEnv;
+  process.env.DEPLOYMENT = originalDeployment;
   process.env.VERSION = originalVersion;
 });
 
@@ -29,8 +29,8 @@ afterEach(() => {
 
 it.each(['dev', 'prod'])(
   'returns expected CloudFormation stack for %s',
-  async (env) => {
-    process.env.ENVIRONMENT = env;
+  async (deployment) => {
+    process.env.DEPLOYMENT = deployment;
     process.env.VERSION = 'local';
 
     const { AppStack } = await import('./appStack.js');
@@ -69,10 +69,7 @@ it.each(['dev', 'prod'])(
         /"DD_TAGS":"git.commit.sha:([0-9a-f]+),git.repository_url:([^\"]+)",/g,
         '',
       )
-      .replaceAll(
-        /(layer:Datadog-Extension-.+?:)\d+/g,
-        (_, layer) => `${layer}x`,
-      );
+      .replaceAll(/(layer:Datadog-[^-]+-.+?:)\d+/g, (_, layer) => `${layer}x`);
     expect(JSON.parse(json)).toMatchSnapshot();
   },
 );

package/template/lambda-sqs-worker-cdk/infra/appStack.ts

@@ -19,7 +19,10 @@ import { DatadogLambda } from 'datadog-cdk-constructs-v2';
 import { config } from './config.js';
 
 // Updated by https://github.com/seek-oss/rynovate
-const DATADOG_EXTENSION_LAYER_VERSION = 64;
+const DATADOG_EXTENSION_LAYER_VERSION = 84;
+
+// Updated by https://github.com/seek-oss/rynovate
+const DATADOG_NODE_LAYER_VERSION = 126;
 
 export class AppStack extends Stack {
   constructor(scope: Construct, id: string, props?: StackProps) {
@@ -95,7 +98,6 @@ export class AppStack extends Stack {
         target: 'node22',
         // aws-sdk-v3 is set as an external module by default, but we want it to be bundled with the function
         externalModules: [],
-        nodeModules: ['datadog-lambda-js', 'dd-trace'],
       },
       functionName: '<%- serviceName %>',
       environment: {
@@ -127,11 +129,15 @@ export class AppStack extends Stack {
     );
 
     const datadog = new DatadogLambda(this, 'datadog', {
+      env: config.env,
+      service: config.service,
+      version: config.version,
+
       apiKeySecret: datadogSecret,
-      addLayers: false,
       enableDatadogLogs: false,
-      flushMetricsToLogs: false,
       extensionLayerVersion: DATADOG_EXTENSION_LAYER_VERSION,
+      flushMetricsToLogs: false,
+      nodeLayerVersion: DATADOG_NODE_LAYER_VERSION,
     });
 
     datadog.addLambdaFunctions([worker]);
@@ -142,8 +148,8 @@ export class AppStack extends Stack {
 
     workerDeployment.alias.addEventSource(
       new aws_lambda_event_sources.SqsEventSource(queue, {
-        maxConcurrency: config.workerLambda.reservedConcurrency,
         batchSize: config.workerLambda.batchSize,
+        maxConcurrency: config.workerLambda.reservedConcurrency - 1, // Ensure we have capacity reserved for our blue/green deployment
         reportBatchItemFailures: true,
       }),
     );

package/template/lambda-sqs-worker-cdk/infra/config.ts

@@ -1,55 +1,64 @@
 import { Env } from 'skuba-dive';
 
-const ENVIRONMENTS = ['dev', 'prod'] as const;
+type Deployment = (typeof deployments)[number];
 
-type Environment = (typeof ENVIRONMENTS)[number];
+const deployments = ['dev', 'prod'] as const;
 
-const environment = Env.oneOf(ENVIRONMENTS)('ENVIRONMENT');
+const deployment = Env.oneOf(deployments)('DEPLOYMENT');
 
 interface Config {
-  appName: string;
+  env: 'development' | 'production';
+  service: string;
+  version: string;
+
   workerLambda: {
     batchSize: number;
     reservedConcurrency: number;
     environment: {
-      ENVIRONMENT: Environment;
-      SERVICE: string;
-      VERSION: string;
+      DEPLOYMENT: Deployment;
     };
   };
+
   datadogApiKeySecretArn: string;
   sourceSnsTopicArn: string;
 }
 
-const configs: Record<Environment, Config> = {
+const service = '<%- serviceName %>';
+const version = Env.string('VERSION');
+
+const configs: Record<Deployment, Config> = {
   dev: {
-    appName: '<%- serviceName %>',
+    env: 'development',
+    service,
+    version,
+
     workerLambda: {
       batchSize: 10,
-      reservedConcurrency: 2,
+      reservedConcurrency: 3,
       environment: {
-        ENVIRONMENT: 'dev',
-        SERVICE: '<%- serviceName %>',
-        VERSION: Env.string('VERSION', { default: 'local' }),
+        DEPLOYMENT: 'dev',
       },
     },
+
     datadogApiKeySecretArn: 'TODO: datadogApiKeySecretArn',
     sourceSnsTopicArn: 'TODO: sourceSnsTopicArn',
   },
   prod: {
-    appName: '<%- serviceName %>',
+    env: 'production',
+    service,
+    version,
+
     workerLambda: {
       batchSize: 10,
       reservedConcurrency: 20,
       environment: {
-        ENVIRONMENT: 'prod',
-        SERVICE: '<%- serviceName %>',
-        VERSION: Env.string('VERSION', { default: 'local' }),
+        DEPLOYMENT: 'prod',
       },
     },
+
     datadogApiKeySecretArn: 'TODO: datadogApiKeySecretArn',
     sourceSnsTopicArn: 'TODO: sourceSnsTopicArn',
   },
 };
 
-export const config: Config = configs[environment];
+export const config: Config = configs[deployment];

package/template/lambda-sqs-worker-cdk/infra/index.ts

@@ -7,7 +7,7 @@ import { config } from './config.js';
 const app = new App();
 
 const appStack = new AppStack(app, 'appStack', {
-  stackName: config.appName,
+  stackName: config.service,
   tags: {
     'seek:source:url': 'https://github.com/SEEK-Jobs/<%- repoName %>',
     // 'seek:system:name': 'TODO: https://rfc.skinfra.xyz/RFC051-AWS-Tagging-Standard.html#tagging-schema',

package/template/lambda-sqs-worker-cdk/package.json

@@ -18,9 +18,7 @@
     "@aws-sdk/client-lambda": "^3.363.0",
     "@aws-sdk/client-sns": "^3.363.0",
     "@seek/aws-codedeploy-hooks": "^2.0.0",
-    "@seek/logger": "^10.0.0",
-    "datadog-lambda-js": "^10.0.0",
-    "dd-trace": "^5.0.0",
+    "@seek/logger": "11.0.0",
     "skuba-dive": "^2.0.0",
     "zod": "^4.0.0"
   },
@@ -35,11 +33,13 @@
     "aws-sdk-client-mock-jest": "^4.0.0",
     "chance": "^1.1.8",
     "constructs": "^10.0.17",
-    "datadog-cdk-constructs-v2": "^2.0.0",
+    "datadog-cdk-constructs-v2": "^3.0.0",
+    "datadog-lambda-js": "^12.0.0",
+    "dd-trace": "^5.0.0",
     "pino-pretty": "^13.0.0",
-    "skuba": "12.1.0-no-sync-in-promise-iterable-20250801105434"
+    "skuba": "*"
   },
-  "packageManager": "pnpm@10.13.1",
+  "packageManager": "pnpm@10.14.0",
   "engines": {
     "node": ">=22"
   }

package/template/lambda-sqs-worker-cdk/src/app.test.ts

@@ -107,7 +107,7 @@ describe('handler', () => {
     expect(stdoutMock.calls).toMatchObject([
       { count: 2, level: 20, msg: 'Received jobs' },
       {
-        err: {
+        error: {
           name: 'ZodError',
           type: 'ZodError',
         },
@@ -151,7 +151,7 @@ describe('handler', () => {
     expect(stdoutMock.calls).toMatchObject([
       { count: 1, level: 20, msg: 'Received jobs' },
       {
-        err: {
+        error: {
           message: err.message,
           type: 'Error',
         },
@@ -181,7 +181,7 @@ describe('handler', () => {
         msg: 'Received jobs',
       },
       {
-        err: {
+        error: {
           message: err.message,
           type: 'Error',
         },
@@ -203,7 +203,7 @@ describe('handler', () => {
 
     expect(stdoutMock.calls).toMatchObject([
       {
-        err: {
+        error: {
           message: 'Received 0 records',
           type: 'Error',
         },

package/template/lambda-sqs-worker-cdk/src/config.ts

@@ -1,27 +1,25 @@
 import { Env } from 'skuba-dive';
 
 interface Config {
-  environment: Environment;
+  deployment: Deployment;
 
   logLevel: string;
-  metrics: boolean;
   name: string;
   version: string;
 
   destinationSnsTopicArn: string;
 }
 
-type Environment = (typeof environments)[number];
+type Deployment = (typeof deployments)[number];
 
-const environments = ['local', 'test', 'dev', 'prod'] as const;
+const deployments = ['local', 'test', 'dev', 'prod'] as const;
 
-const environment = Env.oneOf(environments)('ENVIRONMENT');
+const deployment = Env.oneOf(deployments)('DEPLOYMENT');
 
 /* istanbul ignore next: config verification makes more sense in a smoke test */
-const configs: Record<Environment, () => Omit<Config, 'environment'>> = {
+const configs: Record<Deployment, () => Omit<Config, 'deployment'>> = {
   local: () => ({
     logLevel: 'debug',
-    metrics: false,
     name: '<%- serviceName %>',
     version: 'local',
 
@@ -30,7 +28,6 @@ const configs: Record<Environment, () => Omit<Config, 'environment'>> = {
 
   test: () => ({
     logLevel: Env.string('LOG_LEVEL', { default: 'debug' }),
-    metrics: false,
     name: '<%- serviceName %>',
     version: 'test',
 
@@ -39,24 +36,22 @@ const configs: Record<Environment, () => Omit<Config, 'environment'>> = {
 
   dev: () => ({
     logLevel: 'debug',
-    metrics: true,
-    name: Env.string('SERVICE'),
-    version: Env.string('VERSION'),
+    name: Env.string('DD_SERVICE'),
+    version: Env.string('DD_VERSION'),
 
     destinationSnsTopicArn: Env.string('DESTINATION_SNS_TOPIC_ARN'),
   }),
 
   prod: () => ({
     logLevel: 'info',
-    metrics: true,
-    name: Env.string('SERVICE'),
-    version: Env.string('VERSION'),
+    name: Env.string('DD_SERVICE'),
+    version: Env.string('DD_VERSION'),
 
     destinationSnsTopicArn: Env.string('DESTINATION_SNS_TOPIC_ARN'),
   }),
 };
 
 export const config: Config = {
-  ...configs[environment](),
-  environment,
+  ...configs[deployment](),
+  deployment,
 };

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

@@ -52,7 +52,7 @@ describe('createHandler', () => {
     expect(stdoutMock.calls).toMatchObject([
       {
         awsRequestId: '-',
-        err: {
+        error: {
           message: err.message,
           type: 'Error',
         },
@@ -74,7 +74,7 @@ describe('createHandler', () => {
     expect(stdoutMock.calls).toMatchObject([
       {
         awsRequestId: '-',
-        err: {
+        error: {
           message: err.message,
           type: 'Error',
         },

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

@@ -5,9 +5,7 @@ import type {
   SQSEvent,
   SQSRecord,
 } from 'aws-lambda';
-import { datadog } from 'datadog-lambda-js';
 
-import { config } from 'src/config.js';
 import { lambdaContext, logger, recordContext } from 'src/framework/logging.js';
 
 type Handler<Event, Output> = (
@@ -15,21 +13,11 @@ type Handler<Event, Output> = (
   ctx: LambdaContext,
 ) => Promise<Output>;
 
-/**
- * Conditionally applies the Datadog wrapper to a Lambda handler.
- *
- * This also "fixes" its broken type definitions.
- */
-const withDatadog = <Event, Output = unknown>(
-  fn: Handler<Event, Output>,
-): Handler<Event, Output> =>
-  // istanbul ignore next
-  config.metrics ? (datadog(fn) as Handler<Event, Output>) : fn;
-
-export const createHandler = <Event extends SQSEvent, Output = unknown>(
-  fn: (event: Event, ctx: LambdaContext) => Promise<Output>,
-) =>
-  withDatadog<Event>((event, ctx) =>
+export const createHandler =
+  <Event extends SQSEvent, Output = unknown>(
+    fn: (event: Event, ctx: LambdaContext) => Promise<Output>,
+  ): Handler<Event, Output> =>
+  async (event, ctx) =>
     lambdaContext.run({ awsRequestId: ctx.awsRequestId }, async () => {
       try {
         const output = await fn(event, ctx);
@@ -38,12 +26,11 @@ export const createHandler = <Event extends SQSEvent, Output = unknown>(
 
         return output;
       } catch (err) {
-        logger.error({ err }, 'Function failed');
+        logger.error(err, 'Function failed');
 
         throw new Error('Function failed');
       }
-    }),
-  );
+    });
 
 export const createBatchSQSHandler =
   (
@@ -58,7 +45,7 @@ export const createBatchSQSHandler =
           await fn(record, ctx);
           return;
         } catch (err) {
-          logger.error({ err }, 'Processing record failed');
+          logger.error(err, 'Processing record failed');
           return {
             itemIdentifier: record.messageId,
           };

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

@@ -1,6 +1,6 @@
 import { AsyncLocalStorage } from 'async_hooks';
 
-import createLogger, { createDestination } from '@seek/logger';
+import { createDestination, createLogger } from '@seek/logger';
 
 import { config } from 'src/config.js';
 
@@ -16,7 +16,7 @@ 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'],
   },
 });
@@ -25,9 +25,15 @@ 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,
@@ -37,10 +43,8 @@ export const logger = createLogger(
       ...recordContext.getStore(),
     }),
 
-    name: config.name,
-
     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/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