@openapi-typescript-infra/service 4.10.5 → 4.12.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openapi-typescript-infra/service",
-  "version": "4.10.5",
+  "version": "4.12.0",
   "description": "An opinionated framework for building configuration driven services - web, api, or  ob. Uses OpenAPI, pino logging, express, confit, Typescript and vitest.",
   "main": "build/index.js",
   "scripts": {
@@ -63,29 +63,29 @@
     "@opentelemetry/exporter-prometheus": "^0.43.0",
     "@opentelemetry/exporter-trace-otlp-proto": "^0.43.0",
     "@opentelemetry/instrumentation": "^0.43.0",
-    "@opentelemetry/instrumentation-dns": "^0.32.3",
-    "@opentelemetry/instrumentation-express": "^0.33.2",
-    "@opentelemetry/instrumentation-generic-pool": "^0.32.3",
+    "@opentelemetry/instrumentation-dns": "^0.32.4",
+    "@opentelemetry/instrumentation-express": "^0.33.3",
+    "@opentelemetry/instrumentation-generic-pool": "^0.32.4",
     "@opentelemetry/instrumentation-graphql": "^0.35.2",
     "@opentelemetry/instrumentation-http": "^0.43.0",
-    "@opentelemetry/instrumentation-ioredis": "^0.35.2",
-    "@opentelemetry/instrumentation-net": "^0.32.2",
+    "@opentelemetry/instrumentation-ioredis": "^0.35.3",
+    "@opentelemetry/instrumentation-net": "^0.32.4",
     "@opentelemetry/instrumentation-pg": "^0.36.2",
-    "@opentelemetry/instrumentation-pino": "^0.34.2",
-    "@opentelemetry/resource-detector-container": "^0.3.2",
-    "@opentelemetry/resource-detector-gcp": "^0.29.2",
-    "@opentelemetry/resources": "^1.17.1",
-    "@opentelemetry/sdk-metrics": "^1.17.1",
+    "@opentelemetry/instrumentation-pino": "^0.34.4",
+    "@opentelemetry/resource-detector-container": "^0.3.4",
+    "@opentelemetry/resource-detector-gcp": "^0.29.4",
+    "@opentelemetry/resources": "^1.18.1",
+    "@opentelemetry/sdk-metrics": "^1.18.1",
     "@opentelemetry/sdk-node": "^0.43.0",
-    "@opentelemetry/sdk-trace-base": "^1.17.1",
-    "@opentelemetry/semantic-conventions": "^1.17.1",
+    "@opentelemetry/sdk-trace-base": "^1.18.1",
+    "@opentelemetry/semantic-conventions": "^1.18.1",
     "@sesamecare-oss/confit": "^2.2.0",
     "@sesamecare-oss/opentelemetry-node-metrics": "^1.0.1",
     "ajv": "^8.12.0",
     "cookie-parser": "^1.4.6",
     "dotenv": "^16.3.1",
     "express": "next",
-    "express-openapi-validator": "^5.1.1",
+    "express-openapi-validator": "^5.1.2",
     "glob": "^8.1.0",
     "lodash": "^4.17.21",
     "minimist": "^1.2.8",
@@ -100,28 +100,28 @@
     "@openapi-typescript-infra/coconfig": "^4.2.2",
     "@semantic-release/commit-analyzer": "^11.1.0",
     "@semantic-release/exec": "^6.0.3",
-    "@semantic-release/github": "^9.2.3",
+    "@semantic-release/github": "^9.2.5",
     "@semantic-release/release-notes-generator": "^12.1.0",
     "@types/cookie-parser": "^1.4.6",
     "@types/express": "^4.17.21",
     "@types/glob": "^8.1.0",
     "@types/lodash": "^4.14.202",
     "@types/minimist": "^1.2.5",
-    "@types/node": "^20.10.0",
+    "@types/node": "^20.10.4",
     "@types/request-ip": "^0.0.41",
     "@types/supertest": "^2.0.16",
-    "@typescript-eslint/eslint-plugin": "^6.13.0",
-    "@typescript-eslint/parser": "^6.13.0",
+    "@typescript-eslint/eslint-plugin": "^6.13.2",
+    "@typescript-eslint/parser": "^6.13.2",
     "coconfig": "^1.0.0",
-    "eslint": "^8.54.0",
-    "eslint-config-prettier": "^9.0.0",
+    "eslint": "^8.55.0",
+    "eslint-config-prettier": "^9.1.0",
     "eslint-plugin-import": "^2.29.0",
     "pino-pretty": "^10.2.3",
     "pinst": "^3.0.0",
     "supertest": "^6.3.3",
     "ts-node": "^10.9.1",
     "tsconfig-paths": "^4.2.0",
-    "typescript": "^5.3.2",
+    "typescript": "^5.3.3",
     "vitest": "^0.34.6"
   },
   "resolutions": {

package/src/express-app/app.ts

@@ -3,7 +3,6 @@ import http from 'http';
 import https from 'https';
 import path from 'path';
 
-import express from 'express';
 import { pino } from 'pino';
 import cookieParser from 'cookie-parser';
 import { metrics } from '@opentelemetry/api';
@@ -93,6 +92,7 @@ export async function startApp<
   logger.level = logging?.level || 'info';
 
   // Concentrate the Typescript ugliness...
+  const { default: express } = await import('express');
   const app = express() as unknown as ServiceExpress<SLocals>;
   const routing = config.routing;
 

package/src/telemetry/requestLogger.ts

@@ -6,6 +6,7 @@ import { ServiceError } from '../error';
 import type { AnyServiceLocals, RequestWithApp, ServiceExpress, ServiceLocals } from '../types';
 import type { ServiceHandler } from '../express-app/types';
 import { ConfigurationSchema } from '../config/schema';
+import { getNodeEnv } from '../env';
 
 const LOG_PREFS = Symbol('Logging information');
 
@@ -117,18 +118,22 @@ export function loggerMiddleware<
   histogram: Histogram,
   config?: ConfigurationSchema['logging'],
 ): RequestHandler {
+  const nonProd = getNodeEnv() !== 'production';
   const { logger, service } = app.locals;
   return function gblogger(req, res, next) {
+    const logResponse =
+      config?.logResponseBody || (nonProd && req.headers['x-log']?.includes('res'));
+    const logRequest = config?.logRequestBody || (nonProd && req.headers['x-log']?.includes('req'));
     const prefs: LogPrefs = {
       start: process.hrtime(),
-      logRequests: config?.logRequestBody,
-      chunks: config?.logResponseBody ? [] : undefined,
+      logRequests: logRequest,
+      chunks: logResponse ? [] : undefined,
       logged: false,
     };
 
     (res.locals as WithLogPrefs)[LOG_PREFS] = prefs;
 
-    if (config?.logResponseBody) {
+    if (logResponse) {
       // res is a read-only stream, so the only way to intercept response
       // data is to monkey-patch.
       const oldWrite = res.write;