diff --git a/dd-trace-core/src/main/java/datadog/trace/core/scopemanager/ContinuableScopeManager.java b/dd-trace-core/src/main/java/datadog/trace/core/scopemanager/ContinuableScopeManager.java index e0ac7ea14fa..a1c11f21a45 100644 --- a/dd-trace-core/src/main/java/datadog/trace/core/scopemanager/ContinuableScopeManager.java +++ b/dd-trace-core/src/main/java/datadog/trace/core/scopemanager/ContinuableScopeManager.java @@ -217,7 +217,7 @@ ContinuableScope continueSpan( public boolean isAsyncPropagationEnabled() { ContinuableScope activeScope = scopeStack().active(); - return activeScope != null && activeScope.isAsyncPropagating(); + return activeScope == null || activeScope.isAsyncPropagating(); } public void setAsyncPropagationEnabled(boolean asyncPropagationEnabled) { diff --git a/dd-trace-core/src/test/java/datadog/trace/core/scopemanager/ScopeManagerForkedTest.java b/dd-trace-core/src/test/java/datadog/trace/core/scopemanager/ScopeManagerForkedTest.java index a6e833a215e..3bc3da7b29b 100644 --- a/dd-trace-core/src/test/java/datadog/trace/core/scopemanager/ScopeManagerForkedTest.java +++ b/dd-trace-core/src/test/java/datadog/trace/core/scopemanager/ScopeManagerForkedTest.java @@ -112,6 +112,20 @@ void cleanup() { tracer.close(); } + @Test + void noActiveScopeDefaultsToAsyncPropagation() { + assertNull(scopeManager.active()); + assertTrue(tracer.isAsyncPropagationEnabled()); + + Context context = Context.root().with(ContextKey.named("test-key"), "value"); + ContextContinuation continuation = tracer.capture(context); + try { + assertSame(context, continuation.context()); + } finally { + continuation.release(); + } + } + @Test void nonDdspanActivationResultsInAContinuableScope() { ContextScope scope = scopeManager.activateSpan(noopSpan());