chore: use withSpan where possible

open-telemetry · Feb 26, 2020 · acdae62 · acdae62
1 parent b323afe
commit acdae62
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 12 deletions.
diff --git a/packages/opentelemetry-node/test/NodeTracerProvider.test.ts b/packages/opentelemetry-node/test/NodeTracerProvider.test.ts
@@ -174,7 +174,7 @@ describe('NodeTracerProvider', () => {
     it('should run scope with AsyncHooksScopeManager scope manager', done => {
       provider = new NodeTracerProvider({});
       const span = provider.getTracer('default').startSpan('my-span');
-      context.with(setActiveSpan(context.active(), span), () => {
+      provider.getTracer('default').withSpan(span, () => {
         assert.deepStrictEqual(
           provider.getTracer('default').getCurrentSpan(),
           span
@@ -190,15 +190,15 @@ describe('NodeTracerProvider', () => {
     it('should run scope with AsyncHooksScopeManager scope manager with multiple spans', done => {
       provider = new NodeTracerProvider({});
       const span = provider.getTracer('default').startSpan('my-span');
-      context.with(setActiveSpan(context.active(), span), () => {
+      provider.getTracer('default').withSpan(span, () => {
         assert.deepStrictEqual(
           provider.getTracer('default').getCurrentSpan(),
           span
         );
 
         const span1 = provider.getTracer('default').startSpan('my-span1');
 
-        context.with(setActiveSpan(context.active(), span1), () => {
+        provider.getTracer('default').withSpan(span1, () => {
           assert.deepStrictEqual(
             provider.getTracer('default').getCurrentSpan(),
             span1
@@ -221,7 +221,7 @@ describe('NodeTracerProvider', () => {
     it('should find correct scope with promises', async () => {
       provider = new NodeTracerProvider();
       const span = provider.getTracer('default').startSpan('my-span');
-      await context.with(setActiveSpan(context.active(), span), async () => {
+      await provider.getTracer('default').withSpan(span, async () => {
         for (let i = 0; i < 3; i++) {
           await sleep(5).then(() => {
             assert.deepStrictEqual(

diff --git a/packages/opentelemetry-plugin-document-load/src/documentLoad.ts b/packages/opentelemetry-plugin-document-load/src/documentLoad.ts
@@ -24,7 +24,6 @@ import {
 import {
   BasePlugin,
   otperformance,
-  setActiveSpan,
   TRACE_PARENT_HEADER,
 } from '@opentelemetry/core';
 import {
@@ -119,14 +118,14 @@ export class DocumentLoad extends BasePlugin<unknown> {
         if (!rootSpan) {
           return;
         }
-        context.with(setActiveSpan(context.active(), rootSpan), () => {
+        this._tracer.withSpan(rootSpan, () => {
           const fetchSpan = this._startSpan(
             AttributeNames.DOCUMENT_FETCH,
             PTN.FETCH_START,
             entries
           );
           if (fetchSpan) {
-            context.with(setActiveSpan(context.active(), fetchSpan), () => {
+            this._tracer.withSpan(fetchSpan, () => {
               this._addSpanNetworkEvents(fetchSpan, entries);
               this._endSpan(fetchSpan, PTN.RESPONSE_END, entries);
             });

diff --git a/packages/opentelemetry-plugin-xml-http-request/src/xhr.ts b/packages/opentelemetry-plugin-xml-http-request/src/xhr.ts
@@ -22,7 +22,6 @@ import {
   isWrapped,
   otperformance,
   urlMatches,
-  setActiveSpan,
 } from '@opentelemetry/core';
 import {
   addSpanNetworkEvent,
@@ -133,7 +132,7 @@ export class XMLHttpRequestPlugin extends BasePlugin<XMLHttpRequest> {
     span: api.Span,
     corsPreFlightRequest: PerformanceResourceTiming
   ): void {
-    api.context.with(setActiveSpan(api.context.active(), span), () => {
+    this._tracer.withSpan(span, () => {
       const childSpan = this._tracer.startSpan('CORS Preflight', {
         startTime: corsPreFlightRequest[PTN.FETCH_START],
       });

diff --git a/packages/opentelemetry-web/test/WebTracerProvider.test.ts b/packages/opentelemetry-web/test/WebTracerProvider.test.ts
@@ -84,7 +84,7 @@ describe('WebTracerProvider', () => {
 
         const rootSpan = webTracerWithZone.startSpan('rootSpan');
 
-        context.with(setActiveSpan(context.active(), rootSpan), () => {
+        webTracerWithZone.withSpan(rootSpan, () => {
           assert.ok(
             webTracerWithZone.getCurrentSpan() === rootSpan,
             'Current span is rootSpan'
@@ -96,7 +96,7 @@ describe('WebTracerProvider', () => {
             'concurrentSpan2'
           );
 
-          context.with(setActiveSpan(context.active(), concurrentSpan1), () => {
+          webTracerWithZone.withSpan(concurrentSpan1, () => {
             setTimeout(() => {
               assert.ok(
                 webTracerWithZone.getCurrentSpan() === concurrentSpan1,
@@ -105,7 +105,7 @@ describe('WebTracerProvider', () => {
             }, 10);
           });
 
-          context.with(setActiveSpan(context.active(), concurrentSpan2), () => {
+          webTracerWithZone.withSpan(concurrentSpan2, () => {
             setTimeout(() => {
               assert.ok(
                 webTracerWithZone.getCurrentSpan() === concurrentSpan2,