Simplify activateSpan API to not include async propagation flag

mcculls · mcculls · commit a250acae00fa · 2025-03-14T12:44:32.000Z
These remaining cases were no-op spans which are already not propagated
diff --git a/dd-java-agent/instrumentation/akka-concurrent/src/main/java/datadog/trace/instrumentation/akka/concurrent/AkkaActorCellInstrumentation.java b/dd-java-agent/instrumentation/akka-concurrent/src/main/java/datadog/trace/instrumentation/akka/concurrent/AkkaActorCellInstrumentation.java
@@ -81,7 +81,7 @@ public static void enter(
         return;
       }
       // Create an active scope with a noop span, and clean all the way to the previous scope
-      activateSpan(noopSpan(), false);
+      activateSpan(noopSpan());
     }
 
     @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
diff --git a/dd-java-agent/instrumentation/akka-concurrent/src/main/java/datadog/trace/instrumentation/akka/concurrent/AkkaMailboxInstrumentation.java b/dd-java-agent/instrumentation/akka-concurrent/src/main/java/datadog/trace/instrumentation/akka/concurrent/AkkaMailboxInstrumentation.java
@@ -75,7 +75,7 @@ public static void enter() {
         return;
       }
       // Create an active scope with a noop span, and clean all the way to the previous scope
-      activateSpan(noopSpan(), false);
+      activateSpan(noopSpan());
     }
 
     @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
diff --git a/dd-java-agent/instrumentation/pekko-concurrent/src/main/java/datadog/trace/instrumentation/pekko/concurrent/PekkoActorCellInstrumentation.java b/dd-java-agent/instrumentation/pekko-concurrent/src/main/java/datadog/trace/instrumentation/pekko/concurrent/PekkoActorCellInstrumentation.java
@@ -81,7 +81,7 @@ public static void enter(
         return;
       }
       // Create an active scope with a noop span, and clean all the way to the previous scope
-      activateSpan(noopSpan(), false);
+      activateSpan(noopSpan());
     }
 
     @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
diff --git a/dd-java-agent/instrumentation/pekko-concurrent/src/main/java/datadog/trace/instrumentation/pekko/concurrent/PekkoMailboxInstrumentation.java b/dd-java-agent/instrumentation/pekko-concurrent/src/main/java/datadog/trace/instrumentation/pekko/concurrent/PekkoMailboxInstrumentation.java
@@ -76,7 +76,7 @@ public static void enter() {
         return;
       }
       // Create an active scope with a noop span, and clean all the way to the previous scope
-      activateSpan(noopSpan(), false);
+      activateSpan(noopSpan());
     }
 
     @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
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
@@ -906,18 +906,14 @@ public AgentSpan startSpan(
         .start();
   }
 
-  public AgentScope activateSpan(final AgentSpan span) {
-    return activateSpan(span, DEFAULT_ASYNC_PROPAGATING);
-  }
-
   @Override
-  public AgentScope activateSpan(AgentSpan span, boolean isAsyncPropagating) {
-    return scopeManager.activate(span, ScopeSource.INSTRUMENTATION, isAsyncPropagating);
+  public AgentScope activateSpan(AgentSpan span) {
+    return scopeManager.activate(span, ScopeSource.INSTRUMENTATION, DEFAULT_ASYNC_PROPAGATING);
   }
 
   @Override
   public AgentScope activateManualSpan(final AgentSpan span) {
-    return scopeManager.activate(span, ScopeSource.MANUAL);
+    return scopeManager.activate(span, ScopeSource.MANUAL /* inherit async propagation flag */);
   }
 
   @Override
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
@@ -1,7 +1,5 @@
 package datadog.trace.bootstrap.instrumentation.api;
 
-import static datadog.trace.api.ConfigDefaults.DEFAULT_ASYNC_PROPAGATING;
-
 import datadog.trace.api.ConfigDefaults;
 import datadog.trace.api.DDTraceId;
 import datadog.trace.api.EndpointCheckpointer;
@@ -86,11 +84,7 @@ public static AgentSpan startSpan(
   }
 
   public static AgentScope activateSpan(final AgentSpan span) {
-    return get().activateSpan(span, DEFAULT_ASYNC_PROPAGATING);
-  }
-
-  public static AgentScope activateSpan(final AgentSpan span, final boolean isAsyncPropagating) {
-    return get().activateSpan(span, isAsyncPropagating);
+    return get().activateSpan(span);
   }
 
   /**
@@ -339,7 +333,7 @@ AgentSpan startSpan(
         long startTimeMicros);
 
     /** Activate a span from inside auto-instrumentation. */
-    AgentScope activateSpan(AgentSpan span, boolean isAsyncPropagating);
+    AgentScope activateSpan(AgentSpan span);
 
     /** Activate a span from outside auto-instrumentation, i.e. a manual or custom span. */
     AgentScope activateManualSpan(AgentSpan span);
@@ -480,7 +474,7 @@ public AgentSpan startSpan(
     }
 
     @Override
-    public AgentScope activateSpan(final AgentSpan span, final boolean isAsyncPropagating) {
+    public AgentScope activateSpan(final AgentSpan span) {
       return NoopScope.INSTANCE;
     }
 

Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,7 @@ public static void enter(`
`81`	`81`	`return;`
`82`	`82`	`}`
`83`	`83`	`// Create an active scope with a noop span, and clean all the way to the previous scope`
`84`		`- activateSpan(noopSpan(), false);`
	`84`	`+ activateSpan(noopSpan());`
`85`	`85`	`}`
`86`	`86`
`87`	`87`	`@Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)`
Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,7 @@ public static void enter() {`
`75`	`75`	`return;`
`76`	`76`	`}`
`77`	`77`	`// Create an active scope with a noop span, and clean all the way to the previous scope`
`78`		`- activateSpan(noopSpan(), false);`
	`78`	`+ activateSpan(noopSpan());`
`79`	`79`	`}`
`80`	`80`
`81`	`81`	`@Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)`
Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,7 @@ public static void enter() {`
`76`	`76`	`return;`
`77`	`77`	`}`
`78`	`78`	`// Create an active scope with a noop span, and clean all the way to the previous scope`
`79`		`- activateSpan(noopSpan(), false);`
	`79`	`+ activateSpan(noopSpan());`
`80`	`80`	`}`
`81`	`81`
`82`	`82`	`@Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)`
Original file line number	Diff line number	Diff line change
`@@ -906,18 +906,14 @@ public AgentSpan startSpan(`
`906`	`906`	`.start();`
`907`	`907`	`}`
`908`	`908`
`909`		`- public AgentScope activateSpan(final AgentSpan span) {`
`910`		`- return activateSpan(span, DEFAULT_ASYNC_PROPAGATING);`
`911`		`- }`
`912`		`-`
`913`	`909`	`@Override`
`914`		`- public AgentScope activateSpan(AgentSpan span, boolean isAsyncPropagating) {`
`915`		`- return scopeManager.activate(span, ScopeSource.INSTRUMENTATION, isAsyncPropagating);`
	`910`	`+ public AgentScope activateSpan(AgentSpan span) {`
	`911`	`+ return scopeManager.activate(span, ScopeSource.INSTRUMENTATION, DEFAULT_ASYNC_PROPAGATING);`
`916`	`912`	`}`
`917`	`913`
`918`	`914`	`@Override`
`919`	`915`	`public AgentScope activateManualSpan(final AgentSpan span) {`
`920`		`- return scopeManager.activate(span, ScopeSource.MANUAL);`
	`916`	`+ return scopeManager.activate(span, ScopeSource.MANUAL /* inherit async propagation flag */);`
`921`	`917`	`}`
`922`	`918`
`923`	`919`	`@Override`