skuba 4.2.0 → 4.2.2

package/lib/utils/wait.js

@@ -0,0 +1,32 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.withTimeout = exports.throwOnTimeout = exports.sleep = void 0;
+const error_1 = require("./error");
+const logging_1 = require("./logging");
+const sleep = (ms) => {
+    let timeout;
+    return Object.assign(new Promise((resolve) => (timeout = setTimeout(resolve, ms))), { clear: () => clearTimeout(timeout) });
+};
+exports.sleep = sleep;
+const throwOnTimeout = async (promise, { s }) => {
+    const result = await (0, exports.withTimeout)(promise, { s });
+    if (!result.ok) {
+        throw (0, error_1.createTerseError)(`Timed out after ${(0, logging_1.pluralise)(s, 'second')}`);
+    }
+    return result.value;
+};
+exports.throwOnTimeout = throwOnTimeout;
+const withTimeout = async (promise, { s }) => {
+    const timeout = (0, exports.sleep)(s * 1000);
+    try {
+        return await Promise.race([
+            Promise.resolve(promise).then((value) => ({ ok: true, value })),
+            timeout.then(() => ({ ok: false })),
+        ]);
+    }
+    finally {
+        timeout.clear?.();
+    }
+};
+exports.withTimeout = withTimeout;
+//# sourceMappingURL=wait.js.map

package/lib/utils/wait.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"wait.js","sourceRoot":"","sources":["../../src/utils/wait.ts"],"names":[],"mappings":";;;AAAA,mCAA2C;AAC3C,uCAAsC;AAM/B,MAAM,KAAK,GAAG,CAAC,EAAU,EAAW,EAAE;IAC3C,IAAI,OAAuB,CAAC;IAE5B,OAAO,MAAM,CAAC,MAAM,CAClB,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,OAAO,GAAG,UAAU,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,CAAC,EACnE,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC,YAAY,CAAC,OAAO,CAAC,EAAE,CACvC,CAAC;AACJ,CAAC,CAAC;AAPW,QAAA,KAAK,SAOhB;AAEK,MAAM,cAAc,GAAG,KAAK,EACjC,OAAuB,EACvB,EAAE,CAAC,EAAiB,EACR,EAAE;IACd,MAAM,MAAM,GAAG,MAAM,IAAA,mBAAW,EAAC,OAAO,EAAE,EAAE,CAAC,EAAE,CAAC,CAAC;IAEjD,IAAI,CAAC,MAAM,CAAC,EAAE,EAAE;QACd,MAAM,IAAA,wBAAgB,EAAC,mBAAmB,IAAA,mBAAS,EAAC,CAAC,EAAE,QAAQ,CAAC,EAAE,CAAC,CAAC;KACrE;IAED,OAAO,MAAM,CAAC,KAAK,CAAC;AACtB,CAAC,CAAC;AAXW,QAAA,cAAc,kBAWzB;AAIK,MAAM,WAAW,GAAG,KAAK,EAC9B,OAA2B,EAC3B,EAAE,CAAC,EAAiB,EACO,EAAE;IAC7B,MAAM,OAAO,GAAG,IAAA,aAAK,EAAC,CAAC,GAAG,IAAK,CAAC,CAAC;IAEjC,IAAI;QACF,OAAO,MAAM,OAAO,CAAC,IAAI,CAAmB;YAC1C,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,EAAE,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC;YAC/D,OAAO,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC,EAAE,EAAE,EAAE,KAAK,EAAE,CAAC,CAAC;SACpC,CAAC,CAAC;KACJ;YAAS;QACR,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC;KACnB;AACH,CAAC,CAAC;AAdW,QAAA,WAAW,eActB"}

package/lib/utils/worker.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.postWorkerOutput = exports.execWorkerThread = void 0;
+const util_1 = require("util");
 const worker_threads_1 = require("worker_threads");
 const logging_1 = require("./logging");
 /**
@@ -39,7 +40,7 @@ const postWorkerOutput = (fn, logger = logging_1.log) => {
     fn(worker_threads_1.workerData)
         .then((output) => port.postMessage(output))
         .catch((err) => {
-        logger.err(err);
+        logger.err((0, util_1.inspect)(err));
         process.exit(1);
     });
 };

package/lib/utils/worker.js.map

@@ -1 +1 @@
-{"version":3,"file":"worker.js","sourceRoot":"","sources":["../../src/utils/worker.ts"],"names":[],"mappings":";;;AAAA,mDAAgE;AAEhE,uCAAgC;AAEhC;;GAEG;AACI,MAAM,gBAAgB,GAAG,KAAK,EACnC,QAAgB,EAChB,KAAY,EACZ,EAAE;IACF,IAAI,MAAc,CAAC;IACnB,IAAI,eAAe,GAAG,KAAK,CAAC;IAE5B,OAAO,IAAI,OAAO,CAAS,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE,CAC7C,IAAI,uBAAM,CAAC,QAAQ,EAAE;QACnB,UAAU,EAAE,KAAK;KAClB,CAAC;SACC,EAAE,CAAC,OAAO,EAAE,MAAM,CAAC;SACnB,EAAE,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,EAAE,CACnB,eAAe;QACb,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC;QACjB,CAAC,CAAC,MAAM,CACJ,IAAI,KAAK,CACP,IAAI;YACF,CAAC,CAAC,uCAAuC,IAAI,EAAE;YAC/C,CAAC,CAAC,gDAAgD,CACrD,CACF,CACN;SACA,EAAE,CAAC,SAAS,EAAE,CAAC,OAAe,EAAE,EAAE;QACjC,0DAA0D;QAC1D,MAAM,GAAG,OAAO,CAAC;QACjB,eAAe,GAAG,IAAI,CAAC;IACzB,CAAC,CAAC;SACD,EAAE,CAAC,cAAc,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAC5C,CAAC;AACJ,CAAC,CAAC;AA9BW,QAAA,gBAAgB,oBA8B3B;AAEF;;;GAGG;AACI,MAAM,gBAAgB,GAAG,CAC9B,EAAqC,EACrC,MAAM,GAAG,aAAG,EACZ,EAAE;IACF,MAAM,IAAI,GAAG,2BAAU,CAAC;IAExB,IAAI,CAAC,IAAI,EAAE;QACT,MAAM,CAAC,GAAG,CAAC,8DAA8D,CAAC,CAAC;QAE3E,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;KACjB;IAED,EAAE,CAAC,2BAAmB,CAAC;SACpB,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;SAC1C,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE;QACb,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QAEhB,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC,CAAC,CAAC;AACP,CAAC,CAAC;AAnBW,QAAA,gBAAgB,oBAmB3B"}
+{"version":3,"file":"worker.js","sourceRoot":"","sources":["../../src/utils/worker.ts"],"names":[],"mappings":";;;AAAA,+BAA+B;AAC/B,mDAAgE;AAEhE,uCAAgC;AAEhC;;GAEG;AACI,MAAM,gBAAgB,GAAG,KAAK,EACnC,QAAgB,EAChB,KAAY,EACZ,EAAE;IACF,IAAI,MAAc,CAAC;IACnB,IAAI,eAAe,GAAG,KAAK,CAAC;IAE5B,OAAO,IAAI,OAAO,CAAS,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE,CAC7C,IAAI,uBAAM,CAAC,QAAQ,EAAE;QACnB,UAAU,EAAE,KAAK;KAClB,CAAC;SACC,EAAE,CAAC,OAAO,EAAE,MAAM,CAAC;SACnB,EAAE,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,EAAE,CACnB,eAAe;QACb,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC;QACjB,CAAC,CAAC,MAAM,CACJ,IAAI,KAAK,CACP,IAAI;YACF,CAAC,CAAC,uCAAuC,IAAI,EAAE;YAC/C,CAAC,CAAC,gDAAgD,CACrD,CACF,CACN;SACA,EAAE,CAAC,SAAS,EAAE,CAAC,OAAe,EAAE,EAAE;QACjC,0DAA0D;QAC1D,MAAM,GAAG,OAAO,CAAC;QACjB,eAAe,GAAG,IAAI,CAAC;IACzB,CAAC,CAAC;SACD,EAAE,CAAC,cAAc,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAC5C,CAAC;AACJ,CAAC,CAAC;AA9BW,QAAA,gBAAgB,oBA8B3B;AAEF;;;GAGG;AACI,MAAM,gBAAgB,GAAG,CAC9B,EAAqC,EACrC,MAAM,GAAG,aAAG,EACZ,EAAE;IACF,MAAM,IAAI,GAAG,2BAAU,CAAC;IAExB,IAAI,CAAC,IAAI,EAAE;QACT,MAAM,CAAC,GAAG,CAAC,8DAA8D,CAAC,CAAC;QAE3E,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;KACjB;IAED,EAAE,CAAC,2BAAmB,CAAC;SACpB,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;SAC1C,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE;QACb,MAAM,CAAC,GAAG,CAAC,IAAA,cAAO,EAAC,GAAG,CAAC,CAAC,CAAC;QAEzB,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC,CAAC,CAAC;AACP,CAAC,CAAC;AAnBW,QAAA,gBAAgB,oBAmB3B"}

package/package.json

@@ -8,7 +8,7 @@
   "dependencies": {
     "@octokit/rest": "^18.12.0",
     "@octokit/types": "^6.34.0",
-    "@types/jest": "^27.4.0",
+    "@types/jest": "^27.5.0",
     "@types/node": ">=14.18",
     "chalk": "^4.1.0",
     "concurrently": "^7.0.0",
@@ -16,7 +16,7 @@
     "ejs": "^3.1.6",
     "enquirer": "^2.3.6",
     "eslint": "^8.11.0",
-    "eslint-config-skuba": "1.0.16",
+    "eslint-config-skuba": "1.1.0",
     "execa": "^5.0.0",
     "fdir": "^5.0.0",
     "fs-extra": "^10.0.0",
@@ -25,7 +25,7 @@
     "ignore": "^5.1.8",
     "is-installed-globally": "^0.4.0",
     "isomorphic-git": "^1.11.1",
-    "jest": "^27.4.5",
+    "jest": "^28.1.0",
     "latest-version": "^5.1.0",
     "lodash.mergewith": "^4.6.2",
     "normalize-package-data": "^4.0.0",
@@ -39,35 +39,35 @@
     "serialize-error": "^8.0.1",
     "simple-git": "^3.5.0",
     "strip-ansi": "^6.0.1",
-    "ts-jest": "^27.1.2",
-    "ts-node": "^10.5.0",
+    "ts-jest": "^28.0.2",
+    "ts-node": "^10.7.0",
     "ts-node-dev": "^2.0.0-0",
-    "tsconfig-paths": "^3.11.0",
+    "tsconfig-paths": "^4.0.0",
     "tsconfig-seek": "1.0.2",
-    "typescript": "~4.6.2"
+    "typescript": "~4.6.4"
   },
   "description": "SEEK development toolkit for backend applications and packages",
   "devDependencies": {
     "@changesets/cli": "2.22.0",
     "@changesets/get-github-info": "0.5.0",
-    "@jest/reporters": "27.5.1",
-    "@types/ejs": "3.1.0",
+    "@jest/reporters": "28.1.0",
+    "@types/ejs": "3.1.1",
     "@types/express": "4.17.13",
     "@types/fs-extra": "9.0.13",
     "@types/koa": "2.13.4",
-    "@types/lodash.mergewith": "4.6.6",
+    "@types/lodash.mergewith": "4.6.7",
     "@types/module-alias": "2.0.1",
     "@types/npm-which": "3.0.1",
     "@types/picomatch": "2.3.0",
     "@types/supertest": "2.0.12",
-    "enhanced-resolve": "5.9.2",
-    "express": "4.17.3",
+    "enhanced-resolve": "5.9.3",
+    "express": "4.18.1",
     "jsonfile": "6.1.0",
     "koa": "2.13.4",
-    "memfs": "3.4.1",
-    "semver": "7.3.5",
-    "supertest": "6.2.2",
-    "type-fest": "2.12.1"
+    "memfs": "3.4.3",
+    "semver": "7.3.7",
+    "supertest": "6.2.3",
+    "type-fest": "2.12.2"
   },
   "engines": {
     "node": ">=14.18"
@@ -99,8 +99,7 @@
     "url": "git+https://github.com/seek-oss/skuba.git"
   },
   "resolutions": {
-    "**/@types/node": ">=14.18",
-    "semantic-release/@semantic-release/npm/npm/**/ansi-regex": "5.0.1"
+    "**/@types/node": ">=14.18"
   },
   "scripts": {
     "build": "ts-node --transpile-only src/skuba build && scripts/postbuild.sh",
@@ -124,5 +123,5 @@
     "version": "4.0.0"
   },
   "types": "./lib/index.d.ts",
-  "version": "4.2.0"
+  "version": "4.2.2"
 }

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

@@ -9,7 +9,7 @@ configs:
           NPM_READ_TOKEN: arn:aws:secretsmanager:ap-southeast-2:987872074697:secret:npm/npm-read-token
 
     - &docker-ecr-cache
-      seek-oss/docker-ecr-cache#v1.11.0:
+      seek-oss/docker-ecr-cache#v2.0.0:
         cache-on:
           - package.json
           - yarn.lock
@@ -53,6 +53,7 @@ steps:
       - *docker-ecr-cache
       - docker-compose#v3.9.0:
           run: app
+    timeout_in_minutes: 10
 
   - label: 📦 Build & Package
     depends_on: warm-prod

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

@@ -9,7 +9,7 @@ configs:
           NPM_READ_TOKEN: arn:aws:secretsmanager:ap-southeast-2:987872074697:secret:npm/npm-read-token
 
     - &docker-ecr-cache
-      seek-oss/docker-ecr-cache#v1.11.0:
+      seek-oss/docker-ecr-cache#v2.0.0:
         cache-on:
           - package.json
           - yarn.lock
@@ -34,3 +34,4 @@ steps:
       - *docker-ecr-cache
       - docker-compose#v3.9.0:
           run: app
+    timeout_in_minutes: 10

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

@@ -9,7 +9,7 @@ configs:
           NPM_READ_TOKEN: arn:aws:secretsmanager:ap-southeast-2:987872074697:secret:npm/npm-read-token
 
     - &docker-ecr-cache
-      seek-oss/docker-ecr-cache#v1.11.0:
+      seek-oss/docker-ecr-cache#v2.0.0:
         cache-on:
           - package.json
           - yarn.lock
@@ -53,6 +53,7 @@ steps:
       - *docker-ecr-cache
       - docker-compose#v3.9.0:
           run: app
+    timeout_in_minutes: 10
 
   - label: 📦 Build & Package
     depends_on: warm-prod

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

@@ -1,11 +1,11 @@
 {
   "dependencies": {
     "@koa/router": "^10.1.1",
-    "@opentelemetry/api": "^1.0.4",
+    "@opentelemetry/api": "^1.1.0",
     "@opentelemetry/exporter-collector-grpc": "^0.25.0",
-    "@opentelemetry/instrumentation-aws-sdk": "^0.6.0",
-    "@opentelemetry/instrumentation-http": "^0.27.0",
-    "@opentelemetry/sdk-node": "^0.27.0",
+    "@opentelemetry/instrumentation-aws-sdk": "^0.7.0",
+    "@opentelemetry/instrumentation-http": "^0.28.0",
+    "@opentelemetry/sdk-node": "^0.28.0",
     "@seek/logger": "^5.0.1",
     "aws-sdk": "^2.1039.0",
     "hot-shots": "^9.0.0",
@@ -15,7 +15,7 @@
     "runtypes": "^6.4.1",
     "runtypes-filter": "^0.6.0",
     "seek-datadog-custom-metrics": "^4.0.0",
-    "seek-koala": "^5.1.0",
+    "seek-koala": "^5.2.1",
     "skuba-dive": "^2.0.0",
     "uuid": "^8.3.2"
   },

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

@@ -1,4 +1,4 @@
-import { contextLogger } from 'src/framework/logging';
+import { logger } from 'src/framework/logging';
 import { metricsClient } from 'src/framework/metrics';
 import * as storage from 'src/storage/jobs';
 import { Middleware } from 'src/types/koa';
@@ -7,7 +7,7 @@ export const getJobsHandler: Middleware = async (ctx) => {
   const jobs = await storage.readJobs();
 
   // no PII in these jobs
-  contextLogger(ctx).debug({ jobs }, 'read jobs');
+  logger.debug({ jobs }, 'read jobs');
 
   metricsClient.increment('job.reads', jobs.length);
 

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

@@ -1,4 +1,4 @@
-import { contextLogger } from 'src/framework/logging';
+import { logger } from 'src/framework/logging';
 import { metricsClient } from 'src/framework/metrics';
 import { validateRequestBody } from 'src/framework/validation';
 import * as storage from 'src/storage/jobs';
@@ -11,7 +11,7 @@ export const postJobHandler: Middleware = async (ctx) => {
   const job = await storage.createJob(jobInput);
 
   // no PII in these jobs
-  contextLogger(ctx).debug({ job }, 'created job');
+  logger.debug({ job }, 'created job');
 
   metricsClient.increment('job.creations');
 

package/template/koa-rest-api/src/framework/logging.ts

@@ -2,14 +2,20 @@ import createLogger from '@seek/logger';
 import { RequestLogging } from 'seek-koala';
 
 import { config } from 'src/config';
-import { Context } from 'src/types/koa';
 
-export const rootLogger = createLogger({
+const { createContextMiddleware, mixin } =
+  RequestLogging.createContextStorage();
+
+export const contextMiddleware = createContextMiddleware();
+
+export const logger = createLogger({
   base: {
     environment: config.environment,
     version: config.version,
   },
 
+  mixin,
+
   level: config.logLevel,
 
   name: config.name,
@@ -17,6 +23,3 @@ export const rootLogger = createLogger({
   transport:
     config.environment === 'local' ? { target: 'pino-pretty' } : undefined,
 });
-
-export const contextLogger = (ctx: Context) =>
-  rootLogger.child(RequestLogging.contextFields(ctx));

package/template/koa-rest-api/src/framework/metrics.ts

@@ -3,9 +3,9 @@ import { createStatsDClient } from 'seek-datadog-custom-metrics';
 
 import { config } from 'src/config';
 
-import { rootLogger } from './logging';
+import { logger } from './logging';
 
 /* istanbul ignore next: StatsD client is not our responsibility */
 export const metricsClient = createStatsDClient(StatsD, config, (err) =>
-  rootLogger.error({ err }, 'StatsD error'),
+  logger.error({ err }, 'StatsD error'),
 );

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

@@ -1,6 +1,6 @@
 import Router from '@koa/router';
 
-import { rootLogger } from 'src/testing/logging';
+import { logger } from 'src/testing/logging';
 import { metricsClient } from 'src/testing/metrics';
 import { agentFromRouter } from 'src/testing/server';
 import { chance } from 'src/testing/types';
@@ -15,10 +15,10 @@ const router = new Router()
 const agent = agentFromRouter(router);
 
 describe('createApp', () => {
-  beforeAll(rootLogger.spy);
+  beforeAll(logger.spy);
 
   afterEach(metricsClient.clear);
-  afterEach(rootLogger.clear);
+  afterEach(logger.clear);
 
   it('handles root route', async () => {
     middleware.mockImplementation((ctx) => (ctx.body = ''));
@@ -29,9 +29,9 @@ describe('createApp', () => {
       .expect('server', /.+/)
       .expect('x-api-version', /.+/);
 
-    expect(rootLogger.error).not.toBeCalled();
+    expect(logger.error).not.toBeCalled();
 
-    expect(rootLogger.info).not.toBeCalled();
+    expect(logger.info).not.toBeCalled();
 
     metricsClient.expectTagSubset(['env:test', 'version:test']);
     metricsClient.expectTagSubset([
@@ -51,9 +51,9 @@ describe('createApp', () => {
       .expect('server', /.+/)
       .expect('x-api-version', /.+/);
 
-    expect(rootLogger.error).not.toBeCalled();
+    expect(logger.error).not.toBeCalled();
 
-    expect(rootLogger.info).not.toBeCalled();
+    expect(logger.info).not.toBeCalled();
 
     metricsClient.expectTagSubset([
       'http_method:put',
@@ -72,9 +72,9 @@ describe('createApp', () => {
       .expect('server', /.+/)
       .expect('x-api-version', /.+/);
 
-    expect(rootLogger.error).not.toBeCalled();
+    expect(logger.error).not.toBeCalled();
 
-    expect(rootLogger.info).nthCalledWith(
+    expect(logger.info).nthCalledWith(
       1,
       expect.objectContaining({ status: 404 }),
       'Client error',
@@ -102,9 +102,9 @@ describe('createApp', () => {
       .expect('server', /.+/)
       .expect('x-api-version', /.+/);
 
-    expect(rootLogger.error).not.toBeCalled();
+    expect(logger.error).not.toBeCalled();
 
-    expect(rootLogger.info).nthCalledWith(
+    expect(logger.info).nthCalledWith(
       1,
       expect.objectContaining({ status: 400 }),
       'Client error',
@@ -129,9 +129,9 @@ describe('createApp', () => {
       .expect('server', /.+/)
       .expect('x-api-version', /.+/);
 
-    expect(rootLogger.error).not.toBeCalled();
+    expect(logger.error).not.toBeCalled();
 
-    expect(rootLogger.info).nthCalledWith(
+    expect(logger.info).nthCalledWith(
       1,
       expect.objectContaining({ err: expect.any(Error), status: 400 }),
       'Client error',
@@ -156,13 +156,13 @@ describe('createApp', () => {
       .expect('server', /.+/)
       .expect('x-api-version', /.+/);
 
-    expect(rootLogger.error).nthCalledWith(
+    expect(logger.error).nthCalledWith(
       1,
       expect.objectContaining({ err: expect.any(Error), status: 500 }),
       'Server error',
     );
 
-    expect(rootLogger.info).not.toBeCalled();
+    expect(logger.info).not.toBeCalled();
 
     metricsClient.expectTagSubset([
       'http_method:get',
@@ -185,13 +185,13 @@ describe('createApp', () => {
       .expect('server', /.+/)
       .expect('x-api-version', /.+/);
 
-    expect(rootLogger.error).nthCalledWith(
+    expect(logger.error).nthCalledWith(
       1,
       expect.objectContaining({ err, status: 500 }),
       'Server error',
     );
 
-    expect(rootLogger.info).not.toBeCalled();
+    expect(logger.info).not.toBeCalled();
 
     metricsClient.expectTagSubset([
       'http_method:get',
@@ -213,13 +213,13 @@ describe('createApp', () => {
       .expect('server', /.+/)
       .expect('x-api-version', /.+/);
 
-    expect(rootLogger.error).nthCalledWith(
+    expect(logger.error).nthCalledWith(
       1,
       expect.objectContaining({ err: null, status: 500 }),
       'Server error',
     );
 
-    expect(rootLogger.info).not.toBeCalled();
+    expect(logger.info).not.toBeCalled();
 
     metricsClient.expectTagSubset([
       'http_method:get',
@@ -242,13 +242,13 @@ describe('createApp', () => {
       .expect('server', /.+/)
       .expect('x-api-version', /.+/);
 
-    expect(rootLogger.error).nthCalledWith(
+    expect(logger.error).nthCalledWith(
       1,
       expect.objectContaining({ err, status: 500 }),
       'Server error',
     );
 
-    expect(rootLogger.info).not.toBeCalled();
+    expect(logger.info).not.toBeCalled();
 
     metricsClient.expectTagSubset([
       'http_method:get',

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

@@ -9,7 +9,7 @@ import {
 } from 'seek-koala';
 
 import { config } from 'src/config';
-import { rootLogger } from 'src/framework/logging';
+import { contextMiddleware, logger } from 'src/framework/logging';
 import { metricsClient } from 'src/framework/metrics';
 
 const metrics = MetricsMiddleware.create(
@@ -26,8 +26,8 @@ const requestLogging = RequestLogging.createMiddleware((ctx, fields, err) => {
   }
 
   return ctx.status < 500
-    ? rootLogger.info(fields, 'Client error')
-    : rootLogger.error(fields, 'Server error');
+    ? logger.info(fields, 'Client error')
+    : logger.error(fields, 'Server error');
 });
 
 const version = VersionMiddleware.create({
@@ -43,6 +43,7 @@ export const createApp = <State, Context>(
     // https://github.com/seek-oss/koala/tree/master/src/secureHeaders
     // https://github.com/venables/koa-helmet
     // .use(SecureHeaders.middleware)
+    .use(contextMiddleware)
     .use(requestLogging)
     .use(metrics)
     .use(ErrorMiddleware.handle)

package/template/koa-rest-api/src/listen.ts

@@ -2,7 +2,7 @@ import './register';
 
 import app from './app';
 import { config } from './config';
-import { rootLogger } from './framework/logging';
+import { logger } from './framework/logging';
 
 // This implements a minimal version of `koa-cluster`'s interface
 // If your application is deployed with more than 1 vCPU you can delete this
@@ -12,6 +12,6 @@ const listener = app.listen(config.port, () => {
   const address = listener.address();
 
   if (typeof address === 'object' && address) {
-    rootLogger.debug(`listening on port ${address.port}`);
+    logger.debug(`listening on port ${address.port}`);
   }
 });

package/template/koa-rest-api/src/testing/logging.ts

@@ -1,31 +1,16 @@
 import * as logging from 'src/framework/logging';
 
-export const contextLogger = {
+export const logger = {
   error: jest.fn(),
   info: jest.fn(),
 
   clear: () => {
-    contextLogger.error.mockClear();
-    contextLogger.info.mockClear();
-  },
-
-  spy: () =>
-    jest.spyOn(logging, 'contextLogger').mockReturnValue(contextLogger as any),
-};
-
-export const rootLogger = {
-  error: jest.fn(),
-  info: jest.fn(),
-
-  clear: () => {
-    rootLogger.error.mockClear();
-    rootLogger.info.mockClear();
+    logger.error.mockClear();
+    logger.info.mockClear();
   },
 
   spy: () => {
-    jest
-      .spyOn(logging.rootLogger, 'error')
-      .mockImplementation(rootLogger.error);
-    jest.spyOn(logging.rootLogger, 'info').mockImplementation(rootLogger.info);
+    jest.spyOn(logging.logger, 'error').mockImplementation(logger.error);
+    jest.spyOn(logging.logger, 'info').mockImplementation(logger.info);
   },
 };

package/template/lambda-sqs-worker/.buildkite/pipeline.yml

@@ -9,7 +9,7 @@ configs:
           NPM_READ_TOKEN: arn:aws:secretsmanager:ap-southeast-2:987872074697:secret:npm/npm-read-token
 
     - &docker-ecr-cache
-      seek-oss/docker-ecr-cache#v1.11.0:
+      seek-oss/docker-ecr-cache#v2.0.0:
         cache-on:
           - package.json
           - yarn.lock
@@ -63,6 +63,7 @@ steps:
       - *docker-ecr-cache
       - docker-compose#v3.9.0:
           run: app
+    timeout_in_minutes: 10
 
   - agents:
       queue: <%- devBuildkiteQueueName %>

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

@@ -1 +1 @@
-14
+16

package/template/lambda-sqs-worker/Dockerfile

@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1.2
 
-FROM node:14-alpine AS dev-deps
+FROM node:16-alpine AS dev-deps
 
 WORKDIR /workdir
 

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

@@ -10,16 +10,16 @@
   "devDependencies": {
     "@types/aws-lambda": "^8.10.84",
     "@types/chance": "^1.1.3",
-    "@types/node": "^14.0.0",
+    "@types/node": "^16.0.0",
     "chance": "^1.1.8",
     "pino-pretty": "^7.1.0",
-    "serverless": "^3.0.0",
-    "serverless-plugin-canary-deployments": "^0.7.0",
+    "serverless": "^3.17.0",
+    "serverless-plugin-canary-deployments": "^0.8.0",
     "serverless-prune-plugin": "^2.0.0",
     "skuba": "*"
   },
   "engines": {
-    "node": ">=14"
+    "node": ">=16"
   },
   "license": "UNLICENSED",
   "private": true,

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

@@ -25,11 +25,11 @@ provider:
   logRetentionInDays: 30
   name: aws
   region: ap-southeast-2
-  runtime: nodejs14.x
+  runtime: nodejs16.x
   architecture: arm64
+  deploymentMethod: direct
   stackName: ${self:service}
   stage: ${env:ENVIRONMENT}
-  versionFunctions: true
   deploymentBucket:
     # Use a shared account-level bucket for Lambda bundles and other artefacts.
     # This is easier to manage in terms of access, deployment, and tagging.