Merge branch 'main' into infra-000-otel-exclusions

Author: tfitzgerald-sesame

package.json

@@ -72,66 +72,66 @@
   "dependencies": {
     "@godaddy/terminus": "^4.12.1",
     "@opentelemetry/api": "^1.9.0",
-    "@opentelemetry/auto-instrumentations-node": "^0.52.0",
-    "@opentelemetry/exporter-prometheus": "^0.54.0",
-    "@opentelemetry/instrumentation-dns": "^0.40.0",
-    "@opentelemetry/instrumentation-express": "^0.44.0",
-    "@opentelemetry/instrumentation-generic-pool": "^0.40.0",
-    "@opentelemetry/instrumentation-graphql": "^0.44.0",
-    "@opentelemetry/instrumentation-http": "^0.54.0",
-    "@opentelemetry/instrumentation-ioredis": "^0.44.0",
-    "@opentelemetry/instrumentation-net": "^0.40.0",
-    "@opentelemetry/instrumentation-pg": "^0.47.0",
-    "@opentelemetry/instrumentation-pino": "^0.43.0",
-    "@opentelemetry/instrumentation-undici": "^0.7.0",
-    "@opentelemetry/resource-detector-container": "^0.5.0",
-    "@opentelemetry/resource-detector-gcp": "^0.29.13",
-    "@opentelemetry/sdk-node": "^0.54.0",
-    "@opentelemetry/semantic-conventions": "^1.27.0",
+    "@opentelemetry/auto-instrumentations-node": "^0.55.0",
+    "@opentelemetry/exporter-prometheus": "^0.57.0",
+    "@opentelemetry/instrumentation-dns": "^0.43.0",
+    "@opentelemetry/instrumentation-express": "^0.47.0",
+    "@opentelemetry/instrumentation-generic-pool": "^0.43.0",
+    "@opentelemetry/instrumentation-graphql": "^0.47.0",
+    "@opentelemetry/instrumentation-http": "^0.57.0",
+    "@opentelemetry/instrumentation-ioredis": "^0.47.0",
+    "@opentelemetry/instrumentation-net": "^0.43.0",
+    "@opentelemetry/instrumentation-pg": "^0.50.0",
+    "@opentelemetry/instrumentation-pino": "^0.46.0",
+    "@opentelemetry/instrumentation-undici": "^0.10.0",
+    "@opentelemetry/resource-detector-container": "^0.5.3",
+    "@opentelemetry/resource-detector-gcp": "^0.32.0",
+    "@opentelemetry/sdk-node": "^0.57.0",
+    "@opentelemetry/semantic-conventions": "^1.28.0",
     "@sesamecare-oss/confit": "^2.2.1",
     "@sesamecare-oss/opentelemetry-node-metrics": "^1.1.0",
     "ajv": "^8.17.1",
     "clean-stack": "^5.2.0",
     "cookie-parser": "^1.4.7",
-    "dotenv": "^16.4.5",
+    "dotenv": "^16.4.7",
     "express": "^5.0.1",
-    "express-openapi-validator": "^5.3.8",
+    "express-openapi-validator": "^5.3.9",
     "glob": "^11.0.0",
-    "import-in-the-middle": "^1.11.2",
+    "import-in-the-middle": "^1.12.0",
     "minimist": "^1.2.8",
-    "moderndash": "^3.12.0",
+    "moderndash": "^4.0.0",
     "pino": "^9.5.0",
     "read-package-up": "^11.0.0",
     "request-ip": "^3.3.0"
   },
   "devDependencies": {
-    "@commitlint/cli": "^19.5.0",
-    "@commitlint/config-conventional": "^19.5.0",
+    "@commitlint/cli": "^19.6.1",
+    "@commitlint/config-conventional": "^19.6.0",
     "@openapi-typescript-infra/coconfig": "^4.6.0",
     "@semantic-release/commit-analyzer": "^13.0.0",
     "@semantic-release/exec": "^6.0.3",
-    "@semantic-release/github": "^11.0.0",
-    "@semantic-release/release-notes-generator": "^14.0.1",
-    "@types/cookie-parser": "^1.4.7",
+    "@semantic-release/github": "^11.0.1",
+    "@semantic-release/release-notes-generator": "^14.0.2",
+    "@types/cookie-parser": "^1.4.8",
     "@types/express": "^5.0.0",
     "@types/minimist": "^1.2.5",
-    "@types/node": "^22.8.1",
+    "@types/node": "^22.10.2",
     "@types/request-ip": "^0.0.41",
     "@types/supertest": "^6.0.2",
     "@typescript-eslint/eslint-plugin": "^7.18.0",
     "@typescript-eslint/parser": "^7.18.0",
     "coconfig": "^1.6.1",
     "eslint": "^8.57.1",
     "eslint-config-prettier": "^9.1.0",
-    "eslint-import-resolver-typescript": "^3.6.3",
+    "eslint-import-resolver-typescript": "^3.7.0",
     "eslint-plugin-import": "^2.31.0",
-    "pino-pretty": "^11.3.0",
+    "pino-pretty": "^13.0.0",
     "pinst": "^3.0.0",
     "supertest": "^7.0.0",
     "tsconfig-paths": "^4.2.0",
     "tsx": "^4.19.2",
-    "typescript": "^5.6.3",
-    "vitest": "^2.1.4"
+    "typescript": "^5.7.2",
+    "vitest": "^2.1.8"
   },
   "resolutions": {
     "qs": "^6.11.0"

src/development/repl.ts

@@ -28,6 +28,11 @@ export function serviceRepl<SLocals extends AnyServiceLocals = ServiceLocals<Con
       // eslint-disable-next-line no-console
       console.log(JSON.stringify(o, null, '\t'));
     },
+    // Use iTerm2's escape code to copy to clipboard
+    pbcopy(str: string) {
+      const encoded = Buffer.from(str.toString(), 'utf8').toString('base64');
+      process.stdout.write(`\x1b]52;c;${encoded}\x07`);
+    },
   });
   rl.setupHistory(path.resolve('.node_repl_history'), (err) => {
     if (err) {

src/telemetry/requestLogger.ts

@@ -10,6 +10,7 @@ import { ConfigurationSchema } from '../config/schema.js';
 import { getNodeEnv } from '../env.js';
 
 const LOG_PREFS = Symbol('Logging information');
+const LOGGED_SEMAPHORE = Symbol('Logged semaphore');
 
 interface LogPrefs {
   start: [number, number];
@@ -57,9 +58,13 @@ function finishLog<SLocals extends AnyServiceLocals = ServiceLocals<Configuratio
   app: ServiceExpress<SLocals>,
   error: Error | undefined,
   req: Request,
-  res: Response,
+  res: Response & { [LOGGED_SEMAPHORE]?: boolean },
   histogram: Histogram,
 ) {
+  if (res[LOGGED_SEMAPHORE]) {
+    return;
+  }
+
   const prefs = (res.locals as WithLogPrefs)[LOG_PREFS];
   if (prefs.logged) {
     // This happens when error handler runs, but onEnd hasn't fired yet. We only log the first one.
@@ -71,9 +76,22 @@ function finishLog<SLocals extends AnyServiceLocals = ServiceLocals<Configuratio
 
   const dur = hrdur[0] + hrdur[1] / 1000000000;
   const [url, preInfo] = getBasicInfo(req);
+
+  let responseType: string = 'finished';
+
+  // ts warning is known and incorrect—`aborted` is a subset of `destroyed`
+  if (req.aborted) {
+    responseType = 'aborted';
+  } else if (req.destroyed) {
+    responseType = 'destroyed';
+  } else if (error) {
+    responseType = 'errored';
+  }
+
   const endLog: Record<string, string | string[] | number | undefined> = {
     ...preInfo,
     t: 'req',
+    r: responseType,
     s: (error as ErrorWithStatus)?.status || res.statusCode || 0,
     dur,
   };
@@ -124,6 +142,8 @@ function finishLog<SLocals extends AnyServiceLocals = ServiceLocals<Configuratio
   } else {
     logger.info(endLog, msg);
   }
+
+  res[LOGGED_SEMAPHORE] = true;
 }
 
 export function loggerMiddleware<
@@ -180,8 +200,10 @@ export function loggerMiddleware<
       logger.info(preLog, msg);
     }
 
-    const logWriter = () => finishLog(app, undefined, req, res, histogram);
+    const logWriter = (err?: Error) => finishLog(app, err, req, res, histogram);
     res.on('finish', logWriter);
+    res.on('close', logWriter);
+    res.on('error', logWriter);
     next();
   };
 }