skuba 4.4.0 → 4.4.1

package/lib/utils/version.js

@@ -1,16 +1,59 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getSkubaVersionInfo = exports.getSkubaVersion = exports.latestNpmVersion = void 0;
-const package_json_1 = __importDefault(require("package-json"));
+const path_1 = __importDefault(require("path"));
+const validate_npm_package_name_1 = __importDefault(require("validate-npm-package-name"));
 const manifest_1 = require("./manifest");
+const validation_1 = require("./validation");
 const wait_1 = require("./wait");
+const loadPackageJson = async (packageName) => {
+    const { validForNewPackages } = (0, validate_npm_package_name_1.default)(packageName);
+    if (!validForNewPackages) {
+        throw new Error(`Package "${packageName}" does not have a valid name`);
+    }
+    const message = `Package "${packageName}" does not have a valid package.json manifest`;
+    let packageJson;
+    try {
+        packageJson = await Promise.resolve().then(() => __importStar(require(path_1.default.posix.join(packageName, 'package.json'))));
+    }
+    catch {
+        throw new Error(message);
+    }
+    if (!(0, validation_1.isObject)(packageJson)) {
+        throw new Error(message);
+    }
+    return packageJson;
+};
 const latestNpmVersion = async (packageName) => {
-    const { version } = await (0, package_json_1.default)(packageName);
+    const { version } = await loadPackageJson(packageName);
     if (typeof version !== 'string') {
-        throw new Error(`No version found for package "${packageName}"`);
+        throw new Error(`Package "${packageName}" does not have a valid version in its package.json manifest`);
     }
     return version;
 };

package/lib/utils/version.js.map

@@ -1 +1 @@
-{"version":3,"file":"version.js","sourceRoot":"","sources":["../../src/utils/version.ts"],"names":[],"mappings":";;;;;;AAAA,gEAAuC;AAEvC,yCAA8C;AAC9C,iCAAqC;AAE9B,MAAM,gBAAgB,GAAG,KAAK,EACnC,WAAmB,EACF,EAAE;IACnB,MAAM,EAAE,OAAO,EAAE,GAAG,MAAM,IAAA,sBAAW,EAAC,WAAW,CAAC,CAAC;IAEnD,IAAI,OAAO,OAAO,KAAK,QAAQ,EAAE;QAC/B,MAAM,IAAI,KAAK,CAAC,iCAAiC,WAAW,GAAG,CAAC,CAAC;KAClE;IAED,OAAO,OAAO,CAAC;AACjB,CAAC,CAAC;AAVW,QAAA,gBAAgB,oBAU3B;AAEF,MAAM,kBAAkB,GAAG,KAAK,IAA4B,EAAE;IAC5D,IAAI;QACF,MAAM,MAAM,GAAG,MAAM,IAAA,kBAAW,EAAC,IAAA,wBAAgB,EAAC,OAAO,CAAC,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;QAEtE,OAAO,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC;KACxC;IAAC,MAAM;QACN,OAAO,IAAI,CAAC;KACb;AACH,CAAC,CAAC;AAEK,MAAM,eAAe,GAAG,KAAK,IAAqB,EAAE;IACzD,MAAM,EAAE,OAAO,EAAE,GAAG,MAAM,IAAA,2BAAgB,GAAE,CAAC;IAE7C,OAAO,OAAO,CAAC;AACjB,CAAC,CAAC;AAJW,QAAA,eAAe,mBAI1B;AAgBK,MAAM,mBAAmB,GAAG,KAAK,IAA+B,EAAE;IACvE,MAAM,CAAC,KAAK,EAAE,MAAM,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;QACxC,IAAA,uBAAe,GAAE;QACjB,kBAAkB,EAAE;KACrB,CAAC,CAAC;IAEH,IAAI,MAAM,KAAK,IAAI,EAAE;QACnB,6DAA6D;QAC7D,OAAO;YACL,OAAO,EAAE,KAAK;YACd,KAAK;YACL,MAAM;SACP,CAAC;KACH;IAED,OAAO;QACL,OAAO,EAAE,MAAM,KAAK,KAAK;QACzB,KAAK;QACL,MAAM;KACP,CAAC;AACJ,CAAC,CAAC;AApBW,QAAA,mBAAmB,uBAoB9B"}
+{"version":3,"file":"version.js","sourceRoot":"","sources":["../../src/utils/version.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,gDAAwB;AAExB,0FAA4D;AAE5D,yCAA8C;AAC9C,6CAAwC;AACxC,iCAAqC;AAErC,MAAM,eAAe,GAAG,KAAK,EAC3B,WAAmB,EACe,EAAE;IACpC,MAAM,EAAE,mBAAmB,EAAE,GAAG,IAAA,mCAAmB,EAAC,WAAW,CAAC,CAAC;IAEjE,IAAI,CAAC,mBAAmB,EAAE;QACxB,MAAM,IAAI,KAAK,CAAC,YAAY,WAAW,8BAA8B,CAAC,CAAC;KACxE;IAED,MAAM,OAAO,GAAG,YAAY,WAAW,+CAA+C,CAAC;IAEvF,IAAI,WAAoB,CAAC;IACzB,IAAI;QACF,WAAW,GAAG,wDAAa,cAAI,CAAC,KAAK,CAAC,IAAI,CAAC,WAAW,EAAE,cAAc,CAAC,GAAC,CAAC;KAC1E;IAAC,MAAM;QACN,MAAM,IAAI,KAAK,CAAC,OAAO,CAAC,CAAC;KAC1B;IAED,IAAI,CAAC,IAAA,qBAAQ,EAAC,WAAW,CAAC,EAAE;QAC1B,MAAM,IAAI,KAAK,CAAC,OAAO,CAAC,CAAC;KAC1B;IAED,OAAO,WAAW,CAAC;AACrB,CAAC,CAAC;AAEK,MAAM,gBAAgB,GAAG,KAAK,EACnC,WAAmB,EACF,EAAE;IACnB,MAAM,EAAE,OAAO,EAAE,GAAG,MAAM,eAAe,CAAC,WAAW,CAAC,CAAC;IAEvD,IAAI,OAAO,OAAO,KAAK,QAAQ,EAAE;QAC/B,MAAM,IAAI,KAAK,CACb,YAAY,WAAW,8DAA8D,CACtF,CAAC;KACH;IAED,OAAO,OAAO,CAAC;AACjB,CAAC,CAAC;AAZW,QAAA,gBAAgB,oBAY3B;AAEF,MAAM,kBAAkB,GAAG,KAAK,IAA4B,EAAE;IAC5D,IAAI;QACF,MAAM,MAAM,GAAG,MAAM,IAAA,kBAAW,EAAC,IAAA,wBAAgB,EAAC,OAAO,CAAC,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;QAEtE,OAAO,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC;KACxC;IAAC,MAAM;QACN,OAAO,IAAI,CAAC;KACb;AACH,CAAC,CAAC;AAEK,MAAM,eAAe,GAAG,KAAK,IAAqB,EAAE;IACzD,MAAM,EAAE,OAAO,EAAE,GAAG,MAAM,IAAA,2BAAgB,GAAE,CAAC;IAE7C,OAAO,OAAO,CAAC;AACjB,CAAC,CAAC;AAJW,QAAA,eAAe,mBAI1B;AAgBK,MAAM,mBAAmB,GAAG,KAAK,IAA+B,EAAE;IACvE,MAAM,CAAC,KAAK,EAAE,MAAM,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;QACxC,IAAA,uBAAe,GAAE;QACjB,kBAAkB,EAAE;KACrB,CAAC,CAAC;IAEH,IAAI,MAAM,KAAK,IAAI,EAAE;QACnB,6DAA6D;QAC7D,OAAO;YACL,OAAO,EAAE,KAAK;YACd,KAAK;YACL,MAAM;SACP,CAAC;KACH;IAED,OAAO;QACL,OAAO,EAAE,MAAM,KAAK,KAAK;QACzB,KAAK;QACL,MAAM;KACP,CAAC;AACJ,CAAC,CAAC;AApBW,QAAA,mBAAmB,uBAoB9B"}

package/package.json

@@ -34,7 +34,6 @@
     "normalize-package-data": "^4.0.0",
     "npm-run-path": "^4.0.1",
     "npm-which": "^3.0.1",
-    "package-json": "^7.0.0",
     "picomatch": "^2.2.2",
     "prettier": "~2.7.0",
     "read-pkg-up": "^7.0.1",
@@ -50,7 +49,8 @@
     "ts-node-dev": "^2.0.0",
     "tsconfig-paths": "^4.0.0",
     "tsconfig-seek": "1.0.2",
-    "typescript": "~4.8.2"
+    "typescript": "~4.8.2",
+    "validate-npm-package-name": "^4.0.0"
   },
   "description": "SEEK development toolkit for backend applications and packages",
   "devDependencies": {
@@ -66,6 +66,7 @@
     "@types/npm-which": "3.0.1",
     "@types/picomatch": "2.3.0",
     "@types/supertest": "2.0.12",
+    "@types/validate-npm-package-name": "4.0.0",
     "enhanced-resolve": "5.10.0",
     "express": "4.18.1",
     "jsonfile": "6.1.0",
@@ -154,5 +155,5 @@
     "version": "4.0.0"
   },
   "types": "./lib/index.d.ts",
-  "version": "4.4.0"
+  "version": "4.4.1"
 }

package/template/koa-rest-api/package.json

@@ -3,7 +3,7 @@
     "@koa/router": "^12.0.0",
     "@opentelemetry/api": "^1.1.0",
     "@opentelemetry/exporter-collector-grpc": "^0.25.0",
-    "@opentelemetry/instrumentation-aws-sdk": "^0.8.0",
+    "@opentelemetry/instrumentation-aws-sdk": "^0.9.0",
     "@opentelemetry/instrumentation-http": "^0.32.0",
     "@opentelemetry/sdk-node": "^0.32.0",
     "@seek/logger": "^5.0.1",
@@ -16,8 +16,7 @@
     "runtypes-filter": "^0.6.0",
     "seek-datadog-custom-metrics": "^4.0.0",
     "seek-koala": "^6.0.0",
-    "skuba-dive": "^2.0.0",
-    "uuid": "^8.3.2"
+    "skuba-dive": "^2.0.0"
   },
   "devDependencies": {
     "@types/chance": "^1.1.3",
@@ -26,7 +25,6 @@
     "@types/koa__router": "^8.0.8",
     "@types/node": "^16.0.0",
     "@types/supertest": "^2.0.11",
-    "@types/uuid": "^8.3.1",
     "chance": "^1.1.8",
     "pino-pretty": "^9.0.0",
     "skuba": "*",

package/template/koa-rest-api/src/storage/jobs.ts

@@ -1,11 +1,11 @@
-import { v4 as uuidv4 } from 'uuid';
+import { randomUUID } from 'crypto';
 
 import { Job, JobInput } from 'src/types/jobs';
 
 const jobStore: Record<string, Job> = {};
 
 export const createJob = (jobInput: JobInput): Promise<Job> => {
-  const id = uuidv4();
+  const id = randomUUID();
 
   const job = { ...jobInput, id };
 

package/template/lambda-sqs-worker/README.md

@@ -15,7 +15,7 @@ Next steps:
 3. [ ] Create a new repository in the appropriate GitHub organisation.
 4. [ ] Add the repository to BuildAgency;
        see [Builds at SEEK] for more information.
-5. [ ] Add deployment bucket configuration and data classification tags to [serverless.yml](serverless.yml).
+5. [ ] Add Datadog extension, deployment bucket configuration and data classification tags to [serverless.yml](serverless.yml).
 6. [ ] Push local commits to the upstream GitHub branch.
 7. [ ] Configure [GitHub repository settings].
 8. [ ] Delete this checklist 😌.

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

@@ -2,7 +2,7 @@
   "dependencies": {
     "@seek/logger": "^5.0.1",
     "aws-sdk": "^2.1011.0",
-    "seek-datadog-custom-metrics": "^4.0.0",
+    "datadog-lambda-js": "^6.83.0",
     "skuba-dive": "^2.0.0",
     "runtypes": "^6.4.1",
     "runtypes-filter": "^0.6.0"
@@ -15,6 +15,7 @@
     "pino-pretty": "^9.0.0",
     "serverless": "^3.17.0",
     "serverless-plugin-canary-deployments": "^0.8.0",
+    "serverless-plugin-datadog": "^5.7.0",
     "serverless-prune-plugin": "^2.0.0",
     "skuba": "*"
   },
@@ -23,6 +24,9 @@
   },
   "license": "UNLICENSED",
   "private": true,
+  "resolutions": {
+    "@types/responselike": "1.0.0"
+  },
   "scripts": {
     "build": "skuba build",
     "deploy": "serverless deploy --force --verbose",

package/template/lambda-sqs-worker/serverless.yml

@@ -4,21 +4,33 @@ configValidationMode: error
 
 params:
   default:
+    datadogApiKeySecretArn: 'TODO: arn:aws:secretsmanager:${aws:region}:${aws:accountId}:secret:SECRET-NAME'
     description: <%- description %>
   dev:
-    deploymentBucket: 'TODO: deploymentBucketName'
+    deploymentBucket: 'TODO: deployment-bucket-name'
     isProduction: false
   prod:
-    deploymentBucket: 'TODO: deploymentBucketName'
+    deploymentBucket: 'TODO: deployment-bucket-name'
     isProduction: true
 
 custom:
+  datadog:
+    addLayers: false
+    apiKeySecretArn: ${param:datadogApiKeySecretArn}
+    enableDDLogs: false
+    # TODO: enable Datadog extension
+    enabled: false
+    exclude:
+      - WorkerPreHook
+    injectLogContext: false
+    version: ${env:VERSION}
   prune:
     automatic: true
     number: 3
 
 plugins:
   - serverless-plugin-canary-deployments
+  - serverless-plugin-datadog
   - serverless-prune-plugin
 
 provider:
@@ -51,6 +63,9 @@ provider:
         - Action: lambda:InvokeFunction
           Effect: Allow
           Resource: !Sub arn:aws:lambda:${AWS::Region}:${AWS::AccountId}:function:${self:functions.Worker.name}
+        - Action: secretsmanager:GetSecretValue
+          Effect: Allow
+          Resource: ${param:datadogApiKeySecretArn}-??????
         - Action: sns:Publish
           Effect: Allow
           Resource: !Ref DestinationTopic

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

@@ -17,7 +17,9 @@ describe('handler', () => {
 
   const score = chance.floating({ max: 1, min: 0 });
 
-  const increment = jest.spyOn(metricsClient, 'increment').mockReturnValue();
+  const distribution = jest
+    .spyOn(metricsClient, 'distribution')
+    .mockReturnValue();
 
   beforeAll(logger.spy);
   beforeAll(scoringService.spy);
@@ -32,7 +34,7 @@ describe('handler', () => {
 
   afterEach(() => {
     logger.clear();
-    increment.mockClear();
+    distribution.mockClear();
     scoringService.clear();
     sns.clear();
   });
@@ -47,12 +49,12 @@ describe('handler', () => {
     expect(logger.error).not.toHaveBeenCalled();
 
     expect(logger.info.mock.calls).toEqual([
-      [{ count: 1 }, 'received jobs'],
-      [{ snsMessageId: expect.any(String) }, 'scored job'],
-      ['request'],
+      [{ count: 1 }, 'Received jobs'],
+      [{ snsMessageId: expect.any(String) }, 'Scored job'],
+      ['Function succeeded'],
     ]);
 
-    expect(increment.mock.calls).toEqual([
+    expect(distribution.mock.calls).toEqual([
       ['job.received', 1],
       ['job.scored', 1],
     ]);
@@ -63,7 +65,7 @@ describe('handler', () => {
   it('throws on invalid input', () => {
     const event = createSqsEvent(['}']);
 
-    return expect(app.handler(event, ctx)).rejects.toThrow('invoke error');
+    return expect(app.handler(event, ctx)).rejects.toThrow('Function failed');
   });
 
   it('bubbles up scoring service error', async () => {
@@ -73,9 +75,9 @@ describe('handler', () => {
 
     const event = createSqsEvent([JSON.stringify(jobPublished)]);
 
-    await expect(app.handler(event, ctx)).rejects.toThrow('invoke error');
+    await expect(app.handler(event, ctx)).rejects.toThrow('Function failed');
 
-    expect(logger.error).toHaveBeenCalledWith({ err }, 'request');
+    expect(logger.error).toHaveBeenCalledWith({ err }, 'Function failed');
   });
 
   it('bubbles up SNS error', async () => {
@@ -85,31 +87,31 @@ describe('handler', () => {
 
     const event = createSqsEvent([JSON.stringify(jobPublished)]);
 
-    await expect(app.handler(event, ctx)).rejects.toThrow('invoke error');
+    await expect(app.handler(event, ctx)).rejects.toThrow('Function failed');
 
-    expect(logger.error).toHaveBeenCalledWith({ err }, 'request');
+    expect(logger.error).toHaveBeenCalledWith({ err }, 'Function failed');
   });
 
   it('throws on zero records', async () => {
-    const err = new Error('received 0 records');
+    const err = new Error('Received 0 records');
 
     const event = createSqsEvent([]);
 
-    await expect(app.handler(event, ctx)).rejects.toThrow('invoke error');
+    await expect(app.handler(event, ctx)).rejects.toThrow('Function failed');
 
-    expect(logger.error).toHaveBeenCalledWith({ err }, 'request');
+    expect(logger.error).toHaveBeenCalledWith({ err }, 'Function failed');
   });
 
   it('throws on multiple records', async () => {
-    const err = new Error('received 2 records');
+    const err = new Error('Received 2 records');
 
     const event = createSqsEvent([
       JSON.stringify(jobPublished),
       JSON.stringify(jobPublished),
     ]);
 
-    await expect(app.handler(event, ctx)).rejects.toThrow('invoke error');
+    await expect(app.handler(event, ctx)).rejects.toThrow('Function failed');
 
-    expect(logger.error).toHaveBeenCalledWith({ err }, 'request');
+    expect(logger.error).toHaveBeenCalledWith({ err }, 'Function failed');
   });
 });

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

@@ -20,19 +20,19 @@ const smokeTest = async () => {
 export const handler = createHandler<SQSEvent>(async (event) => {
   // Treat an empty object as our smoke test event.
   if (!Object.keys(event).length) {
-    logger.info('received smoke test request');
+    logger.info('Received smoke test request');
     return smokeTest();
   }
 
   const count = event.Records.length;
 
   if (count !== 1) {
-    throw Error(`received ${count} records`);
+    throw Error(`Received ${count} records`);
   }
 
-  logger.info({ count }, 'received jobs');
+  logger.info({ count }, 'Received jobs');
 
-  metricsClient.increment('job.received', event.Records.length);
+  metricsClient.distribution('job.received', event.Records.length);
 
   const record = event.Records[0];
 
@@ -46,7 +46,7 @@ export const handler = createHandler<SQSEvent>(async (event) => {
 
   const snsMessageId = await sendPipelineEvent(scoredJob);
 
-  logger.info({ snsMessageId }, 'scored job');
+  logger.info({ snsMessageId }, 'Scored job');
 
-  metricsClient.increment('job.scored', 1);
+  metricsClient.distribution('job.scored', 1);
 });

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

@@ -4,6 +4,7 @@ interface Config {
   environment: Environment;
 
   logLevel: string;
+  metrics: boolean;
   name: string;
   version: string;
 
@@ -20,6 +21,7 @@ const environment = Env.oneOf(environments)('ENVIRONMENT');
 const configs: Record<Environment, () => Omit<Config, 'environment'>> = {
   local: () => ({
     logLevel: 'debug',
+    metrics: false,
     name: '<%- serviceName %>',
     version: 'local',
 
@@ -41,6 +43,7 @@ const configs: Record<Environment, () => Omit<Config, 'environment'>> = {
 
   prod: () => ({
     logLevel: 'info',
+    metrics: true,
     name: Env.string('SERVICE'),
     version: Env.string('VERSION'),
 

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

@@ -18,7 +18,7 @@ describe('createHandler', () => {
     const handler = createHandler((event) => {
       expect(event).toBe(input);
 
-      logger.info('hello from handler');
+      logger.info('Handler invoked');
 
       return Promise.resolve(output);
     });
@@ -28,8 +28,8 @@ describe('createHandler', () => {
     expect(logger.error).not.toHaveBeenCalled();
 
     expect(logger.info.mock.calls).toEqual([
-      ['hello from handler'],
-      ['request'],
+      ['Handler invoked'],
+      ['Function succeeded'],
     ]);
   });
 
@@ -38,9 +38,9 @@ describe('createHandler', () => {
 
     const handler = createHandler(() => Promise.reject(err));
 
-    await expect(handler(input, ctx)).rejects.toThrow('invoke error');
+    await expect(handler(input, ctx)).rejects.toThrow('Function failed');
 
-    expect(logger.error.mock.calls).toEqual([[{ err }, 'request']]);
+    expect(logger.error.mock.calls).toEqual([[{ err }, 'Function failed']]);
 
     expect(logger.info).not.toHaveBeenCalled();
   });
@@ -52,9 +52,9 @@ describe('createHandler', () => {
       throw err;
     });
 
-    await expect(handler(input, ctx)).rejects.toThrow('invoke error');
+    await expect(handler(input, ctx)).rejects.toThrow('Function failed');
 
-    expect(logger.error.mock.calls).toEqual([[{ err }, 'request']]);
+    expect(logger.error.mock.calls).toEqual([[{ err }, 'Function failed']]);
 
     expect(logger.info).not.toHaveBeenCalled();
   });

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

@@ -1,20 +1,43 @@
-import { Context } from 'aws-lambda';
+import { datadog } from 'datadog-lambda-js';
 
+import { config } from 'src/config';
 import { logger, loggerContext } from 'src/framework/logging';
 
-export const createHandler =
-  <Event, Output = unknown>(fn: (event: Event) => Promise<Output>) =>
-  (event: Event, { awsRequestId }: Context) =>
+interface LambdaContext {
+  awsRequestId: string;
+}
+
+type Handler<Event, Output> = (
+  event: Event,
+  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, Output = unknown>(
+  fn: (event: Event) => Promise<Output>,
+) =>
+  withDatadog<Event>((event, { awsRequestId }) =>
     loggerContext.run({ awsRequestId }, async () => {
       try {
         const output = await fn(event);
 
-        logger.info('request');
+        logger.info('Function succeeded');
 
         return output;
       } catch (err) {
-        logger.error({ err }, 'request');
+        logger.error({ err }, 'Function failed');
 
-        throw new Error('invoke error');
+        throw new Error('Function failed');
       }
-    });
+    }),
+  );

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

@@ -1,10 +1,14 @@
-import {
-  createCloudWatchClient,
-  createTimedSpan,
-} from 'seek-datadog-custom-metrics';
+import { sendDistributionMetric } from 'datadog-lambda-js';
 
 import { config } from 'src/config';
 
-export const metricsClient = createCloudWatchClient(config);
+const prefix = `${config.name}.`;
 
-export const timedSpan = createTimedSpan(metricsClient);
+export const metricsClient = {
+  distribution: (
+    ...[name, ...rest]: Parameters<typeof sendDistributionMetric>
+  ) =>
+    config.metrics
+      ? sendDistributionMetric(`${prefix}${name}`, ...rest)
+      : undefined,
+};