Merge branch 'main' into fix-2645-examples

Author: david-luna

metapackages/auto-instrumentations-node/README.md

@@ -138,8 +138,10 @@ const provider = new NodeTracerProvider({
   resource: new Resource({
     [SEMRESATTRS_SERVICE_NAME]: 'basic-service',
   }),
+  spanProcessors: [
+    new SimpleSpanProcessor(exporter),
+  ],
 });
-provider.addSpanProcessor(new SimpleSpanProcessor(exporter));
 provider.register();
 
 registerInstrumentations({

metapackages/auto-instrumentations-web/README.md

@@ -26,8 +26,11 @@ const exporter = new CollectorTraceExporter({
   serviceName: 'auto-instrumentations-web',
 });
 
-const provider = new WebTracerProvider();
-provider.addSpanProcessor(new SimpleSpanProcessor(exporter));
+const provider = new WebTracerProvider({
+  spanProcessors: [
+    new SimpleSpanProcessor(exporter),
+  ],
+});
 provider.register({
   contextManager: new ZoneContextManager(),
   propagator: new B3Propagator(),

packages/opentelemetry-test-utils/src/instrumentations/otel-default-provider.ts

@@ -30,19 +30,23 @@ import {
 export const registerInstrumentationTestingProvider = (
   config?: NodeTracerConfig
 ): NodeTracerProvider => {
-  const otelTestingProvider = new NodeTracerProvider(config);
+  const spanProcessors = config?.spanProcessors
+    ? [...config.spanProcessors]
+    : [];
 
   setTestMemoryExporter(new InMemorySpanExporter());
-  otelTestingProvider.addSpanProcessor(
-    new SimpleSpanProcessor(getTestMemoryExporter()!)
-  );
+
+  spanProcessors.push(new SimpleSpanProcessor(getTestMemoryExporter()!));
 
   if (process.env.OTEL_EXPORTER_JAEGER_AGENT_HOST) {
-    otelTestingProvider.addSpanProcessor(
-      new SimpleSpanProcessor(new JaegerExporter())
-    );
+    spanProcessors.push(new SimpleSpanProcessor(new JaegerExporter()));
   }
 
+  const otelTestingProvider = new NodeTracerProvider({
+    ...config,
+    spanProcessors,
+  });
+
   otelTestingProvider.register();
   return otelTestingProvider;
 };

plugins/node/instrumentation-cucumber/test/cucumber.test.ts

@@ -53,14 +53,14 @@ import {
 import { PassThrough } from 'stream';
 
 describe('CucumberInstrumentation', () => {
+  const memoryExporter = new InMemorySpanExporter();
+  const spanProcessor = new SimpleSpanProcessor(memoryExporter);
   const provider = new NodeTracerProvider({
     resource: new Resource({
       [SEMRESATTRS_SERVICE_NAME]: 'CucumberInstrumentation',
     }),
+    spanProcessors: [spanProcessor],
   });
-  const memoryExporter = new InMemorySpanExporter();
-  const spanProcessor = new SimpleSpanProcessor(memoryExporter);
-  provider.addSpanProcessor(spanProcessor);
   const contextManager = new AsyncHooksContextManager().enable();
 
   before(() => {

plugins/node/instrumentation-dataloader/test/dataloader.test.ts

@@ -37,12 +37,13 @@ describe('DataloaderInstrumentation', () => {
   let contextManager: AsyncHooksContextManager;
 
   const memoryExporter = new InMemorySpanExporter();
-  const provider = new NodeTracerProvider();
+  const provider = new NodeTracerProvider({
+    spanProcessors: [new SimpleSpanProcessor(memoryExporter)],
+  });
   const tracer = provider.getTracer('default');
 
   instrumentation.setTracerProvider(provider);
   extraInstrumentation.setTracerProvider(provider);
-  provider.addSpanProcessor(new SimpleSpanProcessor(memoryExporter));
 
   beforeEach(async () => {
     instrumentation.enable();

plugins/node/instrumentation-fs/test/fs.test.ts

@@ -58,10 +58,11 @@ const pluginConfig = {
   createHook,
   endHook,
 };
-const provider = new BasicTracerProvider();
-const tracer = provider.getTracer('default');
 const memoryExporter = new InMemorySpanExporter();
-provider.addSpanProcessor(new SimpleSpanProcessor(memoryExporter));
+const provider = new BasicTracerProvider({
+  spanProcessors: [new SimpleSpanProcessor(memoryExporter)],
+});
+const tracer = provider.getTracer('default');
 
 describe('fs instrumentation', () => {
   let contextManager: AsyncHooksContextManager;

plugins/node/instrumentation-fs/test/fsHooks.test.ts

@@ -37,9 +37,10 @@ const pluginConfig = {
   endHook,
 };
 
-const provider = new BasicTracerProvider();
 const memoryExporter = new InMemorySpanExporter();
-provider.addSpanProcessor(new SimpleSpanProcessor(memoryExporter));
+const provider = new BasicTracerProvider({
+  spanProcessors: [new SimpleSpanProcessor(memoryExporter)],
+});
 
 const assertNotHookError = (err?: Error | null) => {
   assert.ok(

plugins/node/instrumentation-fs/test/fsPromises.test.ts

@@ -37,10 +37,11 @@ const endHook = <EndHook>sinon.spy((fnName, { args, span }) => {
 const pluginConfig = {
   endHook,
 };
-const provider = new BasicTracerProvider();
-const tracer = provider.getTracer('default');
 const memoryExporter = new InMemorySpanExporter();
-provider.addSpanProcessor(new SimpleSpanProcessor(memoryExporter));
+const provider = new BasicTracerProvider({
+  spanProcessors: [new SimpleSpanProcessor(memoryExporter)],
+});
+const tracer = provider.getTracer('default');
 
 describe('fs/promises instrumentation', () => {
   let contextManager: AsyncHooksContextManager;

plugins/node/instrumentation-fs/test/fsPromisesHooks.test.ts

@@ -37,9 +37,10 @@ const pluginConfig = {
   endHook,
 };
 
-const provider = new BasicTracerProvider();
 const memoryExporter = new InMemorySpanExporter();
-provider.addSpanProcessor(new SimpleSpanProcessor(memoryExporter));
+const provider = new BasicTracerProvider({
+  spanProcessors: [new SimpleSpanProcessor(memoryExporter)],
+});
 
 const assertNotHookError = (err?: Error | null) => {
   assert.ok(

plugins/node/instrumentation-fs/test/parent.test.ts

@@ -25,9 +25,10 @@ import type { FsInstrumentationConfig } from '../src/types';
 import * as api from '@opentelemetry/api';
 import { AsyncHooksContextManager } from '@opentelemetry/context-async-hooks';
 
-const provider = new BasicTracerProvider();
 const memoryExporter = new InMemorySpanExporter();
-provider.addSpanProcessor(new SimpleSpanProcessor(memoryExporter));
+const provider = new BasicTracerProvider({
+  spanProcessors: [new SimpleSpanProcessor(memoryExporter)],
+});
 
 const tracer = provider.getTracer('default');