@openapi-typescript-infra/service 2.9.1 → 2.10.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openapi-typescript-infra/service",
-  "version": "2.9.1",
+  "version": "2.10.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": {
@@ -65,23 +65,23 @@
     "@opentelemetry/exporter-prometheus": "^0.43.0",
     "@opentelemetry/exporter-trace-otlp-proto": "^0.43.0",
     "@opentelemetry/instrumentation": "^0.43.0",
-    "@opentelemetry/instrumentation-dns": "^0.32.2",
-    "@opentelemetry/instrumentation-express": "^0.33.1",
-    "@opentelemetry/instrumentation-fetch": "^0.43.0",
-    "@opentelemetry/instrumentation-generic-pool": "^0.32.2",
-    "@opentelemetry/instrumentation-graphql": "^0.35.1",
+    "@opentelemetry/instrumentation-dns": "^0.32.3",
+    "@opentelemetry/instrumentation-express": "^0.33.2",
+    "@opentelemetry/instrumentation-generic-pool": "^0.32.3",
+    "@opentelemetry/instrumentation-graphql": "^0.35.2",
     "@opentelemetry/instrumentation-http": "^0.43.0",
-    "@opentelemetry/instrumentation-ioredis": "^0.35.1",
-    "@opentelemetry/instrumentation-net": "^0.32.1",
-    "@opentelemetry/instrumentation-pg": "^0.36.1",
-    "@opentelemetry/instrumentation-pino": "^0.34.1",
-    "@opentelemetry/resource-detector-container": "^0.3.1",
-    "@opentelemetry/resource-detector-gcp": "^0.29.1",
-    "@opentelemetry/resources": "^1.17.0",
-    "@opentelemetry/sdk-metrics": "^1.17.0",
+    "@opentelemetry/instrumentation-ioredis": "^0.35.2",
+    "@opentelemetry/instrumentation-net": "^0.32.2",
+    "@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/sdk-node": "^0.43.0",
-    "@opentelemetry/sdk-trace-base": "^1.17.0",
-    "@opentelemetry/semantic-conventions": "^1.17.0",
+    "@opentelemetry/sdk-trace-base": "^1.17.1",
+    "@opentelemetry/semantic-conventions": "^1.17.1",
+    "@sesamecare-oss/opentelemetry-node-metrics": "^1.0.1",
     "cookie-parser": "^1.4.6",
     "dotenv": "^16.3.1",
     "eventsource": "^1.1.2",
@@ -90,7 +90,8 @@
     "glob": "^8.1.0",
     "lodash": "^4.17.21",
     "minimist": "^1.2.8",
-    "pino": "^8.15.1",
+    "opentelemetry-instrumentation-fetch-node": "^1.1.0",
+    "pino": "^8.16.0",
     "read-pkg-up": "^7.0.1",
     "rest-api-support": "^1.16.3",
     "shortstop-dns": "^1.1.0",
@@ -98,7 +99,7 @@
     "shortstop-yaml": "^1.0.0"
   },
   "devDependencies": {
-    "@commitlint/cli": "^17.7.1",
+    "@commitlint/cli": "^17.7.2",
     "@commitlint/config-conventional": "^17.7.0",
     "@openapi-typescript-infra/coconfig": "^4.2.1",
     "@semantic-release/changelog": "^6.0.3",
@@ -108,25 +109,25 @@
     "@semantic-release/release-notes-generator": "^12.0.0",
     "@types/cookie-parser": "^1.4.4",
     "@types/eventsource": "1.1.12",
-    "@types/express": "^4.17.18",
+    "@types/express": "^4.17.19",
     "@types/glob": "^8.1.0",
     "@types/lodash": "^4.14.199",
     "@types/minimist": "^1.2.3",
-    "@types/node": "^20.7.0",
-    "@types/supertest": "^2.0.13",
-    "@typescript-eslint/eslint-plugin": "^6.7.3",
-    "@typescript-eslint/parser": "^6.7.3",
+    "@types/node": "^20.8.5",
+    "@types/supertest": "^2.0.14",
+    "@typescript-eslint/eslint-plugin": "^6.7.5",
+    "@typescript-eslint/parser": "^6.7.5",
     "coconfig": "^0.13.3",
-    "eslint": "^8.50.0",
+    "eslint": "^8.51.0",
     "eslint-config-prettier": "^9.0.0",
     "eslint-plugin-import": "^2.28.1",
-    "pino-pretty": "^10.2.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.2.2",
-    "vitest": "^0.34.5"
+    "vitest": "^0.34.6"
   },
   "resolutions": {
     "qs": "^6.11.0"

package/src/config/index.ts

@@ -53,7 +53,7 @@ async function addDefaultConfiguration(
 
 export interface ServiceConfigurationSpec {
   // Used for "sourcerequire" and other source-relative paths and for the package name
-  rootDirectory: string;
+  sourceDirectory: string;
   // The LAST configuration is the most "specific" - if a configuration value
   // exists in all directories, the last one wins
   configurationDirectories: string[];
@@ -63,9 +63,9 @@ export interface ServiceConfigurationSpec {
 export async function loadConfiguration({
   name,
   configurationDirectories: dirs,
-  rootDirectory,
+  sourceDirectory,
 }: ServiceConfigurationSpec): Promise<ConfigStore> {
-  const defaultProtocols = shortstops({ name }, rootDirectory);
+  const defaultProtocols = shortstops({ name }, sourceDirectory);
   const specificConfig = dirs[dirs.length - 1];
 
   // This confit version just gets us environment info

package/src/express-app/app.ts

@@ -7,6 +7,7 @@ import express from 'express';
 import { pino } from 'pino';
 import cookieParser from 'cookie-parser';
 import { metrics } from '@opentelemetry/api';
+import { setupNodeMetrics } from '@sesamecare-oss/opentelemetry-node-metrics';
 import { createTerminus } from '@godaddy/terminus';
 import type { RequestHandler, Response } from 'express';
 
@@ -82,7 +83,7 @@ export async function startApp<
   const config = await loadConfiguration({
     name,
     configurationDirectories: options.configurationDirectories,
-    rootDirectory,
+    sourceDirectory: path.join(rootDirectory, codepath),
   });
 
   const logging = config.get('logging') as ConfigurationSchema['logging'];
@@ -109,6 +110,8 @@ export async function startApp<
   }
 
   app.locals.meter = metrics.getMeterProvider().getMeter(name);
+  setupNodeMetrics(app.locals.meter, {});
+
   if (config.get('trustProxy')) {
     app.set('trust proxy', config.get('trustProxy'));
   }

package/src/telemetry/DummyExporter.ts

@@ -10,7 +10,7 @@ const noop: SpanExporter['export'] = (spans, resultCallback) => {
 };
 
 export class DummySpanExporter implements SpanExporter {
-  export = noop;
+  export: typeof noop = noop;
 
   async shutdown() {
     // Nothing to do

package/src/telemetry/instrumentations.ts

@@ -1,6 +1,7 @@
 import type { Instrumentation } from '@opentelemetry/instrumentation';
 import { DnsInstrumentation } from '@opentelemetry/instrumentation-dns';
 import { ExpressInstrumentation } from '@opentelemetry/instrumentation-express';
+import { FetchInstrumentation } from 'opentelemetry-instrumentation-fetch-node';
 import { GenericPoolInstrumentation } from '@opentelemetry/instrumentation-generic-pool';
 import { HttpInstrumentation } from '@opentelemetry/instrumentation-http';
 import { IORedisInstrumentation } from '@opentelemetry/instrumentation-ioredis';
@@ -18,13 +19,11 @@ import {
   processDetectorSync,
 } from '@opentelemetry/resources';
 
-import { FetchInstrumentation } from './fetchInstrumentation';
-
 const InstrumentationMap = {
   '@opentelemetry/instrumentation-http': HttpInstrumentation,
-  'opentelemetry-instrumentation-node-18-fetch': FetchInstrumentation,
   '@opentelemetry/instrumentation-dns': DnsInstrumentation,
   '@opentelemetry/instrumentation-express': ExpressInstrumentation,
+  'opentelemetry-instrumentation-fetch-node': FetchInstrumentation,
   '@opentelemetry/instrumentation-generic-pool': GenericPoolInstrumentation,
   '@opentelemetry/instrumentation-ioredis': IORedisInstrumentation,
   '@opentelemetry/instrumentation-net': NetInstrumentation,

package/build/telemetry/fetchInstrumentation.d.ts

@@ -1,49 +0,0 @@
-/// <reference types="node" />
-import { Instrumentation, InstrumentationConfig } from '@opentelemetry/instrumentation';
-import { MeterProvider, Span, TracerProvider } from '@opentelemetry/api';
-interface FetchRequestArguments {
-    request: {
-        path: string;
-        method: string;
-        origin: string;
-        headers: string;
-    };
-    span: Span;
-    additionalHeaders: Record<string, unknown>;
-    error?: Error;
-}
-type ErrorFetchRequestArguments = FetchRequestArguments & {
-    error: Error;
-};
-type ResponseFetchRequestArguments = FetchRequestArguments & {
-    response: {
-        statusCode: number;
-        headers: Buffer[];
-    };
-};
-interface FetchInstrumentationConfig extends InstrumentationConfig {
-    onRequest?: (args: FetchRequestArguments) => void;
-}
-export declare class FetchInstrumentation implements Instrumentation {
-    private channelSubs;
-    private spanFromReq;
-    private tracer;
-    private config;
-    private meter;
-    readonly instrumentationName = "opentelemetry-instrumentation-node-18-fetch";
-    readonly instrumentationVersion = "1.0.0";
-    readonly instrumentationDescription = "Instrumentation for Node 18 fetch via diagnostics_channel";
-    private subscribeToChannel;
-    constructor(config: FetchInstrumentationConfig);
-    disable(): void;
-    enable(): void;
-    setTracerProvider(tracerProvider: TracerProvider): void;
-    setMeterProvider(meterProvider: MeterProvider): void;
-    setConfig(config: InstrumentationConfig): void;
-    getConfig(): InstrumentationConfig;
-    onRequest({ request }: FetchRequestArguments): void;
-    onHeaders({ request, response }: ResponseFetchRequestArguments): void;
-    onDone({ request }: FetchRequestArguments): void;
-    onError({ request, error }: ErrorFetchRequestArguments): void;
-}
-export {};

package/build/telemetry/fetchInstrumentation.js

@@ -1,143 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.FetchInstrumentation = void 0;
-const node_diagnostics_channel_1 = __importDefault(require("node:diagnostics_channel"));
-const semantic_conventions_1 = require("@opentelemetry/semantic-conventions");
-const api_1 = require("@opentelemetry/api");
-// Get the content-length from undici response headers.
-// `headers` is an Array of buffers: [k, v, k, v, ...].
-// If the header is not present, or has an invalid value, this returns null.
-function contentLengthFromResponseHeaders(headers) {
-    const name = 'content-length';
-    for (let i = 0; i < headers.length; i += 2) {
-        const k = headers[i];
-        if (k.length === name.length && k.toString().toLowerCase() === name) {
-            const v = Number(headers[i + 1]);
-            if (!Number.isNaN(Number(v))) {
-                return v;
-            }
-            return undefined;
-        }
-    }
-    return undefined;
-}
-// A combination of https://github.com/elastic/apm-agent-nodejs and
-// https://github.com/gadget-inc/opentelemetry-instrumentations/blob/main/packages/opentelemetry-instrumentation-undici/src/index.ts
-class FetchInstrumentation {
-    // Keep ref to avoid https://github.com/nodejs/node/issues/42170 bug and for
-    // unsubscribing.
-    channelSubs;
-    spanFromReq = new WeakMap();
-    tracer;
-    config;
-    meter;
-    instrumentationName = 'opentelemetry-instrumentation-node-18-fetch';
-    instrumentationVersion = '1.0.0';
-    instrumentationDescription = 'Instrumentation for Node 18 fetch via diagnostics_channel';
-    subscribeToChannel(diagnosticChannel, onMessage) {
-        const channel = node_diagnostics_channel_1.default.channel(diagnosticChannel);
-        channel.subscribe(onMessage);
-        this.channelSubs.push({
-            name: diagnosticChannel,
-            channel,
-            onMessage,
-        });
-    }
-    constructor(config) {
-        // Force load fetch API (since it's lazy loaded in Node 18)
-        fetch('').catch(() => Promise.resolve());
-        this.channelSubs = [];
-        this.meter = api_1.metrics.getMeter(this.instrumentationName, this.instrumentationVersion);
-        this.tracer = api_1.trace.getTracer(this.instrumentationName, this.instrumentationVersion);
-        this.config = { ...config };
-    }
-    disable() {
-        this.channelSubs?.forEach((sub) => sub.channel.unsubscribe(sub.onMessage));
-    }
-    enable() {
-        this.subscribeToChannel('undici:request:create', (args) => this.onRequest(args));
-        this.subscribeToChannel('undici:request:headers', (args) => this.onHeaders(args));
-        this.subscribeToChannel('undici:request:trailers', (args) => this.onDone(args));
-        this.subscribeToChannel('undici:request:error', (args) => this.onError(args));
-    }
-    setTracerProvider(tracerProvider) {
-        this.tracer = tracerProvider.getTracer(this.instrumentationName, this.instrumentationVersion);
-    }
-    setMeterProvider(meterProvider) {
-        this.meter = meterProvider.getMeter(this.instrumentationName, this.instrumentationVersion);
-    }
-    setConfig(config) {
-        this.config = { ...config };
-    }
-    getConfig() {
-        return this.config;
-    }
-    onRequest({ request }) {
-        // We do not handle instrumenting HTTP CONNECT. See limitation notes above.
-        if (request.method === 'CONNECT') {
-            return;
-        }
-        const span = this.tracer.startSpan(`HTTP ${request.method}`, {
-            kind: api_1.SpanKind.CLIENT,
-            attributes: {
-                [semantic_conventions_1.SemanticAttributes.HTTP_URL]: String(request.origin),
-                [semantic_conventions_1.SemanticAttributes.HTTP_METHOD]: request.method,
-                [semantic_conventions_1.SemanticAttributes.HTTP_TARGET]: request.path,
-                'http.client': 'fetch',
-            },
-        });
-        const requestContext = api_1.trace.setSpan(api_1.context.active(), span);
-        const addedHeaders = {};
-        api_1.propagation.inject(requestContext, addedHeaders);
-        if (this.config.onRequest) {
-            this.config.onRequest({ request, span, additionalHeaders: addedHeaders });
-        }
-        request.headers += Object.entries(addedHeaders)
-            .map(([k, v]) => `${k}: ${v}\r\n`)
-            .join('');
-        this.spanFromReq.set(request, span);
-    }
-    onHeaders({ request, response }) {
-        const span = this.spanFromReq.get(request);
-        if (span !== undefined) {
-            // We are currently *not* capturing response headers, even though the
-            // intake API does allow it, because none of the other `setHttpContext`
-            // uses currently do.
-            const cLen = contentLengthFromResponseHeaders(response.headers);
-            const attrs = {
-                [semantic_conventions_1.SemanticAttributes.HTTP_STATUS_CODE]: response.statusCode,
-            };
-            if (cLen) {
-                attrs[semantic_conventions_1.SemanticAttributes.HTTP_RESPONSE_CONTENT_LENGTH] = cLen;
-            }
-            span.setAttributes(attrs);
-            span.setStatus({
-                code: response.statusCode >= 400 ? api_1.SpanStatusCode.ERROR : api_1.SpanStatusCode.OK,
-                message: String(response.statusCode),
-            });
-        }
-    }
-    onDone({ request }) {
-        const span = this.spanFromReq.get(request);
-        if (span !== undefined) {
-            span.end();
-            this.spanFromReq.delete(request);
-        }
-    }
-    onError({ request, error }) {
-        const span = this.spanFromReq.get(request);
-        if (span !== undefined) {
-            span.recordException(error);
-            span.setStatus({
-                code: api_1.SpanStatusCode.ERROR,
-                message: error.message,
-            });
-            span.end();
-        }
-    }
-}
-exports.FetchInstrumentation = FetchInstrumentation;
-//# sourceMappingURL=fetchInstrumentation.js.map

package/build/telemetry/fetchInstrumentation.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"fetchInstrumentation.js","sourceRoot":"","sources":["../../src/telemetry/fetchInstrumentation.ts"],"names":[],"mappings":"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"}

package/src/telemetry/fetchInstrumentation.ts

@@ -1,214 +0,0 @@
-import diagch from 'node:diagnostics_channel';
-
-import { SemanticAttributes } from '@opentelemetry/semantic-conventions';
-import { Instrumentation, InstrumentationConfig } from '@opentelemetry/instrumentation';
-import {
-  Attributes,
-  context,
-  propagation,
-  metrics,
-  Meter,
-  MeterProvider,
-  Span,
-  SpanKind,
-  SpanStatusCode,
-  trace,
-  Tracer,
-  TracerProvider,
-} from '@opentelemetry/api';
-
-interface ListenerRecord {
-  name: string;
-  channel: diagch.Channel;
-  onMessage: diagch.ChannelListener;
-}
-
-interface FetchRequestArguments {
-  request: {
-    path: string;
-    method: string;
-    origin: string;
-    headers: string;
-  };
-  span: Span;
-  additionalHeaders: Record<string, unknown>;
-  error?: Error;
-}
-
-type ErrorFetchRequestArguments = FetchRequestArguments & { error: Error };
-type ResponseFetchRequestArguments = FetchRequestArguments & {
-  response: {
-    statusCode: number;
-    headers: Buffer[];
-  };
-};
-
-interface FetchInstrumentationConfig extends InstrumentationConfig {
-  onRequest?: (args: FetchRequestArguments) => void;
-}
-
-// Get the content-length from undici response headers.
-// `headers` is an Array of buffers: [k, v, k, v, ...].
-// If the header is not present, or has an invalid value, this returns null.
-function contentLengthFromResponseHeaders(headers: Buffer[]) {
-  const name = 'content-length';
-  for (let i = 0; i < headers.length; i += 2) {
-    const k = headers[i];
-    if (k.length === name.length && k.toString().toLowerCase() === name) {
-      const v = Number(headers[i + 1]);
-      if (!Number.isNaN(Number(v))) {
-        return v;
-      }
-      return undefined;
-    }
-  }
-  return undefined;
-}
-
-// A combination of https://github.com/elastic/apm-agent-nodejs and
-// https://github.com/gadget-inc/opentelemetry-instrumentations/blob/main/packages/opentelemetry-instrumentation-undici/src/index.ts
-export class FetchInstrumentation implements Instrumentation {
-  // Keep ref to avoid https://github.com/nodejs/node/issues/42170 bug and for
-  // unsubscribing.
-  private channelSubs: ListenerRecord[];
-
-  private spanFromReq = new WeakMap<object, Span>();
-
-  private tracer: Tracer;
-
-  private config: FetchInstrumentationConfig;
-
-  private meter: Meter;
-
-  public readonly instrumentationName = 'opentelemetry-instrumentation-node-18-fetch';
-
-  public readonly instrumentationVersion = '1.0.0';
-
-  public readonly instrumentationDescription =
-    'Instrumentation for Node 18 fetch via diagnostics_channel';
-
-  private subscribeToChannel(diagnosticChannel: string, onMessage: diagch.ChannelListener) {
-    const channel = diagch.channel(diagnosticChannel);
-    channel.subscribe(onMessage);
-    this.channelSubs.push({
-      name: diagnosticChannel,
-      channel,
-      onMessage,
-    });
-  }
-
-  constructor(config: FetchInstrumentationConfig) {
-    // Force load fetch API (since it's lazy loaded in Node 18)
-    fetch('').catch(() => Promise.resolve());
-    this.channelSubs = [];
-    this.meter = metrics.getMeter(this.instrumentationName, this.instrumentationVersion);
-    this.tracer = trace.getTracer(this.instrumentationName, this.instrumentationVersion);
-    this.config = { ...config };
-  }
-
-  disable(): void {
-    this.channelSubs?.forEach((sub) => sub.channel.unsubscribe(sub.onMessage));
-  }
-
-  enable(): void {
-    this.subscribeToChannel('undici:request:create', (args) =>
-      this.onRequest(args as FetchRequestArguments),
-    );
-    this.subscribeToChannel('undici:request:headers', (args) =>
-      this.onHeaders(args as ResponseFetchRequestArguments),
-    );
-    this.subscribeToChannel('undici:request:trailers', (args) =>
-      this.onDone(args as FetchRequestArguments),
-    );
-    this.subscribeToChannel('undici:request:error', (args) =>
-      this.onError(args as ErrorFetchRequestArguments),
-    );
-  }
-
-  setTracerProvider(tracerProvider: TracerProvider): void {
-    this.tracer = tracerProvider.getTracer(this.instrumentationName, this.instrumentationVersion);
-  }
-
-  public setMeterProvider(meterProvider: MeterProvider): void {
-    this.meter = meterProvider.getMeter(this.instrumentationName, this.instrumentationVersion);
-  }
-
-  setConfig(config: InstrumentationConfig): void {
-    this.config = { ...config };
-  }
-
-  getConfig(): InstrumentationConfig {
-    return this.config;
-  }
-
-  onRequest({ request }: FetchRequestArguments): void {
-    // We do not handle instrumenting HTTP CONNECT. See limitation notes above.
-    if (request.method === 'CONNECT') {
-      return;
-    }
-    const span = this.tracer.startSpan(`HTTP ${request.method}`, {
-      kind: SpanKind.CLIENT,
-      attributes: {
-        [SemanticAttributes.HTTP_URL]: String(request.origin),
-        [SemanticAttributes.HTTP_METHOD]: request.method,
-        [SemanticAttributes.HTTP_TARGET]: request.path,
-        'http.client': 'fetch',
-      },
-    });
-    const requestContext = trace.setSpan(context.active(), span);
-    const addedHeaders: Record<string, string> = {};
-    propagation.inject(requestContext, addedHeaders);
-
-    if (this.config.onRequest) {
-      this.config.onRequest({ request, span, additionalHeaders: addedHeaders });
-    }
-
-    request.headers += Object.entries(addedHeaders)
-      .map(([k, v]) => `${k}: ${v}\r\n`)
-      .join('');
-    this.spanFromReq.set(request, span);
-  }
-
-  onHeaders({ request, response }: ResponseFetchRequestArguments): void {
-    const span = this.spanFromReq.get(request);
-
-    if (span !== undefined) {
-      // We are currently *not* capturing response headers, even though the
-      // intake API does allow it, because none of the other `setHttpContext`
-      // uses currently do.
-
-      const cLen = contentLengthFromResponseHeaders(response.headers);
-      const attrs: Attributes = {
-        [SemanticAttributes.HTTP_STATUS_CODE]: response.statusCode,
-      };
-      if (cLen) {
-        attrs[SemanticAttributes.HTTP_RESPONSE_CONTENT_LENGTH] = cLen;
-      }
-      span.setAttributes(attrs);
-      span.setStatus({
-        code: response.statusCode >= 400 ? SpanStatusCode.ERROR : SpanStatusCode.OK,
-        message: String(response.statusCode),
-      });
-    }
-  }
-
-  onDone({ request }: FetchRequestArguments): void {
-    const span = this.spanFromReq.get(request);
-    if (span !== undefined) {
-      span.end();
-      this.spanFromReq.delete(request);
-    }
-  }
-
-  onError({ request, error }: ErrorFetchRequestArguments): void {
-    const span = this.spanFromReq.get(request);
-    if (span !== undefined) {
-      span.recordException(error);
-      span.setStatus({
-        code: SpanStatusCode.ERROR,
-        message: error.message,
-      });
-      span.end();
-    }
-  }
-}