Skip to content

Commit fd0d35d

Browse files
authored
chore: disable apis after use in tests (#1800)
1 parent 5d1b4ee commit fd0d35d

File tree

7 files changed

+26
-7
lines changed

7 files changed

+26
-7
lines changed

packages/opentelemetry-instrumentation-http/test/functionals/http-enable.test.ts

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,6 @@ const provider = new NodeTracerProvider({
6767
});
6868
provider.addSpanProcessor(new SimpleSpanProcessor(memoryExporter));
6969
instrumentation.setTracerProvider(provider);
70-
propagation.setGlobalPropagator(new DummyPropagation());
7170

7271
function doNock(
7372
hostname: string,
@@ -104,6 +103,14 @@ export const responseHookFunction = (
104103
describe('HttpInstrumentation', () => {
105104
let contextManager: ContextManager;
106105

106+
before(() => {
107+
propagation.setGlobalPropagator(new DummyPropagation());
108+
});
109+
110+
after(() => {
111+
propagation.disable();
112+
});
113+
107114
beforeEach(() => {
108115
contextManager = new AsyncHooksContextManager().enable();
109116
context.setGlobalContextManager(contextManager);

packages/opentelemetry-instrumentation-http/test/functionals/http-package.test.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,12 +67,12 @@ describe('Packages', () => {
6767
});
6868
provider.addSpanProcessor(new SimpleSpanProcessor(memoryExporter));
6969
instrumentation.setTracerProvider(provider);
70-
propagation.setGlobalPropagator(new DummyPropagation());
7170
beforeEach(() => {
7271
memoryExporter.reset();
7372
});
7473

7574
before(() => {
75+
propagation.setGlobalPropagator(new DummyPropagation());
7676
instrumentation.setConfig({
7777
applyCustomAttributesOnSpan: customAttributeFunction,
7878
});
@@ -81,6 +81,7 @@ describe('Packages', () => {
8181

8282
after(() => {
8383
// back to normal
84+
propagation.disable();
8485
nock.cleanAll();
8586
nock.enableNetConnect();
8687
});

packages/opentelemetry-instrumentation-http/test/functionals/https-enable.test.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,6 @@ const provider = new BasicTracerProvider({
6969
instrumentation.setTracerProvider(provider);
7070
const tracer = provider.getTracer('test-https');
7171
provider.addSpanProcessor(new SimpleSpanProcessor(memoryExporter));
72-
propagation.setGlobalPropagator(new DummyPropagation());
7372

7473
function doNock(
7574
hostname: string,
@@ -94,12 +93,14 @@ describe('HttpsInstrumentation', () => {
9493

9594
beforeEach(() => {
9695
contextManager = new AsyncHooksContextManager().enable();
96+
propagation.setGlobalPropagator(new DummyPropagation());
9797
context.setGlobalContextManager(contextManager);
9898
});
9999

100100
afterEach(() => {
101101
contextManager.disable();
102102
context.disable();
103+
propagation.disable();
103104
});
104105

105106
describe('enable()', () => {

packages/opentelemetry-instrumentation-http/test/functionals/https-package.test.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,12 +68,12 @@ describe('Packages', () => {
6868
});
6969
provider.addSpanProcessor(new SimpleSpanProcessor(memoryExporter));
7070
instrumentation.setTracerProvider(provider);
71-
propagation.setGlobalPropagator(new DummyPropagation());
7271
beforeEach(() => {
7372
memoryExporter.reset();
7473
});
7574

7675
before(() => {
76+
propagation.setGlobalPropagator(new DummyPropagation());
7777
instrumentation.setConfig({
7878
applyCustomAttributesOnSpan: customAttributeFunction,
7979
});
@@ -84,6 +84,7 @@ describe('Packages', () => {
8484
// back to normal
8585
nock.cleanAll();
8686
nock.enableNetConnect();
87+
propagation.disable();
8788
});
8889

8990
let resHeaders: http.IncomingHttpHeaders;

packages/opentelemetry-instrumentation-http/test/integrations/http-enable.test.ts

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,11 +100,16 @@ describe('HttpInstrumentation Integration tests', () => {
100100

101101
beforeEach(() => {
102102
memoryExporter.reset();
103+
});
104+
105+
before(() => {
106+
propagation.setGlobalPropagator(new DummyPropagation());
103107
context.setGlobalContextManager(new AsyncHooksContextManager().enable());
104108
});
105109

106-
afterEach(() => {
110+
after(() => {
107111
context.disable();
112+
propagation.disable();
108113
});
109114
describe('enable()', () => {
110115
before(function (done) {
@@ -127,7 +132,6 @@ describe('HttpInstrumentation Integration tests', () => {
127132
const provider = new NodeTracerProvider({
128133
logger,
129134
});
130-
propagation.setGlobalPropagator(new DummyPropagation());
131135
provider.addSpanProcessor(new SimpleSpanProcessor(memoryExporter));
132136
instrumentation.setTracerProvider(provider);
133137
beforeEach(() => {

packages/opentelemetry-instrumentation-http/test/integrations/https-enable.test.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,6 @@ describe('HttpsInstrumentation Integration tests', () => {
140140
const provider = new NodeTracerProvider({
141141
logger,
142142
});
143-
propagation.setGlobalPropagator(new DummyPropagation());
144143
provider.addSpanProcessor(new SimpleSpanProcessor(memoryExporter));
145144
instrumentation.setTracerProvider(provider);
146145
beforeEach(() => {
@@ -153,6 +152,7 @@ describe('HttpsInstrumentation Integration tests', () => {
153152
/\/ignored\/regexp$/i,
154153
(url: string) => url.endsWith('/ignored/function'),
155154
];
155+
propagation.setGlobalPropagator(new DummyPropagation());
156156
instrumentation.setConfig({
157157
ignoreIncomingPaths: ignoreConfig,
158158
ignoreOutgoingUrls: ignoreConfig,
@@ -163,6 +163,7 @@ describe('HttpsInstrumentation Integration tests', () => {
163163

164164
after(() => {
165165
instrumentation.disable();
166+
propagation.disable();
166167
});
167168

168169
it('should create a rootSpan for GET requests and add propagation headers', async () => {

packages/opentelemetry-instrumentation-xml-http-request/test/xhr.test.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -150,6 +150,10 @@ describe('xhr', () => {
150150
);
151151
});
152152

153+
after(() => {
154+
api.propagation.disable();
155+
});
156+
153157
describe('when request is successful', () => {
154158
let webTracerWithZone: api.Tracer;
155159
let webTracerProviderWithZone: WebTracerProvider;

0 commit comments

Comments
 (0)