Merge branch 'main' into rm-browser-extension-autoinjection

Author: pichlermarc

examples/connect/tracing.js

@@ -22,10 +22,14 @@ function log() {
 }
 
 module.exports = (serviceName) => {
+  const exporter = new CollectorTraceExporter();
   const provider = new NodeTracerProvider({
     resource: new Resource({
       [SEMRESATTRS_SERVICE_NAME]: serviceName,
     }),
+    spanProcessors: [
+      new SimpleSpanProcessor(exporter),
+    ],
   });
   const connectInstrumentation = new ConnectInstrumentation();
   registerInstrumentations({
@@ -37,10 +41,6 @@ module.exports = (serviceName) => {
     ],
   });
 
-  const exporter = new CollectorTraceExporter();
-
-  provider.addSpanProcessor(new SimpleSpanProcessor(exporter));
-
   // Initialize the OpenTelemetry APIs to use the NodeTracerProvider bindings
   provider.register({});
   return {

examples/dns/tracer.js

@@ -11,8 +11,6 @@ const { registerInstrumentations } = require('@opentelemetry/instrumentation');
 const EXPORTER = process.env.EXPORTER || '';
 
 module.exports = (serviceName) => {
-  const provider = new NodeTracerProvider();
-
   let exporter;
   if (EXPORTER.toLowerCase().startsWith('z')) {
     exporter = new ZipkinExporter({
@@ -24,7 +22,11 @@ module.exports = (serviceName) => {
     });
   }
 
-  provider.addSpanProcessor(new SimpleSpanProcessor(exporter));
+  const provider = new NodeTracerProvider({
+    spanProcessors: [
+      new SimpleSpanProcessor(exporter),
+    ],
+  });
 
   // Initialize the OpenTelemetry APIs to use the NodeTracerProvider bindings
   provider.register();

examples/express/src/tracer.ts

@@ -11,10 +11,14 @@ import { ExpressInstrumentation } from '@opentelemetry/instrumentation-express';
 import { HttpInstrumentation } from '@opentelemetry/instrumentation-http';
 
 export const setupTracing = (serviceName: string) => {
+  const exporter = new OTLPTraceExporter({});
   const provider = new NodeTracerProvider({
     resource: new Resource({
       [ATTR_SERVICE_NAME]: serviceName,
     }),
+    spanProcessors: [
+      new SimpleSpanProcessor(exporter),
+    ],
     sampler: filterSampler(ignoreHealthCheck, new AlwaysOnSampler()),
   });
   registerInstrumentations({
@@ -26,10 +30,6 @@ export const setupTracing = (serviceName: string) => {
     ],
   });
 
-  const exporter = new OTLPTraceExporter({});
-
-  provider.addSpanProcessor(new SimpleSpanProcessor(exporter));
-
   // Initialize the OpenTelemetry APIs to use the NodeTracerProvider bindings
   provider.register();
 

examples/graphql/tracer.js

@@ -14,10 +14,12 @@ const provider = new NodeTracerProvider({
   resource: new Resource({
     [SEMRESATTRS_SERVICE_NAME]: 'graphql-service',
   }),
+  spanProcessors: [
+    new SimpleSpanProcessor(new OTLPTraceExporter()),
+    new SimpleSpanProcessor(new ConsoleSpanExporter()),
+  ],
 });
 
-provider.addSpanProcessor(new SimpleSpanProcessor(new OTLPTraceExporter()));
-provider.addSpanProcessor(new SimpleSpanProcessor(new ConsoleSpanExporter()));
 provider.register();
 
 registerInstrumentations({

examples/grpc-census-prop/tracer.js

@@ -13,11 +13,13 @@ const { GrpcInstrumentation } = require('@opentelemetry/instrumentation-grpc');
  * requested propagator
  */
 module.exports = (serviceName, binaryPropagator) => {
-  const provider = new NodeTracerProvider();
-
-  // It is recommended to use this `BatchSpanProcessor` for better performance
-  // and optimization, especially in production.
-  provider.addSpanProcessor(new SimpleSpanProcessor(new ConsoleSpanExporter()));
+  const provider = new NodeTracerProvider({
+    spanProcessors: [
+      // It is recommended to use `BatchSpanProcessor` for better performance
+      // and optimization, especially in production.
+      new SimpleSpanProcessor(new ConsoleSpanExporter()),
+    ],
+  });
 
   if (binaryPropagator) {
     // Initialize the OpenTelemetry APIs to use the NodeTracerProvider bindings

examples/hapi/tracer.js

@@ -12,15 +12,18 @@ const { registerInstrumentations } = require('@opentelemetry/instrumentation');
 const EXPORTER = process.env.EXPORTER || '';
 
 module.exports = (serviceName) => {
-  const provider = new NodeTracerProvider();
-
   let exporter;
   if (EXPORTER === 'jaeger') {
     exporter = new JaegerExporter({ serviceName });
   } else {
     exporter = new ZipkinExporter({ serviceName });
   }
-  provider.addSpanProcessor(new SimpleSpanProcessor(exporter));
+
+  const provider = new NodeTracerProvider({
+    spanProcessors: [
+      new SimpleSpanProcessor(exporter),
+    ],
+  });
 
   // Initialize the OpenTelemetry APIs to use the NodeTracerProvider bindings
   provider.register();

examples/ioredis/tracer.js

@@ -7,11 +7,13 @@ const { JaegerExporter } = require('@opentelemetry/exporter-jaeger');
 const { IORedisInstrumentation } = require('@opentelemetry/instrumentation-ioredis');
 const { registerInstrumentations } = require('@opentelemetry/instrumentation');
 
-const provider = new NodeTracerProvider();
-
 const exporter = new JaegerExporter({ serviceName: 'ioredis-example' });
 
-provider.addSpanProcessor(new SimpleSpanProcessor(exporter));
+const provider = new NodeTracerProvider({
+  spanProcessors: [
+    new SimpleSpanProcessor(exporter),
+  ],
+});
 
 // Initialize the OpenTelemetry APIs to use the BasicTracer bindings
 provider.register();

examples/koa/src/tracer.ts

@@ -15,19 +15,21 @@ import { SEMRESATTRS_SERVICE_NAME } from '@opentelemetry/semantic-conventions'
 const EXPORTER = process.env.EXPORTER || '';
 
 export const setupTracing = (serviceName: string) => {
-  const provider = new NodeTracerProvider({
-    resource: new Resource({
-      [SEMRESATTRS_SERVICE_NAME]: serviceName
-    })
-  });
-
   let exporter;
   if (EXPORTER === 'jaeger') {
     exporter = new JaegerExporter();
   } else {
     exporter = new ZipkinExporter();
   }
-  provider.addSpanProcessor(new SimpleSpanProcessor(exporter));
+
+  const provider = new NodeTracerProvider({
+    resource: new Resource({
+      [SEMRESATTRS_SERVICE_NAME]: serviceName
+    }),
+    spanProcessors: [
+      new SimpleSpanProcessor(exporter),
+    ],
+  });
 
   registerInstrumentations({
     instrumentations: [

examples/memcached/tracer.js

@@ -14,10 +14,14 @@ const { SEMRESATTRS_SERVICE_NAME } = require('@opentelemetry/semantic-convention
 const { MemcachedInstrumentation } = require('@opentelemetry/instrumentation-memcached');
 
 module.exports = (serviceName) => {
+  const exporter = new ConsoleSpanExporter();
   const provider = new NodeTracerProvider({
     resource: new Resource({
       [SEMRESATTRS_SERVICE_NAME]: serviceName,
     }),
+    spanProcessors: [
+      new SimpleSpanProcessor(exporter),
+    ],
   });
   registerInstrumentations({
     tracerProvider: provider,
@@ -26,10 +30,6 @@ module.exports = (serviceName) => {
     ],
   });
 
-  const exporter = new ConsoleSpanExporter();
-
-  provider.addSpanProcessor(new SimpleSpanProcessor(exporter));
-
   // Initialize the OpenTelemetry APIs to use the NodeTracerProvider bindings
   provider.register();
 

examples/meta-node/tracer.js

@@ -17,8 +17,11 @@ module.exports = () => {
     serviceName: 'basic-service',
   });
 
-  const provider = new NodeTracerProvider();
-  provider.addSpanProcessor(new SimpleSpanProcessor(exporter));
+  const provider = new NodeTracerProvider({
+    spanProcessors: [
+      new SimpleSpanProcessor(exporter),
+    ],
+  });
   provider.register();
 
   registerInstrumentations({