skuba 4.2.0-beta.6 → 4.2.1

package/lib/wrapper/requestListener.js

@@ -1,13 +1,4 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.runRequestListener = void 0;
 const validation_1 = require("../utils/validation");
@@ -18,8 +9,7 @@ const isConfig = (data) => (0, validation_1.isFunction)(data) || (0, validation_
  *
  * This supports Express and Koa applications out of the box.
  */
-const runRequestListener = ({ availablePort, entryPoint, }) => __awaiter(void 0, void 0, void 0, function* () {
-    var _a, _b;
+const runRequestListener = async ({ availablePort, entryPoint, }) => {
     if (!isConfig(entryPoint)) {
         // Assume an executable script with weird exports
         return;
@@ -35,13 +25,13 @@ const runRequestListener = ({ availablePort, entryPoint, }) => __awaiter(void 0,
     }
     const requestListener = typeof config === 'function'
         ? config
-        : (_a = config.requestListener) !== null && _a !== void 0 ? _a : (_b = config.callback) === null || _b === void 0 ? void 0 : _b.call(config);
+        : config.requestListener ?? config.callback?.();
     if (typeof requestListener !== 'function') {
         // Assume an executable script with non-request listener exports
         return;
     }
     const port = (0, validation_1.isIpPort)(config.port) ? config.port : availablePort;
     return (0, http_1.serveRequestListener)(requestListener, port);
-});
+};
 exports.runRequestListener = runRequestListener;
 //# sourceMappingURL=requestListener.js.map

package/lib/wrapper/requestListener.js.map

@@ -1 +1 @@
-{"version":3,"file":"requestListener.js","sourceRoot":"","sources":["../../src/wrapper/requestListener.ts"],"names":[],"mappings":";;;;;;;;;;;;AAEA,oDAAqE;AAErE,iCAA8C;AAiB9C,MAAM,QAAQ,GAAG,CAAC,IAAa,EAAyC,EAAE,CACxE,IAAA,uBAAU,EAAC,IAAI,CAAC,IAAI,IAAA,qBAAQ,EAAC,IAAI,CAAC,CAAC;AAOrC;;;;GAIG;AACI,MAAM,kBAAkB,GAAG,CAAO,EACvC,aAAa,EACb,UAAU,GACL,EAAiB,EAAE;;IACxB,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,EAAE;QACzB,iDAAiD;QACjD,OAAO;KACR;IAED,IAAI,MAAM,GAAG,UAAU,CAAC;IAExB,IAAI,OAAO,MAAM,KAAK,QAAQ,IAAI,QAAQ,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE;QAC1D,0CAA0C;QAC1C,MAAM,GAAG,MAAM,CAAC,OAAO,CAAC;KACzB;IAED,IAAI,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,MAAM,KAAK,CAAC,EAAE;QACpC,8CAA8C;QAC9C,OAAO;KACR;IAED,MAAM,eAAe,GACnB,OAAO,MAAM,KAAK,UAAU;QAC1B,CAAC,CAAC,MAAM;QACR,CAAC,CAAC,MAAA,MAAM,CAAC,eAAe,mCAAI,MAAA,MAAM,CAAC,QAAQ,sDAAI,CAAC;IAEpD,IAAI,OAAO,eAAe,KAAK,UAAU,EAAE;QACzC,gEAAgE;QAChE,OAAO;KACR;IAED,MAAM,IAAI,GAAG,IAAA,qBAAQ,EAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,aAAa,CAAC;IAEjE,OAAO,IAAA,2BAAoB,EAAC,eAAe,EAAE,IAAI,CAAC,CAAC;AACrD,CAAC,CAAA,CAAC;AAlCW,QAAA,kBAAkB,sBAkC7B"}
+{"version":3,"file":"requestListener.js","sourceRoot":"","sources":["../../src/wrapper/requestListener.ts"],"names":[],"mappings":";;;AAEA,oDAAqE;AAErE,iCAA8C;AAiB9C,MAAM,QAAQ,GAAG,CAAC,IAAa,EAAyC,EAAE,CACxE,IAAA,uBAAU,EAAC,IAAI,CAAC,IAAI,IAAA,qBAAQ,EAAC,IAAI,CAAC,CAAC;AAOrC;;;;GAIG;AACI,MAAM,kBAAkB,GAAG,KAAK,EAAE,EACvC,aAAa,EACb,UAAU,GACL,EAAiB,EAAE;IACxB,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,EAAE;QACzB,iDAAiD;QACjD,OAAO;KACR;IAED,IAAI,MAAM,GAAG,UAAU,CAAC;IAExB,IAAI,OAAO,MAAM,KAAK,QAAQ,IAAI,QAAQ,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE;QAC1D,0CAA0C;QAC1C,MAAM,GAAG,MAAM,CAAC,OAAO,CAAC;KACzB;IAED,IAAI,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,MAAM,KAAK,CAAC,EAAE;QACpC,8CAA8C;QAC9C,OAAO;KACR;IAED,MAAM,eAAe,GACnB,OAAO,MAAM,KAAK,UAAU;QAC1B,CAAC,CAAC,MAAM;QACR,CAAC,CAAC,MAAM,CAAC,eAAe,IAAI,MAAM,CAAC,QAAQ,EAAE,EAAE,CAAC;IAEpD,IAAI,OAAO,eAAe,KAAK,UAAU,EAAE;QACzC,gEAAgE;QAChE,OAAO;KACR;IAED,MAAM,IAAI,GAAG,IAAA,qBAAQ,EAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,aAAa,CAAC;IAEjE,OAAO,IAAA,2BAAoB,EAAC,eAAe,EAAE,IAAI,CAAC,CAAC;AACrD,CAAC,CAAC;AAlCW,QAAA,kBAAkB,sBAkC7B"}

package/package.json

@@ -6,13 +6,9 @@
     "url": "https://github.com/seek-oss/skuba/issues"
   },
   "dependencies": {
-    "@changesets/cli": "^2.22.0",
-    "@changesets/pre": "^1.0.10",
-    "@changesets/read": "^0.5.4",
-    "@manypkg/get-packages": "^1.1.3",
     "@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",
@@ -20,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",
@@ -29,54 +25,49 @@
     "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",
-    "mdast-util-to-string": "^2.0.0",
-    "module-alias": "^2.2.2",
     "normalize-package-data": "^4.0.0",
     "npm-run-path": "^4.0.1",
     "npm-which": "^3.0.1",
     "picomatch": "^2.2.2",
     "prettier": "~2.6.0",
     "read-pkg-up": "^7.0.1",
-    "remark-parse": "^9.0.0",
-    "remark-stringify": "^9.0.1",
     "runtypes": "^6.0.0",
     "semantic-release": "^19.0.0",
     "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",
-    "unified": "^9.2.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",
-    "@changesets/types": "4.1.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"
@@ -108,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",
@@ -133,5 +123,5 @@
     "version": "4.0.0"
   },
   "types": "./lib/index.d.ts",
-  "version": "4.2.0-beta.6"
+  "version": "4.2.1"
 }

package/template/base/tsconfig.json

@@ -1,11 +1,12 @@
 {
   "compilerOptions": {
     "baseUrl": ".",
+    "lib": ["ES2020"],
     "outDir": "lib",
     "paths": {
       "src": ["src"]
     },
-    "target": "es2020"
+    "target": "ES2020"
   },
   "exclude": ["lib*/**/*"],
   "extends": "skuba/config/tsconfig.json"

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
@@ -60,7 +61,7 @@ steps:
       - *aws-sm
       - *private-npm
       - *docker-ecr-cache
-      - seek-jobs/gantry#v1.6.2:
+      - seek-jobs/gantry#v1.7.0:
           command: build
           file: gantry.build.yml
           region: <%- region %>
@@ -77,7 +78,7 @@ steps:
     concurrency_group: <%- teamName %>/deploy/gantry/<%- devGantryEnvironmentName %>
     key: deploy-dev
     plugins:
-      - seek-jobs/gantry#v1.6.2:
+      - seek-jobs/gantry#v1.7.0:
           command: apply
           environment: <%- devGantryEnvironmentName %>
           file: gantry.apply.yml
@@ -92,7 +93,7 @@ steps:
     concurrency_group: <%- teamName %>/deploy/gantry/<%- prodGantryEnvironmentName %>
     depends_on: deploy-dev
     plugins:
-      - seek-jobs/gantry#v1.6.2:
+      - seek-jobs/gantry#v1.7.0:
           command: apply
           environment: <%- prodGantryEnvironmentName %>
           file: gantry.apply.yml

package/template/express-rest-api/Dockerfile

@@ -25,13 +25,13 @@ COPY --from=build /workdir/lib lib
 
 COPY --from=deps /workdir/node_modules node_modules
 
-ENV NODE_ENV production
+ENV NODE_ENV=production
 
 # https://nodejs.org/api/cli.html#cli_node_options_options
-ENV NODE_OPTIONS --enable-source-maps
+ENV NODE_OPTIONS=--enable-source-maps
 
 ARG PORT=8001
-ENV PORT ${PORT}
+ENV PORT=${PORT}
 EXPOSE ${PORT}
 
 CMD ["lib/listen.js"]

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
@@ -60,7 +61,7 @@ steps:
       - *aws-sm
       - *private-npm
       - *docker-ecr-cache
-      - seek-jobs/gantry#v1.6.2:
+      - seek-jobs/gantry#v1.7.0:
           command: build
           file: gantry.build.yml
           region: <%- region %>
@@ -77,7 +78,7 @@ steps:
     concurrency_group: <%- teamName %>/deploy/gantry/<%- devGantryEnvironmentName %>
     key: deploy-dev
     plugins:
-      - seek-jobs/gantry#v1.6.2:
+      - seek-jobs/gantry#v1.7.0:
           command: apply
           environment: <%- devGantryEnvironmentName %>
           file: gantry.apply.yml
@@ -92,7 +93,7 @@ steps:
     concurrency_group: <%- teamName %>/deploy/gantry/<%- prodGantryEnvironmentName %>
     depends_on: deploy-dev
     plugins:
-      - seek-jobs/gantry#v1.6.2:
+      - seek-jobs/gantry#v1.7.0:
           command: apply
           environment: <%- prodGantryEnvironmentName %>
           file: gantry.apply.yml

package/template/koa-rest-api/Dockerfile

@@ -25,13 +25,13 @@ COPY --from=build /workdir/lib lib
 
 COPY --from=deps /workdir/node_modules node_modules
 
-ENV NODE_ENV production
+ENV NODE_ENV=production
 
 # https://nodejs.org/api/cli.html#cli_node_options_options
-ENV NODE_OPTIONS --enable-source-maps
+ENV NODE_OPTIONS=--enable-source-maps
 
 ARG PORT=8001
-ENV PORT ${PORT}
+ENV PORT=${PORT}
 EXPOSE ${PORT}
 
 CMD ["--require", "./lib/tracing.js", "./lib/listen.js"]

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.0",
     "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