Skip to content

Commit d9e757f

Browse files
authored
fix(*): Migrate away from deprecated addSpanProcessor in tests (#2659)
1 parent fed82d5 commit d9e757f

File tree

53 files changed

+169
-137
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+169
-137
lines changed

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,14 +53,14 @@ import {
5353
import { PassThrough } from 'stream';
5454

5555
describe('CucumberInstrumentation', () => {
56+
const memoryExporter = new InMemorySpanExporter();
57+
const spanProcessor = new SimpleSpanProcessor(memoryExporter);
5658
const provider = new NodeTracerProvider({
5759
resource: new Resource({
5860
[SEMRESATTRS_SERVICE_NAME]: 'CucumberInstrumentation',
5961
}),
62+
spanProcessors: [spanProcessor],
6063
});
61-
const memoryExporter = new InMemorySpanExporter();
62-
const spanProcessor = new SimpleSpanProcessor(memoryExporter);
63-
provider.addSpanProcessor(spanProcessor);
6464
const contextManager = new AsyncHooksContextManager().enable();
6565

6666
before(() => {

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,12 +37,13 @@ describe('DataloaderInstrumentation', () => {
3737
let contextManager: AsyncHooksContextManager;
3838

3939
const memoryExporter = new InMemorySpanExporter();
40-
const provider = new NodeTracerProvider();
40+
const provider = new NodeTracerProvider({
41+
spanProcessors: [new SimpleSpanProcessor(memoryExporter)],
42+
});
4143
const tracer = provider.getTracer('default');
4244

4345
instrumentation.setTracerProvider(provider);
4446
extraInstrumentation.setTracerProvider(provider);
45-
provider.addSpanProcessor(new SimpleSpanProcessor(memoryExporter));
4647

4748
beforeEach(async () => {
4849
instrumentation.enable();

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,10 +58,11 @@ const pluginConfig = {
5858
createHook,
5959
endHook,
6060
};
61-
const provider = new BasicTracerProvider();
62-
const tracer = provider.getTracer('default');
6361
const memoryExporter = new InMemorySpanExporter();
64-
provider.addSpanProcessor(new SimpleSpanProcessor(memoryExporter));
62+
const provider = new BasicTracerProvider({
63+
spanProcessors: [new SimpleSpanProcessor(memoryExporter)],
64+
});
65+
const tracer = provider.getTracer('default');
6566

6667
describe('fs instrumentation', () => {
6768
let contextManager: AsyncHooksContextManager;

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,10 @@ const pluginConfig = {
3737
endHook,
3838
};
3939

40-
const provider = new BasicTracerProvider();
4140
const memoryExporter = new InMemorySpanExporter();
42-
provider.addSpanProcessor(new SimpleSpanProcessor(memoryExporter));
41+
const provider = new BasicTracerProvider({
42+
spanProcessors: [new SimpleSpanProcessor(memoryExporter)],
43+
});
4344

4445
const assertNotHookError = (err?: Error | null) => {
4546
assert.ok(

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,11 @@ const endHook = <EndHook>sinon.spy((fnName, { args, span }) => {
3737
const pluginConfig = {
3838
endHook,
3939
};
40-
const provider = new BasicTracerProvider();
41-
const tracer = provider.getTracer('default');
4240
const memoryExporter = new InMemorySpanExporter();
43-
provider.addSpanProcessor(new SimpleSpanProcessor(memoryExporter));
41+
const provider = new BasicTracerProvider({
42+
spanProcessors: [new SimpleSpanProcessor(memoryExporter)],
43+
});
44+
const tracer = provider.getTracer('default');
4445

4546
describe('fs/promises instrumentation', () => {
4647
let contextManager: AsyncHooksContextManager;

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,10 @@ const pluginConfig = {
3737
endHook,
3838
};
3939

40-
const provider = new BasicTracerProvider();
4140
const memoryExporter = new InMemorySpanExporter();
42-
provider.addSpanProcessor(new SimpleSpanProcessor(memoryExporter));
41+
const provider = new BasicTracerProvider({
42+
spanProcessors: [new SimpleSpanProcessor(memoryExporter)],
43+
});
4344

4445
const assertNotHookError = (err?: Error | null) => {
4546
assert.ok(

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,10 @@ import type { FsInstrumentationConfig } from '../src/types';
2525
import * as api from '@opentelemetry/api';
2626
import { AsyncHooksContextManager } from '@opentelemetry/context-async-hooks';
2727

28-
const provider = new BasicTracerProvider();
2928
const memoryExporter = new InMemorySpanExporter();
30-
provider.addSpanProcessor(new SimpleSpanProcessor(memoryExporter));
29+
const provider = new BasicTracerProvider({
30+
spanProcessors: [new SimpleSpanProcessor(memoryExporter)],
31+
});
3132

3233
const tracer = provider.getTracer('default');
3334

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -89,10 +89,12 @@ describe('tedious', () => {
8989
let tedious: any;
9090
let contextManager: AsyncHooksContextManager;
9191
let connection: Connection;
92-
const provider = new BasicTracerProvider();
92+
const memoryExporter = new InMemorySpanExporter();
93+
const provider = new BasicTracerProvider({
94+
spanProcessors: [new SimpleSpanProcessor(memoryExporter)],
95+
});
9396
const shouldTest = process.env.RUN_MSSQL_TESTS; // For CI: assumes local db is already available
9497
const shouldTestLocally = process.env.RUN_MSSQL_TESTS_LOCAL; // For local: spins up local db via docker
95-
const memoryExporter = new InMemorySpanExporter();
9698

9799
before(function (done) {
98100
if (!(shouldTest || shouldTestLocally) || incompatVersions) {
@@ -101,7 +103,6 @@ describe('tedious', () => {
101103
this.test!.parent!.pending = true;
102104
this.skip();
103105
}
104-
provider.addSpanProcessor(new SimpleSpanProcessor(memoryExporter));
105106
if (shouldTestLocally) {
106107
testUtils.startDocker('mssql');
107108
// wait 15 seconds for docker container to start

plugins/node/instrumentation-undici/test/fetch.test.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,9 @@ describe('UndiciInstrumentation `fetch` tests', function () {
4242
const hostname = 'localhost';
4343
const mockServer = new MockServer();
4444
const memoryExporter = new InMemorySpanExporter();
45-
const provider = new NodeTracerProvider();
46-
provider.addSpanProcessor(new SimpleSpanProcessor(memoryExporter));
45+
const provider = new NodeTracerProvider({
46+
spanProcessors: [new SimpleSpanProcessor(memoryExporter)],
47+
});
4748

4849
before(function (done) {
4950
// Do not test if the `fetch` global API is not available

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,9 @@ describe('UndiciInstrumentation `undici` tests', function () {
6868
const hostname = 'localhost';
6969
const mockServer = new MockServer();
7070
const memoryExporter = new InMemorySpanExporter();
71-
const provider = new NodeTracerProvider();
72-
provider.addSpanProcessor(new SimpleSpanProcessor(memoryExporter));
71+
const provider = new NodeTracerProvider({
72+
spanProcessors: [new SimpleSpanProcessor(memoryExporter)],
73+
});
7374

7475
before(function (done) {
7576
// Load `undici`. It may fail if nodejs version is <18 because the module uses

0 commit comments

Comments
 (0)