Fold setAsyncPropagation into preceding activateSpan (#8032)

DataDog · Nov 28, 2024 · 1ef67e5 · 1ef67e5
1 parent d949e28
commit 1ef67e5
Show file tree

Hide file tree

Showing 65 changed files with 82 additions and 184 deletions.
diff --git a/...a-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/TestImpl.java b/...a-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/TestImpl.java
@@ -98,8 +98,7 @@ public TestImpl(
 
     span = spanBuilder.start();
 
-    final AgentScope scope = activateSpan(span);
-    scope.setAsyncPropagation(true);
+    activateSpan(span, true);
 
     span.setSpanType(InternalSpanTypes.TEST);
     span.setTag(Tags.SPAN_KIND, Tags.SPAN_KIND_TEST);

diff --git a/...nt/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/TestSuiteImpl.java b/...nt/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/TestSuiteImpl.java
@@ -121,8 +121,7 @@ public TestSuiteImpl(
     testDecorator.afterStart(span);
 
     if (!parallelized) {
-      final AgentScope scope = activateSpan(span);
-      scope.setAsyncPropagation(true);
+      activateSpan(span, true);
     }
 
     metricCollector.add(CiVisibilityCountMetric.EVENT_CREATED, 1, instrumentation, EventType.SUITE);

diff --git a/dd-java-agent/instrumentation/akka-concurrent/src/test/java/LinearTask.java b/dd-java-agent/instrumentation/akka-concurrent/src/test/java/LinearTask.java
@@ -32,9 +32,7 @@ protected Integer compute() {
     } else {
       int next = parent + 1;
       AgentSpan span = startSpan(Integer.toString(next));
-      try (AgentScope scope = activateSpan(span)) {
-        // shouldn't be necessary with a decent API
-        scope.setAsyncPropagation(true);
+      try (AgentScope scope = activateSpan(span, true)) {
         LinearTask child = new LinearTask(next, depth);
         return child.fork().join();
       } finally {

diff --git a/...-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/DatadogWrapperHelper.java b/...-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/DatadogWrapperHelper.java
@@ -15,9 +15,7 @@ public static AgentScope createSpan(final HttpRequest request) {
     DECORATE.afterStart(span);
     DECORATE.onRequest(span, request, request, extractedContext);
 
-    final AgentScope scope = activateSpan(span);
-    scope.setAsyncPropagation(true);
-    return scope;
+    return activateSpan(span, true);
   }
 
   public static void finishSpan(final AgentSpan span, final HttpResponse response) {

diff --git a/...natra-2.9/src/main/java/datadog/trace/instrumentation/finatra/FinatraInstrumentation.java b/...natra-2.9/src/main/java/datadog/trace/instrumentation/finatra/FinatraInstrumentation.java
@@ -76,9 +76,7 @@ public static AgentScope nameSpan(
       DECORATE.afterStart(span);
       span.setResourceName(DECORATE.className(clazz));
 
-      final AgentScope scope = activateSpan(span);
-      scope.setAsyncPropagation(true);
-      return scope;
+      return activateSpan(span, true);
     }
 
     @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)

diff --git a/...rc/main/java/datadog/trace/instrumentation/grizzly/GrizzlyHttpHandlerInstrumentation.java b/...rc/main/java/datadog/trace/instrumentation/grizzly/GrizzlyHttpHandlerInstrumentation.java
@@ -78,8 +78,7 @@ public static class HandleAdvice {
       DECORATE.afterStart(span);
       DECORATE.onRequest(span, request, request, parentContext);
 
-      scope = activateSpan(span);
-      scope.setAsyncPropagation(true);
+      scope = activateSpan(span, true);
 
       request.setAttribute(DD_SPAN_ATTRIBUTE, span);
       request.setAttribute(CorrelationIdentifier.getTraceIdKey(), GlobalTracer.get().getTraceId());

diff --git a/...-http-2.3.20/src/main/java/datadog/trace/instrumentation/grizzlyhttp232/FilterAdvice.java b/...-http-2.3.20/src/main/java/datadog/trace/instrumentation/grizzlyhttp232/FilterAdvice.java
@@ -7,27 +7,22 @@
 import datadog.trace.bootstrap.instrumentation.api.AgentScope;
 import datadog.trace.bootstrap.instrumentation.api.AgentSpan;
 import net.bytebuddy.asm.Advice;
-import org.glassfish.grizzly.filterchain.BaseFilter;
 import org.glassfish.grizzly.filterchain.FilterChainContext;
 
 public class FilterAdvice {
 
   @Advice.OnMethodEnter(suppress = Throwable.class)
-  public static AgentScope onEnter(
-      @Advice.This BaseFilter it, @Advice.Argument(0) final FilterChainContext ctx) {
-    if (ctx.getAttributes().getAttribute(DD_SPAN_ATTRIBUTE) == null || activeSpan() != null) {
+  public static AgentScope onEnter(@Advice.Argument(0) final FilterChainContext ctx) {
+    Object span = ctx.getAttributes().getAttribute(DD_SPAN_ATTRIBUTE);
+    if (span == null || activeSpan() != null) {
       return null;
     }
-    AgentScope scope =
-        activateSpan((AgentSpan) ctx.getAttributes().getAttribute(DD_SPAN_ATTRIBUTE));
-    scope.setAsyncPropagation(true);
-    return scope;
+    return activateSpan((AgentSpan) span, true);
   }
 
   @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-  public static void onExit(@Advice.This BaseFilter it, @Advice.Enter final AgentScope scope) {
+  public static void onExit(@Advice.Enter final AgentScope scope) {
     if (scope != null) {
-      scope.setAsyncPropagation(false);
       scope.close();
     }
   }

diff --git a/...p-2.3.20/src/main/java/datadog/trace/instrumentation/grizzlyhttp232/GrizzlyDecorator.java b/...p-2.3.20/src/main/java/datadog/trace/instrumentation/grizzlyhttp232/GrizzlyDecorator.java
@@ -115,8 +115,7 @@ public static NextAction onHttpCodecFilterExit(
     HttpResponsePacket httpResponse = httpRequest.getResponse();
     AgentSpan.Context.Extracted context = DECORATE.extract(httpRequest);
     AgentSpan span = DECORATE.startSpan(httpRequest, context);
-    AgentScope scope = activateSpan(span);
-    scope.setAsyncPropagation(true);
+    AgentScope scope = activateSpan(span, true);
     DECORATE.afterStart(span);
     ctx.getAttributes().setAttribute(DD_SPAN_ATTRIBUTE, span);
     ctx.getAttributes().setAttribute(DD_RESPONSE_ATTRIBUTE, httpResponse);

diff --git a/...n/java/datadog/trace/instrumentation/ignite/v2/cache/IgniteCacheAsyncInstrumentation.java b/...n/java/datadog/trace/instrumentation/ignite/v2/cache/IgniteCacheAsyncInstrumentation.java
@@ -91,11 +91,9 @@ public static AgentScope onEnter(
           span, InstrumentationContext.get(IgniteCache.class, Ignite.class).get(that));
       DECORATE.onOperation(span, that.getName(), methodName);
 
-      final AgentScope scope = activateSpan(span);
       // Enable async propagation, so the newly spawned task will be associated back with this
       // original trace.
-      scope.setAsyncPropagation(true);
-      return scope;
+      return activateSpan(span, true);
     }
 
     @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
@@ -149,11 +147,9 @@ public static AgentScope onEnter(
           span, InstrumentationContext.get(IgniteCache.class, Ignite.class).get(that));
       DECORATE.onOperation(span, that.getName(), methodName, key);
 
-      final AgentScope scope = activateSpan(span);
       // Enable async propagation, so the newly spawned task will be associated back with this
       // original trace.
-      scope.setAsyncPropagation(true);
-      return scope;
+      return activateSpan(span, true);
     }
 
     @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)

diff --git a/...ain/java/datadog/trace/instrumentation/jakarta3/DefaultRequestContextInstrumentation.java b/...ain/java/datadog/trace/instrumentation/jakarta3/DefaultRequestContextInstrumentation.java
@@ -47,8 +47,7 @@ public static AgentScope createGenericSpan(@Advice.This final ContainerRequestCo
           // can only be aborted inside the filter method
         }
 
-        final AgentScope scope = activateSpan(span);
-        scope.setAsyncPropagation(true);
+        final AgentScope scope = activateSpan(span, true);
 
         DECORATE.afterStart(span);
         DECORATE.onJakartaRsSpan(span, parent, filterClass, method);

diff --git a/...main/java/datadog/trace/instrumentation/jakarta3/JakartaRsAnnotationsInstrumentation.java b/...main/java/datadog/trace/instrumentation/jakarta3/JakartaRsAnnotationsInstrumentation.java
@@ -123,8 +123,7 @@ public static AgentScope nameSpan(
       DECORATE.onJakartaRsSpan(span, parent, target.getClass(), method);
       DECORATE.afterStart(span);
 
-      final AgentScope scope = activateSpan(span);
-      scope.setAsyncPropagation(true);
+      final AgentScope scope = activateSpan(span, true);
 
       if (contextStore != null && asyncResponse != null) {
         contextStore.put(asyncResponse, span);

diff --git a/...notations-3/src/main/java/datadog/trace/instrumentation/jakarta3/RequestFilterHelper.java b/...notations-3/src/main/java/datadog/trace/instrumentation/jakarta3/RequestFilterHelper.java
@@ -28,8 +28,7 @@ public static AgentScope createOrUpdateAbortSpan(
         parent = activeSpan();
         span = startSpan(JAKARTA_RS_REQUEST_ABORT);
 
-        final AgentScope scope = activateSpan(span);
-        scope.setAsyncPropagation(true);
+        final AgentScope scope = activateSpan(span, true);
 
         DECORATE.afterStart(span);
         DECORATE.onJakartaRsSpan(span, parent, resourceClass, method);

diff --git a/...tation/java-concurrent/src/test/java/executor/recursive/RecursiveThreadPoolExecution.java b/...tation/java-concurrent/src/test/java/executor/recursive/RecursiveThreadPoolExecution.java
@@ -26,8 +26,7 @@ public void run() {
       return;
     }
     AgentSpan span = startSpan(String.valueOf(depth));
-    try (AgentScope scope = activateSpan(span)) {
-      scope.setAsyncPropagation(true);
+    try (AgentScope scope = activateSpan(span, true)) {
       executor.execute(new RecursiveThreadPoolExecution(executor, maxDepth, depth + 1));
     } finally {
       span.finish();

diff --git a/...rent/src/test/java/executor/recursive/RecursiveThreadPoolMixedSubmissionAndExecution.java b/...rent/src/test/java/executor/recursive/RecursiveThreadPoolMixedSubmissionAndExecution.java
@@ -27,8 +27,7 @@ public void run() {
       return;
     }
     AgentSpan span = startSpan(String.valueOf(depth));
-    try (AgentScope scope = activateSpan(span)) {
-      scope.setAsyncPropagation(true);
+    try (AgentScope scope = activateSpan(span, true)) {
       if (depth % 2 == 0) {
         executor.submit(
             new RecursiveThreadPoolMixedSubmissionAndExecution(executor, maxDepth, depth + 1));

diff --git a/...ation/java-concurrent/src/test/java/executor/recursive/RecursiveThreadPoolSubmission.java b/...ation/java-concurrent/src/test/java/executor/recursive/RecursiveThreadPoolSubmission.java
@@ -26,8 +26,7 @@ public void run() {
       return;
     }
     AgentSpan span = startSpan(String.valueOf(depth));
-    try (AgentScope scope = activateSpan(span)) {
-      scope.setAsyncPropagation(true);
+    try (AgentScope scope = activateSpan(span, true)) {
       executor.submit(new RecursiveThreadPoolSubmission(executor, maxDepth, depth + 1));
     } finally {
       span.finish();

diff --git a/dd-java-agent/instrumentation/java-concurrent/src/test/java/forkjoin/LinearTask.java b/dd-java-agent/instrumentation/java-concurrent/src/test/java/forkjoin/LinearTask.java
@@ -34,9 +34,7 @@ protected Integer compute() {
     } else {
       int next = parent + 1;
       AgentSpan span = startSpan(Integer.toString(next));
-      try (AgentScope scope = activateSpan(span)) {
-        // shouldn't be necessary with a decent API
-        scope.setAsyncPropagation(true);
+      try (AgentScope scope = activateSpan(span, true)) {
         LinearTask child = new LinearTask(next, depth);
         return child.fork().join();
       } finally {

diff --git a/...1/src/main/java/datadog/trace/instrumentation/jaxrs1/JaxRsAnnotationsInstrumentation.java b/...1/src/main/java/datadog/trace/instrumentation/jaxrs1/JaxRsAnnotationsInstrumentation.java
@@ -100,9 +100,7 @@ public static AgentScope nameSpan(
       DECORATE.onJaxRsSpan(span, parent, target.getClass(), method);
       DECORATE.afterStart(span);
 
-      final AgentScope scope = activateSpan(span);
-      scope.setAsyncPropagation(true);
-      return scope;
+      return activateSpan(span, true);
     }
 
     @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)

diff --git a/.../main/java/datadog/trace/instrumentation/jaxrs2/DefaultRequestContextInstrumentation.java b/.../main/java/datadog/trace/instrumentation/jaxrs2/DefaultRequestContextInstrumentation.java
@@ -47,8 +47,7 @@ public static AgentScope createGenericSpan(@Advice.This final ContainerRequestCo
           // can only be aborted inside the filter method
         }
 
-        final AgentScope scope = activateSpan(span);
-        scope.setAsyncPropagation(true);
+        final AgentScope scope = activateSpan(span, true);
 
         DECORATE.afterStart(span);
         DECORATE.onJaxRsSpan(span, parent, filterClass, method);

diff --git a/...2/src/main/java/datadog/trace/instrumentation/jaxrs2/JaxRsAnnotationsInstrumentation.java b/...2/src/main/java/datadog/trace/instrumentation/jaxrs2/JaxRsAnnotationsInstrumentation.java
@@ -131,8 +131,7 @@ public static AgentScope nameSpan(
       DECORATE.onJaxRsSpan(span, parent, target.getClass(), method);
       DECORATE.afterStart(span);
 
-      final AgentScope scope = activateSpan(span);
-      scope.setAsyncPropagation(true);
+      final AgentScope scope = activateSpan(span, true);
 
       if (contextStore != null && asyncResponse != null) {
         contextStore.put(asyncResponse, span);

diff --git a/...annotations-2/src/main/java/datadog/trace/instrumentation/jaxrs2/RequestFilterHelper.java b/...annotations-2/src/main/java/datadog/trace/instrumentation/jaxrs2/RequestFilterHelper.java
@@ -27,8 +27,7 @@ public static AgentScope createOrUpdateAbortSpan(
         parent = activeSpan();
         span = startSpan(JAX_RS_REQUEST_ABORT);
 
-        final AgentScope scope = activateSpan(span);
-        scope.setAsyncPropagation(true);
+        final AgentScope scope = activateSpan(span, true);
 
         DECORATE.afterStart(span);
         DECORATE.onJaxRsSpan(span, parent, resourceClass, method);

diff --git a/...tion/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/DataSourceInstrumentation.java b/...tion/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/DataSourceInstrumentation.java
@@ -67,9 +67,7 @@ public static AgentScope start(@Advice.This final DataSource ds) {
 
       span.setResourceName(DECORATE.spanNameForMethod(ds.getClass(), "getConnection"));
 
-      final AgentScope agentScope = activateSpan(span);
-      agentScope.setAsyncPropagation(true);
-      return agentScope;
+      return activateSpan(span, true);
     }
 
     @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)

diff --git a/...ion/jetty-11/src/main/java11/datadog/trace/instrumentation/jetty11/JettyServerAdvice.java b/...ion/jetty-11/src/main/java11/datadog/trace/instrumentation/jetty11/JettyServerAdvice.java
@@ -27,8 +27,7 @@ public static AgentScope onEnter(
 
       final AgentSpan.Context.Extracted extractedContext = DECORATE.extract(req);
       span = DECORATE.startSpan(req, extractedContext);
-      final AgentScope scope = activateSpan(span);
-      scope.setAsyncPropagation(true);
+      final AgentScope scope = activateSpan(span, true);
       span.setMeasured(true);
       DECORATE.afterStart(span);
       DECORATE.onRequest(span, req, req, extractedContext);

diff --git a/...ion/jetty-12/src/main/java17/datadog/trace/instrumentation/jetty12/JettyServerAdvice.java b/...ion/jetty-12/src/main/java17/datadog/trace/instrumentation/jetty12/JettyServerAdvice.java
@@ -29,8 +29,7 @@ public static void onExit(
 
       final AgentSpan.Context.Extracted extractedContext = JettyDecorator.DECORATE.extract(req);
       final AgentSpan span = JettyDecorator.DECORATE.startSpan(req, extractedContext);
-      try (final AgentScope scope = activateSpan(span)) {
-        scope.setAsyncPropagation(true);
+      try (final AgentScope scope = activateSpan(span, true)) {
         span.setMeasured(true);
         JettyDecorator.DECORATE.afterStart(span);
         JettyDecorator.DECORATE.onRequest(span, req, req, extractedContext);

diff --git a/...y-7.0/src/main/java/datadog/trace/instrumentation/jetty70/JettyServerInstrumentation.java b/...y-7.0/src/main/java/datadog/trace/instrumentation/jetty70/JettyServerInstrumentation.java
@@ -155,8 +155,7 @@ public static AgentScope onEnter(
 
       final AgentSpan.Context.Extracted extractedContext = DECORATE.extract(req);
       span = DECORATE.startSpan(req, extractedContext);
-      final AgentScope scope = activateSpan(span);
-      scope.setAsyncPropagation(true);
+      final AgentScope scope = activateSpan(span, true);
       DECORATE.afterStart(span);
       DECORATE.onRequest(span, req, req, extractedContext);
 

diff --git a/...y-7.6/src/main/java/datadog/trace/instrumentation/jetty76/JettyServerInstrumentation.java b/...y-7.6/src/main/java/datadog/trace/instrumentation/jetty76/JettyServerInstrumentation.java
@@ -156,8 +156,7 @@ public static AgentScope onEnter(
 
       final AgentSpan.Context.Extracted extractedContext = DECORATE.extract(req);
       span = DECORATE.startSpan(req, extractedContext);
-      final AgentScope scope = activateSpan(span);
-      scope.setAsyncPropagation(true);
+      final AgentScope scope = activateSpan(span, true);
       DECORATE.afterStart(span);
       DECORATE.onRequest(span, req, req, extractedContext);
 

diff --git a/...etty-9/src/main/java/datadog/trace/instrumentation/jetty9/JettyServerInstrumentation.java b/...etty-9/src/main/java/datadog/trace/instrumentation/jetty9/JettyServerInstrumentation.java
@@ -169,8 +169,7 @@ public static AgentScope onEnter(
 
       final AgentSpan.Context.Extracted extractedContext = DECORATE.extract(req);
       span = DECORATE.startSpan(req, extractedContext);
-      final AgentScope scope = activateSpan(span);
-      scope.setAsyncPropagation(true);
+      final AgentScope scope = activateSpan(span, true);
       DECORATE.afterStart(span);
       DECORATE.onRequest(span, req, req, extractedContext);
 

diff --git a/...ion/jetty-9/src/main/java_jetty10/datadog/trace/instrumentation/jetty10/HandleAdvice.java b/...ion/jetty-9/src/main/java_jetty10/datadog/trace/instrumentation/jetty10/HandleAdvice.java
@@ -29,8 +29,7 @@ public static AgentScope onEnter(
     DECORATE.afterStart(span);
     DECORATE.onRequest(span, req, req, extractedContext);
 
-    final AgentScope scope = activateSpan(span);
-    scope.setAsyncPropagation(true);
+    final AgentScope scope = activateSpan(span, true);
     req.setAttribute(DD_SPAN_ATTRIBUTE, span);
     req.setAttribute(CorrelationIdentifier.getTraceIdKey(), GlobalTracer.get().getTraceId());
     req.setAttribute(CorrelationIdentifier.getSpanIdKey(), GlobalTracer.get().getSpanId());

diff --git a/...0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/KafkaProducerCallback.java b/...0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/KafkaProducerCallback.java
@@ -39,8 +39,7 @@ public void onCompletion(final RecordMetadata metadata, final Exception exceptio
     span.finish();
     if (callback != null) {
       if (parent != null) {
-        try (final AgentScope scope = activateSpan(parent)) {
-          scope.setAsyncPropagation(true);
+        try (final AgentScope scope = activateSpan(parent, true)) {
           callback.onCompletion(metadata, exception);
         }
       } else {

diff --git a/.../src/main/java17/datadog/trace/instrumentation/kafka_clients38/KafkaProducerCallback.java b/.../src/main/java17/datadog/trace/instrumentation/kafka_clients38/KafkaProducerCallback.java
@@ -38,8 +38,7 @@ public void onCompletion(final RecordMetadata metadata, final Exception exceptio
     span.finish();
     if (callback != null) {
       if (parent != null) {
-        try (final AgentScope scope = activateSpan(parent)) {
-          scope.setAsyncPropagation(true);
+        try (final AgentScope scope = activateSpan(parent, true)) {
           callback.onCompletion(metadata, exception);
         }
       } else {

diff --git a/...0/src/main/java/datadog/trace/instrumentation/liberty20/LibertyServerInstrumentation.java b/...0/src/main/java/datadog/trace/instrumentation/liberty20/LibertyServerInstrumentation.java
@@ -103,8 +103,7 @@ public static class HandleRequestAdvice {
       final AgentSpan.Context.Extracted extractedContext = DECORATE.extract(request);
       request.setAttribute(DD_EXTRACTED_CONTEXT_ATTRIBUTE, extractedContext);
       final AgentSpan span = DECORATE.startSpan(request, extractedContext);
-      scope = activateSpan(span);
-      scope.setAsyncPropagation(true);
+      scope = activateSpan(span, true);
 
       DECORATE.afterStart(span);
       DECORATE.onRequest(span, request, request, extractedContext);

diff --git a/...3/src/main/java/datadog/trace/instrumentation/liberty23/LibertyServerInstrumentation.java b/...3/src/main/java/datadog/trace/instrumentation/liberty23/LibertyServerInstrumentation.java
@@ -105,8 +105,7 @@ public static class HandleRequestAdvice {
       final AgentSpan.Context.Extracted extractedContext = DECORATE.extract(request);
       request.setAttribute(DD_EXTRACTED_CONTEXT_ATTRIBUTE, extractedContext);
       final AgentSpan span = DECORATE.startSpan(request, extractedContext);
-      scope = activateSpan(span);
-      scope.setAsyncPropagation(true);
+      scope = activateSpan(span, true);
 
       DECORATE.afterStart(span);
       DECORATE.onRequest(span, request, request, extractedContext);

diff --git a/...n/java/datadog/trace/instrumentation/netty38/client/HttpClientResponseTracingHandler.java b/...n/java/datadog/trace/instrumentation/netty38/client/HttpClientResponseTracingHandler.java
@@ -48,8 +48,7 @@ public void messageReceived(final ChannelHandlerContext ctx, final MessageEvent
     }
 
     // We want the callback in the scope of the parent, not the client span
-    try (final AgentScope scope = activateSpan(parent)) {
-      scope.setAsyncPropagation(true);
+    try (final AgentScope scope = activateSpan(parent, true)) {
       ctx.sendUpstream(msg);
     }
   }
@@ -77,8 +76,7 @@ public void exceptionCaught(ChannelHandlerContext ctx, ExceptionEvent e) throws
     }
 
     // We want the callback in the scope of the parent, not the client span
-    try (final AgentScope scope = activateSpan(parent)) {
-      scope.setAsyncPropagation(true);
+    try (final AgentScope scope = activateSpan(parent, true)) {
       super.exceptionCaught(ctx, e);
     }
   }

diff --git a/...in/java/datadog/trace/instrumentation/netty38/server/HttpServerRequestTracingHandler.java b/...in/java/datadog/trace/instrumentation/netty38/server/HttpServerRequestTracingHandler.java
@@ -35,8 +35,7 @@ public void messageReceived(final ChannelHandlerContext ctx, final MessageEvent
       if (span == null) {
         ctx.sendUpstream(msg); // superclass does not throw
       } else {
-        try (final AgentScope scope = activateSpan(span)) {
-          scope.setAsyncPropagation(true);
+        try (final AgentScope scope = activateSpan(span, true)) {
           ctx.sendUpstream(msg); // superclass does not throw
         }
       }
@@ -51,12 +50,10 @@ public void messageReceived(final ChannelHandlerContext ctx, final MessageEvent
     channelTraceContext.reset();
     channelTraceContext.setRequestHeaders(headers);
 
-    try (final AgentScope scope = activateSpan(span)) {
+    try (final AgentScope scope = activateSpan(span, true)) {
       DECORATE.afterStart(span);
       DECORATE.onRequest(span, ctx.getChannel(), request, context);
 
-      scope.setAsyncPropagation(true);
-
       channelTraceContext.setServerSpan(span);
 
       Flow.Action.RequestBlockingAction rba = span.getRequestBlockingAction();