From fcaeeeb90459065c7a8b36a303bb581b943c0455 Mon Sep 17 00:00:00 2001 From: Stuart McCulloch Date: Mon, 9 Nov 2026 13:12:11 +0000 Subject: [PATCH] Use context capture controls instead of async propagation methods Capture suppression belongs to the active execution context rather than its tracer. Move instrumentation helpers and tests to the Context capture controls so they follow the selected context manager. --- .../com/datadog/aiguard/AIGuardInternal.java | 13 ++-- .../AIGuardContextPropagationTest.java | 8 ++- .../java/concurrent/AdviceUtils.java | 4 +- .../agent/test/base/HttpServerTest.groovy | 4 +- .../src/akka23Test/scala/AkkaActors.scala | 12 ++-- .../groovy/AkkaHttpTimeoutCleanupTest.groovy | 8 +-- .../groovy/ArmeriaGrpcStreamingTest.groovy | 14 +++-- .../src/test/groovy/GrpcStreamingTest.groovy | 14 +++-- ...syncPropagatingDisableInstrumentation.java | 10 +-- .../ForkJoinPoolSchedulingTest.java | 10 +-- .../groovy/KafkaClientTestBase.groovy | 4 +- .../test/groovy/KafkaClientTestBase.groovy | 4 +- .../test/groovy/KafkaClientTestBase.groovy | 6 +- .../coroutines/CoreKotlinCoroutineTests.kt | 6 +- ...entExecutorStartThreadInstrumentation.java | 10 +-- .../src/test/groovy/OpenTracing31Test.groovy | 13 ++-- .../src/test/groovy/OpenTracing32Test.groovy | 13 ++-- .../src/test/scala/PekkoActors.scala | 14 ++--- .../scala/ScalaConcurrentTests.scala | 16 +++-- .../src/test/scala/ScalaConcurrentTests.scala | 16 +++-- .../test/groovy/ScalaPromiseTestBase.groovy | 4 +- .../slick-3.2/src/test/scala/SlickUtils.scala | 10 ++- .../src/test/java/server/VertxTestServer.java | 4 +- .../java/server/IastVertx39TestVerticle.java | 4 +- .../java/server/VertxTestServer.java | 4 +- .../LocalSessionStoreInstrumentation.java | 10 +-- .../src/test/java/server/VertxTestServer.java | 4 +- .../LocalSessionStoreInstrumentationTest.java | 14 ++--- .../src/test/java/server/VertxTestServer.java | 4 +- .../java/datadog/trace/core/CoreTracer.java | 20 +++--- .../scopemanager/ContinuableScopeManager.java | 6 +- .../scopemanager/ScopeManagerForkedTest.java | 58 +++++++++++++++--- .../opentracing/OpenTracingAPITest.java | 35 +++++++---- .../instrumentation/api/AgentTracer.java | 61 ++++++++----------- 34 files changed, 235 insertions(+), 202 deletions(-) diff --git a/dd-java-agent/agent-aiguard/src/main/java/com/datadog/aiguard/AIGuardInternal.java b/dd-java-agent/agent-aiguard/src/main/java/com/datadog/aiguard/AIGuardInternal.java index bf656c43cc9..5eb4223ea87 100644 --- a/dd-java-agent/agent-aiguard/src/main/java/com/datadog/aiguard/AIGuardInternal.java +++ b/dd-java-agent/agent-aiguard/src/main/java/com/datadog/aiguard/AIGuardInternal.java @@ -1,6 +1,8 @@ package com.datadog.aiguard; import static datadog.communication.ddagent.TracerVersion.TRACER_VERSION; +import static datadog.context.Context.isCaptureEnabled; +import static datadog.context.Context.setCaptureEnabled; import static datadog.trace.api.telemetry.WafMetricCollector.AIGuardTruncationType.CONTENT; import static datadog.trace.api.telemetry.WafMetricCollector.AIGuardTruncationType.MESSAGES; import static datadog.trace.util.Strings.isBlank; @@ -365,7 +367,7 @@ public Evaluation evaluate(final List messages, final Options options) .url(url) .method("POST", new MoshiJsonRequestBody(moshi, messages, meta)); headers.forEach(request::header); - try (final Response response = executeRequest(tracer, request.build())) { + try (final Response response = executeRequest(request.build())) { final Map result; try { result = parseResponseBody(response); @@ -456,15 +458,14 @@ public Evaluation evaluate(final List messages, final Options options) } } - private Response executeRequest(final AgentTracer.TracerAPI tracer, final Request request) - throws IOException { - final boolean asyncPropagation = tracer.isAsyncPropagationEnabled(); + private Response executeRequest(final Request request) throws IOException { + final boolean captureEnabled = isCaptureEnabled(); try { // The synchronous HTTP call must not pass its context to pool maintenance threads. - tracer.setAsyncPropagationEnabled(false); + setCaptureEnabled(false); return client.newCall(request).execute(); } finally { - tracer.setAsyncPropagationEnabled(asyncPropagation); + setCaptureEnabled(captureEnabled); } } diff --git a/dd-java-agent/agent-aiguard/src/test/java/com/datadog/aiguard/AIGuardContextPropagationTest.java b/dd-java-agent/agent-aiguard/src/test/java/com/datadog/aiguard/AIGuardContextPropagationTest.java index 54161b1a3da..f5098bc3466 100644 --- a/dd-java-agent/agent-aiguard/src/test/java/com/datadog/aiguard/AIGuardContextPropagationTest.java +++ b/dd-java-agent/agent-aiguard/src/test/java/com/datadog/aiguard/AIGuardContextPropagationTest.java @@ -1,5 +1,7 @@ package com.datadog.aiguard; +import static datadog.context.Context.isCaptureEnabled; +import static datadog.context.Context.setCaptureEnabled; import static java.util.Collections.emptyMap; import static java.util.Collections.singletonList; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -80,7 +82,7 @@ void isolatesHttpWorkAndRestoresCaller( DDSpan span = (DDSpan) tracer.activeSpan(); assertEquals( scopeDepthLimit == 1 ? "parent" : "ai_guard", span.getOperationName().toString()); - assertFalse(tracer.isAsyncPropagationEnabled()); + assertFalse(isCaptureEnabled()); if (outcome == Outcome.ERROR) { throw new IOException("Transport failed"); } @@ -102,7 +104,7 @@ void isolatesHttpWorkAndRestoresCaller( List messages = singletonList(AIGuard.Message.message("user", "Hello")); AgentSpan parent = tracer.startSpan("test", "parent"); try (ContextScope ignored = tracer.activateSpan(parent)) { - tracer.setAsyncPropagationEnabled(callerPropagation); + setCaptureEnabled(callerPropagation); if (outcome == Outcome.ERROR) { assertThrows( AIGuard.AIGuardClientError.class, @@ -117,7 +119,7 @@ void isolatesHttpWorkAndRestoresCaller( evaluator.evaluate(messages, AIGuard.Options.DEFAULT).getAction()); } assertSame(parent, tracer.activeSpan()); - assertEquals(callerPropagation, tracer.isAsyncPropagationEnabled()); + assertEquals(callerPropagation, isCaptureEnabled()); verify(call).execute(); } finally { parent.finish(); diff --git a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/java/concurrent/AdviceUtils.java b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/java/concurrent/AdviceUtils.java index 9fe033d7632..4e9c1556902 100644 --- a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/java/concurrent/AdviceUtils.java +++ b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/java/concurrent/AdviceUtils.java @@ -1,6 +1,6 @@ package datadog.trace.bootstrap.instrumentation.java.concurrent; -import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.isAsyncPropagationEnabled; +import static datadog.context.Context.isCaptureEnabled; import datadog.context.Context; import datadog.context.ContextContinuation; @@ -68,7 +68,7 @@ public static boolean shouldCapture(Context context) { } AgentSpan span = AgentSpan.fromContext(context); // propagate contexts with no span or a valid span, when flag is on - return (span == null || span.isValid()) && isAsyncPropagationEnabled(); + return (span == null || span.isValid()) && isCaptureEnabled(); } public static void capture(ContextStore contextStore, T task) { diff --git a/dd-java-agent/instrumentation-testing/src/main/groovy/datadog/trace/agent/test/base/HttpServerTest.groovy b/dd-java-agent/instrumentation-testing/src/main/groovy/datadog/trace/agent/test/base/HttpServerTest.groovy index d668153c29b..408aed69ff0 100644 --- a/dd-java-agent/instrumentation-testing/src/main/groovy/datadog/trace/agent/test/base/HttpServerTest.groovy +++ b/dd-java-agent/instrumentation-testing/src/main/groovy/datadog/trace/agent/test/base/HttpServerTest.groovy @@ -67,6 +67,7 @@ import java.util.function.BiFunction import java.util.function.Function import java.util.function.Supplier +import static datadog.context.Context.isCaptureEnabled import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.BODY_JSON import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.BODY_MULTIPART import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.BODY_MULTIPART_COMBINED @@ -104,7 +105,6 @@ import static datadog.trace.api.config.TracerConfig.RESPONSE_HEADER_TAGS import static datadog.trace.bootstrap.blocking.BlockingActionHelper.TemplateType.JSON import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activeSpan import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.get -import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.isAsyncPropagationEnabled import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.noopSpan import static java.nio.charset.StandardCharsets.UTF_8 import static org.junit.jupiter.api.Assumptions.assumeTrue @@ -667,7 +667,7 @@ abstract class HttpServerTest extends WithHttpServer { static T controller(ServerEndpoint endpoint, Closure closure) { assert activeSpan() != null: "Controller should have a parent span." assert activeSpan() != noopSpan(): "Parent span shouldn't be noopSpan" - assert isAsyncPropagationEnabled(): "Span should be propagating async." + assert isCaptureEnabled(): "Span should be propagating async." if (endpoint == NOT_FOUND || endpoint == UNKNOWN) { return closure() } diff --git a/dd-java-agent/instrumentation/akka/akka-actor-2.5/src/akka23Test/scala/AkkaActors.scala b/dd-java-agent/instrumentation/akka/akka-actor-2.5/src/akka23Test/scala/AkkaActors.scala index 912506af26f..408c8e151d0 100644 --- a/dd-java-agent/instrumentation/akka/akka-actor-2.5/src/akka23Test/scala/AkkaActors.scala +++ b/dd-java-agent/instrumentation/akka/akka-actor-2.5/src/akka23Test/scala/AkkaActors.scala @@ -1,15 +1,11 @@ +import datadog.context.Context.setCaptureEnabled import java.util.concurrent.Semaphore import akka.actor.{Actor, ActorLogging, ActorRef, ActorSystem, Props} import akka.pattern.ask import akka.routing.RoundRobinPool import akka.util.Timeout import datadog.trace.api.Trace -import datadog.trace.bootstrap.instrumentation.api.AgentTracer.{ - activateSpan, - setAsyncPropagationEnabled, - activeSpan, - startSpan -} +import datadog.trace.bootstrap.instrumentation.api.AgentTracer.{activateSpan, activeSpan, startSpan} import scala.concurrent.Await import scala.concurrent.duration._ @@ -58,7 +54,7 @@ class AkkaActors extends AutoCloseable { @Trace def send(name: String, who: String): Unit = { val actor = actors(name) - setAsyncPropagationEnabled(true) + setCaptureEnabled(true) activeSpan().setSpanName(name) actor ! WhoToGreet(who) if (name == "ask") { @@ -70,7 +66,7 @@ class AkkaActors extends AutoCloseable { @Trace def leak(who: String, leak: String): Unit = { - setAsyncPropagationEnabled(true) + setCaptureEnabled(true) activeSpan().setSpanName("leak all the things") tellGreeter ! WhoToGreet(who) tellGreeter ! Leak(leak) diff --git a/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/baseTest/groovy/AkkaHttpTimeoutCleanupTest.groovy b/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/baseTest/groovy/AkkaHttpTimeoutCleanupTest.groovy index 99c1ce703cc..daa3f109b8b 100644 --- a/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/baseTest/groovy/AkkaHttpTimeoutCleanupTest.groovy +++ b/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/baseTest/groovy/AkkaHttpTimeoutCleanupTest.groovy @@ -11,9 +11,9 @@ import spock.util.concurrent.PollingConditions import java.util.concurrent.TimeUnit +import static datadog.context.Context.isCaptureEnabled +import static datadog.context.Context.setCaptureEnabled import static datadog.trace.agent.test.utils.TraceUtils.runUnderTrace -import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.isAsyncPropagationEnabled -import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.setAsyncPropagationEnabled class AkkaHttpTimeoutCleanupTest extends InstrumentationSpecification { @@ -41,9 +41,9 @@ class AkkaHttpTimeoutCleanupTest extends InstrumentationSpecification { when: runUnderTrace('request') { - setAsyncPropagationEnabled(enabled) + setCaptureEnabled(enabled) clear.invoke(access) - assert isAsyncPropagationEnabled() == enabled + assert isCaptureEnabled() == enabled } then: diff --git a/dd-java-agent/instrumentation/armeria/armeria-grpc-0.84/src/test/groovy/ArmeriaGrpcStreamingTest.groovy b/dd-java-agent/instrumentation/armeria/armeria-grpc-0.84/src/test/groovy/ArmeriaGrpcStreamingTest.groovy index 912fa60e0ed..13e68a40bab 100644 --- a/dd-java-agent/instrumentation/armeria/armeria-grpc-0.84/src/test/groovy/ArmeriaGrpcStreamingTest.groovy +++ b/dd-java-agent/instrumentation/armeria/armeria-grpc-0.84/src/test/groovy/ArmeriaGrpcStreamingTest.groovy @@ -1,3 +1,5 @@ +import static datadog.context.Context.isCaptureEnabled + import com.linecorp.armeria.client.Clients import com.linecorp.armeria.common.SessionProtocol import com.linecorp.armeria.common.grpc.GrpcSerializationFormats @@ -75,7 +77,7 @@ abstract class ArmeriaGrpcStreamingTest extends VersionedNamingTestBase { serverReceived << value.message (1..msgCount).each { - if (TEST_TRACER.isAsyncPropagationEnabled()) { + if (isCaptureEnabled()) { observer.onNext(value) } else { observer.onError(new IllegalStateException("not async propagating!")) @@ -85,7 +87,7 @@ abstract class ArmeriaGrpcStreamingTest extends VersionedNamingTestBase { @Override void onError(Throwable t) { - if (TEST_TRACER.isAsyncPropagationEnabled()) { + if (isCaptureEnabled()) { error.set(t) observer.onError(t) } else { @@ -95,7 +97,7 @@ abstract class ArmeriaGrpcStreamingTest extends VersionedNamingTestBase { @Override void onCompleted() { - if (TEST_TRACER.isAsyncPropagationEnabled()) { + if (isCaptureEnabled()) { observer.onCompleted() } else { observer.onError(new IllegalStateException("not async propagating!")) @@ -118,7 +120,7 @@ abstract class ArmeriaGrpcStreamingTest extends VersionedNamingTestBase { def streamObserver = client.conversation(new StreamObserver() { @Override void onNext(Helloworld.Response value) { - if (TEST_TRACER.isAsyncPropagationEnabled()) { + if (isCaptureEnabled()) { clientReceived << value.message } else { error.set(new IllegalStateException("not async propagating!")) @@ -127,7 +129,7 @@ abstract class ArmeriaGrpcStreamingTest extends VersionedNamingTestBase { @Override void onError(Throwable t) { - if (TEST_TRACER.isAsyncPropagationEnabled()) { + if (isCaptureEnabled()) { error.set(t) } else { error.set(new IllegalStateException("not async propagating!")) @@ -136,7 +138,7 @@ abstract class ArmeriaGrpcStreamingTest extends VersionedNamingTestBase { @Override void onCompleted() { - if (!TEST_TRACER.isAsyncPropagationEnabled()) { + if (!isCaptureEnabled()) { error.set(new IllegalStateException("not async propagating!")) } } diff --git a/dd-java-agent/instrumentation/grpc-1.5/src/test/groovy/GrpcStreamingTest.groovy b/dd-java-agent/instrumentation/grpc-1.5/src/test/groovy/GrpcStreamingTest.groovy index 6d28463e9d7..7d36e04487e 100644 --- a/dd-java-agent/instrumentation/grpc-1.5/src/test/groovy/GrpcStreamingTest.groovy +++ b/dd-java-agent/instrumentation/grpc-1.5/src/test/groovy/GrpcStreamingTest.groovy @@ -1,3 +1,5 @@ +import static datadog.context.Context.isCaptureEnabled + import com.google.common.util.concurrent.MoreExecutors import datadog.trace.agent.test.naming.VersionedNamingTestBase import datadog.trace.api.DDSpanTypes @@ -68,7 +70,7 @@ abstract class GrpcStreamingTest extends VersionedNamingTestBase { serverReceived << value.message (1..msgCount).each { - if (TEST_TRACER.isAsyncPropagationEnabled()) { + if (isCaptureEnabled()) { observer.onNext(value) } else { observer.onError(new IllegalStateException("not async propagating!")) @@ -78,7 +80,7 @@ abstract class GrpcStreamingTest extends VersionedNamingTestBase { @Override void onError(Throwable t) { - if (TEST_TRACER.isAsyncPropagationEnabled()) { + if (isCaptureEnabled()) { error.set(t) observer.onError(t) } else { @@ -88,7 +90,7 @@ abstract class GrpcStreamingTest extends VersionedNamingTestBase { @Override void onCompleted() { - if (TEST_TRACER.isAsyncPropagationEnabled()) { + if (isCaptureEnabled()) { observer.onCompleted() } else { observer.onError(new IllegalStateException("not async propagating!")) @@ -108,7 +110,7 @@ abstract class GrpcStreamingTest extends VersionedNamingTestBase { def streamObserver = client.conversation(new StreamObserver() { @Override void onNext(Helloworld.Response value) { - if (TEST_TRACER.isAsyncPropagationEnabled()) { + if (isCaptureEnabled()) { clientReceived << value.message } else { error.set(new IllegalStateException("not async propagating!")) @@ -117,7 +119,7 @@ abstract class GrpcStreamingTest extends VersionedNamingTestBase { @Override void onError(Throwable t) { - if (TEST_TRACER.isAsyncPropagationEnabled()) { + if (isCaptureEnabled()) { error.set(t) } else { error.set(new IllegalStateException("not async propagating!")) @@ -126,7 +128,7 @@ abstract class GrpcStreamingTest extends VersionedNamingTestBase { @Override void onCompleted() { - if (!TEST_TRACER.isAsyncPropagationEnabled()) { + if (!isCaptureEnabled()) { error.set(new IllegalStateException("not async propagating!")) } } diff --git a/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/concurrent/AsyncPropagatingDisableInstrumentation.java b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/concurrent/AsyncPropagatingDisableInstrumentation.java index 3e8662f7791..ea96aa68290 100644 --- a/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/concurrent/AsyncPropagatingDisableInstrumentation.java +++ b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/concurrent/AsyncPropagatingDisableInstrumentation.java @@ -5,8 +5,8 @@ import static datadog.trace.agent.tooling.bytebuddy.matcher.NameMatchers.nameStartsWith; import static datadog.trace.agent.tooling.bytebuddy.matcher.NameMatchers.named; import static datadog.trace.agent.tooling.bytebuddy.matcher.NameMatchers.namedOneOf; -import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.isAsyncPropagationEnabled; -import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.setAsyncPropagationEnabled; +import static datadog.trace.bootstrap.instrumentation.api.Java8BytecodeBridge.isContextCaptureEnabled; +import static datadog.trace.bootstrap.instrumentation.api.Java8BytecodeBridge.setContextCaptureEnabled; import static datadog.trace.instrumentation.java.concurrent.ConcurrentInstrumentationNames.EXECUTOR_INSTRUMENTATION_NAME; import static net.bytebuddy.matcher.ElementMatchers.isDeclaredBy; import static net.bytebuddy.matcher.ElementMatchers.isTypeInitializer; @@ -276,8 +276,8 @@ public static class DisableAsyncAdvice { @Advice.OnMethodEnter(suppress = Throwable.class) public static boolean before() { - if (isAsyncPropagationEnabled()) { - setAsyncPropagationEnabled(false); + if (isContextCaptureEnabled()) { + setContextCaptureEnabled(false); return true; } return false; @@ -286,7 +286,7 @@ public static boolean before() { @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class) public static void after(@Advice.Enter boolean wasDisabled) { if (wasDisabled) { - setAsyncPropagationEnabled(true); + setContextCaptureEnabled(true); } } } diff --git a/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-25.0/src/test/java/testdog/trace/instrumentation/java/concurrent/ForkJoinPoolSchedulingTest.java b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-25.0/src/test/java/testdog/trace/instrumentation/java/concurrent/ForkJoinPoolSchedulingTest.java index a17af291cc0..7c32b5749d7 100644 --- a/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-25.0/src/test/java/testdog/trace/instrumentation/java/concurrent/ForkJoinPoolSchedulingTest.java +++ b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-25.0/src/test/java/testdog/trace/instrumentation/java/concurrent/ForkJoinPoolSchedulingTest.java @@ -1,12 +1,12 @@ package testdog.trace.instrumentation.java.concurrent; import static datadog.context.Context.current; +import static datadog.context.Context.isCaptureEnabled; +import static datadog.context.Context.setCaptureEnabled; import static datadog.trace.agent.test.assertions.SpanMatcher.span; import static datadog.trace.agent.test.assertions.TraceMatcher.SORT_BY_START_TIME; import static datadog.trace.agent.test.assertions.TraceMatcher.trace; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activateSpan; -import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.isAsyncPropagationEnabled; -import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.setAsyncPropagationEnabled; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.startSpan; import static java.util.concurrent.TimeUnit.DAYS; import static java.util.concurrent.TimeUnit.MILLISECONDS; @@ -348,12 +348,12 @@ void disabledPropagationDoesNotCaptureParent() throws Exception { try (ForkJoinPool pool = new ForkJoinPool(1)) { AgentSpan parent = startSpan("test", "parent"); try (ContextScope ignored = current().with(parent).attach()) { - boolean enabled = isAsyncPropagationEnabled(); - setAsyncPropagationEnabled(false); + boolean enabled = isCaptureEnabled(); + setCaptureEnabled(false); try { pool.schedule(() -> assertNull(AgentSpan.current()), 0, MILLISECONDS).get(10, SECONDS); } finally { - setAsyncPropagationEnabled(enabled); + setCaptureEnabled(enabled); } } finally { parent.finish(); diff --git a/dd-java-agent/instrumentation/kafka/kafka-clients-0.11/src/latestDepTest/groovy/KafkaClientTestBase.groovy b/dd-java-agent/instrumentation/kafka/kafka-clients-0.11/src/latestDepTest/groovy/KafkaClientTestBase.groovy index 1d4ead5f6f7..a561bf0ef08 100644 --- a/dd-java-agent/instrumentation/kafka/kafka-clients-0.11/src/latestDepTest/groovy/KafkaClientTestBase.groovy +++ b/dd-java-agent/instrumentation/kafka/kafka-clients-0.11/src/latestDepTest/groovy/KafkaClientTestBase.groovy @@ -25,9 +25,9 @@ import spock.lang.Shared import java.util.concurrent.LinkedBlockingQueue import java.util.concurrent.TimeUnit +import static datadog.context.Context.isCaptureEnabled import static datadog.trace.agent.test.utils.TraceUtils.basicSpan import static datadog.trace.agent.test.utils.TraceUtils.runUnderTrace -import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.isAsyncPropagationEnabled abstract class KafkaClientTestBase extends VersionedNamingTestBase { static final SHARED_TOPIC = "shared.topic" @@ -179,7 +179,7 @@ abstract class KafkaClientTestBase extends VersionedNamingTestBase { String greeting = "Hello Spring Kafka Sender!" runUnderTrace("parent") { producer.send(new ProducerRecord(SHARED_TOPIC, greeting)) { meta, ex -> - assert isAsyncPropagationEnabled() + assert isCaptureEnabled() if (ex == null) { runUnderTrace("producer callback") {} } else { diff --git a/dd-java-agent/instrumentation/kafka/kafka-clients-0.11/src/test/groovy/KafkaClientTestBase.groovy b/dd-java-agent/instrumentation/kafka/kafka-clients-0.11/src/test/groovy/KafkaClientTestBase.groovy index 6d311a1b8d5..69bacf054c9 100644 --- a/dd-java-agent/instrumentation/kafka/kafka-clients-0.11/src/test/groovy/KafkaClientTestBase.groovy +++ b/dd-java-agent/instrumentation/kafka/kafka-clients-0.11/src/test/groovy/KafkaClientTestBase.groovy @@ -4,10 +4,10 @@ import datadog.trace.api.config.TraceInstrumentationConfig import datadog.trace.api.config.TracerConfig import datadog.trace.instrumentation.kafka_common.ClusterIdHolder +import static datadog.context.Context.isCaptureEnabled import static datadog.trace.agent.test.utils.TraceUtils.basicSpan import static datadog.trace.agent.test.utils.TraceUtils.runUnderTrace import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activeSpan -import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.isAsyncPropagationEnabled import datadog.trace.agent.test.InstrumentationSpecification import datadog.trace.agent.test.asserts.TraceAssert @@ -229,7 +229,7 @@ abstract class KafkaClientTestBase extends VersionedNamingTestBase { String greeting = "Hello Spring Kafka Sender!" runUnderTrace("parent") { producer.send(new ProducerRecord(SHARED_TOPIC, greeting)) { meta, ex -> - assert isAsyncPropagationEnabled() + assert isCaptureEnabled() if (ex == null) { runUnderTrace("producer callback") {} } else { diff --git a/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/src/test/groovy/KafkaClientTestBase.groovy b/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/src/test/groovy/KafkaClientTestBase.groovy index f4ae23b6d0e..73b0dc19a4e 100644 --- a/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/src/test/groovy/KafkaClientTestBase.groovy +++ b/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/src/test/groovy/KafkaClientTestBase.groovy @@ -42,11 +42,11 @@ import java.util.concurrent.Future import java.util.concurrent.LinkedBlockingQueue import java.util.concurrent.TimeUnit +import static datadog.context.Context.isCaptureEnabled import static datadog.trace.agent.test.asserts.TagsAssert.codeOriginTags import static datadog.trace.agent.test.utils.TraceUtils.basicSpan import static datadog.trace.agent.test.utils.TraceUtils.runUnderTrace import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activeSpan -import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.isAsyncPropagationEnabled abstract class KafkaClientTestBase extends VersionedNamingTestBase { static final SHARED_TOPIC = "shared.topic" @@ -197,7 +197,7 @@ abstract class KafkaClientTestBase extends VersionedNamingTestBase { String greeting = "Hello Spring Kafka Sender!" runUnderTrace("parent") { producer.send(new ProducerRecord(SHARED_TOPIC, greeting)) { meta, ex -> - assert isAsyncPropagationEnabled() + assert isCaptureEnabled() if (ex == null) { runUnderTrace("producer callback") {} } else { @@ -356,7 +356,7 @@ abstract class KafkaClientTestBase extends VersionedNamingTestBase { String greeting = "Hello Spring Kafka Sender!" runUnderTrace("parent") { kafkaTemplate.send(SHARED_TOPIC, greeting).whenComplete { meta, ex -> - assert isAsyncPropagationEnabled() + assert isCaptureEnabled() if (ex == null) { runUnderTrace("producer callback") {} } else { diff --git a/dd-java-agent/instrumentation/kotlin-coroutines-1.3/src/testFixtures/kotlin/datadog/trace/instrumentation/kotlin/coroutines/CoreKotlinCoroutineTests.kt b/dd-java-agent/instrumentation/kotlin-coroutines-1.3/src/testFixtures/kotlin/datadog/trace/instrumentation/kotlin/coroutines/CoreKotlinCoroutineTests.kt index fef7fb4be11..71e2d17312c 100644 --- a/dd-java-agent/instrumentation/kotlin-coroutines-1.3/src/testFixtures/kotlin/datadog/trace/instrumentation/kotlin/coroutines/CoreKotlinCoroutineTests.kt +++ b/dd-java-agent/instrumentation/kotlin-coroutines-1.3/src/testFixtures/kotlin/datadog/trace/instrumentation/kotlin/coroutines/CoreKotlinCoroutineTests.kt @@ -1,11 +1,11 @@ package datadog.trace.instrumentation.kotlin.coroutines import datadog.context.Context +import datadog.context.Context.setCaptureEnabled import datadog.trace.api.Trace import datadog.trace.bootstrap.instrumentation.api.AgentSpan import datadog.trace.bootstrap.instrumentation.api.AgentTracer.activeSpan import datadog.trace.bootstrap.instrumentation.api.AgentTracer.get -import datadog.trace.bootstrap.instrumentation.api.AgentTracer.setAsyncPropagationEnabled import kotlinx.coroutines.CompletableDeferred import kotlinx.coroutines.CoroutineDispatcher import kotlinx.coroutines.CoroutineName @@ -51,7 +51,7 @@ abstract class CoreKotlinCoroutineTests(private val dispatcher: CoroutineDispatc @Trace open fun scopedSpanSurvivesSuspension(mdc: Boolean, differentDispatcher: Boolean): Int { - setAsyncPropagationEnabled(true) + setCaptureEnabled(true) val outer = Executors.newSingleThreadExecutor().asCoroutineDispatcher() val inner = if (differentDispatcher) Executors.newSingleThreadExecutor().asCoroutineDispatcher() else outer try { @@ -635,7 +635,7 @@ abstract class CoreKotlinCoroutineTests(private val dispatcher: CoroutineDispatc } protected fun runTest(asyncPropagation: Boolean = true, block: suspend CoroutineScope.() -> T): T { - setAsyncPropagationEnabled(asyncPropagation) + setCaptureEnabled(asyncPropagation) return runBlocking(jobName("test") + dispatcher, block = block) } diff --git a/dd-java-agent/instrumentation/netty/netty-concurrent-4.0/src/main/java/datadog/trace/instrumentation/netty40/concurrent/SingleThreadEventExecutorStartThreadInstrumentation.java b/dd-java-agent/instrumentation/netty/netty-concurrent-4.0/src/main/java/datadog/trace/instrumentation/netty40/concurrent/SingleThreadEventExecutorStartThreadInstrumentation.java index 826b37103f7..344b64ca448 100644 --- a/dd-java-agent/instrumentation/netty/netty-concurrent-4.0/src/main/java/datadog/trace/instrumentation/netty40/concurrent/SingleThreadEventExecutorStartThreadInstrumentation.java +++ b/dd-java-agent/instrumentation/netty/netty-concurrent-4.0/src/main/java/datadog/trace/instrumentation/netty40/concurrent/SingleThreadEventExecutorStartThreadInstrumentation.java @@ -1,8 +1,8 @@ package datadog.trace.instrumentation.netty40.concurrent; import static datadog.trace.agent.tooling.bytebuddy.matcher.NameMatchers.named; -import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.isAsyncPropagationEnabled; -import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.setAsyncPropagationEnabled; +import static datadog.trace.bootstrap.instrumentation.api.Java8BytecodeBridge.isContextCaptureEnabled; +import static datadog.trace.bootstrap.instrumentation.api.Java8BytecodeBridge.setContextCaptureEnabled; import static net.bytebuddy.matcher.ElementMatchers.isPrivate; import static net.bytebuddy.matcher.ElementMatchers.returns; import static net.bytebuddy.matcher.ElementMatchers.takesNoArguments; @@ -42,8 +42,8 @@ public void methodAdvice(MethodTransformer transformer) { public static final class DisableAsyncPropagation { @Advice.OnMethodEnter(suppress = Throwable.class) public static boolean before() { - if (isAsyncPropagationEnabled()) { - setAsyncPropagationEnabled(false); + if (isContextCaptureEnabled()) { + setContextCaptureEnabled(false); return true; } return false; @@ -52,7 +52,7 @@ public static boolean before() { @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class) public static void after(@Advice.Enter boolean wasDisabled) { if (wasDisabled) { - setAsyncPropagationEnabled(true); + setContextCaptureEnabled(true); } } } diff --git a/dd-java-agent/instrumentation/opentracing/opentracing-0.31/src/test/groovy/OpenTracing31Test.groovy b/dd-java-agent/instrumentation/opentracing/opentracing-0.31/src/test/groovy/OpenTracing31Test.groovy index 00fe86fb479..91b4e056390 100644 --- a/dd-java-agent/instrumentation/opentracing/opentracing-0.31/src/test/groovy/OpenTracing31Test.groovy +++ b/dd-java-agent/instrumentation/opentracing/opentracing-0.31/src/test/groovy/OpenTracing31Test.groovy @@ -1,9 +1,11 @@ +import static datadog.context.Context.isCaptureEnabled +import static datadog.context.Context.setCaptureEnabled + import datadog.trace.agent.test.InstrumentationSpecification import datadog.trace.api.DDSpanId import datadog.trace.api.DDTags import datadog.trace.api.DDTraceId import datadog.trace.api.interceptor.MutableSpan -import datadog.trace.bootstrap.instrumentation.api.AgentTracer import datadog.trace.bootstrap.instrumentation.api.ResourceNamePriorities import datadog.trace.core.propagation.PropagationTags import datadog.trace.instrumentation.opentracing.DefaultLogHandler @@ -155,24 +157,23 @@ class OpenTracing31Test extends InstrumentationSpecification { def "test scopemanager"() { setup: - AgentTracer.TracerAPI internalTracer = tracer.tracer.tracer def span = tracer.buildSpan("some name").start() def scope = tracer.scopeManager().activate(span, finishSpan) - internalTracer.setAsyncPropagationEnabled(false) + setCaptureEnabled(false) expect: span instanceof MutableSpan scope instanceof TraceScope - !internalTracer.isAsyncPropagationEnabled() + !isCaptureEnabled() (tracer.scopeManager().active().span().delegate == span.delegate) when: - internalTracer.setAsyncPropagationEnabled(true) + setCaptureEnabled(true) def continuation = (scope as TraceScope).capture() continuation.cancel() then: - internalTracer.isAsyncPropagationEnabled() + isCaptureEnabled() continuation instanceof TraceScope.Continuation when: "attempting to close the span this way doesn't work because we lost the 'finishSpan' reference" diff --git a/dd-java-agent/instrumentation/opentracing/opentracing-0.32/src/test/groovy/OpenTracing32Test.groovy b/dd-java-agent/instrumentation/opentracing/opentracing-0.32/src/test/groovy/OpenTracing32Test.groovy index eb074bd028b..9e1f81301b9 100644 --- a/dd-java-agent/instrumentation/opentracing/opentracing-0.32/src/test/groovy/OpenTracing32Test.groovy +++ b/dd-java-agent/instrumentation/opentracing/opentracing-0.32/src/test/groovy/OpenTracing32Test.groovy @@ -1,10 +1,12 @@ +import static datadog.context.Context.isCaptureEnabled +import static datadog.context.Context.setCaptureEnabled + import datadog.trace.agent.test.InstrumentationSpecification import datadog.trace.api.DDSpanId import datadog.trace.api.DDTags import datadog.trace.api.DDTraceId import datadog.trace.api.internal.util.LongStringUtils import datadog.trace.api.interceptor.MutableSpan -import datadog.trace.bootstrap.instrumentation.api.AgentTracer import datadog.trace.bootstrap.instrumentation.api.ResourceNamePriorities import datadog.trace.context.TraceScope import datadog.trace.core.DDSpan @@ -166,24 +168,23 @@ class OpenTracing32Test extends InstrumentationSpecification { def "test scopemanager"() { setup: - AgentTracer.TracerAPI internalTracer = tracer.tracer.tracer def span = tracer.buildSpan("some name").start() def scope = tracer.scopeManager().activate(span, finishSpan) - internalTracer.setAsyncPropagationEnabled(false) + setCaptureEnabled(false) expect: span instanceof MutableSpan scope instanceof TraceScope - !internalTracer.isAsyncPropagationEnabled() + !isCaptureEnabled() (tracer.scopeManager().active().span().delegate == span.delegate) when: - internalTracer.setAsyncPropagationEnabled(true) + setCaptureEnabled(true) def continuation = (scope as TraceScope).capture() continuation.cancel() then: - internalTracer.isAsyncPropagationEnabled() + isCaptureEnabled() continuation instanceof TraceScope.Continuation when: "attempting to close the span this way doesn't work because we lost the 'finishSpan' reference" diff --git a/dd-java-agent/instrumentation/pekko/pekko-concurrent-1.0/src/test/scala/PekkoActors.scala b/dd-java-agent/instrumentation/pekko/pekko-concurrent-1.0/src/test/scala/PekkoActors.scala index fa4aa877d6d..337f51e1093 100644 --- a/dd-java-agent/instrumentation/pekko/pekko-concurrent-1.0/src/test/scala/PekkoActors.scala +++ b/dd-java-agent/instrumentation/pekko/pekko-concurrent-1.0/src/test/scala/PekkoActors.scala @@ -1,3 +1,4 @@ +import datadog.context.Context.setCaptureEnabled import Scheduler.Schedule import java.util.concurrent.Semaphore @@ -6,12 +7,7 @@ import org.apache.pekko.pattern.ask import org.apache.pekko.routing.RoundRobinPool import org.apache.pekko.util.Timeout import datadog.trace.api.Trace -import datadog.trace.bootstrap.instrumentation.api.AgentTracer.{ - activateSpan, - activeSpan, - setAsyncPropagationEnabled, - startSpan -} +import datadog.trace.bootstrap.instrumentation.api.AgentTracer.{activateSpan, activeSpan, startSpan} import scala.concurrent.Await import scala.concurrent.duration._ @@ -61,7 +57,7 @@ class PekkoActors extends AutoCloseable { @Trace def send(name: String, who: String): Unit = { val actor = actors(name) - setAsyncPropagationEnabled(true) + setCaptureEnabled(true) activeSpan().setSpanName(name) actor ! WhoToGreet(who) if (name == "ask") { @@ -73,7 +69,7 @@ class PekkoActors extends AutoCloseable { @Trace def leak(who: String, leak: String): Unit = { - setAsyncPropagationEnabled(true) + setCaptureEnabled(true) activeSpan().setSpanName("leak all the things") tellGreeter ! WhoToGreet(who) tellGreeter ! Leak(leak) @@ -82,7 +78,7 @@ class PekkoActors extends AutoCloseable { @Trace def schedule(): Semaphore = { val barrier = new Semaphore(0) - setAsyncPropagationEnabled(true) + setCaptureEnabled(true) activeSpan().setSpanName("schedulerSpan") scheduler ! Schedule(barrier) barrier diff --git a/dd-java-agent/instrumentation/scala/scala-concurrent-2.8/src/latestDepTest/scala/ScalaConcurrentTests.scala b/dd-java-agent/instrumentation/scala/scala-concurrent-2.8/src/latestDepTest/scala/ScalaConcurrentTests.scala index 91150f6739f..5e9665f4db5 100644 --- a/dd-java-agent/instrumentation/scala/scala-concurrent-2.8/src/latestDepTest/scala/ScalaConcurrentTests.scala +++ b/dd-java-agent/instrumentation/scala/scala-concurrent-2.8/src/latestDepTest/scala/ScalaConcurrentTests.scala @@ -1,9 +1,7 @@ +import datadog.context.Context.setCaptureEnabled import datadog.trace.agent.test.InstrumentationSpecification.blockUntilChildSpansFinished import datadog.trace.api.Trace -import datadog.trace.bootstrap.instrumentation.api.AgentTracer.{ - setAsyncPropagationEnabled, - activeSpan -} +import datadog.trace.bootstrap.instrumentation.api.AgentTracer.{activeSpan} import scala.concurrent.ExecutionContext.Implicits.global import scala.concurrent.duration._ @@ -16,7 +14,7 @@ class ScalaConcurrentTests { */ @Trace def traceWithFutureAndCallbacks(): Integer = { - setAsyncPropagationEnabled(true) + setCaptureEnabled(true) val goodFuture: Future[Integer] = Future { tracedChild("goodFuture") 1 @@ -34,7 +32,7 @@ class ScalaConcurrentTests { @Trace def tracedAcrossThreadsWithNoTrace(): Integer = { - setAsyncPropagationEnabled(true) + setCaptureEnabled(true) val goodFuture: Future[Integer] = Future { 1 } @@ -53,7 +51,7 @@ class ScalaConcurrentTests { */ @Trace def traceWithPromises(): Integer = { - setAsyncPropagationEnabled(true) + setCaptureEnabled(true) val keptPromise = Promise[Boolean]() val brokenPromise = Promise[Boolean]() val afterPromise = keptPromise.future @@ -80,7 +78,7 @@ class ScalaConcurrentTests { */ @Trace def tracedWithFutureFirstCompletions(): Integer = { - setAsyncPropagationEnabled(true) + setCaptureEnabled(true) val completedVal = Future.firstCompletedOf( List( Future { @@ -108,7 +106,7 @@ class ScalaConcurrentTests { */ @Trace def tracedTimeout(): Integer = { - setAsyncPropagationEnabled(true) + setCaptureEnabled(true) val f: Future[String] = Future { tracedChild("timeoutChild") while (true) { diff --git a/dd-java-agent/instrumentation/scala/scala-concurrent-2.8/src/test/scala/ScalaConcurrentTests.scala b/dd-java-agent/instrumentation/scala/scala-concurrent-2.8/src/test/scala/ScalaConcurrentTests.scala index 91150f6739f..5e9665f4db5 100644 --- a/dd-java-agent/instrumentation/scala/scala-concurrent-2.8/src/test/scala/ScalaConcurrentTests.scala +++ b/dd-java-agent/instrumentation/scala/scala-concurrent-2.8/src/test/scala/ScalaConcurrentTests.scala @@ -1,9 +1,7 @@ +import datadog.context.Context.setCaptureEnabled import datadog.trace.agent.test.InstrumentationSpecification.blockUntilChildSpansFinished import datadog.trace.api.Trace -import datadog.trace.bootstrap.instrumentation.api.AgentTracer.{ - setAsyncPropagationEnabled, - activeSpan -} +import datadog.trace.bootstrap.instrumentation.api.AgentTracer.{activeSpan} import scala.concurrent.ExecutionContext.Implicits.global import scala.concurrent.duration._ @@ -16,7 +14,7 @@ class ScalaConcurrentTests { */ @Trace def traceWithFutureAndCallbacks(): Integer = { - setAsyncPropagationEnabled(true) + setCaptureEnabled(true) val goodFuture: Future[Integer] = Future { tracedChild("goodFuture") 1 @@ -34,7 +32,7 @@ class ScalaConcurrentTests { @Trace def tracedAcrossThreadsWithNoTrace(): Integer = { - setAsyncPropagationEnabled(true) + setCaptureEnabled(true) val goodFuture: Future[Integer] = Future { 1 } @@ -53,7 +51,7 @@ class ScalaConcurrentTests { */ @Trace def traceWithPromises(): Integer = { - setAsyncPropagationEnabled(true) + setCaptureEnabled(true) val keptPromise = Promise[Boolean]() val brokenPromise = Promise[Boolean]() val afterPromise = keptPromise.future @@ -80,7 +78,7 @@ class ScalaConcurrentTests { */ @Trace def tracedWithFutureFirstCompletions(): Integer = { - setAsyncPropagationEnabled(true) + setCaptureEnabled(true) val completedVal = Future.firstCompletedOf( List( Future { @@ -108,7 +106,7 @@ class ScalaConcurrentTests { */ @Trace def tracedTimeout(): Integer = { - setAsyncPropagationEnabled(true) + setCaptureEnabled(true) val f: Future[String] = Future { tracedChild("timeoutChild") while (true) { diff --git a/dd-java-agent/instrumentation/scala/scala-promise/scala-promise-common/src/test/groovy/ScalaPromiseTestBase.groovy b/dd-java-agent/instrumentation/scala/scala-promise/scala-promise-common/src/test/groovy/ScalaPromiseTestBase.groovy index 824c4695ede..2ea2b4766e0 100644 --- a/dd-java-agent/instrumentation/scala/scala-promise/scala-promise-common/src/test/groovy/ScalaPromiseTestBase.groovy +++ b/dd-java-agent/instrumentation/scala/scala-promise/scala-promise-common/src/test/groovy/ScalaPromiseTestBase.groovy @@ -4,10 +4,10 @@ import scala.concurrent.Future import scala.concurrent.Promise import spock.lang.Shared +import static datadog.context.Context.setCaptureEnabled import static datadog.trace.agent.test.utils.TraceUtils.basicSpan import static datadog.trace.agent.test.utils.TraceUtils.runUnderTrace import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activeSpan -import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.setAsyncPropagationEnabled abstract class ScalaPromiseTestBase extends AbstractPromiseTest, Future> { @@ -61,7 +61,7 @@ abstract class ScalaPromiseTestBase extends AbstractPromiseTest } runUnderTrace("other") { - setAsyncPropagationEnabled(false) + setCaptureEnabled(false) complete(promise, value) } diff --git a/dd-java-agent/instrumentation/slick-3.2/src/test/scala/SlickUtils.scala b/dd-java-agent/instrumentation/slick-3.2/src/test/scala/SlickUtils.scala index 42febdf5bf5..549535c0331 100644 --- a/dd-java-agent/instrumentation/slick-3.2/src/test/scala/SlickUtils.scala +++ b/dd-java-agent/instrumentation/slick-3.2/src/test/scala/SlickUtils.scala @@ -1,9 +1,7 @@ +import datadog.context.Context.setCaptureEnabled import datadog.trace.agent.test.InstrumentationSpecification.blockUntilChildSpansFinished import datadog.trace.api.Trace -import datadog.trace.bootstrap.instrumentation.api.AgentTracer.{ - setAsyncPropagationEnabled, - activeSpan -} +import datadog.trace.bootstrap.instrumentation.api.AgentTracer.{activeSpan} import datadog.trace.common.writer.ListWriter import datadog.trace.core.DDSpan import slick.jdbc.H2Profile.api._ @@ -29,7 +27,7 @@ class SlickUtils(TEST_WRITER: ListWriter) { @Trace def setup(): DDSpan = { - setAsyncPropagationEnabled(true) + setCaptureEnabled(true) Await.result( database.run( sqlu"""CREATE ALIAS IF NOT EXISTS SLEEP FOR "java.lang.Thread.sleep(long)"""" @@ -42,7 +40,7 @@ class SlickUtils(TEST_WRITER: ListWriter) { @Trace def startQuery(query: String): Future[Vector[Int]] = { try { - setAsyncPropagationEnabled(true) + setCaptureEnabled(true) database.run(sql"#$query".as[Int]) } finally { blockUntilChildSpansFinished(activeSpan(), 1) diff --git a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.4/src/test/java/server/VertxTestServer.java b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.4/src/test/java/server/VertxTestServer.java index f1aea412fbb..ea455223106 100644 --- a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.4/src/test/java/server/VertxTestServer.java +++ b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.4/src/test/java/server/VertxTestServer.java @@ -1,5 +1,6 @@ package server; +import static datadog.context.Context.isCaptureEnabled; import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.BODY_JSON; import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.BODY_MULTIPART; import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.BODY_URLENCODED; @@ -19,7 +20,6 @@ import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.USER_BLOCK; import static datadog.trace.agent.test.utils.TraceUtils.runnableUnderTraceAsync; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activeSpan; -import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.isAsyncPropagationEnabled; import datadog.appsec.api.blocking.Blocking; import datadog.trace.agent.test.base.HttpServerTest; @@ -236,7 +236,7 @@ private static void exception() { private static void controller( RoutingContext ctx, final ServerEndpoint endpoint, final Runnable runnable) { assert activeSpan() != null : "Controller should have a parent span."; - assert isAsyncPropagationEnabled() : "Span should be propagating async."; + assert isCaptureEnabled() : "Span should be propagating async."; ctx.response() .putHeader( HttpServerTest.getIG_RESPONSE_HEADER(), HttpServerTest.getIG_RESPONSE_HEADER_VALUE()); diff --git a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.9/src/test/java/server/IastVertx39TestVerticle.java b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.9/src/test/java/server/IastVertx39TestVerticle.java index 9ed47d8e5a3..02c69df61f6 100644 --- a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.9/src/test/java/server/IastVertx39TestVerticle.java +++ b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.9/src/test/java/server/IastVertx39TestVerticle.java @@ -1,5 +1,6 @@ package server; +import static datadog.context.Context.isCaptureEnabled; import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.BODY_JSON; import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.BODY_URLENCODED; import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.CREATED; @@ -17,7 +18,6 @@ import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.USER_BLOCK; import static datadog.trace.agent.test.utils.TraceUtils.runnableUnderTraceAsync; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activeSpan; -import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.isAsyncPropagationEnabled; import datadog.appsec.api.blocking.Blocking; import datadog.trace.agent.test.base.HttpServerTest; @@ -236,7 +236,7 @@ private static void exception() { private static void controller( RoutingContext ctx, final ServerEndpoint endpoint, final Runnable runnable) { assert activeSpan() != null : "Controller should have a parent span."; - assert isAsyncPropagationEnabled() : "Span should be propagating async."; + assert isCaptureEnabled() : "Span should be propagating async."; ctx.response() .putHeader( HttpServerTest.getIG_RESPONSE_HEADER(), HttpServerTest.getIG_RESPONSE_HEADER_VALUE()); diff --git a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/latestDepTest/java/server/VertxTestServer.java b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/latestDepTest/java/server/VertxTestServer.java index 803524acae7..6af4b4e0350 100644 --- a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/latestDepTest/java/server/VertxTestServer.java +++ b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/latestDepTest/java/server/VertxTestServer.java @@ -1,5 +1,6 @@ package server; +import static datadog.context.Context.isCaptureEnabled; import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.BODY_JSON; import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.BODY_MULTIPART; import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.BODY_URLENCODED; @@ -19,7 +20,6 @@ import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.USER_BLOCK; import static datadog.trace.agent.test.utils.TraceUtils.runnableUnderTraceAsync; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activeSpan; -import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.isAsyncPropagationEnabled; import datadog.appsec.api.blocking.Blocking; import datadog.trace.agent.test.base.HttpServerTest; @@ -251,7 +251,7 @@ private static void exception() { private static void controller( RoutingContext ctx, final ServerEndpoint endpoint, final Runnable runnable) { assert activeSpan() != null : "Controller should have a parent span."; - assert isAsyncPropagationEnabled() : "Span should be propagating async."; + assert isCaptureEnabled() : "Span should be propagating async."; ctx.response() .putHeader( HttpServerTest.getIG_RESPONSE_HEADER(), HttpServerTest.getIG_RESPONSE_HEADER_VALUE()); diff --git a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/server/LocalSessionStoreInstrumentation.java b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/server/LocalSessionStoreInstrumentation.java index c74528e7515..381f27a9501 100644 --- a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/server/LocalSessionStoreInstrumentation.java +++ b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/server/LocalSessionStoreInstrumentation.java @@ -1,8 +1,8 @@ package datadog.trace.instrumentation.vertx_4_0.server; import static datadog.trace.agent.tooling.bytebuddy.matcher.NameMatchers.named; -import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.isAsyncPropagationEnabled; -import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.setAsyncPropagationEnabled; +import static datadog.trace.bootstrap.instrumentation.api.Java8BytecodeBridge.isContextCaptureEnabled; +import static datadog.trace.bootstrap.instrumentation.api.Java8BytecodeBridge.setContextCaptureEnabled; import static net.bytebuddy.matcher.ElementMatchers.isPrivate; import static net.bytebuddy.matcher.ElementMatchers.isPublic; import static net.bytebuddy.matcher.ElementMatchers.returns; @@ -53,8 +53,8 @@ public void methodAdvice(MethodTransformer transformer) { public static final class DisablePropagationAdvice { @Advice.OnMethodEnter(suppress = Throwable.class) public static boolean before() { - if (isAsyncPropagationEnabled()) { - setAsyncPropagationEnabled(false); + if (isContextCaptureEnabled()) { + setContextCaptureEnabled(false); return true; } return false; @@ -63,7 +63,7 @@ public static boolean before() { @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class) public static void after(@Advice.Enter boolean wasEnabled) { if (wasEnabled) { - setAsyncPropagationEnabled(true); + setContextCaptureEnabled(true); } } } diff --git a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/test/java/server/VertxTestServer.java b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/test/java/server/VertxTestServer.java index 5e8d0629be8..22ef3a53827 100644 --- a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/test/java/server/VertxTestServer.java +++ b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/test/java/server/VertxTestServer.java @@ -1,5 +1,6 @@ package server; +import static datadog.context.Context.isCaptureEnabled; import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.BODY_JSON; import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.BODY_MULTIPART; import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.BODY_URLENCODED; @@ -19,7 +20,6 @@ import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.USER_BLOCK; import static datadog.trace.agent.test.utils.TraceUtils.runnableUnderTraceAsync; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activeSpan; -import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.isAsyncPropagationEnabled; import datadog.appsec.api.blocking.Blocking; import datadog.trace.agent.test.base.HttpServerTest; @@ -255,7 +255,7 @@ private static void exception() { private static void controller( RoutingContext ctx, final ServerEndpoint endpoint, final Runnable runnable) { assert activeSpan() != null : "Controller should have a parent span."; - assert isAsyncPropagationEnabled() : "Span should be propagating async."; + assert isCaptureEnabled() : "Span should be propagating async."; ctx.response() .putHeader( HttpServerTest.getIG_RESPONSE_HEADER(), HttpServerTest.getIG_RESPONSE_HEADER_VALUE()); diff --git a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-5.0/src/test/java/server/LocalSessionStoreInstrumentationTest.java b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-5.0/src/test/java/server/LocalSessionStoreInstrumentationTest.java index 1e9fc26a8b3..114fe8ce0ff 100644 --- a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-5.0/src/test/java/server/LocalSessionStoreInstrumentationTest.java +++ b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-5.0/src/test/java/server/LocalSessionStoreInstrumentationTest.java @@ -1,11 +1,11 @@ package server; +import static datadog.context.Context.isCaptureEnabled; +import static datadog.context.Context.setCaptureEnabled; import static datadog.trace.agent.test.assertions.SpanMatcher.span; import static datadog.trace.agent.test.assertions.TraceMatcher.trace; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activateSpan; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activeSpan; -import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.isAsyncPropagationEnabled; -import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.setAsyncPropagationEnabled; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.startSpan; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertSame; @@ -44,7 +44,7 @@ void creatingSessionStoreDoesNotRetainRequest() throws Exception { try (ContextScope ignored = activateSpan(parent)) { store = LocalSessionStore.create(vertx, "creation", 60_000); assertSame(parent, activeSpan()); - assertTrue(isAsyncPropagationEnabled()); + assertTrue(isCaptureEnabled()); } finally { parent.finish(); } @@ -64,7 +64,7 @@ void rearmingSessionReaperDoesNotRetainRequest() throws Exception { // A worker queue can invoke the maintenance callback under an unrelated request context. ((LocalSessionStoreImpl) store).handle(0L); assertSame(parent, activeSpan()); - assertTrue(isAsyncPropagationEnabled()); + assertTrue(isCaptureEnabled()); } finally { parent.finish(); } @@ -82,7 +82,7 @@ void failedSchedulingRestoresPropagation() throws Exception { IllegalArgumentException.class, () -> LocalSessionStore.create(vertx, "invalid-interval", -1)); assertSame(parent, activeSpan()); - assertTrue(isAsyncPropagationEnabled()); + assertTrue(isCaptureEnabled()); } finally { parent.finish(); } @@ -93,10 +93,10 @@ void failedSchedulingRestoresPropagation() throws Exception { void preservesDisabledPropagation() throws Exception { AgentSpan parent = startSpan("test", "parent"); try (ContextScope ignored = activateSpan(parent)) { - setAsyncPropagationEnabled(false); + setCaptureEnabled(false); LocalSessionStore store = LocalSessionStore.create(vertx, "disabled", 60_000); try { - assertFalse(isAsyncPropagationEnabled()); + assertFalse(isCaptureEnabled()); } finally { store.close(); } diff --git a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-5.0/src/test/java/server/VertxTestServer.java b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-5.0/src/test/java/server/VertxTestServer.java index b608b69850b..349d75f4954 100644 --- a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-5.0/src/test/java/server/VertxTestServer.java +++ b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-5.0/src/test/java/server/VertxTestServer.java @@ -1,5 +1,6 @@ package server; +import static datadog.context.Context.isCaptureEnabled; import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.BODY_JSON; import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.BODY_MULTIPART; import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.BODY_URLENCODED; @@ -19,7 +20,6 @@ import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.USER_BLOCK; import static datadog.trace.agent.test.utils.TraceUtils.runnableUnderTraceAsync; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activeSpan; -import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.isAsyncPropagationEnabled; import datadog.appsec.api.blocking.Blocking; import datadog.trace.agent.test.base.HttpServerTest; @@ -252,7 +252,7 @@ private static void exception() { private static void controller( RoutingContext ctx, final ServerEndpoint endpoint, final Runnable runnable) { assert activeSpan() != null : "Controller should have a parent span."; - assert isAsyncPropagationEnabled() : "Span should be propagating async."; + assert isCaptureEnabled() : "Span should be propagating async."; ctx.response() .putHeader( HttpServerTest.getIG_RESPONSE_HEADER(), HttpServerTest.getIG_RESPONSE_HEADER_VALUE()); diff --git a/dd-trace-core/src/main/java/datadog/trace/core/CoreTracer.java b/dd-trace-core/src/main/java/datadog/trace/core/CoreTracer.java index 63899a47995..a8a193a3d48 100644 --- a/dd-trace-core/src/main/java/datadog/trace/core/CoreTracer.java +++ b/dd-trace-core/src/main/java/datadog/trace/core/CoreTracer.java @@ -1268,16 +1268,6 @@ public void activateSpanWithoutScope(AgentSpan span) { scopeManager.activateSpan(span); } - @Override - public boolean isAsyncPropagationEnabled() { - return scopeManager.isAsyncPropagationEnabled(); - } - - @Override - public void setAsyncPropagationEnabled(boolean asyncPropagationEnabled) { - scopeManager.setAsyncPropagationEnabled(asyncPropagationEnabled); - } - @Override public void closePrevious(boolean finishSpan) { if (!InstrumenterConfig.get().isLegacyContextManagerEnabled()) { @@ -2734,6 +2724,16 @@ static TagMap withTracerTags( return result.freeze(); } + @Override + public boolean isCaptureEnabled() { + return scopeManager.isCaptureEnabled(); + } + + @Override + public void setCaptureEnabled(boolean enabled) { + scopeManager.setCaptureEnabled(enabled); + } + @Override public Context currentContext() { return scopeManager.currentContext(); 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 4985d24eb2a..68f220aa5b9 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 @@ -216,15 +216,15 @@ ContinuableScope continueSpan( return scope; } - public boolean isAsyncPropagationEnabled() { + public boolean isCaptureEnabled() { ContinuableScope activeScope = scopeStack().active(); return activeScope == null || activeScope.isAsyncPropagating(); } - public void setAsyncPropagationEnabled(boolean asyncPropagationEnabled) { + public void setCaptureEnabled(boolean enabled) { ContinuableScope activeScope = scopeStack().active(); if (activeScope != null) { - activeScope.setAsyncPropagation(asyncPropagationEnabled); + activeScope.setAsyncPropagation(enabled); } } 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 4d89953e246..b89dadcda43 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 @@ -1,5 +1,7 @@ package datadog.trace.core.scopemanager; +import static datadog.context.Context.isCaptureEnabled; +import static datadog.context.Context.setCaptureEnabled; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.noopSpan; import static datadog.trace.core.scopemanager.ScopeManagerForkedTest.EVENT.ACTIVATE; import static datadog.trace.core.scopemanager.ScopeManagerForkedTest.EVENT.CLOSE; @@ -15,9 +17,11 @@ import static org.junit.jupiter.api.Assertions.assertSame; import static org.junit.jupiter.api.Assertions.assertTrue; import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyBoolean; import static org.mockito.Mockito.clearInvocations; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; +import static org.mockito.Mockito.spy; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyNoMoreInteractions; @@ -113,10 +117,44 @@ void cleanup() { tracer.close(); } + @Test + void contextCaptureBypassesLegacyAsyncPropagationMethods() { + CoreTracer registeredTracer = spy(tracer); + AgentTracer.forceRegister(registeredTracer); + Context context = Context.root().with(ContextKey.named("test-key"), "value"); + try (ContextScope ignored = context.attach()) { + setCaptureEnabled(false); + assertFalse(isCaptureEnabled()); + assertFalse(scopeManager.isCaptureEnabled()); + setCaptureEnabled(true); + assertTrue(isCaptureEnabled()); + assertTrue(scopeManager.isCaptureEnabled()); + } finally { + AgentTracer.forceRegister(tracer); + } + verify(registeredTracer, never()).isAsyncPropagationEnabled(); + verify(registeredTracer, never()).setAsyncPropagationEnabled(anyBoolean()); + } + + @Test + @SuppressWarnings("deprecation") + void legacyAsyncPropagationAndContextCaptureShareScopeState() { + Context context = Context.root().with(ContextKey.named("test-key"), "value"); + try (ContextScope ignored = context.attach()) { + tracer.setAsyncPropagationEnabled(false); + assertFalse(isCaptureEnabled()); + setCaptureEnabled(true); + assertTrue(tracer.isAsyncPropagationEnabled()); + tracer.setAsyncPropagationEnabled(false); + assertFalse(scopeManager.isCaptureEnabled()); + } + assertTrue(isCaptureEnabled()); + } + @Test void noActiveScopeDefaultsToAsyncPropagation() { assertNull(scopeManager.active()); - assertTrue(tracer.isAsyncPropagationEnabled()); + assertTrue(isCaptureEnabled()); Context context = Context.root().with(ContextKey.named("test-key"), "value"); ContextContinuation continuation = tracer.capture(context); @@ -142,7 +180,7 @@ void attachingNewContextResetsAsyncPropagation(boolean before, boolean during) { Context.setCaptureEnabled(before); try (ContextScope ignored2 = child.attach()) { assertSame(child, Context.current()); - assertTrue(tracer.isAsyncPropagationEnabled()); + assertTrue(scopeManager.isCaptureEnabled()); assertTrue(Context.isCaptureEnabled()); ContextContinuation continuation = Context.current().capture(); assertSame(child, continuation.context()); @@ -150,12 +188,12 @@ void attachingNewContextResetsAsyncPropagation(boolean before, boolean during) { Context.setCaptureEnabled(during); } assertSame(parent, Context.current()); - assertEquals(before, tracer.isAsyncPropagationEnabled()); + assertEquals(before, scopeManager.isCaptureEnabled()); assertEquals(before, Context.isCaptureEnabled()); } assertSame(Context.root(), Context.current()); assertTrue(Context.isCaptureEnabled()); - assertTrue(tracer.isAsyncPropagationEnabled()); + assertTrue(scopeManager.isCaptureEnabled()); } @TableTest({ @@ -171,17 +209,17 @@ void attachingTheCurrentContextPreservesAsyncPropagation(boolean before, boolean Context.setCaptureEnabled(before); try (ContextScope ignored2 = context.attach()) { assertSame(ignored, ignored2); - assertEquals(before, tracer.isAsyncPropagationEnabled()); + assertEquals(before, scopeManager.isCaptureEnabled()); assertEquals(before, Context.isCaptureEnabled()); Context.setCaptureEnabled(during); } assertSame(context, Context.current()); - assertEquals(during, tracer.isAsyncPropagationEnabled()); + assertEquals(during, scopeManager.isCaptureEnabled()); assertEquals(during, Context.isCaptureEnabled()); } assertSame(Context.root(), Context.current()); assertTrue(Context.isCaptureEnabled()); - assertTrue(tracer.isAsyncPropagationEnabled()); + assertTrue(scopeManager.isCaptureEnabled()); } @Test @@ -294,12 +332,12 @@ void setsParentAsCurrentUponCloseWithNoopChild() { void ddScopeCreatesNoOpContinuationsWhenPropagationIsNotSet() { AgentSpan span = tracer.buildSpan("test", "test").start(); tracer.activateSpan(span); - tracer.setAsyncPropagationEnabled(false); + setCaptureEnabled(false); ContextContinuation continuation = Context.current().capture(); assertSame(Context.root(), continuation.context()); - tracer.setAsyncPropagationEnabled(true); + setCaptureEnabled(true); continuation = Context.current().capture(); assertNotSame(Context.root(), continuation.context()); @@ -398,7 +436,7 @@ void continuationRestoresTrace() throws Exception { // the continued scope becomes active and span state doesn't change assertInstanceOf(ContinuableScope.class, newScope); - assertTrue(tracer.isAsyncPropagationEnabled()); + assertTrue(isCaptureEnabled()); assertSame(newScope, scopeManager.active()); assertNotSame(childScope, newScope); assertNotSame(parentScope, newScope); diff --git a/dd-trace-ot/src/test/java/datadog/opentracing/OpenTracingAPITest.java b/dd-trace-ot/src/test/java/datadog/opentracing/OpenTracingAPITest.java index 72632f84565..14f64445615 100644 --- a/dd-trace-ot/src/test/java/datadog/opentracing/OpenTracingAPITest.java +++ b/dd-trace-ot/src/test/java/datadog/opentracing/OpenTracingAPITest.java @@ -1,6 +1,9 @@ package datadog.opentracing; +import static datadog.context.Context.isCaptureEnabled; +import static datadog.context.Context.setCaptureEnabled; import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertNull; import static org.junit.jupiter.api.Assertions.assertThrows; @@ -22,6 +25,7 @@ import datadog.trace.context.TraceScope; import datadog.trace.core.DDSpan; import datadog.trace.test.junit.utils.config.WithConfig; +import datadog.trace.test.junit.utils.context.LegacyContextTestingExtension; import datadog.trace.test.util.DDJavaSpecification; import io.opentracing.Scope; import io.opentracing.Span; @@ -35,9 +39,12 @@ import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +@ExtendWith(LegacyContextTestingExtension.class) class OpenTracingAPITest extends DDJavaSpecification { + AgentTracer.TracerAPI previousTracer; ListWriter writer = new ListWriter(); DDTracer tracer = DDTracer.builder().writer(writer).build(); TraceInterceptor traceInterceptor = mock(TraceInterceptor.class); @@ -45,6 +52,8 @@ class OpenTracingAPITest extends DDJavaSpecification { @BeforeEach void setup() { + previousTracer = AgentTracer.get(); + AgentTracer.forceRegister(tracer.getInternalTracer()); assertNull(tracer.scopeManager().active()); tracer.addTraceInterceptor(traceInterceptor); tracer.getInternalTracer().addScopeListener(scopeListener); @@ -56,7 +65,11 @@ void setup() { @AfterEach void tearDown() throws Exception { - tracer.close(); + try { + tracer.close(); + } finally { + AgentTracer.forceRegister(previousTracer); + } } @Test @@ -220,22 +233,20 @@ void nestedSpans() throws Exception { @Test void spanWithAsyncPropagation() throws Exception { - AgentTracer.TracerAPI internalTracer = tracer.getInternalTracer(); - Scope scope = tracer .buildSpan("someOperation") .withTag(DDTags.SERVICE_NAME, "someService") .startActive(true); - internalTracer.setAsyncPropagationEnabled(false); + setCaptureEnabled(false); assertTrue(scope instanceof TraceScope); - assertTrue(!internalTracer.isAsyncPropagationEnabled()); + assertFalse(isCaptureEnabled()); - internalTracer.setAsyncPropagationEnabled(true); + setCaptureEnabled(true); TraceScope.Continuation continuation = ((TraceScope) scope).capture(); - assertTrue(internalTracer.isAsyncPropagationEnabled()); + assertTrue(isCaptureEnabled()); assertNotNull(continuation); continuation.cancel(); @@ -255,25 +266,23 @@ void spanWithAsyncPropagation() throws Exception { @Test void spanInheritsAsyncPropagation() throws Exception { - AgentTracer.TracerAPI internalTracer = tracer.getInternalTracer(); - Scope outer = tracer .buildSpan("someOperation") .withTag(DDTags.SERVICE_NAME, "someService") .startActive(true); - internalTracer.setAsyncPropagationEnabled(false); + setCaptureEnabled(false); - assertTrue(!internalTracer.isAsyncPropagationEnabled()); + assertFalse(isCaptureEnabled()); - internalTracer.setAsyncPropagationEnabled(true); + setCaptureEnabled(true); Scope inner = tracer .buildSpan("otherOperation") .withTag(DDTags.SERVICE_NAME, "otherService") .startActive(true); - assertTrue(internalTracer.isAsyncPropagationEnabled()); + assertTrue(isCaptureEnabled()); inner.close(); outer.close(); diff --git a/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/AgentTracer.java b/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/AgentTracer.java index 41c5472a877..6964e526047 100644 --- a/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/AgentTracer.java +++ b/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/AgentTracer.java @@ -6,7 +6,6 @@ import datadog.context.ContextListener; import datadog.context.ContextManager; import datadog.context.ContextScope; -import datadog.trace.api.ConfigDefaults; import datadog.trace.api.DDTraceId; import datadog.trace.api.EndpointCheckpointer; import datadog.trace.api.EndpointTracker; @@ -156,29 +155,6 @@ public static AgentSpan activeSpan() { return get().activeSpan(); } - /** - * Checks whether asynchronous propagation is enabled, meaning this context will propagate across - * asynchronous boundaries. - * - * @return {@code true} if asynchronous propagation is enabled, {@code false} otherwise. - */ - public static boolean isAsyncPropagationEnabled() { - return get().isAsyncPropagationEnabled(); - } - - /** - * Enables or disables asynchronous propagation for the active span. - * - *

Asynchronous propagation is enabled by default from {@link - * ConfigDefaults#DEFAULT_ASYNC_PROPAGATING}. - * - * @param asyncPropagationEnabled {@code true} to enable asynchronous propagation, {@code false} - * to disable it. - */ - public static void setAsyncPropagationEnabled(boolean asyncPropagationEnabled) { - get().setAsyncPropagationEnabled(asyncPropagationEnabled); - } - /** * Returns the noop span instance. * @@ -297,6 +273,16 @@ AgentSpan startSpan( /** Activate a span which will be closed by {@link #closeActive()} instead of a scope. */ void activateSpanWithoutScope(AgentSpan span); + @Override + default boolean isAsyncPropagationEnabled() { + return Context.isCaptureEnabled(); + } + + @Override + default void setAsyncPropagationEnabled(boolean asyncPropagationEnabled) { + Context.setCaptureEnabled(asyncPropagationEnabled); + } + @Override default TraceScope.Continuation captureActiveSpan() { Context current = currentContext(); @@ -418,6 +404,12 @@ default AgentSpan startSpan(@Nonnull SpanPrototype prototype, CharSequence opera @Deprecated ContextContinuation capture(Context context); + + @Deprecated + boolean isCaptureEnabled(); + + @Deprecated + void setCaptureEnabled(boolean enabled); } public interface SpanBuilder { @@ -504,14 +496,6 @@ public ContextScope activateManualSpan(final AgentSpan span) { @Override public void activateSpanWithoutScope(final AgentSpan span) {} - @Override - public boolean isAsyncPropagationEnabled() { - return false; - } - - @Override - public void setAsyncPropagationEnabled(boolean asyncPropagationEnabled) {} - @Override public void checkpointActiveForRollback() {} @@ -700,6 +684,14 @@ public ContextHandle swap(ContextHandle context) { public ContextContinuation capture(Context context) { return NoopContinuation.INSTANCE; } + + @Override + public boolean isCaptureEnabled() { + return false; + } + + @Override + public void setCaptureEnabled(boolean enabled) {} } public static class NoopAgentTraceCollector implements AgentTraceCollector { @@ -806,7 +798,6 @@ public static void installLegacyContextManager() { } /** Shim mapping new Context API to legacy scope manager. */ - @SuppressWarnings("deprecation") static final class LegacyContextManager implements ContextManager { static final LegacyContextManager INSTANCE = new LegacyContextManager(); @@ -837,12 +828,12 @@ public ContextContinuation capture(@Nonnull Context context) { @Override public boolean isCaptureEnabled() { - return AgentTracer.get().isAsyncPropagationEnabled(); + return AgentTracer.get().isCaptureEnabled(); } @Override public void setCaptureEnabled(boolean enabled) { - AgentTracer.get().setAsyncPropagationEnabled(enabled); + AgentTracer.get().setCaptureEnabled(enabled); } @Override