Enable Code Origin by default for JDK21+ (#10468)

jpbempel · web-flow · commit b89fa0af05fd · 2026-01-29T15:29:40.000+01:00
Modified test to ensure enablement by JDK version
diff --git a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/origin/CodeOriginConfigTest.java b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/origin/CodeOriginConfigTest.java
@@ -22,8 +22,8 @@ public void defaultConfigJDK25() {
   @EnabledOnJre(JRE.JAVA_21)
   @Test
   public void defaultConfigJDK21() {
-    assertFalse(Config.get().isDebuggerCodeOriginEnabled());
-    assertFalse(InstrumenterConfig.get().isCodeOriginEnabled());
+    assertTrue(Config.get().isDebuggerCodeOriginEnabled());
+    assertTrue(InstrumenterConfig.get().isCodeOriginEnabled());
   }
 
   @EnabledOnJre(JRE.JAVA_17)
diff --git a/internal-api/src/main/java/datadog/trace/api/InstrumenterConfig.java b/internal-api/src/main/java/datadog/trace/api/InstrumenterConfig.java
@@ -690,8 +690,8 @@ public boolean isAppLogsCollectionEnabled() {
               : ConfigProvider.getInstance());
 
   public static boolean getDefaultCodeOriginForSpanEnabled() {
-    if (JavaVirtualMachine.isJavaVersionAtLeast(25)) {
-      // activate by default Code Origin only for JDK25+
+    if (JavaVirtualMachine.isJavaVersionAtLeast(21)) {
+      // activate by default Code Origin only for JDK21+
       return true;
     }
     return false;
