|
40 | 40 | import static datadog.trace.api.ConfigDefaults.DEFAULT_CIVISIBILITY_SOURCE_DATA_ENABLED; |
41 | 41 | import static datadog.trace.api.ConfigDefaults.DEFAULT_CLIENT_IP_ENABLED; |
42 | 42 | import static datadog.trace.api.ConfigDefaults.DEFAULT_CLOCK_SYNC_PERIOD; |
43 | | -import static datadog.trace.api.ConfigDefaults.DEFAULT_CODE_ORIGIN_FOR_SPANS_ENABLED; |
44 | 43 | import static datadog.trace.api.ConfigDefaults.DEFAULT_CODE_ORIGIN_MAX_USER_FRAMES; |
45 | 44 | import static datadog.trace.api.ConfigDefaults.DEFAULT_COUCHBASE_INTERNAL_SPANS_ENABLED; |
46 | 45 | import static datadog.trace.api.ConfigDefaults.DEFAULT_CWS_ENABLED; |
@@ -2597,7 +2596,7 @@ PROFILING_DATADOG_PROFILER_ENABLED, isDatadogProfilerSafeInCurrentEnvironment()) |
2597 | 2596 | EXCEPTION_REPLAY_ENABLED); |
2598 | 2597 | debuggerCodeOriginEnabled = |
2599 | 2598 | configProvider.getBoolean( |
2600 | | - CODE_ORIGIN_FOR_SPANS_ENABLED, DEFAULT_CODE_ORIGIN_FOR_SPANS_ENABLED); |
| 2599 | + CODE_ORIGIN_FOR_SPANS_ENABLED, getDefaultCodeOriginForSpanEnabled()); |
2601 | 2600 | debuggerCodeOriginMaxUserFrames = |
2602 | 2601 | configProvider.getInteger(CODE_ORIGIN_MAX_USER_FRAMES, DEFAULT_CODE_ORIGIN_MAX_USER_FRAMES); |
2603 | 2602 | debuggerMaxExceptionPerSecond = |
@@ -2978,6 +2977,14 @@ PROFILING_DATADOG_PROFILER_ENABLED, isDatadogProfilerSafeInCurrentEnvironment()) |
2978 | 2977 | log.debug("New instance: {}", this); |
2979 | 2978 | } |
2980 | 2979 |
|
| 2980 | + private boolean getDefaultCodeOriginForSpanEnabled() { |
| 2981 | + if (JavaVirtualMachine.isJavaVersionAtLeast(25)) { |
| 2982 | + // activate by default Code Origin only for JDK25+ |
| 2983 | + return true; |
| 2984 | + } |
| 2985 | + return false; |
| 2986 | + } |
| 2987 | + |
2981 | 2988 | private static boolean isValidUrl(String url) { |
2982 | 2989 | if (url == null || url.isEmpty()) { |
2983 | 2990 | return false; |
|
0 commit comments