Skip to content

Disable virtual thread instrumentation by default #10171

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
PerfectSlayer wants to merge 1 commit into from
Closed

Disable virtual thread instrumentation by default #10171

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions ...main/java/datadog/trace/instrumentation/java/lang/jdk21/VirtualThreadInstrumentation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,12 @@ public boolean isEnabled() {
return JavaVirtualMachine.isJavaVersionAtLeast(21) && super.isEnabled();
}

@Override
protected boolean defaultEnabled() {
// Disabled by default until non flaky
return false;
}

@Override
public Map<String, String> contextStore() {
Map<String, String> contextStore = new HashMap<>();
Expand Down
7 changes: 7 additions & 0 deletions ...instrumentation/java/java-lang/java-lang-21.0/src/test/groovy/VirtualThreadApiTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,13 @@ import datadog.trace.test.util.Flaky
// Note: test builder x2 + test factory can be refactored but are kept simple to ease with debugging.
@Flaky("class loader deadlock on virtual thread clean up while Groovy do dynamic code generation - APMLP-782")
class VirtualThreadApiTest extends InstrumentationSpecification {

@Override
protected void configurePreAgent() {
super.configurePreAgent()
injectSysConfig('dd.trace.java.lang.21.enabled=true', 'true')
}

def "test Thread.Builder.OfVirtual - start()"() {
setup:
def threadBuilder = Thread.ofVirtual().name("builder - started")
Expand Down
1 change: 1 addition & 0 deletions ...urrent/java-21/src/test/groovy/datadog/smoketest/concurrent/AbstractConcurrentTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ abstract class AbstractConcurrentTest extends AbstractSmokeTest {
command.add(javaPath())
command.addAll(defaultJavaProperties)
command.add("-Ddd.trace.otel.enabled=true")
command.add("-Ddd.trace.java.lang.21.enabled=true")
command.addAll(["-jar", jarPath])
command.addAll(getTestArguments())

Expand Down
Loading