Skip to content

Support all value for DD_TRACE_EXPERIMENTAL_FEATURES_ENABLED #8598

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mhlidd merged 2 commits into from
Mar 24, 2025
Merged

Support all value for DD_TRACE_EXPERIMENTAL_FEATURES_ENABLED #8598

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1d915ed
support all value for experimentalFeaturesEnabled
mhlidd Mar 20, 2025
441f6c9
Merge branch 'master' into mhlidd/support_all_breaking_config
mhlidd Mar 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion dd-trace-api/src/main/java/datadog/trace/api/ConfigDefaults.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,8 @@ public final class ConfigDefaults {
static final boolean DEFAULT_TELEMETRY_LOG_COLLECTION_ENABLED = true;
static final int DEFAULT_TELEMETRY_DEPENDENCY_RESOLUTION_QUEUE_SIZE = 100000;

static final Set<String> DEFAULT_TRACE_EXPERIMENTAL_FEATURES_ENABLED = new HashSet<>();
static final Set<String> DEFAULT_TRACE_EXPERIMENTAL_FEATURES_ENABLED =
new HashSet<>(asList("DD_TAGS", "DD_LOGS_INJECTION"));
Comment thread
amarziali marked this conversation as resolved.

static final boolean DEFAULT_TRACE_128_BIT_TRACEID_GENERATION_ENABLED = true;
static final boolean DEFAULT_TRACE_128_BIT_TRACEID_LOGGING_ENABLED = true;
Expand Down
5 changes: 3 additions & 2 deletions internal-api/src/main/java/datadog/trace/api/Config.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -632,8 +632,9 @@ private Config(final ConfigProvider configProvider, final InstrumenterConfig ins
SERVLET_ROOT_CONTEXT_SERVICE_NAME, DEFAULT_SERVLET_ROOT_CONTEXT_SERVICE_NAME);

experimentalFeaturesEnabled =
configProvider.getSet(
TRACE_EXPERIMENTAL_FEATURES_ENABLED, DEFAULT_TRACE_EXPERIMENTAL_FEATURES_ENABLED);
configProvider.getString(TRACE_EXPERIMENTAL_FEATURES_ENABLED, "").equals("all")
? DEFAULT_TRACE_EXPERIMENTAL_FEATURES_ENABLED
: configProvider.getSet(TRACE_EXPERIMENTAL_FEATURES_ENABLED, new HashSet<>());

integrationSynapseLegacyOperationName =
configProvider.getBoolean(INTEGRATION_SYNAPSE_LEGACY_OPERATION_NAME, false);
Expand Down
13 changes: 13 additions & 0 deletions internal-api/src/test/groovy/datadog/trace/api/ConfigTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -637,6 +637,7 @@ class ConfigTest extends DDSpecification {
System.setProperty(PREFIX + PROPAGATION_STYLE_INJECT, " ")
System.setProperty(PREFIX + TRACE_LONG_RUNNING_ENABLED, "invalid")
System.setProperty(PREFIX + TRACE_LONG_RUNNING_FLUSH_INTERVAL, "invalid")
System.setProperty(PREFIX + TRACE_EXPERIMENTAL_FEATURES_ENABLED, " ")

when:
def config = new Config()
Expand Down Expand Up @@ -666,6 +667,7 @@ class ConfigTest extends DDSpecification {
config.tracePropagationStylesToExtract.toList() == [DATADOG, TRACECONTEXT, BAGGAGE]
config.tracePropagationStylesToInject.toList() == [DATADOG, TRACECONTEXT, BAGGAGE]
config.longRunningTraceEnabled == false
config.experimentalFeaturesEnabled == [].toSet()
}

def "sys props and env vars overrides for trace_agent_port and agent_port_legacy as expected"() {
Expand Down Expand Up @@ -1928,6 +1930,17 @@ class ConfigTest extends DDSpecification {
config.globalTags == [env:"test", aKey:"aVal", bKey:"bVal"]
}

def "verify behavior of DD_TRACE_EXPERIMENTAL_FEATURE_ENABLED when value is 'all'"() {
setup:
environmentVariables.set("DD_TRACE_EXPERIMENTAL_FEATURES_ENABLED", "all")

when:
def config = new Config()

then:
config.experimentalFeaturesEnabled == ["DD_TAGS", "DD_LOGS_INJECTION"].toSet()
}

def "detect if agent is configured using default values"() {
setup:
if (host != null) {
Expand Down