Skip to content

Commit eaaa10e

Browse files
committed
test: stop using the obsolete AsyncHooksContextManager in tests
Since support for Node.js <14.8.0 was dropped, the modern AsyncLocalStorageContextManager can always be used. This was done for runtime code in open-telemetry/opentelemetry-js#4341 This PR does this for tests that were explicitly setting a context manager.
1 parent 33337d4 commit eaaa10e

File tree

36 files changed

+100
-100
lines changed

36 files changed

+100
-100
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
import { context, SpanStatusCode } from '@opentelemetry/api';
1818
import { NodeTracerProvider } from '@opentelemetry/sdk-trace-node';
19-
import { AsyncHooksContextManager } from '@opentelemetry/context-async-hooks';
19+
import { AsyncLocalStorageContextManager } from '@opentelemetry/context-async-hooks';
2020
import {
2121
InMemorySpanExporter,
2222
SimpleSpanProcessor,
@@ -61,7 +61,7 @@ describe('CucumberInstrumentation', () => {
6161
}),
6262
spanProcessors: [spanProcessor],
6363
});
64-
const contextManager = new AsyncHooksContextManager().enable();
64+
const contextManager = new AsyncLocalStorageContextManager().enable();
6565

6666
before(() => {
6767
instrumentation.setTracerProvider(provider);

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import {
2020
} from '@opentelemetry/sdk-trace-base';
2121
import { context, SpanKind, SpanStatusCode, trace } from '@opentelemetry/api';
2222
import { NodeTracerProvider } from '@opentelemetry/sdk-trace-node';
23-
import { AsyncHooksContextManager } from '@opentelemetry/context-async-hooks';
23+
import { AsyncLocalStorageContextManager } from '@opentelemetry/context-async-hooks';
2424

2525
import { DataloaderInstrumentation } from '../src';
2626
const instrumentation = new DataloaderInstrumentation();
@@ -34,7 +34,7 @@ import * as Dataloader from 'dataloader';
3434

3535
describe('DataloaderInstrumentation', () => {
3636
let dataloader: Dataloader<string, number>;
37-
let contextManager: AsyncHooksContextManager;
37+
let contextManager: AsyncLocalStorageContextManager;
3838

3939
const memoryExporter = new InMemorySpanExporter();
4040
const provider = new NodeTracerProvider({
@@ -47,7 +47,7 @@ describe('DataloaderInstrumentation', () => {
4747

4848
beforeEach(async () => {
4949
instrumentation.enable();
50-
contextManager = new AsyncHooksContextManager();
50+
contextManager = new AsyncLocalStorageContextManager();
5151
context.setGlobalContextManager(contextManager.enable());
5252
dataloader = new Dataloader(async keys => keys.map((_, idx) => idx), {
5353
cache: false,

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616
import { context, trace } from '@opentelemetry/api';
17-
import { AsyncHooksContextManager } from '@opentelemetry/context-async-hooks';
17+
import { AsyncLocalStorageContextManager } from '@opentelemetry/context-async-hooks';
1818
import {
1919
BasicTracerProvider,
2020
InMemorySpanExporter,
@@ -65,12 +65,12 @@ const provider = new BasicTracerProvider({
6565
const tracer = provider.getTracer('default');
6666

6767
describe('fs instrumentation', () => {
68-
let contextManager: AsyncHooksContextManager;
68+
let contextManager: AsyncLocalStorageContextManager;
6969
let fs: typeof FSType;
7070
let plugin: FsInstrumentation;
7171

7272
beforeEach(async () => {
73-
contextManager = new AsyncHooksContextManager();
73+
contextManager = new AsyncLocalStorageContextManager();
7474
context.setGlobalContextManager(contextManager.enable());
7575
plugin = new FsInstrumentation(pluginConfig);
7676
plugin.setTracerProvider(provider);

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616
import { context, trace } from '@opentelemetry/api';
17-
import { AsyncHooksContextManager } from '@opentelemetry/context-async-hooks';
17+
import { AsyncLocalStorageContextManager } from '@opentelemetry/context-async-hooks';
1818
import {
1919
BasicTracerProvider,
2020
InMemorySpanExporter,
@@ -44,12 +44,12 @@ const provider = new BasicTracerProvider({
4444
const tracer = provider.getTracer('default');
4545

4646
describe('fs/promises instrumentation', () => {
47-
let contextManager: AsyncHooksContextManager;
47+
let contextManager: AsyncLocalStorageContextManager;
4848
let fsPromises: typeof FSPromisesType;
4949
let plugin: FsInstrumentation;
5050

5151
beforeEach(async () => {
52-
contextManager = new AsyncHooksContextManager();
52+
contextManager = new AsyncLocalStorageContextManager();
5353
context.setGlobalContextManager(contextManager.enable());
5454
plugin = new FsInstrumentation(pluginConfig);
5555
plugin.setTracerProvider(provider);

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import * as assert from 'assert';
2323
import type * as FSType from 'fs';
2424
import type { FsInstrumentationConfig } from '../src/types';
2525
import * as api from '@opentelemetry/api';
26-
import { AsyncHooksContextManager } from '@opentelemetry/context-async-hooks';
26+
import { AsyncLocalStorageContextManager } from '@opentelemetry/context-async-hooks';
2727

2828
const memoryExporter = new InMemorySpanExporter();
2929
const provider = new BasicTracerProvider({
@@ -49,7 +49,7 @@ describe('fs instrumentation: requireParentSpan', () => {
4949
};
5050

5151
beforeEach(() => {
52-
const contextManager = new AsyncHooksContextManager();
52+
const contextManager = new AsyncLocalStorageContextManager();
5353
api.context.setGlobalContextManager(contextManager.enable());
5454
});
5555

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
*/
1616

1717
import { context, trace, SpanStatusCode, SpanKind } from '@opentelemetry/api';
18-
import { AsyncHooksContextManager } from '@opentelemetry/context-async-hooks';
18+
import { AsyncLocalStorageContextManager } from '@opentelemetry/context-async-hooks';
1919
import {
2020
DBSYSTEMVALUES_MSSQL,
2121
SEMATTRS_DB_NAME,
@@ -87,7 +87,7 @@ const incompatVersions =
8787

8888
describe('tedious', () => {
8989
let tedious: any;
90-
let contextManager: AsyncHooksContextManager;
90+
let contextManager: AsyncLocalStorageContextManager;
9191
let connection: Connection;
9292
const memoryExporter = new InMemorySpanExporter();
9393
const provider = new BasicTracerProvider({
@@ -124,7 +124,7 @@ describe('tedious', () => {
124124
// connecting often takes more time even if the DB is running locally
125125
this.timeout(10000);
126126
instrumentation.disable();
127-
contextManager = new AsyncHooksContextManager().enable();
127+
contextManager = new AsyncLocalStorageContextManager().enable();
128128
context.setGlobalContextManager(contextManager);
129129
instrumentation.setTracerProvider(provider);
130130
instrumentation.enable();

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import {
2222
propagation,
2323
trace,
2424
} from '@opentelemetry/api';
25-
import { AsyncHooksContextManager } from '@opentelemetry/context-async-hooks';
25+
import { AsyncLocalStorageContextManager } from '@opentelemetry/context-async-hooks';
2626
import {
2727
InMemorySpanExporter,
2828
SimpleSpanProcessor,
@@ -59,7 +59,7 @@ describe('UndiciInstrumentation `fetch` tests', function () {
5959
instrumentation.setTracerProvider(provider);
6060

6161
propagation.setGlobalPropagator(new MockPropagation());
62-
context.setGlobalContextManager(new AsyncHooksContextManager().enable());
62+
context.setGlobalContextManager(new AsyncLocalStorageContextManager().enable());
6363
mockServer.start(done);
6464
mockServer.mockListener((req, res) => {
6565
// There are some situations where there is no way to access headers

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
import * as assert from 'assert';
1717

1818
import { context, propagation } from '@opentelemetry/api';
19-
import { AsyncHooksContextManager } from '@opentelemetry/context-async-hooks';
19+
import { AsyncLocalStorageContextManager } from '@opentelemetry/context-async-hooks';
2020
import { NodeTracerProvider } from '@opentelemetry/sdk-trace-node';
2121
import {
2222
AggregationTemporality,
@@ -58,7 +58,7 @@ describe('UndiciInstrumentation metrics tests', function () {
5858
instrumentation.setTracerProvider(provider);
5959
instrumentation.setMeterProvider(meterProvider);
6060

61-
context.setGlobalContextManager(new AsyncHooksContextManager().enable());
61+
context.setGlobalContextManager(new AsyncLocalStorageContextManager().enable());
6262
mockServer.start(done);
6363
mockServer.mockListener((req, res) => {
6464
// Return a valid response always

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import {
2424
propagation,
2525
trace,
2626
} from '@opentelemetry/api';
27-
import { AsyncHooksContextManager } from '@opentelemetry/context-async-hooks';
27+
import { AsyncLocalStorageContextManager } from '@opentelemetry/context-async-hooks';
2828
import {
2929
InMemorySpanExporter,
3030
SimpleSpanProcessor,
@@ -85,7 +85,7 @@ describe('UndiciInstrumentation `undici` tests', function () {
8585
instrumentation.setTracerProvider(provider);
8686

8787
propagation.setGlobalPropagator(new MockPropagation());
88-
context.setGlobalContextManager(new AsyncHooksContextManager().enable());
88+
context.setGlobalContextManager(new AsyncLocalStorageContextManager().enable());
8989
mockServer.start(done);
9090
mockServer.mockListener((req, res) => {
9191
// There are some situations where there is no way to access headers

plugins/node/opentelemetry-instrumentation-cassandra/test/cassandra-driver.test.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ import {
2828
SpanStatusCode,
2929
} from '@opentelemetry/api';
3030
import { NodeTracerProvider } from '@opentelemetry/sdk-trace-node';
31-
import { AsyncHooksContextManager } from '@opentelemetry/context-async-hooks';
31+
import { AsyncLocalStorageContextManager } from '@opentelemetry/context-async-hooks';
3232
import {
3333
DBSYSTEMVALUES_CASSANDRA,
3434
SEMATTRS_DB_STATEMENT,
@@ -51,7 +51,7 @@ const memoryExporter = new InMemorySpanExporter();
5151
const provider = new NodeTracerProvider({
5252
spanProcessors: [new SimpleSpanProcessor(memoryExporter)],
5353
});
54-
context.setGlobalContextManager(new AsyncHooksContextManager());
54+
context.setGlobalContextManager(new AsyncLocalStorageContextManager());
5555

5656
const testCassandra = process.env.RUN_CASSANDRA_TESTS;
5757
const testCassandraLocally = process.env.RUN_CASSANDRA_TESTS_LOCAL;

plugins/node/opentelemetry-instrumentation-connect/test/instrumentation.test.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import * as assert from 'assert';
1818
import { context, trace } from '@opentelemetry/api';
1919
import { RPCType, setRPCMetadata, RPCMetadata } from '@opentelemetry/core';
2020
import { ATTR_HTTP_ROUTE } from '@opentelemetry/semantic-conventions';
21-
import { AsyncHooksContextManager } from '@opentelemetry/context-async-hooks';
21+
import { AsyncLocalStorageContextManager } from '@opentelemetry/context-async-hooks';
2222
import { NodeTracerProvider } from '@opentelemetry/sdk-trace-node';
2323
import {
2424
InMemorySpanExporter,
@@ -48,7 +48,7 @@ const httpRequest = {
4848
};
4949

5050
const instrumentation = new ConnectInstrumentation();
51-
const contextManager = new AsyncHooksContextManager().enable();
51+
const contextManager = new AsyncLocalStorageContextManager().enable();
5252
const memoryExporter = new InMemorySpanExporter();
5353
const spanProcessor = new SimpleSpanProcessor(memoryExporter);
5454
const provider = new NodeTracerProvider({

plugins/node/opentelemetry-instrumentation-express/test/custom-config.test.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
import { context, trace } from '@opentelemetry/api';
1818
import { NodeTracerProvider } from '@opentelemetry/sdk-trace-node';
19-
import { AsyncHooksContextManager } from '@opentelemetry/context-async-hooks';
19+
import { AsyncLocalStorageContextManager } from '@opentelemetry/context-async-hooks';
2020
import {
2121
InMemorySpanExporter,
2222
SimpleSpanProcessor,
@@ -44,7 +44,7 @@ describe('ExpressInstrumentation', () => {
4444
spanProcessors: [new SimpleSpanProcessor(memoryExporter)],
4545
});
4646
const tracer = provider.getTracer('default');
47-
const contextManager = new AsyncHooksContextManager().enable();
47+
const contextManager = new AsyncLocalStorageContextManager().enable();
4848

4949
before(() => {
5050
instrumentation.setTracerProvider(provider);

plugins/node/opentelemetry-instrumentation-express/test/express.test.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
import { SpanStatusCode, context, trace } from '@opentelemetry/api';
1818
import { NodeTracerProvider } from '@opentelemetry/sdk-trace-node';
19-
import { AsyncHooksContextManager } from '@opentelemetry/context-async-hooks';
19+
import { AsyncLocalStorageContextManager } from '@opentelemetry/context-async-hooks';
2020
import {
2121
InMemorySpanExporter,
2222
SimpleSpanProcessor,
@@ -47,7 +47,7 @@ describe('ExpressInstrumentation', () => {
4747
spanProcessors: [spanProcessor],
4848
});
4949
const tracer = provider.getTracer('default');
50-
const contextManager = new AsyncHooksContextManager().enable();
50+
const contextManager = new AsyncLocalStorageContextManager().enable();
5151

5252
before(() => {
5353
instrumentation.setTracerProvider(provider);

plugins/node/opentelemetry-instrumentation-express/test/hooks.test.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
import { context, trace, Span } from '@opentelemetry/api';
1818
import { NodeTracerProvider } from '@opentelemetry/sdk-trace-node';
19-
import { AsyncHooksContextManager } from '@opentelemetry/context-async-hooks';
19+
import { AsyncLocalStorageContextManager } from '@opentelemetry/context-async-hooks';
2020
import {
2121
InMemorySpanExporter,
2222
SimpleSpanProcessor,
@@ -43,7 +43,7 @@ describe('ExpressInstrumentation hooks', () => {
4343
spanProcessors: [spanProcessor],
4444
});
4545
const tracer = provider.getTracer('default');
46-
const contextManager = new AsyncHooksContextManager().enable();
46+
const contextManager = new AsyncLocalStorageContextManager().enable();
4747

4848
before(() => {
4949
instrumentation.setTracerProvider(provider);

plugins/node/opentelemetry-instrumentation-express/test/ignore-all.test.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
import { context, trace, Span } from '@opentelemetry/api';
1818
import { NodeTracerProvider } from '@opentelemetry/sdk-trace-node';
19-
import { AsyncHooksContextManager } from '@opentelemetry/context-async-hooks';
19+
import { AsyncLocalStorageContextManager } from '@opentelemetry/context-async-hooks';
2020
import {
2121
InMemorySpanExporter,
2222
SimpleSpanProcessor,
@@ -47,7 +47,7 @@ describe('ExpressInstrumentation', () => {
4747
spanProcessors: [spanProcessor],
4848
});
4949
const tracer = provider.getTracer('default');
50-
const contextManager = new AsyncHooksContextManager().enable();
50+
const contextManager = new AsyncLocalStorageContextManager().enable();
5151

5252
before(() => {
5353
instrumentation.setTracerProvider(provider);

plugins/node/opentelemetry-instrumentation-fastify/test/instrumentation.test.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
import * as assert from 'assert';
1818
import { context, SpanStatusCode } from '@opentelemetry/api';
1919
import { ATTR_HTTP_ROUTE } from '@opentelemetry/semantic-conventions';
20-
import { AsyncHooksContextManager } from '@opentelemetry/context-async-hooks';
20+
import { AsyncLocalStorageContextManager } from '@opentelemetry/context-async-hooks';
2121
import { NodeTracerProvider } from '@opentelemetry/sdk-trace-node';
2222
import {
2323
InMemorySpanExporter,
@@ -61,7 +61,7 @@ const httpRequest = {
6161

6262
const httpInstrumentation = new HttpInstrumentation();
6363
const instrumentation = new FastifyInstrumentation();
64-
const contextManager = new AsyncHooksContextManager().enable();
64+
const contextManager = new AsyncLocalStorageContextManager().enable();
6565
const memoryExporter = new InMemorySpanExporter();
6666
const spanProcessor = new SimpleSpanProcessor(memoryExporter);
6767
const provider = new NodeTracerProvider({

plugins/node/opentelemetry-instrumentation-generic-pool/test/index.test.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
import { context, trace } from '@opentelemetry/api';
1818
import { NodeTracerProvider } from '@opentelemetry/sdk-trace-node';
19-
import { AsyncHooksContextManager } from '@opentelemetry/context-async-hooks';
19+
import { AsyncLocalStorageContextManager } from '@opentelemetry/context-async-hooks';
2020
import {
2121
InMemorySpanExporter,
2222
SimpleSpanProcessor,
@@ -74,13 +74,13 @@ describe('GenericPool instrumentation', () => {
7474
});
7575
plugin.setTracerProvider(provider);
7676
const tracer = provider.getTracer('default');
77-
let contextManager: AsyncHooksContextManager;
77+
let contextManager: AsyncLocalStorageContextManager;
7878
let acquire: Function;
7979

8080
beforeEach(async () => {
8181
plugin.enable();
8282
acquire = createPool();
83-
contextManager = new AsyncHooksContextManager();
83+
contextManager = new AsyncLocalStorageContextManager();
8484
context.setGlobalContextManager(contextManager.enable());
8585
assert.strictEqual(memoryExporter.getFinishedSpans().length, 0);
8686
});

plugins/node/opentelemetry-instrumentation-hapi/test/hapi-plugin.test.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
import { context, trace } from '@opentelemetry/api';
1818
import { NodeTracerProvider } from '@opentelemetry/sdk-trace-node';
19-
import { AsyncHooksContextManager } from '@opentelemetry/context-async-hooks';
19+
import { AsyncLocalStorageContextManager } from '@opentelemetry/context-async-hooks';
2020
import {
2121
InMemorySpanExporter,
2222
SimpleSpanProcessor,
@@ -35,7 +35,7 @@ describe('Hapi Instrumentation - Hapi.Plugin Tests', () => {
3535
spanProcessors: [spanProcessor],
3636
});
3737
const tracer = provider.getTracer('default');
38-
let contextManager: AsyncHooksContextManager;
38+
let contextManager: AsyncLocalStorageContextManager;
3939
let server: hapi.Server;
4040

4141
before(() => {
@@ -44,7 +44,7 @@ describe('Hapi Instrumentation - Hapi.Plugin Tests', () => {
4444
});
4545

4646
beforeEach(async () => {
47-
contextManager = new AsyncHooksContextManager();
47+
contextManager = new AsyncLocalStorageContextManager();
4848
context.setGlobalContextManager(contextManager.enable());
4949
server = hapi.server({
5050
port: 3000,

plugins/node/opentelemetry-instrumentation-hapi/test/hapi-server-ext.test.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
import { context, SpanStatusCode, trace } from '@opentelemetry/api';
1818
import { NodeTracerProvider } from '@opentelemetry/sdk-trace-node';
19-
import { AsyncHooksContextManager } from '@opentelemetry/context-async-hooks';
19+
import { AsyncLocalStorageContextManager } from '@opentelemetry/context-async-hooks';
2020
import {
2121
InMemorySpanExporter,
2222
SimpleSpanProcessor,
@@ -36,7 +36,7 @@ describe('Hapi Instrumentation - Server.Ext Tests', () => {
3636
spanProcessors: [spanProcessor],
3737
});
3838
const tracer = provider.getTracer('default');
39-
let contextManager: AsyncHooksContextManager;
39+
let contextManager: AsyncLocalStorageContextManager;
4040
let server: hapi.Server;
4141

4242
before(() => {
@@ -45,7 +45,7 @@ describe('Hapi Instrumentation - Server.Ext Tests', () => {
4545
});
4646

4747
beforeEach(async () => {
48-
contextManager = new AsyncHooksContextManager();
48+
contextManager = new AsyncLocalStorageContextManager();
4949
context.setGlobalContextManager(contextManager.enable());
5050
server = hapi.server({
5151
port: 5000,

0 commit comments

Comments
 (0)