@openapi-typescript-infra/service 2.6.6 → 2.7.0

package/build/types.d.ts

@@ -5,7 +5,7 @@ import type pino from 'pino';
 import type { Request, Response } from 'express';
 import type { Application } from 'express-serve-static-core';
 import type { middleware } from 'express-openapi-validator';
-import type { Meter, MeterProvider } from '@opentelemetry/api-metrics';
+import type { Meter, MeterProvider } from '@opentelemetry/api';
 import type { ConfigStore } from './config/types';
 export interface InternalLocals extends Record<string, unknown> {
     server?: Server;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openapi-typescript-infra/service",
-  "version": "2.6.6",
+  "version": "2.7.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": {
@@ -62,11 +62,9 @@
     "@gasbuddy/confit": "^3.0.0",
     "@godaddy/terminus": "^4.12.1",
     "@opentelemetry/api": "^1.6.0",
-    "@opentelemetry/api-metrics": "^0.33.0",
     "@opentelemetry/exporter-prometheus": "^0.43.0",
     "@opentelemetry/exporter-trace-otlp-proto": "^0.43.0",
     "@opentelemetry/instrumentation": "^0.43.0",
-    "@opentelemetry/instrumentation-aws-sdk": "^0.36.0",
     "@opentelemetry/instrumentation-dns": "^0.32.2",
     "@opentelemetry/instrumentation-express": "^0.33.1",
     "@opentelemetry/instrumentation-generic-pool": "^0.32.2",
@@ -78,6 +76,7 @@
     "@opentelemetry/instrumentation-pino": "^0.34.1",
     "@opentelemetry/sdk-metrics": "^1.17.0",
     "@opentelemetry/sdk-node": "^0.43.0",
+    "@opentelemetry/sdk-trace-base": "^1.17.0",
     "@opentelemetry/semantic-conventions": "^1.17.0",
     "cookie-parser": "^1.4.6",
     "dotenv": "^16.3.1",

package/src/express-app/app.ts

@@ -7,7 +7,9 @@ import express from 'express';
 import { pino } from 'pino';
 import cookieParser from 'cookie-parser';
 import { MeterProvider } from '@opentelemetry/sdk-metrics';
-import { metrics } from '@opentelemetry/api-metrics';
+import { Resource } from '@opentelemetry/resources';
+import { SemanticResourceAttributes } from '@opentelemetry/semantic-conventions';
+import { metrics } from '@opentelemetry/api';
 import { PrometheusExporter } from '@opentelemetry/exporter-prometheus';
 import { createTerminus } from '@godaddy/terminus';
 import type { RequestHandler, Response } from 'express';
@@ -48,7 +50,11 @@ async function enableMetrics<SLocals extends ServiceLocals = ServiceLocals>(
   app: ServiceExpress<SLocals>,
   name: string,
 ) {
-  const meterProvider = new MeterProvider();
+  const meterProvider = new MeterProvider({
+    resource: new Resource({
+      [SemanticResourceAttributes.SERVICE_NAME]: name,
+    }),
+  });
   metrics.setGlobalMeterProvider(meterProvider);
   app.locals.meter = meterProvider.getMeter(name);
 

package/src/telemetry/DummyExporter.ts

@@ -0,0 +1,11 @@
+import { SpanExporter } from '@opentelemetry/sdk-trace-base';
+
+export class DummySpanExporter implements SpanExporter {
+  export() {
+    // Nothing
+  }
+
+  async shutdown() {
+    // Nothing
+  }
+}

package/src/telemetry/fetchInstrumentation.ts

@@ -6,6 +6,9 @@ import {
   Attributes,
   context,
   propagation,
+  metrics,
+  Meter,
+  MeterProvider,
   Span,
   SpanKind,
   SpanStatusCode,
@@ -13,7 +16,6 @@ import {
   Tracer,
   TracerProvider,
 } from '@opentelemetry/api';
-import { Meter, MeterProvider, metrics } from '@opentelemetry/api-metrics';
 
 interface ListenerRecord {
   name: string;

package/src/telemetry/index.ts

@@ -11,6 +11,7 @@ import type {
 import type { ListenFn, StartAppFn } from '../express-app/index';
 
 import { getAutoInstrumentations } from './instrumentations';
+import { DummySpanExporter } from './DummyExporter';
 
 // For troubleshooting, set the log level to DiagLogLevel.DEBUG
 diag.setLogger(new DiagConsoleLogger(), DiagLogLevel.INFO);
@@ -27,6 +28,7 @@ function getExporter() {
   if (process.env.ENABLE_CONSOLE_OLTP_EXPORTER) {
     return new opentelemetry.tracing.ConsoleSpanExporter();
   }
+  return new DummySpanExporter();
 }
 
 export async function startWithTelemetry<

package/src/telemetry/instrumentations.ts

@@ -1,5 +1,4 @@
 import type { Instrumentation } from '@opentelemetry/instrumentation';
-import { AwsInstrumentation } from '@opentelemetry/instrumentation-aws-sdk';
 import { DnsInstrumentation } from '@opentelemetry/instrumentation-dns';
 import { ExpressInstrumentation } from '@opentelemetry/instrumentation-express';
 import { GenericPoolInstrumentation } from '@opentelemetry/instrumentation-generic-pool';
@@ -12,11 +11,8 @@ import { PinoInstrumentation } from '@opentelemetry/instrumentation-pino';
 import { FetchInstrumentation } from './fetchInstrumentation';
 
 const InstrumentationMap = {
-  // Disable this for now because it logs a stupid message
-  // '@opentelemetry/instrumentation-aws-lambda': AwsLambdaInstrumentation,
   '@opentelemetry/instrumentation-http': HttpInstrumentation,
   'opentelemetry-instrumentation-node-18-fetch': FetchInstrumentation,
-  '@opentelemetry/instrumentation-aws-sdk': AwsInstrumentation,
   '@opentelemetry/instrumentation-dns': DnsInstrumentation,
   '@opentelemetry/instrumentation-express': ExpressInstrumentation,
   '@opentelemetry/instrumentation-generic-pool': GenericPoolInstrumentation,

package/src/types.ts

@@ -4,7 +4,7 @@ import type pino from 'pino';
 import type { Request, Response } from 'express';
 import type { Application } from 'express-serve-static-core';
 import type { middleware } from 'express-openapi-validator';
-import type { Meter, MeterProvider } from '@opentelemetry/api-metrics';
+import type { Meter, MeterProvider } from '@opentelemetry/api';
 
 import type { ConfigStore } from './config/types';