@saidsef/tracing-node 2.2.5 → 2.2.7

package/README.md

@@ -43,12 +43,12 @@ ENDPOINT
 Function args
 ```
 const { setupTracing } = require('@saidsef/tracing-node');
-setupTracing({hostname: 'hostname', serviceName: 'service_name', endpoint: 'endpoint'});
+setupTracing({hostname: 'hostname', serviceName: 'service_name', url: 'endpoint'});
 ```
 
 ```
 import { setupTracing } from '@saidsef/tracing-node';
-setupTracing({hostname: 'hostname', serviceName: 'service_name', endpoint: 'endpoint'});
+setupTracing({hostname: 'hostname', serviceName: 'service_name', url: 'endpoint'});
 ```
 
 ### Required Parameters are
@@ -57,7 +57,7 @@ setupTracing({hostname: 'hostname', serviceName: 'service_name', endpoint: 'endp
 |----- | ---- | ------------- |
 | hostname | string | container / pod hostname | 
 | service_name | string | service / application name |
-| endpoint | string | tracing endpoint i.e. `<schema>://<host>:<port>` |
+| url | string | tracing endpoint i.e. `<schema>://<host>:<port>` |
 
 ## Source
 

package/libs/index.mjs

@@ -17,19 +17,19 @@
  */
 
 import {CompositePropagator, W3CBaggagePropagator, W3CTraceContextPropagator} from '@opentelemetry/core';
-import {registerInstrumentations} from '@opentelemetry/instrumentation';
 import {NodeTracerProvider} from '@opentelemetry/sdk-trace-node';
 import {BatchSpanProcessor} from '@opentelemetry/sdk-trace-base';
+import {registerInstrumentations} from '@opentelemetry/instrumentation';
+import {diag, DiagConsoleLogger, DiagLogLevel} from '@opentelemetry/api';
+import {AwsInstrumentation} from '@opentelemetry/instrumentation-aws-sdk';
 import {OTLPTraceExporter} from '@opentelemetry/exporter-trace-otlp-grpc';
+import {B3Propagator, B3InjectEncoding} from '@opentelemetry/propagator-b3';
 import {HttpInstrumentation} from '@opentelemetry/instrumentation-http';
-import {ExpressInstrumentation} from '@opentelemetry/instrumentation-express';
-import {diag, DiagConsoleLogger, DiagLogLevel} from '@opentelemetry/api';
 import {Resource} from '@opentelemetry/resources';
 import {SemanticResourceAttributes} from '@opentelemetry/semantic-conventions';
-import {AwsInstrumentation} from '@opentelemetry/instrumentation-aws-sdk';
+import {ExpressInstrumentation} from '@opentelemetry/instrumentation-express';
 import {PinoInstrumentation} from '@opentelemetry/instrumentation-pino';
 import {DnsInstrumentation} from '@opentelemetry/instrumentation-dns';
-import {B3Propagator, B3InjectEncoding} from '@opentelemetry/propagator-b3';
 
 diag.setLogger(new DiagConsoleLogger(), DiagLogLevel.INFO);
 
@@ -77,6 +77,12 @@ export function setupTracing (options={}) {
     }),
   });
 
+  // Initialize the tracer provider
+  provider.register({
+    propagator: new CompositePropagator({
+      propagators: [new W3CBaggagePropagator(), new W3CTraceContextPropagator(), new B3Propagator({injectEncoding: B3InjectEncoding.MULTI_HEADER})],
+  })});
+
   // Configure exporter with the Collector endpoint - uses gRPC
   const exportOptions = {
     concurrencyLimit: concurrencyLimit,
@@ -97,32 +103,26 @@ export function setupTracing (options={}) {
   registerInstrumentations({
     tracerProvider: provider,
     instrumentations: [
-      new HttpInstrumentation({
-        requireParentforOutgoingSpans: false,
-        requireParentforIncomingSpans: false,
-        ignoreIncomingRequestHook,
-      }),
       new ExpressInstrumentation({
         ignoreIncomingRequestHook,
       }),
-      new AwsInstrumentation({
-        sqsExtractContextPropagationFromPayload: true
-      }),
       new PinoInstrumentation({
         logHook: (span, record) => {
           record['resource.service.name'] = provider.resource.attributes['service.name'];
         },
       }),
+      new HttpInstrumentation({
+        requireParentforOutgoingSpans: false,
+        requireParentforIncomingSpans: false,
+        ignoreIncomingRequestHook,
+      }),
+      new AwsInstrumentation({
+        sqsExtractContextPropagationFromPayload: true
+      }),
       new DnsInstrumentation(),
     ],
   });
 
-  // Initialize the tracer provider
-  provider.register({
-    propagator: new CompositePropagator({
-      propagators: [new W3CBaggagePropagator(), new W3CTraceContextPropagator(), new B3Propagator({injectEncoding: B3InjectEncoding.MULTI_HEADER})],
-  })});
-
   // Return the tracer for the service
   return provider.getTracer(serviceName);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@saidsef/tracing-node",
-  "version": "2.2.5",
+  "version": "2.2.7",
   "description": "tracing NodeJS - This is a wrapper for OpenTelemetry instrumentation packages",
   "main": "libs/index.mjs",
   "scripts": {
@@ -42,10 +42,10 @@
     "@opentelemetry/exporter-trace-otlp-grpc": "^0.53.0",
     "@opentelemetry/instrumentation": "^0.53.0",
     "@opentelemetry/instrumentation-aws-sdk": "^0.44.0",
-    "@opentelemetry/instrumentation-dns": "^0.39.0",
-    "@opentelemetry/instrumentation-express": "^0.43.0",
+    "@opentelemetry/instrumentation-dns": "^0.40.0",
+    "@opentelemetry/instrumentation-express": "^0.44.0",
     "@opentelemetry/instrumentation-http": "^0.53.0",
-    "@opentelemetry/instrumentation-pino": "^0.42.0",
+    "@opentelemetry/instrumentation-pino": "^0.43.0",
     "@opentelemetry/propagator-b3": "^1.25.1",
     "@opentelemetry/resources": "^1.26.0",
     "@opentelemetry/sdk-trace-base": "^1.26.0",