Skip to content

Enable Code Origin by default for JDK25+ #10234

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

Merged
jpbempel merged 1 commit into from
Dec 18, 2025
Merged

Enable Code Origin by default for JDK25+ #10234

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
43 changes: 43 additions & 0 deletions ...-agent/agent-debugger/src/test/java/com/datadog/debugger/origin/CodeOriginConfigTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
package com.datadog.debugger.origin;

import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertTrue;

import datadog.trace.api.Config;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.condition.EnabledForJreRange;
import org.junit.jupiter.api.condition.EnabledOnJre;
import org.junit.jupiter.api.condition.JRE;

public class CodeOriginConfigTest {

@EnabledForJreRange(min = JRE.JAVA_25)
@Test
public void defaultConfigJDK25() {
assertTrue(Config.get().isDebuggerCodeOriginEnabled());
}

@EnabledOnJre(JRE.JAVA_21)
@Test
public void defaultConfigJDK21() {
assertFalse(Config.get().isDebuggerCodeOriginEnabled());
}

@EnabledOnJre(JRE.JAVA_17)
@Test
public void defaultConfigJDK17() {
assertFalse(Config.get().isDebuggerCodeOriginEnabled());
}

@EnabledOnJre(JRE.JAVA_11)
@Test
public void defaultConfigJDK11() {
assertFalse(Config.get().isDebuggerCodeOriginEnabled());
}

@EnabledOnJre(JRE.JAVA_8)
@Test
public void defaultConfigJDK8() {
assertFalse(Config.get().isDebuggerCodeOriginEnabled());
}
}
11 changes: 9 additions & 2 deletions internal-api/src/main/java/datadog/trace/api/Config.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@
import static datadog.trace.api.ConfigDefaults.DEFAULT_CIVISIBILITY_SOURCE_DATA_ENABLED;
import static datadog.trace.api.ConfigDefaults.DEFAULT_CLIENT_IP_ENABLED;
import static datadog.trace.api.ConfigDefaults.DEFAULT_CLOCK_SYNC_PERIOD;
import static datadog.trace.api.ConfigDefaults.DEFAULT_CODE_ORIGIN_FOR_SPANS_ENABLED;
import static datadog.trace.api.ConfigDefaults.DEFAULT_CODE_ORIGIN_MAX_USER_FRAMES;
import static datadog.trace.api.ConfigDefaults.DEFAULT_COUCHBASE_INTERNAL_SPANS_ENABLED;
import static datadog.trace.api.ConfigDefaults.DEFAULT_CWS_ENABLED;
Expand Down Expand Up @@ -2597,7 +2596,7 @@ PROFILING_DATADOG_PROFILER_ENABLED, isDatadogProfilerSafeInCurrentEnvironment())
EXCEPTION_REPLAY_ENABLED);
debuggerCodeOriginEnabled =
configProvider.getBoolean(
CODE_ORIGIN_FOR_SPANS_ENABLED, DEFAULT_CODE_ORIGIN_FOR_SPANS_ENABLED);
CODE_ORIGIN_FOR_SPANS_ENABLED, getDefaultCodeOriginForSpanEnabled());
debuggerCodeOriginMaxUserFrames =
configProvider.getInteger(CODE_ORIGIN_MAX_USER_FRAMES, DEFAULT_CODE_ORIGIN_MAX_USER_FRAMES);
debuggerMaxExceptionPerSecond =
Expand Down Expand Up @@ -2978,6 +2977,14 @@ PROFILING_DATADOG_PROFILER_ENABLED, isDatadogProfilerSafeInCurrentEnvironment())
log.debug("New instance: {}", this);
}

private boolean getDefaultCodeOriginForSpanEnabled() {
if (JavaVirtualMachine.isJavaVersionAtLeast(25)) {
// activate by default Code Origin only for JDK25+
return true;
}
return false;
}

private static boolean isValidUrl(String url) {
if (url == null || url.isEmpty()) {
return false;
Expand Down
Loading