@saidsef/tracing-node 3.5.4 → 3.7.2

package/libs/index.mjs

@@ -17,7 +17,7 @@
  */
 
 import {AwsInstrumentation} from '@opentelemetry/instrumentation-aws-sdk';
-import {B3Propagator, B3InjectEncoding} from '@opentelemetry/propagator-b3';
+import {AsyncHooksContextManager} from '@opentelemetry/context-async-hooks';
 import {BatchSpanProcessor} from '@opentelemetry/sdk-trace-base';
 import {CompositePropagator, W3CBaggagePropagator, W3CTraceContextPropagator} from '@opentelemetry/core';
 import {ConnectInstrumentation} from '@opentelemetry/instrumentation-connect';
@@ -68,7 +68,7 @@ export function setupTracing(options = {}) {
 
   // Configure exporter with the Collector endpoint - uses gRPC
   const exportOptions = {
-    concurrencyLimit: concurrencyLimit,
+    concurrencyLimit: parseInt(concurrencyLimit, 10),
     url: url,
     timeoutMillis: 1000,
   };
@@ -92,29 +92,28 @@ export function setupTracing(options = {}) {
 
   // Initialize the tracer provider with propagators
   tracerProvider.register({
+    contextManager: new AsyncHooksContextManager().enable(),
     propagator: new CompositePropagator({
     propagators: [
-      new W3CBaggagePropagator(),
       new W3CTraceContextPropagator(),
-      new B3Propagator({ injectEncoding: B3InjectEncoding.MULTI_HEADER }),
+      new W3CBaggagePropagator(),
       ],
     }),
   });
 
   // Ignore spans from static assets.
   const ignoreIncomingRequestHook = (req) => {
-    const isStaticAsset = !!req.url.match(/^\/metrics|\/healthz.*$/);
-    return isStaticAsset;
+    return req.url.startsWith('/metrics') || req.url.startsWith('/healthz');
   };
 
   // Register instrumentations
   const instrumentations = [
-    new HttpInstrumentation({ serverName: serviceName, requireParentforOutgoingSpans: true, requireParentforIncomingSpans: true, ignoreIncomingRequestHook, }),
+    new HttpInstrumentation({serverName: serviceName, ignoreIncomingRequestHook,}),
     new ExpressInstrumentation({ ignoreIncomingRequestHook, }),
-    new PinoInstrumentation(),
+    new PinoInstrumentation({logHook: (span, record) => {record['trace_id'] = span.spanContext().traceId;record['span_id'] = span.spanContext().spanId;},}),
     new ConnectInstrumentation(),
     new AwsInstrumentation({ sqsExtractContextPropagationFromPayload: true, }),
-    new IORedisInstrumentation({ requireParentSpan: true, }),
+    new IORedisInstrumentation(),
   ];
 
   if (enableFsInstrumentation) {
@@ -131,8 +130,8 @@ export function setupTracing(options = {}) {
 
   // Register instrumentations
   registerInstrumentations({
-  tracerProvider: tracerProvider,
-  instrumentations: instrumentations,
+    tracerProvider: tracerProvider,
+    instrumentations: instrumentations,
   });
 
   // Return the tracer for the service

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@saidsef/tracing-node",
-  "version": "3.5.4",
+  "version": "3.7.2",
   "description": "tracing NodeJS - Wrapper for OpenTelemetry instrumentation packages",
   "main": "libs/index.mjs",
   "scripts": {
@@ -31,9 +31,10 @@
   "homepage": "https://github.com/saidsef/tracing-node#readme",
   "dependencies": {
     "@opentelemetry/api": "^1.9.0",
+    "@opentelemetry/context-async-hooks": "^2.0.1",
     "@opentelemetry/exporter-trace-otlp-grpc": "^0.203.0",
     "@opentelemetry/instrumentation": "^0.203.0",
-    "@opentelemetry/instrumentation-aws-sdk": "^0.56.0",
+    "@opentelemetry/instrumentation-aws-sdk": "^0.57.0",
     "@opentelemetry/instrumentation-connect": "^0.47.0",
     "@opentelemetry/instrumentation-dns": "^0.47.0",
     "@opentelemetry/instrumentation-express": "^0.52.0",
@@ -41,7 +42,6 @@
     "@opentelemetry/instrumentation-http": "^0.203.0",
     "@opentelemetry/instrumentation-ioredis": "^0.51.0",
     "@opentelemetry/instrumentation-pino": "^0.50.0",
-    "@opentelemetry/propagator-b3": "^2.0.0",
     "@opentelemetry/resources": "^2.0.1",
     "@opentelemetry/sdk-trace-base": "^2.0.0",
     "@opentelemetry/sdk-trace-node": "^2.0.0",