fix(instr-http): respect requireParent flag when INVALID_SPAN_CONTEXT…

… is used
open-telemetry · Jun 20, 2024 · 658e198 · 658e198
1 parent 0608f40
commit 658e198
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 1 deletion.
diff --git a/experimental/CHANGELOG.md b/experimental/CHANGELOG.md
@@ -11,6 +11,8 @@ All notable changes to experimental packages in this project will be documented
 
 ### :bug: (Bug Fix)
 
+* fix(instrumentation-http): respect requireParent flag when INVALID_SPAN_CONTEXT is used [#4788](https://github.com/open-telemetry/opentelemetry-js/pull/4788) @reberhardt7
+
 ### :books: (Refine Doc)
 
 ### :house: (Internal)

diff --git a/experimental/packages/opentelemetry-instrumentation-http/src/http.ts b/experimental/packages/opentelemetry-instrumentation-http/src/http.ts
@@ -765,7 +765,10 @@ export class HttpInstrumentation extends InstrumentationBase<HttpInstrumentation
     let span: Span;
     const currentSpan = trace.getSpan(ctx);
 
-    if (requireParent === true && currentSpan === undefined) {
+    if (
+      requireParent === true &&
+      (!currentSpan || !trace.isSpanContextValid(currentSpan.spanContext()))
+    ) {
       span = trace.wrapSpanContext(INVALID_SPAN_CONTEXT);
     } else if (requireParent === true && currentSpan?.spanContext().isRemote) {
       span = currentSpan;

diff --git a/...rimental/packages/opentelemetry-instrumentation-http/test/functionals/http-enable.test.ts b/...rimental/packages/opentelemetry-instrumentation-http/test/functionals/http-enable.test.ts
@@ -23,6 +23,7 @@ import {
   trace,
   SpanAttributes,
   DiagConsoleLogger,
+  INVALID_SPAN_CONTEXT,
 } from '@opentelemetry/api';
 import { NodeTracerProvider } from '@opentelemetry/sdk-trace-node';
 import {
@@ -1043,6 +1044,24 @@ describe('HttpInstrumentation', () => {
         );
       });
 
+      it('should not trace with INVALID_SPAN_CONTEXT parent with requireParent options enabled', async () => {
+        instrumentation.disable();
+        instrumentation.setConfig({
+          requireParentforIncomingSpans: true,
+          requireParentforOutgoingSpans: true,
+        });
+        instrumentation.enable();
+        const root = trace.wrapSpanContext(INVALID_SPAN_CONTEXT);
+        await context.with(trace.setSpan(context.active(), root), async () => {
+          const testPath = '/test/test';
+          await httpRequest.get(
+            `${protocol}://${hostname}:${serverPort}${testPath}`
+          );
+        });
+        const spans = memoryExporter.getFinishedSpans();
+        assert.strictEqual(spans.length, 0);
+      });
+
       it('should trace with parent with both requireParent options enabled', done => {
         instrumentation.disable();
         instrumentation.setConfig({