@mereb/shared-packages 0.0.35 → 0.0.37

package/dist/observability/otel.d.ts

@@ -5,4 +5,5 @@ export interface OtelConfig {
     instrumentations?: Instrumentation[];
 }
 export declare function initTelemetry({ serviceName, otlpEndpoint, instrumentations }: OtelConfig): void;
+export declare function initDefaultTelemetry(serviceName: string, instrumentations?: Instrumentation[]): void;
 //# sourceMappingURL=otel.d.ts.map

package/dist/observability/otel.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"otel.d.ts","sourceRoot":"","sources":["../../src/observability/otel.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAC,eAAe,EAAC,MAAM,gCAAgC,CAAC;AAOpE,MAAM,WAAW,UAAU;IACvB,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,gBAAgB,CAAC,EAAE,eAAe,EAAE,CAAC;CACxC;AAED,wBAAgB,aAAa,CAAC,EACI,WAAW,EACX,YAAY,EACZ,gBAAqB,EACxB,EAAE,UAAU,QA0B1C"}
+{"version":3,"file":"otel.d.ts","sourceRoot":"","sources":["../../src/observability/otel.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAC,eAAe,EAAC,MAAM,gCAAgC,CAAC;AASpE,MAAM,WAAW,UAAU;IACvB,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,gBAAgB,CAAC,EAAE,eAAe,EAAE,CAAC;CACxC;AA2BD,wBAAgB,aAAa,CAAC,EACI,WAAW,EACX,YAAY,EACZ,gBAAqB,EACxB,EAAE,UAAU,QA8B1C;AAED,wBAAgB,oBAAoB,CAChC,WAAW,EAAE,MAAM,EACnB,gBAAgB,GAAE,eAAe,EAAO,QAS3C"}

package/dist/observability/otel.js

@@ -2,24 +2,60 @@ import { diag, DiagConsoleLogger, DiagLogLevel } from '@opentelemetry/api';
 import { Resource } from '@opentelemetry/resources';
 import { BatchSpanProcessor } from '@opentelemetry/sdk-trace-base';
 import { NodeTracerProvider } from '@opentelemetry/sdk-trace-node';
-import { OTLPTraceExporter } from '@opentelemetry/exporter-trace-otlp-grpc';
+import { OTLPTraceExporter as OTLPHttpTraceExporter } from '@opentelemetry/exporter-trace-otlp-http';
 import { registerInstrumentations } from '@opentelemetry/instrumentation';
+import { HttpInstrumentation } from '@opentelemetry/instrumentation-http';
+import { FastifyOtelInstrumentation } from '@fastify/otel';
 diag.setLogger(new DiagConsoleLogger(), DiagLogLevel.INFO);
 let initialized = false;
+function defaultEndpoint() {
+    const env = process.env.NODE_ENV ?? 'development';
+    const map = {
+        production: 'https://otel-collector.mereb.app',
+        staging: 'https://otel-collector-stg.mereb.app',
+        test: 'http://localhost:4318',
+        development: 'https://otel-collector-dev.mereb.app'
+    };
+    return map[env] ?? map.development;
+}
+function resolveEndpoint(override) {
+    const fromEnv = override ??
+        process.env.OTEL_EXPORTER_OTLP_TRACES_ENDPOINT ??
+        process.env.OTEL_EXPORTER_OTLP_ENDPOINT;
+    return fromEnv ?? defaultEndpoint();
+}
+function defaultInstrumentations() {
+    return [new HttpInstrumentation(), new FastifyOtelInstrumentation()];
+}
 export function initTelemetry({ serviceName, otlpEndpoint, instrumentations = [] }) {
     if (initialized) {
         return;
     }
+    const endpoint = resolveEndpoint(otlpEndpoint);
     const resource = new Resource({
         'service.name': serviceName
     });
-    const provider = new NodeTracerProvider({ resource });
-    if (otlpEndpoint) {
-        provider.addSpanProcessor(new BatchSpanProcessor(new OTLPTraceExporter({ url: otlpEndpoint })));
-    }
+    const exporter = new OTLPHttpTraceExporter({
+        // the HTTP exporter appends /v1/traces when no path is present
+        url: endpoint
+    });
+    const provider = new NodeTracerProvider({
+        resource,
+        spanProcessors: [new BatchSpanProcessor(exporter)]
+    });
     provider.register();
-    if (instrumentations.length) {
-        registerInstrumentations({ instrumentations });
-    }
+    registerInstrumentations({
+        instrumentations: instrumentations.length
+            ? instrumentations
+            : defaultInstrumentations()
+    });
     initialized = true;
 }
+export function initDefaultTelemetry(serviceName, instrumentations = []) {
+    initTelemetry({
+        serviceName,
+        instrumentations: instrumentations.length > 0
+            ? instrumentations
+            : defaultInstrumentations()
+    });
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mereb/shared-packages",
-  "version": "0.0.35",
+  "version": "0.0.37",
   "type": "module",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -15,14 +15,15 @@
   },
   "dependencies": {
     "@fastify/cors": "^9.0.1",
+    "@fastify/otel": "^0.16.0",
     "@fastify/rate-limit": "^10.2.0",
     "@fastify/sensible": "^5.6.0",
     "@fastify/under-pressure": "^9.0.3",
     "@opentelemetry/api": "^1.8.0",
     "@opentelemetry/exporter-trace-otlp-grpc": "^0.52.0",
+    "@opentelemetry/exporter-trace-otlp-http": "^0.52.1",
     "@opentelemetry/host-metrics": "^0.36.2",
     "@opentelemetry/instrumentation": "^0.52.0",
-    "@opentelemetry/instrumentation-fastify": "^0.52.0",
     "@opentelemetry/instrumentation-http": "^0.52.0",
     "@opentelemetry/resources": "^1.8.0",
     "@opentelemetry/sdk-metrics": "^1.18.0",
@@ -41,7 +42,7 @@
     "@types/node": "^20.12.7",
     "@typescript-eslint/eslint-plugin": "^8.18.1",
     "@typescript-eslint/parser": "^8.18.1",
-    "eslint": "^8.57.0",
+    "eslint": "^9.26.0",
     "husky": "^9.1.7",
     "rimraf": "^5.0.5",
     "typescript": "^5.4.5",