@openapi-typescript-infra/service 5.4.4 → 5.5.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openapi-typescript-infra/service",
-  "version": "5.4.4",
+  "version": "5.5.1",
   "description": "An opinionated framework for building configuration driven services - web, api, or  ob. Uses OpenAPI, pino logging, express, confit, Typescript and vitest.",
   "exports": {
     ".": {
@@ -72,20 +72,21 @@
   "dependencies": {
     "@godaddy/terminus": "^4.12.1",
     "@opentelemetry/api": "^1.9.0",
-    "@opentelemetry/exporter-prometheus": "^0.53.0",
-    "@opentelemetry/instrumentation-dns": "^0.39.0",
-    "@opentelemetry/instrumentation-express": "^0.43.0",
-    "@opentelemetry/instrumentation-generic-pool": "^0.39.0",
-    "@opentelemetry/instrumentation-graphql": "^0.43.0",
-    "@opentelemetry/instrumentation-http": "^0.53.0",
-    "@opentelemetry/instrumentation-ioredis": "^0.43.0",
-    "@opentelemetry/instrumentation-net": "^0.39.0",
-    "@opentelemetry/instrumentation-pg": "^0.46.0",
-    "@opentelemetry/instrumentation-pino": "^0.42.0",
-    "@opentelemetry/instrumentation-undici": "^0.6.0",
-    "@opentelemetry/resource-detector-container": "^0.4.4",
-    "@opentelemetry/resource-detector-gcp": "^0.29.12",
-    "@opentelemetry/sdk-node": "^0.53.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",
     "@sesamecare-oss/confit": "^2.2.1",
     "@sesamecare-oss/opentelemetry-node-metrics": "^1.1.0",
@@ -94,8 +95,9 @@
     "cookie-parser": "^1.4.7",
     "dotenv": "^16.4.5",
     "express": "^5.0.1",
-    "express-openapi-validator": "^5.3.7",
+    "express-openapi-validator": "^5.3.8",
     "glob": "^11.0.0",
+    "import-in-the-middle": "^1.11.2",
     "minimist": "^1.2.8",
     "moderndash": "^3.12.0",
     "pino": "^9.5.0",
@@ -113,12 +115,12 @@
     "@types/cookie-parser": "^1.4.7",
     "@types/express": "^5.0.0",
     "@types/minimist": "^1.2.5",
-    "@types/node": "^22.7.7",
+    "@types/node": "^22.8.1",
     "@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.0",
+    "coconfig": "^1.6.1",
     "eslint": "^8.57.1",
     "eslint-config-prettier": "^9.1.0",
     "eslint-import-resolver-typescript": "^3.6.3",
@@ -127,9 +129,9 @@
     "pinst": "^3.0.0",
     "supertest": "^7.0.0",
     "tsconfig-paths": "^4.2.0",
-    "tsx": "^4.19.1",
+    "tsx": "^4.19.2",
     "typescript": "^5.6.3",
-    "vitest": "^2.1.3"
+    "vitest": "^2.1.4"
   },
   "resolutions": {
     "qs": "^6.11.0"

package/src/bin/start-service.ts

@@ -15,6 +15,10 @@ const argv = minimist(process.argv.slice(2), {
   boolean: ['built', 'repl', 'telemetry', 'nobind'],
 });
 
+if (argv.telemetry) {
+  await import('../telemetry/hook-modules.js');
+}
+
 const noTelemetry = (argv.repl || isDev()) && !argv.telemetry;
 bootstrap({
   ...argv,

package/src/config/shortstops.ts

@@ -84,7 +84,7 @@ function serviceTypeFactory(name: string) {
   return function serviceType(v: string) {
     let checkValue = v;
     let matchIsGood = true;
-    if (checkValue[0] === '!') {
+    if (checkValue.startsWith('!')) {
       matchIsGood = false;
       checkValue = checkValue.substring(1);
     }
@@ -114,7 +114,7 @@ export function shortstops(service: { name: string }, sourcedir: string) {
     env,
     // A version of env that can default to false
     env_switch(v: string) {
-      if (v && v[0] === '!') {
+      if (v && v.startsWith('!')) {
         const bval = env(`${v.substring(1)}|b`);
         return !bval;
       }
@@ -122,7 +122,7 @@ export function shortstops(service: { name: string }, sourcedir: string) {
     },
     base64: base64Handler(),
     regex(v: string) {
-      const [, pattern, flags] = v.match(/^\/(.*)\/([a-z]*)$/) || [];
+      const [, pattern, flags] = /^\/(.*)\/([a-z]*)$/.exec(v) || [];
       if (pattern === undefined) {
         throw new Error(`Invalid regular expression in configuration ${v}`);
       }

package/src/config/validation.ts

@@ -16,7 +16,8 @@ export function validateConfiguration<Config extends ConfigurationSchema>(
 ) {
   const result = validator(config);
   if (!result.success) {
+    const errorMessages = result.errors.map((e) => `  - ${e.path}: ${e.message}`).join('\n');
     throw new Error(`Configuration validation failed:
-${result.errors.map((e) => `  - ${e.path}: ${e.message}`).join('\n')}`);
+${errorMessages}`);
   }
 }

package/src/express-app/app.ts

@@ -5,7 +5,7 @@ import path from 'path';
 
 import { pino } from 'pino';
 import cookieParser from 'cookie-parser';
-import { metrics } from '@opentelemetry/api';
+import { context, metrics, trace } from '@opentelemetry/api';
 import { setupNodeMetrics } from '@sesamecare-oss/opentelemetry-node-metrics';
 import { createTerminus } from '@godaddy/terminus';
 import type { RequestHandler, Response } from 'express';
@@ -52,6 +52,22 @@ export async function startApp<
     dest: process.env.LOG_TO_FILE || process.stdout.fd,
     minLength: process.env.LOG_BUFFER ? Number(process.env.LOG_BUFFER) : undefined,
   });
+
+  function poorMansOtlp(mergeObject: object) {
+    if (!('trace_id' in mergeObject)) {
+      const activeSpan = trace.getSpan(context.active());
+      if (activeSpan) {
+        const ctx = activeSpan.spanContext();
+        Object.assign(mergeObject, {
+          trace_id: ctx.traceId,
+          span_id: ctx.spanId,
+          trace_flags: ctx.traceFlags
+        });
+      }
+    }
+    return mergeObject;
+  }
+
   const logger = shouldPrettyPrint
     ? pino(
       {
@@ -61,6 +77,7 @@ export async function startApp<
             colorize: true,
           },
         },
+        mixin: poorMansOtlp,
       },
       destination,
     )
@@ -71,6 +88,7 @@ export async function startApp<
             return { level: label };
           },
         },
+        mixin: poorMansOtlp,
       },
       destination,
     );

package/src/telemetry/hook-modules.ts

@@ -0,0 +1,18 @@
+import module from 'node:module';
+
+module.register('import-in-the-middle/hook.mjs', import.meta.url, {
+  parentURL: import.meta.url,
+  data: {
+    include: [
+      'express',
+      'pino',
+      'http',
+      'dns',
+      'net',
+      'pg',
+      'ioredis',
+      'undici',
+      'generic-pool',
+    ],
+  },
+});

package/src/telemetry/index.ts

@@ -1,9 +1,14 @@
+import { OTLPLogExporter } from '@opentelemetry/exporter-logs-otlp-proto';
 import { OTLPTraceExporter } from '@opentelemetry/exporter-trace-otlp-proto';
 import {
+  Detector,
+  DetectorSync,
   envDetectorSync,
   hostDetectorSync,
+  IResource,
   osDetectorSync,
   processDetectorSync,
+  ResourceDetectionConfig,
 } from '@opentelemetry/resources';
 import { containerDetector } from '@opentelemetry/resource-detector-container';
 import { gcpDetector } from '@opentelemetry/resource-detector-gcp';
@@ -23,14 +28,18 @@ import type { ConfigurationSchema } from '../config/schema.js';
 import { getAutoInstrumentations } from './instrumentations.js';
 import { DummySpanExporter } from './DummyExporter.js';
 
-function getExporter() {
+// OTLP seems to only support http, and this is a default on the local network so I'm keeping it.
+// NOSONAR
+const baseDefaultOtlpUrl = new URL('http://otlp-exporter:4318/v1').toString();
+
+function getSpanExporter() {
   if (
     !process.env.DISABLE_OLTP_EXPORTER &&
     (['production', 'staging'].includes(process.env.APP_ENV || process.env.NODE_ENV || '') ||
       process.env.OTLP_EXPORTER)
   ) {
     return new OTLPTraceExporter({
-      url: process.env.OTLP_EXPORTER || 'http://otlp-exporter:4318/v1/traces',
+      url: process.env.OTLP_EXPORTER || `${baseDefaultOtlpUrl}/traces`,
     });
   }
   if (process.env.ENABLE_CONSOLE_OLTP_EXPORTER) {
@@ -39,9 +48,36 @@ function getExporter() {
   return new DummySpanExporter();
 }
 
+function getLogExporter() {
+  if (
+    !process.env.DISABLE_OLTP_EXPORTER &&
+    (['production', 'staging'].includes(process.env.APP_ENV || process.env.NODE_ENV || '') ||
+      process.env.OTLP_EXPORTER)
+  ) {
+    return new OTLPLogExporter({
+      url: process.env.OTLP_EXPORTER || `${baseDefaultOtlpUrl}/logs`,
+    });
+  }
+  if (process.env.ENABLE_CONSOLE_OLTP_EXPORTER) {
+    return new opentelemetry.logs.ConsoleLogRecordExporter();
+  }
+  return undefined;
+}
+
 let prometheusExporter: PrometheusExporter | undefined;
 let telemetrySdk: opentelemetry.NodeSDK | undefined;
 
+function awaitAttributes(detector: DetectorSync): Detector {
+  return {
+    async detect(config?: ResourceDetectionConfig): Promise<IResource> {
+      const resource = detector.detect(config)
+      await resource.waitForAsyncAttributes?.()
+
+      return resource
+    },
+  }
+}
+
 /**
  * OpenTelemetry is not friendly to the idea of stopping
  * and starting itself, it seems. So we can only keep a global
@@ -52,31 +88,31 @@ let telemetrySdk: opentelemetry.NodeSDK | undefined;
  */
 export async function startGlobalTelemetry(serviceName: string) {
   if (!prometheusExporter) {
-    // For troubleshooting, set the log level to DiagLogLevel.DEBUG
-    opentelemetry.api.diag.setLogger(new (opentelemetry.api.DiagConsoleLogger)(), opentelemetry.api.DiagLogLevel.INFO);
+    const { metrics, logs, NodeSDK } = opentelemetry;
 
     prometheusExporter = new PrometheusExporter({ preventServerStart: true });
     const instrumentations = getAutoInstrumentations();
-    telemetrySdk = new opentelemetry.NodeSDK({
+    const logExporter = getLogExporter();
+    telemetrySdk = new NodeSDK({
       serviceName,
       autoDetectResources: false,
-      traceExporter: getExporter(),
       resourceDetectors: [
-        envDetectorSync,
-        hostDetectorSync,
-        osDetectorSync,
-        processDetectorSync,
-        containerDetector,
-        gcpDetector,
+        awaitAttributes(envDetectorSync),
+        awaitAttributes(hostDetectorSync),
+        awaitAttributes(osDetectorSync),
+        awaitAttributes(processDetectorSync),
+        awaitAttributes(containerDetector),
+        awaitAttributes(gcpDetector),
       ],
+      traceExporter: getSpanExporter(),
       metricReader: prometheusExporter,
       instrumentations,
-      logRecordProcessors: [],
+      logRecordProcessors: logExporter ? [new logs.BatchLogRecordProcessor(logExporter)] : [],
       views: [
-        new opentelemetry.metrics.View({
+        new metrics.View({
           instrumentName: 'http_request_duration_seconds',
-          instrumentType: opentelemetry.metrics.InstrumentType.HISTOGRAM,
-          aggregation: new opentelemetry.metrics.ExplicitBucketHistogramAggregation(
+          instrumentType: metrics.InstrumentType.HISTOGRAM,
+          aggregation: new metrics.ExplicitBucketHistogramAggregation(
             [0.003, 0.03, 0.1, 0.3, 1.5, 10],
             true,
           ),

package/vitest.config.ts

@@ -3,7 +3,7 @@
  * Instead, edit the coconfig.js or coconfig.ts file in your project root.
  *
  * See https://github.com/gas-buddy/coconfig for more information.
- * @version coconfig@1.6.0
+ * @version coconfig@1.6.1
  */
 import cjs from '@openapi-typescript-infra/coconfig';
 import * as esmToCjs from '@openapi-typescript-infra/coconfig';