Skip to content

Commit 9a815a2

Browse files
PerfectSlayerPerfectSlayer
committed
feat(core): Improve API
1 parent 863cdbc commit 9a815a2

File tree

32 files changed

+123
-123
lines changed

32 files changed

+123
-123
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package datadog.trace.bootstrap.instrumentation.java.concurrent;
22

33
import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activeScope;
4-
import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.setAsyncPropagation;
4+
import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.setAsyncPropagationEnabled;
55

66
import datadog.trace.bootstrap.ContextStore;
77
import datadog.trace.bootstrap.instrumentation.api.AgentScope;
@@ -27,7 +27,7 @@ public static AgentScope startTaskScope(State state) {
2727
final AgentScope.Continuation continuation = state.getAndResetContinuation();
2828
if (continuation != null) {
2929
final AgentScope scope = continuation.activate();
30-
setAsyncPropagation(true);
30+
setAsyncPropagationEnabled(true);
3131
// important - stop timing after the scope has been activated so the time in the queue can
3232
// be attributed to the correct context without duplicating the propagated information
3333
state.stopTiming();

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ 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.setAsyncPropagation
19+
import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.setAsyncPropagationEnabled
2020

2121
/**
2222
* Test executor instrumentation for Akka specific classes.
@@ -46,7 +46,7 @@ class AkkaExecutorInstrumentationTest extends AgentTestRunner {
4646
@Override
4747
@Trace(operationName = "parent")
4848
void run() {
49-
setAsyncPropagation(true)
49+
setAsyncPropagationEnabled(true)
5050
// this child will have a span
5151
m(pool, new AkkaAsyncChild())
5252
// this child won't
@@ -102,7 +102,7 @@ class AkkaExecutorInstrumentationTest extends AgentTestRunner {
102102
@Override
103103
@Trace(operationName = "parent")
104104
void run() {
105-
setAsyncPropagation(true)
105+
setAsyncPropagationEnabled(true)
106106
// this child will have a span
107107
dispatcher.execute(new AkkaAsyncChild())
108108
// this child won't
@@ -133,7 +133,7 @@ class AkkaExecutorInstrumentationTest extends AgentTestRunner {
133133
@Override
134134
@Trace(operationName = "parent")
135135
void run() {
136-
setAsyncPropagation(true)
136+
setAsyncPropagationEnabled(true)
137137
try {
138138
for (int i = 0; i < 20; ++i) {
139139
// 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: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package datadog.trace.instrumentation.apachehttpasyncclient;
22

3-
import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.setAsyncPropagation;
3+
import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.setAsyncPropagationEnabled;
44
import static datadog.trace.instrumentation.apachehttpasyncclient.ApacheHttpAsyncClientDecorator.DECORATE;
55

66
import datadog.trace.bootstrap.instrumentation.api.AgentScope;
@@ -40,7 +40,7 @@ public void completed(final T result) {
4040
completeDelegate(result);
4141
} else {
4242
try (final AgentScope scope = parentContinuation.activate()) {
43-
setAsyncPropagation(true);
43+
setAsyncPropagationEnabled(true);
4444
completeDelegate(result);
4545
}
4646
}
@@ -57,7 +57,7 @@ public void failed(final Exception ex) {
5757
failDelegate(ex);
5858
} else {
5959
try (final AgentScope scope = parentContinuation.activate()) {
60-
setAsyncPropagation(true);
60+
setAsyncPropagationEnabled(true);
6161
failDelegate(ex);
6262
}
6363
}
@@ -73,7 +73,7 @@ public void cancelled() {
7373
cancelDelegate();
7474
} else {
7575
try (final AgentScope scope = parentContinuation.activate()) {
76-
setAsyncPropagation(true);
76+
setAsyncPropagationEnabled(true);
7777
cancelDelegate();
7878
}
7979
}

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

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

3-
import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.setAsyncPropagation;
3+
import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.setAsyncPropagationEnabled;
44
import static datadog.trace.instrumentation.apachehttpclient5.ApacheHttpClientDecorator.DECORATE;
55

66
import datadog.trace.bootstrap.instrumentation.api.AgentScope;
@@ -43,7 +43,7 @@ public void completed(final T result) {
4343
completeDelegate(result);
4444
} else {
4545
try (final AgentScope scope = parentContinuation.activate()) {
46-
setAsyncPropagation(true);
46+
setAsyncPropagationEnabled(true);
4747
completeDelegate(result);
4848
}
4949
}
@@ -60,7 +60,7 @@ public void failed(final Exception ex) {
6060
failDelegate(ex);
6161
} else {
6262
try (final AgentScope scope = parentContinuation.activate()) {
63-
setAsyncPropagation(true);
63+
setAsyncPropagationEnabled(true);
6464
failDelegate(ex);
6565
}
6666
}
@@ -76,7 +76,7 @@ public void cancelled() {
7676
cancelDelegate();
7777
} else {
7878
try (final AgentScope scope = parentContinuation.activate()) {
79-
setAsyncPropagation(true);
79+
setAsyncPropagationEnabled(true);
8080
cancelDelegate();
8181
}
8282
}

‎dd-java-agent/instrumentation/hystrix-1.4/src/main/java/datadog/trace/instrumentation/hystrix/HystrixThreadPoolInstrumentation.java‎

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

33
import static datadog.trace.agent.tooling.bytebuddy.matcher.NameMatchers.named;
4-
import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.isAsyncPropagation;
5-
import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.setAsyncPropagation;
4+
import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.isAsyncPropagationEnabled;
5+
import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.setAsyncPropagationEnabled;
66
import static net.bytebuddy.matcher.ElementMatchers.isMethod;
77
import static net.bytebuddy.matcher.ElementMatchers.takesArguments;
88

@@ -35,8 +35,8 @@ public static class EnableAsyncAdvice {
3535

3636
@Advice.OnMethodEnter(suppress = Throwable.class)
3737
public static boolean enableAsyncTracking() {
38-
if (!isAsyncPropagation()) {
39-
setAsyncPropagation(true);
38+
if (!isAsyncPropagationEnabled()) {
39+
setAsyncPropagationEnabled(true);
4040
return true;
4141
}
4242
return false;
@@ -45,7 +45,7 @@ public static boolean enableAsyncTracking() {
4545
@Advice.OnMethodExit(suppress = Throwable.class)
4646
public static void disableAsyncTracking(@Advice.Enter final boolean wasEnabled) {
4747
if (wasEnabled) {
48-
setAsyncPropagation(false);
48+
setAsyncPropagationEnabled(false);
4949
}
5050
}
5151
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ 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.setAsyncPropagation
14+
import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.setAsyncPropagationEnabled
1515

1616
/**
1717
* Note: ideally this should live with the rest of ExecutorInstrumentationTest,
@@ -45,7 +45,7 @@ class CompletableFutureTest extends AgentTestRunner {
4545
@Trace(operationName = "parent")
4646
CompletableFuture<String> get() {
4747
try {
48-
setAsyncPropagation(true)
48+
setAsyncPropagationEnabled(true)
4949
return CompletableFuture.supplyAsync(supplier, pool)
5050
.thenCompose({ s -> CompletableFuture.supplyAsync(new AppendingSupplier(s), differentPool) })
5151
.thenApply(function)

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ 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.setAsyncPropagation
11+
import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.setAsyncPropagationEnabled
1212

1313
class VirtualThreadTest extends AgentTestRunner {
1414
@Shared
@@ -37,7 +37,7 @@ class VirtualThreadTest extends AgentTestRunner {
3737
@Override
3838
@Trace(operationName = "parent")
3939
void run() {
40-
setAsyncPropagation(true)
40+
setAsyncPropagationEnabled(true)
4141
// this child will have a span
4242
m(pool, new JavaAsyncChild())
4343
// this child won't

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
import static datadog.trace.agent.tooling.bytebuddy.matcher.NameMatchers.nameStartsWith;
66
import static datadog.trace.agent.tooling.bytebuddy.matcher.NameMatchers.named;
77
import static datadog.trace.agent.tooling.bytebuddy.matcher.NameMatchers.namedOneOf;
8-
import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.isAsyncPropagation;
9-
import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.setAsyncPropagation;
8+
import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.isAsyncPropagationEnabled;
9+
import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.setAsyncPropagationEnabled;
1010
import static datadog.trace.instrumentation.java.concurrent.ConcurrentInstrumentationNames.EXECUTOR_INSTRUMENTATION_NAME;
1111
import static net.bytebuddy.matcher.ElementMatchers.isDeclaredBy;
1212
import static net.bytebuddy.matcher.ElementMatchers.isTypeInitializer;
@@ -178,8 +178,8 @@ public static class DisableAsyncAdvice {
178178

179179
@Advice.OnMethodEnter
180180
public static boolean before() {
181-
if (isAsyncPropagation()) {
182-
setAsyncPropagation(false);
181+
if (isAsyncPropagationEnabled()) {
182+
setAsyncPropagationEnabled(false);
183183
return true;
184184
}
185185
return false;
@@ -188,7 +188,7 @@ public static boolean before() {
188188
@Advice.OnMethodExit(onThrowable = Throwable.class)
189189
public static void after(@Advice.Enter boolean wasDisabled) {
190190
if (wasDisabled) {
191-
setAsyncPropagation(true);
191+
setAsyncPropagationEnabled(true);
192192
}
193193
}
194194
}

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ 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.setAsyncPropagation
29+
import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.setAsyncPropagationEnabled
3030
import static org.junit.Assume.assumeTrue
3131

3232
abstract class ExecutorInstrumentationTest extends AgentTestRunner {
@@ -82,7 +82,7 @@ abstract class ExecutorInstrumentationTest extends AgentTestRunner {
8282
@Override
8383
@Trace(operationName = "parent")
8484
void run() {
85-
setAsyncPropagation(true)
85+
setAsyncPropagationEnabled(true)
8686
// this child will have a span
8787
m(pool, new JavaAsyncChild())
8888
// this child won't
@@ -256,7 +256,7 @@ abstract class ExecutorInstrumentationTest extends AgentTestRunner {
256256
@Override
257257
@Trace(operationName = "parent")
258258
void run() {
259-
setAsyncPropagation(true)
259+
setAsyncPropagationEnabled(true)
260260
def future = m(pool, task)
261261
sleep(500)
262262
future.cancel(true)
@@ -317,7 +317,7 @@ abstract class ExecutorInstrumentationTest extends AgentTestRunner {
317317
@Override
318318
@Trace(operationName = "parent")
319319
void run() {
320-
setAsyncPropagation(true)
320+
setAsyncPropagationEnabled(true)
321321
// this child will have a span
322322
pool.execute(new JavaAsyncChild())
323323
// this child won't
@@ -368,7 +368,7 @@ abstract class ExecutorInstrumentationTest extends AgentTestRunner {
368368
@Override
369369
@Trace(operationName = "parent")
370370
void run() {
371-
setAsyncPropagation(true)
371+
setAsyncPropagationEnabled(true)
372372
m(pool, w(child))
373373
}
374374
}.run()
@@ -406,7 +406,7 @@ abstract class ExecutorInstrumentationTest extends AgentTestRunner {
406406
@Override
407407
@Trace(operationName = "parent")
408408
void run() {
409-
setAsyncPropagation(true)
409+
setAsyncPropagationEnabled(true)
410410
try {
411411
for (int i = 0; i < 20; ++i) {
412412
final JavaAsyncChild child = new JavaAsyncChild(false, true)

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ 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.setAsyncPropagation
20+
import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.setAsyncPropagationEnabled
2121
import static org.junit.Assume.assumeTrue
2222

2323
class NettyExecutorInstrumentationTest extends AgentTestRunner {
@@ -65,7 +65,7 @@ class NettyExecutorInstrumentationTest extends AgentTestRunner {
6565
@Override
6666
@Trace(operationName = "parent")
6767
void run() {
68-
setAsyncPropagation(true)
68+
setAsyncPropagationEnabled(true)
6969
// this child will have a span
7070
m(pool, new JavaAsyncChild())
7171
// this child won't
@@ -213,7 +213,7 @@ class NettyExecutorInstrumentationTest extends AgentTestRunner {
213213
@Override
214214
@Trace(operationName = "parent")
215215
void run() {
216-
setAsyncPropagation(true)
216+
setAsyncPropagationEnabled(true)
217217
try {
218218
for (int i = 0; i < 20; ++i) {
219219
final JavaAsyncChild child = new JavaAsyncChild(false, true)

0 commit comments

Comments
 (0)