Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
4 changes: 2 additions & 2 deletions tracer/src/Datadog.Trace/Configuration/TracerSettings.cs
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ namespace Datadog.Trace.Configuration
public partial record TracerSettings
{
private static readonly IDatadogLogger Log = DatadogLogging.GetLoggerFor<TracerSettings>();
private static readonly HashSet<string> DefaultExperimentalFeatures = ["DD_TAGS", ConfigurationKeys.PropagateProcessTags];
private static readonly HashSet<string> DefaultExperimentalFeatures = ["DD_TAGS"];

private readonly Lazy<string> _fallbackApplicationName;

Expand Down Expand Up @@ -87,7 +87,7 @@ internal TracerSettings(IConfigurationSource? source, IConfigurationTelemetry te

PropagateProcessTags = config
.WithKeys(ConfigurationKeys.PropagateProcessTags)
.AsBool(ExperimentalFeaturesEnabled.Contains(ConfigurationKeys.PropagateProcessTags)); // read it as "defaults to false"
.AsBool(true);

GCPFunctionSettings = new ImmutableGCPFunctionSettings(source, telemetry);
IsRunningInGCPFunctions = GCPFunctionSettings.IsGCPFunction;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -766,9 +766,9 @@ supportedConfigurations:
const_name: UseUnsafeEncoder
documentation: Use new unsafe encoder for the waf
DD_EXPERIMENTAL_PROPAGATE_PROCESS_TAGS_ENABLED:
- implementation: A
- implementation: B
type: boolean
default: 'false'
default: 'true'
const_name: PropagateProcessTags
documentation: |-
Enables propagation of process-level tags across traces. Type: `boolean`. Default: `false`
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1069,27 +1069,13 @@ public void OtlpLogsTimeoutMsFallback(string logsTimeout, string generalTimeout,
}

[Theory]
[MemberData(nameof(BooleanTestCases), false)]
[MemberData(nameof(BooleanTestCases), true)]
public void ProcessTagsEnabled(string value, bool expected)
{
var source = CreateConfigurationSource((ConfigurationKeys.PropagateProcessTags, value));
var settings = new TracerSettings(source);

settings.PropagateProcessTags.Should().Be(expected);
}

[Theory]
[InlineData(null, false)]
[InlineData("", false)]
[InlineData("none", false)]
[InlineData("all", true)]
[InlineData(ConfigurationKeys.PropagateProcessTags, true)]
public void ProcessTagsEnabledIfExperimentalEnabled(string value, bool expected)
{
var source = CreateConfigurationSource((ConfigurationKeys.ExperimentalFeaturesEnabled, value));
var settings = new TracerSettings(source);

settings.PropagateProcessTags.Should().Be(expected);
}
}
}
Loading