Skip to content

Commit 0a8bc73

Browse files
mccullsmtoffl01
mcculls
authored and
mtoffl01
committed
Remove unnecessary calls to setAsyncPropagationEnabled (#8551)
1 parent 6eb11aa commit 0a8bc73

File tree

25 files changed

+0
-79
lines changed

25 files changed

+0
-79
lines changed

‎dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/java/concurrent/AdviceUtils.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activeSpan;
44
import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.isAsyncPropagationEnabled;
5-
import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.setAsyncPropagationEnabled;
65

76
import datadog.trace.bootstrap.ContextStore;
87
import datadog.trace.bootstrap.instrumentation.api.AgentScope;
@@ -29,7 +28,6 @@ public static AgentScope startTaskScope(State state) {
2928
final AgentScope.Continuation continuation = state.getAndResetContinuation();
3029
if (continuation != null) {
3130
final AgentScope scope = continuation.activate();
32-
setAsyncPropagationEnabled(true);
3331
// important - stop timing after the scope has been activated so the time in the queue can
3432
// be attributed to the correct context without duplicating the propagated information
3533
state.stopTiming();

‎dd-java-agent/instrumentation/akka-concurrent/src/test/groovy/AkkaExecutorInstrumentationTest.groovy

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,6 @@ import java.util.concurrent.RejectedExecutionException
1616
import java.util.concurrent.ThreadPoolExecutor
1717
import java.util.concurrent.TimeUnit
1818

19-
import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.setAsyncPropagationEnabled
20-
2119
/**
2220
* Test executor instrumentation for Akka specific classes.
2321
* This is to large extent a copy of ExecutorInstrumentationTest.
@@ -46,7 +44,6 @@ class AkkaExecutorInstrumentationTest extends AgentTestRunner {
4644
@Override
4745
@Trace(operationName = "parent")
4846
void run() {
49-
setAsyncPropagationEnabled(true)
5047
// this child will have a span
5148
m(pool, new AkkaAsyncChild())
5249
// this child won't
@@ -102,7 +99,6 @@ class AkkaExecutorInstrumentationTest extends AgentTestRunner {
10299
@Override
103100
@Trace(operationName = "parent")
104101
void run() {
105-
setAsyncPropagationEnabled(true)
106102
// this child will have a span
107103
dispatcher.execute(new AkkaAsyncChild())
108104
// this child won't
@@ -133,7 +129,6 @@ class AkkaExecutorInstrumentationTest extends AgentTestRunner {
133129
@Override
134130
@Trace(operationName = "parent")
135131
void run() {
136-
setAsyncPropagationEnabled(true)
137132
try {
138133
for (int i = 0; i < 20; ++i) {
139134
// Our current instrumentation instrumentation does not behave very well

‎dd-java-agent/instrumentation/apache-httpasyncclient-4/src/main/java/datadog/trace/instrumentation/apachehttpasyncclient/TraceContinuedFutureCallback.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package datadog.trace.instrumentation.apachehttpasyncclient;
22

33
import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.noopContinuation;
4-
import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.setAsyncPropagationEnabled;
54
import static datadog.trace.instrumentation.apachehttpasyncclient.ApacheHttpAsyncClientDecorator.DECORATE;
65

76
import datadog.trace.bootstrap.instrumentation.api.AgentScope;
@@ -37,7 +36,6 @@ public void completed(final T result) {
3736
completeDelegate(result);
3837
} else {
3938
try (final AgentScope scope = parentContinuation.activate()) {
40-
setAsyncPropagationEnabled(true);
4139
completeDelegate(result);
4240
}
4341
}
@@ -54,7 +52,6 @@ public void failed(final Exception ex) {
5452
failDelegate(ex);
5553
} else {
5654
try (final AgentScope scope = parentContinuation.activate()) {
57-
setAsyncPropagationEnabled(true);
5855
failDelegate(ex);
5956
}
6057
}
@@ -70,7 +67,6 @@ public void cancelled() {
7067
cancelDelegate();
7168
} else {
7269
try (final AgentScope scope = parentContinuation.activate()) {
73-
setAsyncPropagationEnabled(true);
7470
cancelDelegate();
7571
}
7672
}

‎dd-java-agent/instrumentation/apache-httpclient-5/src/main/java/datadog/trace/instrumentation/apachehttpclient5/TraceContinuedFutureCallback.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package datadog.trace.instrumentation.apachehttpclient5;
22

33
import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.noopContinuation;
4-
import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.setAsyncPropagationEnabled;
54
import static datadog.trace.instrumentation.apachehttpclient5.ApacheHttpClientDecorator.DECORATE;
65

76
import datadog.trace.bootstrap.instrumentation.api.AgentScope;
@@ -40,7 +39,6 @@ public void completed(final T result) {
4039
completeDelegate(result);
4140
} else {
4241
try (final AgentScope scope = parentContinuation.activate()) {
43-
setAsyncPropagationEnabled(true);
4442
completeDelegate(result);
4543
}
4644
}
@@ -57,7 +55,6 @@ public void failed(final Exception ex) {
5755
failDelegate(ex);
5856
} else {
5957
try (final AgentScope scope = parentContinuation.activate()) {
60-
setAsyncPropagationEnabled(true);
6158
failDelegate(ex);
6259
}
6360
}
@@ -73,7 +70,6 @@ public void cancelled() {
7370
cancelDelegate();
7471
} else {
7572
try (final AgentScope scope = parentContinuation.activate()) {
76-
setAsyncPropagationEnabled(true);
7773
cancelDelegate();
7874
}
7975
}

‎dd-java-agent/instrumentation/java-concurrent/java-completablefuture/src/test/groovy/CompletableFutureTest.groovy

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ import java.util.function.Supplier
1111

1212
import static datadog.trace.agent.test.utils.TraceUtils.basicSpan
1313
import static datadog.trace.agent.test.utils.TraceUtils.runUnderTrace
14-
import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.setAsyncPropagationEnabled
1514

1615
/**
1716
* Note: ideally this should live with the rest of ExecutorInstrumentationTest,
@@ -45,7 +44,6 @@ class CompletableFutureTest extends AgentTestRunner {
4544
@Trace(operationName = "parent")
4645
CompletableFuture<String> get() {
4746
try {
48-
setAsyncPropagationEnabled(true)
4947
return CompletableFuture.supplyAsync(supplier, pool)
5048
.thenCompose({ s -> CompletableFuture.supplyAsync(new AppendingSupplier(s), differentPool) })
5149
.thenApply(function)

‎dd-java-agent/instrumentation/java-concurrent/java-concurrent-21/src/test/groovy/VirtualThreadTest.groovy

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@ import java.util.concurrent.ExecutorCompletionService
88
import java.util.concurrent.Executors
99
import java.util.concurrent.TimeUnit
1010

11-
import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.setAsyncPropagationEnabled
12-
1311
class VirtualThreadTest extends AgentTestRunner {
1412
@Shared
1513
def executeRunnable = { e, c -> e.execute((Runnable) c) }
@@ -37,7 +35,6 @@ class VirtualThreadTest extends AgentTestRunner {
3735
@Override
3836
@Trace(operationName = "parent")
3937
void run() {
40-
setAsyncPropagationEnabled(true)
4138
// this child will have a span
4239
m(pool, new JavaAsyncChild())
4340
// this child won't

‎dd-java-agent/instrumentation/java-concurrent/src/test/groovy/executor/ExecutorInstrumentationTest.groovy

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ import java.util.concurrent.ScheduledThreadPoolExecutor
2626
import java.util.concurrent.ThreadPoolExecutor
2727
import java.util.concurrent.TimeUnit
2828

29-
import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.setAsyncPropagationEnabled
3029
import static org.junit.Assume.assumeTrue
3130

3231
abstract class ExecutorInstrumentationTest extends AgentTestRunner {
@@ -82,7 +81,6 @@ abstract class ExecutorInstrumentationTest extends AgentTestRunner {
8281
@Override
8382
@Trace(operationName = "parent")
8483
void run() {
85-
setAsyncPropagationEnabled(true)
8684
// this child will have a span
8785
m(pool, new JavaAsyncChild())
8886
// this child won't
@@ -256,7 +254,6 @@ abstract class ExecutorInstrumentationTest extends AgentTestRunner {
256254
@Override
257255
@Trace(operationName = "parent")
258256
void run() {
259-
setAsyncPropagationEnabled(true)
260257
def future = m(pool, task)
261258
sleep(500)
262259
future.cancel(true)
@@ -317,7 +314,6 @@ abstract class ExecutorInstrumentationTest extends AgentTestRunner {
317314
@Override
318315
@Trace(operationName = "parent")
319316
void run() {
320-
setAsyncPropagationEnabled(true)
321317
// this child will have a span
322318
pool.execute(new JavaAsyncChild())
323319
// this child won't
@@ -368,7 +364,6 @@ abstract class ExecutorInstrumentationTest extends AgentTestRunner {
368364
@Override
369365
@Trace(operationName = "parent")
370366
void run() {
371-
setAsyncPropagationEnabled(true)
372367
m(pool, w(child))
373368
}
374369
}.run()
@@ -406,7 +401,6 @@ abstract class ExecutorInstrumentationTest extends AgentTestRunner {
406401
@Override
407402
@Trace(operationName = "parent")
408403
void run() {
409-
setAsyncPropagationEnabled(true)
410404
try {
411405
for (int i = 0; i < 20; ++i) {
412406
final JavaAsyncChild child = new JavaAsyncChild(false, true)

‎dd-java-agent/instrumentation/java-concurrent/src/test/groovy/executor/NettyExecutorInstrumentationTest.groovy

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ import java.util.concurrent.Future
1717
import java.util.concurrent.RejectedExecutionException
1818
import java.util.concurrent.TimeUnit
1919

20-
import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.setAsyncPropagationEnabled
2120
import static org.junit.Assume.assumeTrue
2221

2322
class NettyExecutorInstrumentationTest extends AgentTestRunner {
@@ -65,7 +64,6 @@ class NettyExecutorInstrumentationTest extends AgentTestRunner {
6564
@Override
6665
@Trace(operationName = "parent")
6766
void run() {
68-
setAsyncPropagationEnabled(true)
6967
// this child will have a span
7068
m(pool, new JavaAsyncChild())
7169
// this child won't
@@ -213,7 +211,6 @@ class NettyExecutorInstrumentationTest extends AgentTestRunner {
213211
@Override
214212
@Trace(operationName = "parent")
215213
void run() {
216-
setAsyncPropagationEnabled(true)
217214
try {
218215
for (int i = 0; i < 20; ++i) {
219216
final JavaAsyncChild child = new JavaAsyncChild(false, true)

‎dd-java-agent/instrumentation/java-concurrent/src/test/groovy/executor/RejectedExecutionTest.groovy

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ import java.util.concurrent.ThreadPoolExecutor
2121
import java.util.concurrent.TimeUnit
2222

2323
import static datadog.trace.agent.test.utils.TraceUtils.runUnderTrace
24-
import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.setAsyncPropagationEnabled
2524

2625
class RejectedExecutionTest extends AgentTestRunner {
2726

@@ -193,7 +192,6 @@ class RejectedExecutionTest extends AgentTestRunner {
193192

194193
when:
195194
runUnderTrace("parent") {
196-
setAsyncPropagationEnabled(true)
197195
// must be rejected because the queue will be full until some
198196
// time after the first task is released
199197
executor.submit((Runnable) new JavaAsyncChild(true, false))
@@ -237,7 +235,6 @@ class RejectedExecutionTest extends AgentTestRunner {
237235

238236
return {
239237
runUnderTrace("parent") {
240-
setAsyncPropagationEnabled(true)
241238
pool.submit({})
242239
}
243240
}
@@ -261,7 +258,6 @@ class RejectedExecutionTest extends AgentTestRunner {
261258

262259
return {
263260
runUnderTrace("parent") {
264-
setAsyncPropagationEnabled(true)
265261
// must be rejected because the queue will be full until some
266262
// time after the first task is released
267263
def testTask = new JavaAsyncChild(true, false)

‎dd-java-agent/instrumentation/jetty-util/src/test/groovy/JettyExecutorInstrumentationTest.groovy

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ import java.util.concurrent.Callable
1010
import java.util.concurrent.ExecutorService
1111
import java.util.concurrent.Executors
1212

13-
import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.setAsyncPropagationEnabled
1413
import static org.junit.Assume.assumeTrue
1514

1615
class JettyExecutorInstrumentationTest extends AgentTestRunner {
@@ -46,7 +45,6 @@ class JettyExecutorInstrumentationTest extends AgentTestRunner {
4645
@Override
4746
@Trace(operationName = "parent")
4847
void run() {
49-
setAsyncPropagationEnabled(true)
5048
// this child will have a span
5149
m(pool, new JavaAsyncChild())
5250
// this child won't

‎dd-java-agent/instrumentation/opentelemetry/opentelemetry-0.3/src/test/groovy/OpenTelemetryTest.groovy

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,6 @@ import io.opentelemetry.trace.Status
1919
import io.opentelemetry.trace.TracingContextUtils
2020
import spock.lang.Subject
2121

22-
import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.setAsyncPropagationEnabled
23-
2422
class OpenTelemetryTest extends AgentTestRunner {
2523
@Subject
2624
def tracer = OpenTelemetry.tracerProvider.get("test-inst")
@@ -234,7 +232,6 @@ class OpenTelemetryTest extends AgentTestRunner {
234232
setup:
235233
def span = tracer.spanBuilder("some name").startSpan()
236234
TraceScope scope = tracer.withSpan(span)
237-
setAsyncPropagationEnabled(true)
238235

239236
expect:
240237
tracer.currentSpan.delegate == span.delegate

‎dd-java-agent/instrumentation/opentracing/api-0.31/src/test/groovy/OpenTracing31Test.groovy

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,6 @@ class OpenTracing31Test extends AgentTestRunner {
219219
setup:
220220
def span = tracer.buildSpan("some name").start()
221221
TraceScope scope = tracer.scopeManager().activate(span, false)
222-
setAsyncPropagationEnabled(true)
223222

224223
expect:
225224
tracer.activeSpan().delegate == span.delegate

‎dd-java-agent/instrumentation/opentracing/api-0.32/src/test/groovy/OpenTracing32Test.groovy

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,6 @@ class OpenTracing32Test extends AgentTestRunner {
234234
setup:
235235
def span = tracer.buildSpan("some name").start()
236236
TraceScope scope = tracer.scopeManager().activate(span, false)
237-
setAsyncPropagationEnabled(true)
238237

239238
expect:
240239
tracer.activeSpan().delegate == span.delegate

‎dd-java-agent/instrumentation/play-2.3/src/main/java/datadog/trace/instrumentation/play23/RequestCompleteCallback.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package datadog.trace.instrumentation.play23;
22

3-
import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.setAsyncPropagationEnabled;
43
import static datadog.trace.instrumentation.play23.PlayHttpServerDecorator.DECORATE;
54
import static datadog.trace.instrumentation.play23.PlayHttpServerDecorator.REPORT_HTTP_STATUS;
65

@@ -30,7 +29,6 @@ public Object apply(final Try<Result> result) {
3029
}
3130
}
3231
DECORATE.beforeFinish(span);
33-
setAsyncPropagationEnabled(false);
3432
} catch (final Throwable t) {
3533
log.debug("error in play instrumentation", t);
3634
} finally {

‎dd-java-agent/instrumentation/play-2.4/src/main/java/datadog/trace/instrumentation/play24/RequestCompleteCallback.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package datadog.trace.instrumentation.play24;
22

3-
import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.setAsyncPropagationEnabled;
43
import static datadog.trace.instrumentation.play24.PlayHttpServerDecorator.DECORATE;
54
import static datadog.trace.instrumentation.play24.PlayHttpServerDecorator.REPORT_HTTP_STATUS;
65

@@ -29,7 +28,6 @@ public Object apply(final Try<Result> result) {
2928
}
3029
}
3130
DECORATE.beforeFinish(span);
32-
setAsyncPropagationEnabled(false);
3331
} catch (final Throwable t) {
3432
log.debug("error in play instrumentation", t);
3533
} finally {

‎dd-java-agent/instrumentation/play-2.6/src/main/java/datadog/trace/instrumentation/play26/RequestCompleteCallback.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package datadog.trace.instrumentation.play26;
22

3-
import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.setAsyncPropagationEnabled;
43
import static datadog.trace.instrumentation.play26.PlayHttpServerDecorator.DECORATE;
54
import static datadog.trace.instrumentation.play26.PlayHttpServerDecorator.REPORT_HTTP_STATUS;
65

@@ -31,7 +30,6 @@ public Object apply(final Try<Result> result) {
3130
}
3231
}
3332
DECORATE.beforeFinish(span);
34-
setAsyncPropagationEnabled(false);
3533
} catch (final Throwable t) {
3634
log.debug("error in play instrumentation", t);
3735
} finally {

‎dd-java-agent/instrumentation/play-ws-1/src/main/java/datadog/trace/instrumentation/playws1/AsyncHandlerWrapper.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package datadog.trace.instrumentation.playws1;
22

33
import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.captureSpan;
4-
import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.setAsyncPropagationEnabled;
54
import static datadog.trace.instrumentation.playws.PlayWSClientDecorator.DECORATE;
65

76
import datadog.trace.bootstrap.instrumentation.api.AgentScope;
@@ -55,7 +54,6 @@ public Object onCompleted() throws Exception {
5554

5655
if (continuation != null) {
5756
try (final AgentScope scope = continuation.activate()) {
58-
setAsyncPropagationEnabled(true);
5957
return delegate.onCompleted();
6058
}
6159
} else {
@@ -71,7 +69,6 @@ public void onThrowable(final Throwable throwable) {
7169

7270
if (continuation != null) {
7371
try (final AgentScope scope = continuation.activate()) {
74-
setAsyncPropagationEnabled(true);
7572
delegate.onThrowable(throwable);
7673
}
7774
} else {

‎dd-java-agent/instrumentation/play-ws-2.1/src/main/java/datadog/trace/instrumentation/playws21/AsyncHandlerWrapper.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package datadog.trace.instrumentation.playws21;
22

33
import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.captureSpan;
4-
import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.setAsyncPropagationEnabled;
54
import static datadog.trace.instrumentation.playws.PlayWSClientDecorator.DECORATE;
65

76
import datadog.trace.bootstrap.instrumentation.api.AgentScope;
@@ -60,7 +59,6 @@ public Object onCompleted() throws Exception {
6059

6160
if (continuation != null) {
6261
try (final AgentScope scope = continuation.activate()) {
63-
setAsyncPropagationEnabled(true);
6462
return delegate.onCompleted();
6563
}
6664
} else {
@@ -76,7 +74,6 @@ public void onThrowable(final Throwable throwable) {
7674

7775
if (continuation != null) {
7876
try (final AgentScope scope = continuation.activate()) {
79-
setAsyncPropagationEnabled(true);
8077
delegate.onThrowable(throwable);
8178
}
8279
} else {

0 commit comments

Comments
 (0)