Add support for DD_THIRD_PARTY_DETECTION_*

jpbempel · jpbempel · commit 457248bd36bd · 2025-11-14T10:23:36.000+01:00
need to align with others tracers
diff --git a/dd-trace-api/src/main/java/datadog/trace/api/config/DebuggerConfig.java b/dd-trace-api/src/main/java/datadog/trace/api/config/DebuggerConfig.java
@@ -65,6 +65,8 @@ public final class DebuggerConfig {
       "dynamic.instrumentation.source.file.tracking.enabled";
   public static final String THIRD_PARTY_INCLUDES = "third.party.includes";
   public static final String THIRD_PARTY_EXCLUDES = "third.party.excludes";
+  public static final String THIRD_PARTY_DETECTION_INCLUDES = "third.party.detection.includes";
+  public static final String THIRD_PARTY_DETECTION_EXCLUDES = "third.party.detection.excludes";
   public static final String THIRD_PARTY_SHADING_IDENTIFIERS = "third.party.shading.identifiers";
 
   private DebuggerConfig() {}
diff --git a/internal-api/src/main/java/datadog/trace/api/Config.java b/internal-api/src/main/java/datadog/trace/api/Config.java
@@ -337,6 +337,8 @@
 import static datadog.trace.api.config.DebuggerConfig.SYMBOL_DATABASE_ENABLED;
 import static datadog.trace.api.config.DebuggerConfig.SYMBOL_DATABASE_FLUSH_THRESHOLD;
 import static datadog.trace.api.config.DebuggerConfig.SYMBOL_DATABASE_FORCE_UPLOAD;
+import static datadog.trace.api.config.DebuggerConfig.THIRD_PARTY_DETECTION_EXCLUDES;
+import static datadog.trace.api.config.DebuggerConfig.THIRD_PARTY_DETECTION_INCLUDES;
 import static datadog.trace.api.config.DebuggerConfig.THIRD_PARTY_EXCLUDES;
 import static datadog.trace.api.config.DebuggerConfig.THIRD_PARTY_INCLUDES;
 import static datadog.trace.api.config.DebuggerConfig.THIRD_PARTY_SHADING_IDENTIFIERS;
@@ -2607,8 +2609,14 @@ PROFILING_DATADOG_PROFILER_ENABLED, isDatadogProfilerSafeInCurrentEnvironment())
         configProvider.getBoolean(
             DEBUGGER_SOURCE_FILE_TRACKING_ENABLED, DEFAULT_DEBUGGER_SOURCE_FILE_TRACKING_ENABLED);
 
-    debuggerThirdPartyIncludes = tryMakeImmutableSet(configProvider.getList(THIRD_PARTY_INCLUDES));
-    debuggerThirdPartyExcludes = tryMakeImmutableSet(configProvider.getList(THIRD_PARTY_EXCLUDES));
+    debuggerThirdPartyIncludes =
+        tryMakeImmutableSet(
+            configProvider.getList(
+                THIRD_PARTY_INCLUDES, Collections.emptyList(), THIRD_PARTY_DETECTION_INCLUDES));
+    debuggerThirdPartyExcludes =
+        tryMakeImmutableSet(
+            configProvider.getList(
+                THIRD_PARTY_EXCLUDES, Collections.emptyList(), THIRD_PARTY_DETECTION_EXCLUDES));
     debuggerShadingIdentifiers =
         tryMakeImmutableSet(configProvider.getList(THIRD_PARTY_SHADING_IDENTIFIERS));
 
diff --git a/metadata/supported-configurations.json b/metadata/supported-configurations.json
@@ -486,6 +486,8 @@
     "DD_TEST_SESSION_NAME": ["A"],
     "DD_THIRD_PARTY_EXCLUDES": ["A"],
     "DD_THIRD_PARTY_INCLUDES": ["A"],
+    "DD_THIRD_PARTY_DETECTION_EXCLUDES": ["A"],
+    "DD_THIRD_PARTY_DETECTION_INCLUDES": ["A"],
     "DD_THIRD_PARTY_SHADING_IDENTIFIERS": ["A"],
     "DD_TRACE_128_BIT_TRACEID_GENERATION_ENABLED": ["A"],
     "DD_TRACE_128_BIT_TRACEID_LOGGING_ENABLED": ["A"],
diff --git a/utils/config-utils/src/main/java/datadog/trace/bootstrap/config/provider/ConfigProvider.java b/utils/config-utils/src/main/java/datadog/trace/bootstrap/config/provider/ConfigProvider.java
@@ -303,12 +303,12 @@ public List<String> getList(String key) {
     return ConfigConverter.parseList(getString(key));
   }
 
-  public List<String> getList(String key, List<String> defaultValue) {
+  public List<String> getList(String key, List<String> defaultValue, String... aliases) {
     // Ensure the first item at DEFAULT is the accurate one
     if (collectConfig) {
       reportDefault(key, defaultValue);
     }
-    String list = getStringInternal(key);
+    String list = getStringInternal(key, aliases);
     if (null == list) {
       return defaultValue;
     } else {

Original file line number	Diff line number	Diff line change
`@@ -303,12 +303,12 @@ public List<String> getList(String key) {`
`303`	`303`	`return ConfigConverter.parseList(getString(key));`
`304`	`304`	`}`
`305`	`305`
`306`		`- public List<String> getList(String key, List<String> defaultValue) {`
	`306`	`+ public List<String> getList(String key, List<String> defaultValue, String... aliases) {`
`307`	`307`	`// Ensure the first item at DEFAULT is the accurate one`
`308`	`308`	`if (collectConfig) {`
`309`	`309`	`reportDefault(key, defaultValue);`
`310`	`310`	`}`
`311`		`- String list = getStringInternal(key);`
	`311`	`+ String list = getStringInternal(key, aliases);`
`312`	`312`	`if (null == list) {`
`313`	`313`	`return defaultValue;`
`314`	`314`	`} else {`