Skip to content

Commit 36ba616

Browse files
committed
TracerSettings no longer uses DynamicSettings
1 parent d6deba1 commit 36ba616

File tree

1 file changed

+7
-9
lines changed

1 file changed

+7
-9
lines changed

tracer/src/Datadog.Trace/Configuration/TracerSettings.cs

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -675,7 +675,7 @@ not null when string.Equals(x, "lowmemory", StringComparison.OrdinalIgnoreCase)
675675
internal bool GitMetadataEnabled { get; }
676676

677677
/// <inheritdoc cref="MutableSettings.TraceEnabled"/>
678-
public bool TraceEnabled => DynamicSettings.TraceEnabled ?? MutableSettings.TraceEnabled;
678+
public bool TraceEnabled => MutableSettings.TraceEnabled;
679679

680680
/// <summary>
681681
/// Gets a value indicating whether APM traces are enabled.
@@ -777,15 +777,15 @@ not null when string.Equals(x, "lowmemory", StringComparison.OrdinalIgnoreCase)
777777
public bool AnalyticsEnabled => MutableSettings.AnalyticsEnabled;
778778

779779
/// <inheritdoc cref="MutableSettings.LogsInjectionEnabled"/>
780-
public bool LogsInjectionEnabled => DynamicSettings.LogsInjectionEnabled ?? MutableSettings.LogsInjectionEnabled;
780+
public bool LogsInjectionEnabled => MutableSettings.LogsInjectionEnabled;
781781

782782
/// <inheritdoc cref="MutableSettings.MaxTracesSubmittedPerSecond"/>
783783
public int MaxTracesSubmittedPerSecond => MutableSettings.MaxTracesSubmittedPerSecond;
784784

785785
/// <inheritdoc cref="MutableSettings.CustomSamplingRules"/>
786-
public string? CustomSamplingRules => DynamicSettings.SamplingRules ?? MutableSettings.CustomSamplingRules;
786+
public string? CustomSamplingRules => MutableSettings.CustomSamplingRules;
787787

788-
internal bool CustomSamplingRulesIsRemote => DynamicSettings.SamplingRules != null;
788+
internal bool CustomSamplingRulesIsRemote => MutableSettings.CustomSamplingRulesIsRemote;
789789

790790
/// <summary>
791791
/// Gets a value indicating the format for custom trace sampling rules ("regex" or "glob").
@@ -801,16 +801,16 @@ not null when string.Equals(x, "lowmemory", StringComparison.OrdinalIgnoreCase)
801801
internal string? SpanSamplingRules { get; }
802802

803803
/// <inheritdoc cref="MutableSettings.GlobalSamplingRate"/>
804-
public double? GlobalSamplingRate => DynamicSettings.GlobalSamplingRate ?? MutableSettings.GlobalSamplingRate;
804+
public double? GlobalSamplingRate => MutableSettings.GlobalSamplingRate;
805805

806806
/// <inheritdoc cref="MutableSettings.Integrations"/>
807807
public IntegrationSettingsCollection Integrations => MutableSettings.Integrations;
808808

809809
/// <inheritdoc cref="MutableSettings.GlobalTags"/>
810-
public IReadOnlyDictionary<string, string> GlobalTags => DynamicSettings.GlobalTags ?? MutableSettings.GlobalTags;
810+
public IReadOnlyDictionary<string, string> GlobalTags => MutableSettings.GlobalTags;
811811

812812
/// <inheritdoc cref="MutableSettings.HeaderTags"/>
813-
public IReadOnlyDictionary<string, string> HeaderTags => DynamicSettings.HeaderTags ?? MutableSettings.HeaderTags;
813+
public IReadOnlyDictionary<string, string> HeaderTags => MutableSettings.HeaderTags;
814814

815815
/// <summary>
816816
/// Gets a custom request header configured to read the ip from. For backward compatibility, it fallbacks on DD_APPSEC_IPHEADER
@@ -1170,8 +1170,6 @@ public bool DiagnosticSourceEnabled
11701170
/// </summary>
11711171
public int PartialFlushMinSpans { get; }
11721172

1173-
internal ImmutableDynamicSettings DynamicSettings { get; init; } = new();
1174-
11751173
internal List<string> JsonConfigurationFilePaths { get; } = new();
11761174

11771175
/// <summary>

0 commit comments

Comments
 (0)