Fix noParent being ignored after explicit parent. (#1617)

open-telemetry · Sep 2, 2020 · 8418753 · 8418753
1 parent 225acce
commit 8418753
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 3 deletions.
diff --git a/api/src/main/java/io/opentelemetry/trace/DefaultTracer.java b/api/src/main/java/io/opentelemetry/trace/DefaultTracer.java
@@ -66,12 +66,11 @@ static NoopSpanBuilder create(String spanName) {
       return new NoopSpanBuilder(spanName);
     }
 
-    private boolean isRootSpan;
     @Nullable private SpanContext spanContext;
 
     @Override
     public Span startSpan() {
-      if (spanContext == null && !isRootSpan) {
+      if (spanContext == null) {
         spanContext = TracingContextUtils.getCurrentSpan().getContext();
       }
 
@@ -103,7 +102,7 @@ public NoopSpanBuilder setParent(Context context) {
 
     @Override
     public NoopSpanBuilder setNoParent() {
-      isRootSpan = true;
+      spanContext = SpanContext.getInvalid();
       return this;
     }
 

diff --git a/api/src/test/java/io/opentelemetry/trace/DefaultTracerTest.java b/api/src/test/java/io/opentelemetry/trace/DefaultTracerTest.java
@@ -114,6 +114,22 @@ void testSpanContextPropagation_fromContext() {
     assertThat(span.getContext()).isSameAs(spanContext);
   }
 
+  @Test
+  void testSpanContextPropagation_fromContextAfterNoParent() {
+    Context context = TracingContextUtils.withSpan(new DefaultSpan(spanContext), Context.current());
+
+    Span span = defaultTracer.spanBuilder(SPAN_NAME).setNoParent().setParent(context).startSpan();
+    assertThat(span.getContext()).isSameAs(spanContext);
+  }
+
+  @Test
+  void testSpanContextPropagation_fromContextThenNoParent() {
+    Context context = TracingContextUtils.withSpan(new DefaultSpan(spanContext), Context.current());
+
+    Span span = defaultTracer.spanBuilder(SPAN_NAME).setParent(context).setNoParent().startSpan();
+    assertThat(span.getContext()).isEqualTo(SpanContext.getInvalid());
+  }
+
   @Test
   void testSpanContextPropagationCurrentSpan() {
     DefaultSpan parent = new DefaultSpan(spanContext);