@saidsef/tracing-node 1.1.2 → 1.6.4

package/libs/index.js

@@ -19,15 +19,17 @@
 const { registerInstrumentations } = require('@opentelemetry/instrumentation');
 const { NodeTracerProvider } = require('@opentelemetry/sdk-trace-node');
 const { BatchSpanProcessor } = require('@opentelemetry/sdk-trace-base');
-const { CollectorTraceExporter } = require('@opentelemetry/exporter-collector-grpc');
+const { OTLPTraceExporter } =  require('@opentelemetry/exporter-trace-otlp-grpc');
+const { OTLPMetricExporter } = require('@opentelemetry/exporter-metrics-otlp-grpc');
 const { HttpInstrumentation } = require('@opentelemetry/instrumentation-http');
 const { ExpressInstrumentation } = require('@opentelemetry/instrumentation-express');
 const { diag, DiagConsoleLogger, DiagLogLevel } = require('@opentelemetry/api');
 const { Resource } = require('@opentelemetry/resources');
 const { SemanticResourceAttributes } = require('@opentelemetry/semantic-conventions');
 const { AwsInstrumentation } = require('@opentelemetry/instrumentation-aws-sdk');
-const { PeriodicExportingMetricReader, ConsoleMetricExporter } = require('@opentelemetry/sdk-metrics');
-const { AWSXRayPropagator } = require('@opentelemetry/propagator-aws-xray');
+const { PinoInstrumentation } = require('@opentelemetry/instrumentation-pino');
+const { PeriodicExportingMetricReader } = require('@opentelemetry/sdk-metrics');
+const { JaegerPropagator } = require('@opentelemetry/propagator-jaeger');
 
 diag.setLogger(new DiagConsoleLogger(), DiagLogLevel.INFO);
 
@@ -43,7 +45,7 @@ function setupTracing(serviceName, appName="application", endpoint=null) {
   });
 
   // Configure exporter with the Collector endpoint - uses gRPC
-  const exporter = new CollectorTraceExporter({
+  const exporter = new OTLPTraceExporter({
     serviceName: serviceName,
     url: endpoint,
   });
@@ -55,7 +57,8 @@ function setupTracing(serviceName, appName="application", endpoint=null) {
   registerInstrumentations({
     tracerProvider: provider,
     metricReader: new PeriodicExportingMetricReader({
-      exporter: new ConsoleMetricExporter()
+      exporter: new OTLPMetricExporter(),
+      exportIntervalMillis: 1000
     }),
     instrumentations: [
       new ExpressInstrumentation({
@@ -77,11 +80,16 @@ function setupTracing(serviceName, appName="application", endpoint=null) {
       new AwsInstrumentation({
         sqsExtractContextPropagationFromPayload: true
       }),
+      new PinoInstrumentation({
+        logHook: (span, record) => {
+          record['resource.service.name'] = provider.resource.attributes['service.name'];
+        },
+      })
     ],
   });
 
   // Initialize the tracer provider
-  provider.register({propagator: new AWSXRayPropagator()});
+  provider.register({propagator: new JaegerPropagator()});
 
   // Return the tracer for the service
   return provider.getTracer(serviceName);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@saidsef/tracing-node",
-  "version": "1.1.2",
+  "version": "1.6.4",
   "description": "tracing NodeJS - This is wrapper for OpenTelemetry instrumentation packages",
   "main": "libs/index.js",
   "scripts": {
@@ -18,11 +18,10 @@
     "tracing",
     "opentelemetry",
     "instrumentation-aws-sdk",
-    "exporter-collector-grpc",
     "instrumentation",
     "instrumentation-express",
     "instrumentation-http",
-    "propagator-aws-xray",
+    "propagator-jaeger",
     "resources",
     "sdk-metrics",
     "sdk-trace-base",
@@ -30,19 +29,21 @@
     "semantic-conventions"
   ],
   "author": "Said Sef <saidsef@gmail.com>",
-  "license": "Apache License, Version 2.0",
+  "license": "Apache-2.0",
   "bugs": {
     "url": "https://github.com/saidsef/tracing-nodejs/issues"
   },
   "homepage": "https://github.com/saidsef/tracing-nodejs#readme",
   "dependencies": {
     "@opentelemetry/api": "^1.4.1",
-    "@opentelemetry/exporter-collector-grpc": "^0.25.0",
+    "@opentelemetry/exporter-metrics-otlp-grpc": "^0.40.0",
+    "@opentelemetry/exporter-trace-otlp-grpc": "^0.40.0",
     "@opentelemetry/instrumentation": "^0.40.0",
     "@opentelemetry/instrumentation-aws-sdk": "^0.34.3",
     "@opentelemetry/instrumentation-express": "^0.32.4",
     "@opentelemetry/instrumentation-http": "^0.40.0",
-    "@opentelemetry/propagator-aws-xray": "^1.2.1",
+    "@opentelemetry/instrumentation-pino": "^0.33.4",
+    "@opentelemetry/propagator-jaeger": "^1.14.0",
     "@opentelemetry/resources": "^1.14.0",
     "@opentelemetry/sdk-metrics": "^1.14.0",
     "@opentelemetry/sdk-trace-base": "^1.14.0",