From daa6cf269cf6d2c6cba6d21ede45e0c4bfe3b1ac Mon Sep 17 00:00:00 2001
From: vmarchaud <contact@vmarchaud.fr>
Date: Sat, 19 Sep 2020 17:57:52 +0200
Subject: [PATCH] fix: do not set outgoing http span as active in the context
 #1479

---
 .../opentelemetry-plugin-http/src/http.ts     | 30 +++++++++++--------
 .../test/functionals/http-enable.test.ts      | 14 ++++++++-
 2 files changed, 30 insertions(+), 14 deletions(-)

diff --git a/packages/opentelemetry-plugin-http/src/http.ts b/packages/opentelemetry-plugin-http/src/http.ts
index 7f5e45b2583..0a152aafe17 100644
--- a/packages/opentelemetry-plugin-http/src/http.ts
+++ b/packages/opentelemetry-plugin-http/src/http.ts
@@ -28,6 +28,7 @@ import {
   BasePlugin,
   NoRecordingSpan,
   getExtractedSpanContext,
+  setActiveSpan,
 } from '@opentelemetry/core';
 import {
   ClientRequest,
@@ -422,21 +423,24 @@ export class HttpPlugin extends BasePlugin<Http> {
         kind: SpanKind.CLIENT,
       };
       const span = plugin._startHttpSpan(operationName, spanOptions);
+      if (!optionsParsed.headers) {
+        optionsParsed.headers = {};
+      }
+      propagation.inject(
+        optionsParsed.headers,
+        undefined,
+        setActiveSpan(context.active(), span)
+      );
 
-      return plugin._tracer.withSpan(span, () => {
-        if (!optionsParsed.headers) optionsParsed.headers = {};
-        propagation.inject(optionsParsed.headers);
-
-        const request: ClientRequest = plugin._safeExecute(
-          span,
-          () => original.apply(this, [optionsParsed, ...args]),
-          true
-        );
+      const request: ClientRequest = plugin._safeExecute(
+        span,
+        () => original.apply(this, [optionsParsed, ...args]),
+        true
+      );
 
-        plugin._logger.debug('%s plugin outgoingRequest', plugin.moduleName);
-        plugin._tracer.bind(request);
-        return plugin._traceClientRequest(request, optionsParsed, span);
-      });
+      plugin._logger.debug('%s plugin outgoingRequest', plugin.moduleName);
+      plugin._tracer.bind(request);
+      return plugin._traceClientRequest(request, optionsParsed, span);
     };
   }
 
diff --git a/packages/opentelemetry-plugin-http/test/functionals/http-enable.test.ts b/packages/opentelemetry-plugin-http/test/functionals/http-enable.test.ts
index 60d34fa45ce..a978e0782f0 100644
--- a/packages/opentelemetry-plugin-http/test/functionals/http-enable.test.ts
+++ b/packages/opentelemetry-plugin-http/test/functionals/http-enable.test.ts
@@ -20,7 +20,11 @@ import {
   Span as ISpan,
   SpanKind,
 } from '@opentelemetry/api';
-import { NoopLogger } from '@opentelemetry/core';
+import {
+  NoopLogger,
+  getActiveSpan,
+  getParentSpanContext,
+} from '@opentelemetry/core';
 import { NodeTracerProvider } from '@opentelemetry/node';
 import {
   InMemorySpanExporter,
@@ -751,6 +755,14 @@ describe('HttpPlugin', () => {
           SpanKind.CLIENT
         );
       });
+
+      it('should not set span as active in context for outgoing request', async () => {
+        assert.deepStrictEqual(getActiveSpan(context.active()), undefined);
+        await httpRequest.get(`${protocol}://${hostname}:${serverPort}/test`);
+        assert.deepStrictEqual(getActiveSpan(context.active()), undefined);
+        const spans = memoryExporter.getFinishedSpans();
+        assert.strictEqual(spans.length, 2);
+      });
     });
 
     describe('with require parent span', () => {