skuba 4.3.0 → 4.4.1

package/template/express-rest-api/README.md

@@ -19,15 +19,11 @@ Next steps:
        see the [Gantry] documentation for more information.
 6. [ ] Push local commits to the upstream GitHub branch.
 7. [ ] Configure [GitHub repository settings].
-8. [ ] Keep dependencies up to date with [Renovate];
-       request installation in [SEEK-Jobs/renovate].
-9. [ ] Delete this checklist 😌.
+8. [ ] Delete this checklist 😌.
 
-[arm64]: https://seek-oss.github.io/skuba/docs/deep-dives/arm64.html
+[arm64 guide]: https://seek-oss.github.io/skuba/docs/deep-dives/arm64.html
 [builds at seek]: https://builds-at-seek.ssod.skinfra.xyz
 [github repository settings]: https://github.com/<%-orgName%>/<%-repoName%>/settings
-[renovate]: https://github.com/apps/renovate
-[seek-jobs/renovate]: https://github.com/SEEK-Jobs/renovate
 
 ## Design
 
@@ -109,5 +105,5 @@ TODO: add support links for the prod environment.
 
 [codedeploy]: https://docs.aws.amazon.com/codedeploy
 [express]: https://expressjs.com
-[gantry]: https://gantry.ssod.skinfra.xyz
+[gantry]: https://backstage.myseek.xyz/docs/default/component/gantry/
 [technology strategy]: https://tech-strategy.ssod.skinfra.xyz

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

@@ -8,7 +8,7 @@
     "@types/express": "^4.17.13",
     "@types/node": "^16.0.0",
     "@types/supertest": "^2.0.11",
-    "pino-pretty": "^8.0.0",
+    "pino-pretty": "^9.0.0",
     "skuba": "*",
     "supertest": "^6.1.6"
   },

package/template/greeter/.buildkite/pipeline.yml

@@ -32,6 +32,6 @@ steps:
       - *aws-sm
       - *private-npm
       - *docker-ecr-cache
-      - docker-compose#v3.9.0:
+      - docker-compose#v3.10.0:
           run: app
     timeout_in_minutes: 10

package/template/greeter/README.md

@@ -17,15 +17,11 @@ Next steps:
        see [Builds at SEEK] for more information.
 5. [ ] Push local commits to the upstream GitHub branch.
 6. [ ] Configure [GitHub repository settings].
-7. [ ] Keep dependencies up to date with [Renovate];
-       request installation in [SEEK-Jobs/renovate].
-8. [ ] Delete this checklist 😌.
+7. [ ] Delete this checklist 😌.
 
-[arm64]: https://seek-oss.github.io/skuba/docs/deep-dives/arm64.html
+[arm64 guide]: https://seek-oss.github.io/skuba/docs/deep-dives/arm64.html
 [builds at seek]: https://builds-at-seek.ssod.skinfra.xyz
 [github repository settings]: https://github.com/<%-orgName%>/<%-repoName%>/settings
-[renovate]: https://github.com/apps/renovate
-[seek-jobs/renovate]: https://github.com/SEEK-Jobs/renovate
 
 ## Design
 
@@ -35,8 +31,8 @@ or serve as a starting point for a backend project if the other built-in templat
 
 It's a barebones Node.js application that comprises:
 
-- A [src/app.ts] that can be run locally to greet the user
-- A [src/app.test.ts] that demonstrates rudimentary Jest usage
+- A [src/app.ts](src/app.ts) that can be run locally to greet the user
+- A [src/app.test.ts](src/app.test.ts) that demonstrates rudimentary Jest usage
 
 ## Development
 

package/template/koa-rest-api/.buildkite/pipeline.yml

@@ -51,7 +51,7 @@ steps:
       - *aws-sm
       - *private-npm
       - *docker-ecr-cache
-      - docker-compose#v3.9.0:
+      - docker-compose#v3.10.0:
           run: app
     timeout_in_minutes: 10
 
@@ -61,7 +61,7 @@ steps:
       - *aws-sm
       - *private-npm
       - *docker-ecr-cache
-      - seek-jobs/gantry#v1.8.1:
+      - seek-jobs/gantry#v2.0.0:
           command: build
           file: gantry.build.yml
           region: <%- region %>
@@ -78,7 +78,7 @@ steps:
     concurrency_group: <%- teamName %>/deploy/gantry/<%- devGantryEnvironmentName %>
     key: deploy-dev
     plugins:
-      - seek-jobs/gantry#v1.8.1:
+      - seek-jobs/gantry#v2.0.0:
           command: apply
           environment: <%- devGantryEnvironmentName %>
           file: gantry.apply.yml
@@ -93,7 +93,7 @@ steps:
     concurrency_group: <%- teamName %>/deploy/gantry/<%- prodGantryEnvironmentName %>
     depends_on: deploy-dev
     plugins:
-      - seek-jobs/gantry#v1.8.1:
+      - seek-jobs/gantry#v2.0.0:
           command: apply
           environment: <%- prodGantryEnvironmentName %>
           file: gantry.apply.yml

package/template/koa-rest-api/.gantry/common.yml

@@ -4,7 +4,7 @@ image: '{{values "prodAccountId"}}.dkr.ecr.<%- region %>.amazonaws.com/{{values
 service: '<%- serviceName %>'
 
 # TODO: enable Datadog agent
-# https://gantry.ssod.skinfra.xyz/docs/v1/resources/service.html#datadogSecretId
+# https://backstage.myseek.xyz/docs/default/component/gantry/v1/reference/resources/service/#datadogSecretId
 # datadogSecretId: arn:aws:secretsmanager:<%- region %>:<aws-account-id>:secret:<secret-name>
 
 tags:

package/template/koa-rest-api/README.md

@@ -19,15 +19,11 @@ Next steps:
        see the [Gantry] documentation for more information.
 6. [ ] Push local commits to the upstream GitHub branch.
 7. [ ] Configure [GitHub repository settings].
-8. [ ] Keep dependencies up to date with [Renovate];
-       request installation in [SEEK-Jobs/renovate].
-9. [ ] Delete this checklist 😌.
+8. [ ] Delete this checklist 😌.
 
-[arm64]: https://seek-oss.github.io/skuba/docs/deep-dives/arm64.html
+[arm64 guide]: https://seek-oss.github.io/skuba/docs/deep-dives/arm64.html
 [builds at seek]: https://builds-at-seek.ssod.skinfra.xyz
 [github repository settings]: https://github.com/<%-orgName%>/<%-repoName%>/settings
-[renovate]: https://github.com/apps/renovate
-[seek-jobs/renovate]: https://github.com/SEEK-Jobs/renovate
 
 ## Design
 
@@ -113,6 +109,6 @@ TODO: add support links for the prod environment.
 -->
 
 [codedeploy]: https://docs.aws.amazon.com/codedeploy
-[gantry]: https://gantry.ssod.skinfra.xyz
+[gantry]: https://backstage.myseek.xyz/docs/default/component/gantry/
 [koa]: https://koajs.com
 [technology strategy]: https://tech-strategy.ssod.skinfra.xyz

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

@@ -1,11 +1,11 @@
 {
   "dependencies": {
-    "@koa/router": "^10.1.1",
+    "@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-http": "^0.29.2",
-    "@opentelemetry/sdk-node": "^0.29.2",
+    "@opentelemetry/instrumentation-aws-sdk": "^0.9.0",
+    "@opentelemetry/instrumentation-http": "^0.32.0",
+    "@opentelemetry/sdk-node": "^0.32.0",
     "@seek/logger": "^5.0.1",
     "aws-sdk": "^2.1039.0",
     "hot-shots": "^9.0.0",
@@ -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,9 +25,8 @@
     "@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": "^8.0.0",
+    "pino-pretty": "^9.0.0",
     "skuba": "*",
     "supertest": "^6.1.6"
   },

package/template/koa-rest-api/src/api/jobs/postJob.test.ts

@@ -26,9 +26,13 @@ describe('postJobHandler', () => {
       .send(jobInput)
       .expect(422)
       .expect(({ text }) =>
-        expect(text).toMatchInlineSnapshot(
-          `"Expected { hirer: { id: string; }; }, but was incompatible"`,
-        ),
+        expect(text).toMatchInlineSnapshot(`
+          "Validation failed:
+          {
+            "hirer": "Expected { id: string; }, but was missing"
+          }.
+          Object should match { hirer: { id: string; }; }"
+        `),
       );
   });
 });

package/template/koa-rest-api/src/framework/server.test.ts

@@ -29,9 +29,9 @@ describe('createApp', () => {
       .expect('server', /.+/)
       .expect('x-api-version', /.+/);
 
-    expect(logger.error).not.toBeCalled();
+    expect(logger.error).not.toHaveBeenCalled();
 
-    expect(logger.info).not.toBeCalled();
+    expect(logger.info).not.toHaveBeenCalled();
 
     metricsClient.expectTagSubset(['env:test', 'version:test']);
     metricsClient.expectTagSubset([
@@ -51,9 +51,9 @@ describe('createApp', () => {
       .expect('server', /.+/)
       .expect('x-api-version', /.+/);
 
-    expect(logger.error).not.toBeCalled();
+    expect(logger.error).not.toHaveBeenCalled();
 
-    expect(logger.info).not.toBeCalled();
+    expect(logger.info).not.toHaveBeenCalled();
 
     metricsClient.expectTagSubset([
       'http_method:put',
@@ -72,9 +72,9 @@ describe('createApp', () => {
       .expect('server', /.+/)
       .expect('x-api-version', /.+/);
 
-    expect(logger.error).not.toBeCalled();
+    expect(logger.error).not.toHaveBeenCalled();
 
-    expect(logger.info).nthCalledWith(
+    expect(logger.info).toHaveBeenNthCalledWith(
       1,
       expect.objectContaining({ status: 404 }),
       'Client error',
@@ -102,9 +102,9 @@ describe('createApp', () => {
       .expect('server', /.+/)
       .expect('x-api-version', /.+/);
 
-    expect(logger.error).not.toBeCalled();
+    expect(logger.error).not.toHaveBeenCalled();
 
-    expect(logger.info).nthCalledWith(
+    expect(logger.info).toHaveBeenNthCalledWith(
       1,
       expect.objectContaining({ status: 400 }),
       'Client error',
@@ -129,9 +129,9 @@ describe('createApp', () => {
       .expect('server', /.+/)
       .expect('x-api-version', /.+/);
 
-    expect(logger.error).not.toBeCalled();
+    expect(logger.error).not.toHaveBeenCalled();
 
-    expect(logger.info).nthCalledWith(
+    expect(logger.info).toHaveBeenNthCalledWith(
       1,
       expect.objectContaining({ err: expect.any(Error), status: 400 }),
       'Client error',
@@ -156,13 +156,13 @@ describe('createApp', () => {
       .expect('server', /.+/)
       .expect('x-api-version', /.+/);
 
-    expect(logger.error).nthCalledWith(
+    expect(logger.error).toHaveBeenNthCalledWith(
       1,
       expect.objectContaining({ err: expect.any(Error), status: 500 }),
       'Server error',
     );
 
-    expect(logger.info).not.toBeCalled();
+    expect(logger.info).not.toHaveBeenCalled();
 
     metricsClient.expectTagSubset([
       'http_method:get',
@@ -185,13 +185,13 @@ describe('createApp', () => {
       .expect('server', /.+/)
       .expect('x-api-version', /.+/);
 
-    expect(logger.error).nthCalledWith(
+    expect(logger.error).toHaveBeenNthCalledWith(
       1,
       expect.objectContaining({ err, status: 500 }),
       'Server error',
     );
 
-    expect(logger.info).not.toBeCalled();
+    expect(logger.info).not.toHaveBeenCalled();
 
     metricsClient.expectTagSubset([
       'http_method:get',
@@ -213,13 +213,13 @@ describe('createApp', () => {
       .expect('server', /.+/)
       .expect('x-api-version', /.+/);
 
-    expect(logger.error).nthCalledWith(
+    expect(logger.error).toHaveBeenNthCalledWith(
       1,
       expect.objectContaining({ err: null, status: 500 }),
       'Server error',
     );
 
-    expect(logger.info).not.toBeCalled();
+    expect(logger.info).not.toHaveBeenCalled();
 
     metricsClient.expectTagSubset([
       'http_method:get',
@@ -242,13 +242,13 @@ describe('createApp', () => {
       .expect('server', /.+/)
       .expect('x-api-version', /.+/);
 
-    expect(logger.error).nthCalledWith(
+    expect(logger.error).toHaveBeenNthCalledWith(
       1,
       expect.objectContaining({ err, status: 500 }),
       'Server error',
     );
 
-    expect(logger.info).not.toBeCalled();
+    expect(logger.info).not.toHaveBeenCalled();
 
     metricsClient.expectTagSubset([
       'http_method:get',

package/template/koa-rest-api/src/framework/validation.test.ts

@@ -42,9 +42,13 @@ describe('validate', () => {
       .send({ ...idDescription, id: null })
       .expect(422)
       .expect(({ text }) =>
-        expect(text).toMatchInlineSnapshot(
-          `"Expected { id: string; description: string; }, but was incompatible"`,
-        ),
+        expect(text).toMatchInlineSnapshot(`
+          "Validation failed:
+          {
+            "id": "Expected string, but was null"
+          }.
+          Object should match { id: string; description: string; }"
+        `),
       );
   });
 
@@ -54,8 +58,13 @@ describe('validate', () => {
       .send({})
       .expect(422)
       .expect(({ text }) =>
-        expect(text).toMatchInlineSnapshot(
-          `"Expected { id: string; description: string; }, but was incompatible"`,
-        ),
+        expect(text).toMatchInlineSnapshot(`
+          "Validation failed:
+          {
+            "id": "Expected string, but was missing",
+            "description": "Expected string, but was missing"
+          }.
+          Object should match { id: string; description: string; }"
+        `),
       ));
 });

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/.buildkite/pipeline.yml

@@ -32,10 +32,9 @@ configs:
         - *aws-sm
         - *private-npm
         - *docker-ecr-cache
-        - docker-compose#v3.9.0:
+        - docker-compose#v3.10.0:
             dependencies: false
             run: app
-            tty: false
       retry:
         manual:
           # Only use this if you need to roll back a deployment ASAP.
@@ -61,7 +60,7 @@ steps:
       - *aws-sm
       - *private-npm
       - *docker-ecr-cache
-      - docker-compose#v3.9.0:
+      - docker-compose#v3.10.0:
           run: app
     timeout_in_minutes: 10
 

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

@@ -15,18 +15,14 @@ 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. [ ] Keep dependencies up to date with [Renovate];
-       request installation in [SEEK-Jobs/renovate].
-9. [ ] Delete this checklist 😌.
+8. [ ] Delete this checklist 😌.
 
-[arm64]: https://seek-oss.github.io/skuba/docs/deep-dives/arm64.html
+[arm64 guide]: https://seek-oss.github.io/skuba/docs/deep-dives/arm64.html
 [builds at seek]: https://builds-at-seek.ssod.skinfra.xyz
 [github repository settings]: https://github.com/<%-orgName%>/<%-repoName%>/settings
-[renovate]: https://github.com/apps/renovate
-[seek-jobs/renovate]: https://github.com/SEEK-Jobs/renovate
 
 ## Design
 

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"
@@ -12,9 +12,10 @@
     "@types/chance": "^1.1.3",
     "@types/node": "^16.0.0",
     "chance": "^1.1.8",
-    "pino-pretty": "^8.0.0",
+    "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,12 +63,12 @@ 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
-        - Action: sqs:SendMessage*
-          Effect: Allow
-          Resource: !GetAtt DeadLetterQueue.Arn
   stackTags:
     # TODO: add data classification tags
     # https://rfc.skinfra.xyz/RFC019-AWS-Tagging-Standard.html#seekdataconsumers

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();
   });
@@ -42,28 +44,28 @@ describe('handler', () => {
 
     await expect(app.handler(event, ctx)).resolves.toBeUndefined();
 
-    expect(scoringService.request).toBeCalledTimes(1);
+    expect(scoringService.request).toHaveBeenCalledTimes(1);
 
-    expect(logger.error).not.toBeCalled();
+    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],
     ]);
 
-    expect(sns.publish).toBeCalledTimes(1);
+    expect(sns.publish).toHaveBeenCalledTimes(1);
   });
 
   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).toBeCalledWith({ 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).toBeCalledWith({ 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).toBeCalledWith({ 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).toBeCalledWith({ 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);
 });