Mend tracing instrumentation for Node services (#3028)

Co-authored-by: Olivier Bourgeois <[email protected]>

Author: vpadi

src/currencyservice/server.js

@@ -49,22 +49,25 @@ registerInstrumentations({
 
 if(process.env.ENABLE_TRACING == "1") {
   logger.info("Tracing enabled.")
-  const { NodeTracerProvider } = require('@opentelemetry/sdk-trace-node');
-  const { SimpleSpanProcessor } = require('@opentelemetry/sdk-trace-base');
-  const { OTLPTraceExporter } = require("@opentelemetry/exporter-otlp-grpc");
-  const { Resource } = require('@opentelemetry/resources');
-  const { SemanticResourceAttributes } = require('@opentelemetry/semantic-conventions');
-
-  const provider = new NodeTracerProvider({
-    resource: new Resource({
-      [SemanticResourceAttributes.SERVICE_NAME]: process.env.OTEL_SERVICE_NAME || 'currencyservice',
+
+  const { resourceFromAttributes } = require('@opentelemetry/resources');
+
+  const { ATTR_SERVICE_NAME } = require('@opentelemetry/semantic-conventions');
+
+  const opentelemetry = require('@opentelemetry/sdk-node');
+
+  const { OTLPTraceExporter } = require('@opentelemetry/exporter-otlp-grpc');
+
+  const collectorUrl = process.env.COLLECTOR_SERVICE_ADDR;
+  const traceExporter = new OTLPTraceExporter({url: collectorUrl});
+  const sdk = new opentelemetry.NodeSDK({
+    resource: resourceFromAttributes({
+      [ ATTR_SERVICE_NAME ]: process.env.OTEL_SERVICE_NAME || 'currencyservice',
     }),
+    traceExporter: traceExporter,
   });
 
-  const collectorUrl = process.env.COLLECTOR_SERVICE_ADDR
-
-  provider.addSpanProcessor(new SimpleSpanProcessor(new OTLPTraceExporter({url: collectorUrl})));
-  provider.register();
+  sdk.start()
 }
 else {
   logger.info("Tracing disabled.")

src/paymentservice/index.js

@@ -18,10 +18,9 @@
 
 const logger = require('./logger')
 
-if(process.env.DISABLE_PROFILER) {
+if (process.env.DISABLE_PROFILER) {
   logger.info("Profiler disabled.")
-}
-else {
+} else {
   logger.info("Profiler enabled.")
   require('@google-cloud/profiler').start({
     serviceContext: {
@@ -32,32 +31,35 @@ else {
 }
 
 
-if(process.env.ENABLE_TRACING == "1") {
+if (process.env.ENABLE_TRACING == "1") {
   logger.info("Tracing enabled.")
-  const { NodeTracerProvider } = require('@opentelemetry/sdk-trace-node');
-  const { SimpleSpanProcessor } = require('@opentelemetry/sdk-trace-base');
+
+  const { resourceFromAttributes } = require('@opentelemetry/resources');
+
+  const { ATTR_SERVICE_NAME }= require('@opentelemetry/semantic-conventions');
+
   const { GrpcInstrumentation } = require('@opentelemetry/instrumentation-grpc');
   const { registerInstrumentations } = require('@opentelemetry/instrumentation');
-  const { OTLPTraceExporter } = require("@opentelemetry/exporter-otlp-grpc");
-  const { Resource } = require('@opentelemetry/resources');
-  const { SemanticResourceAttributes } = require('@opentelemetry/semantic-conventions');
+  const opentelemetry = require('@opentelemetry/sdk-node');
 
-  const provider = new NodeTracerProvider({
-    resource: new Resource({
-      [SemanticResourceAttributes.SERVICE_NAME]: process.env.OTEL_SERVICE_NAME || 'paymentservice',
-    }),
-  });
+  const { OTLPTraceExporter } = require('@opentelemetry/exporter-otlp-grpc');
 
-  const collectorUrl = process.env.COLLECTOR_SERVICE_ADDR
+  const collectorUrl = process.env.COLLECTOR_SERVICE_ADDR;
+  const traceExporter = new OTLPTraceExporter({url: collectorUrl});
 
-  provider.addSpanProcessor(new SimpleSpanProcessor(new OTLPTraceExporter({url: collectorUrl})));
-  provider.register();
+  const sdk = new opentelemetry.NodeSDK({
+    resource: resourceFromAttributes({
+      [ATTR_SERVICE_NAME]: process.env.OTEL_SERVICE_NAME || 'paymentservice',
+    }),
+    traceExporter: traceExporter,
+  });
 
   registerInstrumentations({
     instrumentations: [new GrpcInstrumentation()]
   });
-}
-else {
+
+  sdk.start()
+} else {
   logger.info("Tracing disabled.")
 }