Fix InstrumenterConfig for Code Origin default (#10240)

Missed that Code Origin is also defined in InstrumenterConfig
so need to share the default based on JDK version between
InstrumenterConfig and Config

Author: jpbempel

dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/origin/CodeOriginConfigTest.java

@@ -4,6 +4,7 @@
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import datadog.trace.api.Config;
+import datadog.trace.api.InstrumenterConfig;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.condition.EnabledForJreRange;
 import org.junit.jupiter.api.condition.EnabledOnJre;
@@ -15,29 +16,34 @@ public class CodeOriginConfigTest {
   @Test
   public void defaultConfigJDK25() {
     assertTrue(Config.get().isDebuggerCodeOriginEnabled());
+    assertTrue(InstrumenterConfig.get().isCodeOriginEnabled());
   }
 
   @EnabledOnJre(JRE.JAVA_21)
   @Test
   public void defaultConfigJDK21() {
     assertFalse(Config.get().isDebuggerCodeOriginEnabled());
+    assertFalse(InstrumenterConfig.get().isCodeOriginEnabled());
   }
 
   @EnabledOnJre(JRE.JAVA_17)
   @Test
   public void defaultConfigJDK17() {
     assertFalse(Config.get().isDebuggerCodeOriginEnabled());
+    assertFalse(InstrumenterConfig.get().isCodeOriginEnabled());
   }
 
   @EnabledOnJre(JRE.JAVA_11)
   @Test
   public void defaultConfigJDK11() {
     assertFalse(Config.get().isDebuggerCodeOriginEnabled());
+    assertFalse(InstrumenterConfig.get().isCodeOriginEnabled());
   }
 
   @EnabledOnJre(JRE.JAVA_8)
   @Test
   public void defaultConfigJDK8() {
     assertFalse(Config.get().isDebuggerCodeOriginEnabled());
+    assertFalse(InstrumenterConfig.get().isCodeOriginEnabled());
   }
 }

internal-api/src/main/java/datadog/trace/api/Config.java

@@ -2596,7 +2596,7 @@ PROFILING_DATADOG_PROFILER_ENABLED, isDatadogProfilerSafeInCurrentEnvironment())
             EXCEPTION_REPLAY_ENABLED);
     debuggerCodeOriginEnabled =
         configProvider.getBoolean(
-            CODE_ORIGIN_FOR_SPANS_ENABLED, getDefaultCodeOriginForSpanEnabled());
+            CODE_ORIGIN_FOR_SPANS_ENABLED, InstrumenterConfig.getDefaultCodeOriginForSpanEnabled());
     debuggerCodeOriginMaxUserFrames =
         configProvider.getInteger(CODE_ORIGIN_MAX_USER_FRAMES, DEFAULT_CODE_ORIGIN_MAX_USER_FRAMES);
     debuggerMaxExceptionPerSecond =
@@ -2977,14 +2977,6 @@ 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;

internal-api/src/main/java/datadog/trace/api/InstrumenterConfig.java

@@ -3,7 +3,6 @@
 import static datadog.trace.api.ConfigDefaults.DEFAULT_API_SECURITY_ENDPOINT_COLLECTION_ENABLED;
 import static datadog.trace.api.ConfigDefaults.DEFAULT_APPSEC_ENABLED;
 import static datadog.trace.api.ConfigDefaults.DEFAULT_CIVISIBILITY_ENABLED;
-import static datadog.trace.api.ConfigDefaults.DEFAULT_CODE_ORIGIN_FOR_SPANS_ENABLED;
 import static datadog.trace.api.ConfigDefaults.DEFAULT_DATA_JOBS_ENABLED;
 import static datadog.trace.api.ConfigDefaults.DEFAULT_IAST_ENABLED;
 import static datadog.trace.api.ConfigDefaults.DEFAULT_INTEGRATIONS_ENABLED;
@@ -86,6 +85,7 @@
 import static datadog.trace.util.CollectionUtils.tryMakeImmutableList;
 import static datadog.trace.util.CollectionUtils.tryMakeImmutableSet;
 
+import datadog.environment.JavaVirtualMachine;
 import datadog.trace.api.profiling.ProfilingEnablement;
 import datadog.trace.api.telemetry.ConfigInversionMetricCollectorImpl;
 import datadog.trace.api.telemetry.ConfigInversionMetricCollectorProvider;
@@ -231,7 +231,7 @@ private InstrumenterConfig() {
 
     codeOriginEnabled =
         configProvider.getBoolean(
-            CODE_ORIGIN_FOR_SPANS_ENABLED, DEFAULT_CODE_ORIGIN_FOR_SPANS_ENABLED);
+            CODE_ORIGIN_FOR_SPANS_ENABLED, getDefaultCodeOriginForSpanEnabled());
     traceEnabled = configProvider.getBoolean(TRACE_ENABLED, DEFAULT_TRACE_ENABLED);
     traceOtelEnabled = configProvider.getBoolean(TRACE_OTEL_ENABLED, DEFAULT_TRACE_OTEL_ENABLED);
     metricsOtelEnabled =
@@ -665,6 +665,14 @@ public boolean isApiSecurityEndpointCollectionEnabled() {
               ? ConfigProvider.withoutCollector()
               : ConfigProvider.getInstance());
 
+  static boolean getDefaultCodeOriginForSpanEnabled() {
+    if (JavaVirtualMachine.isJavaVersionAtLeast(25)) {
+      // activate by default Code Origin only for JDK25+
+      return true;
+    }
+    return false;
+  }
+
   public static InstrumenterConfig get() {
     return INSTANCE;
   }