From fa90c8112bd4ed483d5bd6e5fd082cc98e255fee Mon Sep 17 00:00:00 2001 From: Stuart McCulloch Date: Sun, 8 Nov 2026 23:29:08 +0000 Subject: [PATCH] Return the default async propagation setting when no scope is active When no scope is active, report async propagation as enabled, matching the default setting used when activating a scope without an enclosing scope. This is also consistent with capture(context), which already permits capture when there is no active scope to suppress propagation. Add a regression test checking that the query reports propagation as enabled and that a context can be captured without an active scope. --- .../core/scopemanager/ContinuableScopeManager.java | 2 +- .../core/scopemanager/ScopeManagerForkedTest.java | 14 ++++++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) 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());