Skip to content

Commit 164a756

Browse files
committed
chore(java-lang): Disable instrumentation by default
1 parent 4a91aa7 commit 164a756

File tree

3 files changed

+14
-0
lines changed

3 files changed

+14
-0
lines changed

dd-java-agent/instrumentation/java/java-lang/java-lang-21.0/src/main/java/datadog/trace/instrumentation/java/lang/jdk21/VirtualThreadInstrumentation.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,12 @@ public boolean isEnabled() {
5959
return JavaVirtualMachine.isJavaVersionAtLeast(21) && super.isEnabled();
6060
}
6161

62+
@Override
63+
protected boolean defaultEnabled() {
64+
// Disabled by default until non flaky
65+
return false;
66+
}
67+
6268
@Override
6369
public Map<String, String> contextStore() {
6470
Map<String, String> contextStore = new HashMap<>();

dd-java-agent/instrumentation/java/java-lang/java-lang-21.0/src/test/groovy/VirtualThreadApiTest.groovy

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,13 @@ import datadog.trace.test.util.Flaky
66
// Note: test builder x2 + test factory can be refactored but are kept simple to ease with debugging.
77
@Flaky("class loader deadlock on virtual thread clean up while Groovy do dynamic code generation - APMLP-782")
88
class VirtualThreadApiTest extends InstrumentationSpecification {
9+
10+
@Override
11+
protected void configurePreAgent() {
12+
super.configurePreAgent()
13+
injectSysConfig('dd.trace.java.lang.21.enabled=true', 'true')
14+
}
15+
916
def "test Thread.Builder.OfVirtual - start()"() {
1017
setup:
1118
def threadBuilder = Thread.ofVirtual().name("builder - started")

dd-smoke-tests/concurrent/java-21/src/test/groovy/datadog/smoketest/concurrent/AbstractConcurrentTest.groovy

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ abstract class AbstractConcurrentTest extends AbstractSmokeTest {
1818
command.add(javaPath())
1919
command.addAll(defaultJavaProperties)
2020
command.add("-Ddd.trace.otel.enabled=true")
21+
command.add("-Ddd.trace.java.lang.21.enabled=true")
2122
command.addAll(["-jar", jarPath])
2223
command.addAll(getTestArguments())
2324

0 commit comments

Comments
 (0)