OpenTracing shim: baggage of active span was not used (open-telemetry…

…#4539)
LWogan · Jul 8, 2022 · 198aecd · 198aecd
1 parent eb373a3
commit 198aecd
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/opentracing-shim/src/main/java/io/opentelemetry/opentracingshim/SpanBuilderShim.java b/opentracing-shim/src/main/java/io/opentelemetry/opentracingshim/SpanBuilderShim.java
@@ -199,6 +199,8 @@ public Span start() {
           Context.root()
               .with(io.opentelemetry.api.trace.Span.wrap(parentSpanContext.getSpanContext())));
       baggage = parentSpanContext.getBaggage();
+    } else {
+      baggage = Baggage.current();
     }
 
     for (io.opentelemetry.api.trace.SpanContext link : parentLinks) {

diff --git a/opentracing-shim/src/test/java/io/opentelemetry/opentracingshim/TracerShimTest.java b/opentracing-shim/src/test/java/io/opentelemetry/opentracingshim/TracerShimTest.java
@@ -135,6 +135,9 @@ void activateSpan_withBaggage() {
 
       assertThat(io.opentelemetry.api.trace.Span.current()).isSameAs(actualSpan);
       assertThat(io.opentelemetry.api.baggage.Baggage.current()).isSameAs(actualBaggage);
+
+      Span child = tracerShim.buildSpan("child").start();
+      assertThat(child.getBaggageItem("foo")).isEqualTo("bar");
     }
 
     assertThat(tracerShim.activeSpan()).isNull();