Skip to content

Commit d87cee2

Browse files
authored
Add support for DD_THIRD_PARTY_DETECTION_* (#9963)
need to align with others tracers
1 parent 6721645 commit d87cee2

File tree

4 files changed

+16
-4
lines changed

4 files changed

+16
-4
lines changed

dd-trace-api/src/main/java/datadog/trace/api/config/DebuggerConfig.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,8 @@ public final class DebuggerConfig {
6565
"dynamic.instrumentation.source.file.tracking.enabled";
6666
public static final String THIRD_PARTY_INCLUDES = "third.party.includes";
6767
public static final String THIRD_PARTY_EXCLUDES = "third.party.excludes";
68+
public static final String THIRD_PARTY_DETECTION_INCLUDES = "third.party.detection.includes";
69+
public static final String THIRD_PARTY_DETECTION_EXCLUDES = "third.party.detection.excludes";
6870
public static final String THIRD_PARTY_SHADING_IDENTIFIERS = "third.party.shading.identifiers";
6971

7072
private DebuggerConfig() {}

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

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -337,6 +337,8 @@
337337
import static datadog.trace.api.config.DebuggerConfig.SYMBOL_DATABASE_ENABLED;
338338
import static datadog.trace.api.config.DebuggerConfig.SYMBOL_DATABASE_FLUSH_THRESHOLD;
339339
import static datadog.trace.api.config.DebuggerConfig.SYMBOL_DATABASE_FORCE_UPLOAD;
340+
import static datadog.trace.api.config.DebuggerConfig.THIRD_PARTY_DETECTION_EXCLUDES;
341+
import static datadog.trace.api.config.DebuggerConfig.THIRD_PARTY_DETECTION_INCLUDES;
340342
import static datadog.trace.api.config.DebuggerConfig.THIRD_PARTY_EXCLUDES;
341343
import static datadog.trace.api.config.DebuggerConfig.THIRD_PARTY_INCLUDES;
342344
import static datadog.trace.api.config.DebuggerConfig.THIRD_PARTY_SHADING_IDENTIFIERS;
@@ -2607,8 +2609,14 @@ PROFILING_DATADOG_PROFILER_ENABLED, isDatadogProfilerSafeInCurrentEnvironment())
26072609
configProvider.getBoolean(
26082610
DEBUGGER_SOURCE_FILE_TRACKING_ENABLED, DEFAULT_DEBUGGER_SOURCE_FILE_TRACKING_ENABLED);
26092611

2610-
debuggerThirdPartyIncludes = tryMakeImmutableSet(configProvider.getList(THIRD_PARTY_INCLUDES));
2611-
debuggerThirdPartyExcludes = tryMakeImmutableSet(configProvider.getList(THIRD_PARTY_EXCLUDES));
2612+
debuggerThirdPartyIncludes =
2613+
tryMakeImmutableSet(
2614+
configProvider.getList(
2615+
THIRD_PARTY_INCLUDES, Collections.emptyList(), THIRD_PARTY_DETECTION_INCLUDES));
2616+
debuggerThirdPartyExcludes =
2617+
tryMakeImmutableSet(
2618+
configProvider.getList(
2619+
THIRD_PARTY_EXCLUDES, Collections.emptyList(), THIRD_PARTY_DETECTION_EXCLUDES));
26122620
debuggerShadingIdentifiers =
26132621
tryMakeImmutableSet(configProvider.getList(THIRD_PARTY_SHADING_IDENTIFIERS));
26142622

metadata/supported-configurations.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -486,6 +486,8 @@
486486
"DD_TEST_SESSION_NAME": ["A"],
487487
"DD_THIRD_PARTY_EXCLUDES": ["A"],
488488
"DD_THIRD_PARTY_INCLUDES": ["A"],
489+
"DD_THIRD_PARTY_DETECTION_EXCLUDES": ["A"],
490+
"DD_THIRD_PARTY_DETECTION_INCLUDES": ["A"],
489491
"DD_THIRD_PARTY_SHADING_IDENTIFIERS": ["A"],
490492
"DD_TRACE_128_BIT_TRACEID_GENERATION_ENABLED": ["A"],
491493
"DD_TRACE_128_BIT_TRACEID_LOGGING_ENABLED": ["A"],

utils/config-utils/src/main/java/datadog/trace/bootstrap/config/provider/ConfigProvider.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -303,12 +303,12 @@ public List<String> getList(String key) {
303303
return ConfigConverter.parseList(getString(key));
304304
}
305305

306-
public List<String> getList(String key, List<String> defaultValue) {
306+
public List<String> getList(String key, List<String> defaultValue, String... aliases) {
307307
// Ensure the first item at DEFAULT is the accurate one
308308
if (collectConfig) {
309309
reportDefault(key, defaultValue);
310310
}
311-
String list = getStringInternal(key);
311+
String list = getStringInternal(key, aliases);
312312
if (null == list) {
313313
return defaultValue;
314314
} else {

0 commit comments

Comments
 (0)