Skip to content

Remove properties from TracerSettings which can change at runtime #7723

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

Open
wants to merge 4 commits into
base: andrew/settings/4-mutable-settings-service
Choose a base branch
from
+254 −321
Open

Remove properties from TracerSettings which can change at runtime #7723

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
91799c6
Update ServiceDiscoveryHelper to explicitly take MutableSettings
andrewlock Oct 22, 2025
2b4880e
Don't expose InitialMutableSettings directly on TracerSettings
andrewlock Oct 22, 2025
e4c7e03
Remove "MutableSettings properties" from TracerSettings and call the …
andrewlock Oct 22, 2025
2dfae3d
Fix more usages
andrewlock Oct 28, 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
4 changes: 2 additions & 2 deletions tracer/src/Datadog.Trace.BenchmarkDotNet/DatadogDiagnoser.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,12 +216,12 @@ private static void SetEnvironmentVariables(DiagnoserActionParameters parameters

if (!environment.TryGetValue(ConfigurationKeys.Environment, out _))
{
environment[ConfigurationKeys.Environment] = tracer.Settings.Environment;
environment[ConfigurationKeys.Environment] = tracer.CurrentTraceSettings.Settings.Environment;
}

if (!environment.TryGetValue(ConfigurationKeys.ServiceVersion, out _))
{
environment[ConfigurationKeys.ServiceVersion] = tracer.Settings.ServiceVersion;
environment[ConfigurationKeys.ServiceVersion] = tracer.CurrentTraceSettings.Settings.ServiceVersion;
}

const string ProfilerId = "{846F5F1C-F9AE-4B07-969E-05C26BC060D8}";
Expand Down
4 changes: 2 additions & 2 deletions tracer/src/Datadog.Trace/Agent/StatsAggregator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,8 @@ internal StatsAggregator(IApi api, TracerSettings settings, IDiscoveryService di

var header = new ClientStatsPayload
{
Environment = settings.Environment,
Version = settings.ServiceVersion,
Environment = settings.MutableSettings.Environment,
Version = settings.MutableSettings.ServiceVersion,
HostName = HostMetadata.Instance.Hostname
};

Expand Down
4 changes: 2 additions & 2 deletions tracer/src/Datadog.Trace/Ci/Agent/MessagePack/CIEventMessagePackFormatter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,9 @@ internal class CIEventMessagePackFormatter : EventMessagePackFormatter<CIVisibil

public CIEventMessagePackFormatter(TracerSettings tracerSettings)
{
if (!string.IsNullOrEmpty(tracerSettings.Environment))
if (!string.IsNullOrEmpty(tracerSettings.MutableSettings.Environment))
{
_environmentValueBytes = StringEncoding.UTF8.GetBytes(tracerSettings.Environment);
_environmentValueBytes = StringEncoding.UTF8.GetBytes(tracerSettings.MutableSettings.Environment);
}

var testOptimization = TestOptimization.Instance;
Expand Down
6 changes: 3 additions & 3 deletions tracer/src/Datadog.Trace/Ci/Net/TestOptimizationClient.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,11 +72,11 @@ private TestOptimizationClient(string workingDirectory, ITestOptimization testOp
var settings = _testOptimization.Settings;

_workingDirectory = workingDirectory;
_environment = TraceUtil.NormalizeTag(settings.TracerSettings.Environment ?? "none") ?? "none";
_serviceName = NormalizerTraceProcessor.NormalizeService(settings.TracerSettings.ServiceName) ?? string.Empty;
_environment = TraceUtil.NormalizeTag(settings.TracerSettings.MutableSettings.Environment ?? "none") ?? "none";
_serviceName = NormalizerTraceProcessor.NormalizeService(settings.TracerSettings.MutableSettings.ServiceName) ?? string.Empty;

// Extract custom tests configurations from DD_TAGS
_customConfigurations = GetCustomTestsConfigurations(settings.TracerSettings.GlobalTags);
_customConfigurations = GetCustomTestsConfigurations(settings.TracerSettings.MutableSettings.GlobalTags);

_apiRequestFactory = _testOptimization.TracerManagement!.GetRequestFactory(settings.TracerSettings, TimeSpan.FromSeconds(45));
_eventPlatformProxySupport = settings.Agentless ? EventPlatformProxySupport.None : _testOptimization.TracerManagement.EventPlatformProxySupport;
Expand Down
4 changes: 2 additions & 2 deletions tracer/src/Datadog.Trace/Ci/TestOptimization.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -257,7 +257,7 @@ public void Initialize()

var tracerSettings = settings.TracerSettings;
Log.Debug("TestOptimization: Setting up the test session name to: {TestSessionName}", settings.TestSessionName);
Log.Debug("TestOptimization: Setting up the service name to: {ServiceName}", tracerSettings.ServiceName);
Log.Debug("TestOptimization: Setting up the service name to: {ServiceName}", tracerSettings.MutableSettings.ServiceName);

// Initialize Tracer
Log.Information("TestOptimization: Initialize Test Tracer instance");
Expand Down Expand Up @@ -308,7 +308,7 @@ public void InitializeFromRunner(TestOptimizationSettings settings, IDiscoverySe

var tracerSettings = settings.TracerSettings;
Log.Debug("TestOptimization: Setting up the test session name to: {TestSessionName}", settings.TestSessionName);
Log.Debug("TestOptimization: Setting up the service name to: {ServiceName}", tracerSettings.ServiceName);
Log.Debug("TestOptimization: Setting up the service name to: {ServiceName}", tracerSettings.MutableSettings.ServiceName);

// Initialize Tracer
Log.Information("TestOptimization: Initialize Test Tracer instance");
Expand Down
34 changes: 17 additions & 17 deletions ...ation/ManualInstrumentation/Configuration/TracerSettings/PopulateDictionaryIntegration.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,29 +47,29 @@ internal static void PopulateSettings(Dictionary<string, object?> values, Trace.
// record all the settings in the dictionary
values[TracerSettingKeyConstants.AgentUriKey] = settings.Exporter.AgentUri;
#pragma warning disable CS0618 // Type or member is obsolete
values[TracerSettingKeyConstants.AnalyticsEnabledKey] = settings.AnalyticsEnabled;
values[TracerSettingKeyConstants.AnalyticsEnabledKey] = settings.MutableSettings.AnalyticsEnabled;
#pragma warning restore CS0618 // Type or member is obsolete
values[TracerSettingKeyConstants.CustomSamplingRules] = settings.CustomSamplingRules;
values[TracerSettingKeyConstants.CustomSamplingRules] = settings.MutableSettings.CustomSamplingRules;
values[TracerSettingKeyConstants.DiagnosticSourceEnabledKey] = GlobalSettings.Instance.DiagnosticSourceEnabled;
values[TracerSettingKeyConstants.DisabledIntegrationNamesKey] = settings.DisabledIntegrationNames;
values[TracerSettingKeyConstants.EnvironmentKey] = settings.Environment;
values[TracerSettingKeyConstants.GlobalSamplingRateKey] = settings.GlobalSamplingRate;
values[TracerSettingKeyConstants.GrpcTags] = settings.GrpcTags;
values[TracerSettingKeyConstants.HeaderTags] = settings.HeaderTags;
values[TracerSettingKeyConstants.KafkaCreateConsumerScopeEnabledKey] = settings.KafkaCreateConsumerScopeEnabled;
values[TracerSettingKeyConstants.DisabledIntegrationNamesKey] = settings.MutableSettings.DisabledIntegrationNames;
values[TracerSettingKeyConstants.EnvironmentKey] = settings.MutableSettings.Environment;
values[TracerSettingKeyConstants.GlobalSamplingRateKey] = settings.MutableSettings.GlobalSamplingRate;
values[TracerSettingKeyConstants.GrpcTags] = settings.MutableSettings.GrpcTags;
values[TracerSettingKeyConstants.HeaderTags] = settings.MutableSettings.HeaderTags;
values[TracerSettingKeyConstants.KafkaCreateConsumerScopeEnabledKey] = settings.MutableSettings.KafkaCreateConsumerScopeEnabled;
#pragma warning disable DD0002 // This API is only for public usage and should not be called internally (there's no internal version currently)
values[TracerSettingKeyConstants.LogsInjectionEnabledKey] = settings.LogsInjectionEnabled;
values[TracerSettingKeyConstants.LogsInjectionEnabledKey] = settings.MutableSettings.LogsInjectionEnabled;
#pragma warning restore DD0002
values[TracerSettingKeyConstants.MaxTracesSubmittedPerSecondKey] = settings.MaxTracesSubmittedPerSecond;
values[TracerSettingKeyConstants.ServiceNameKey] = settings.ServiceName;
values[TracerSettingKeyConstants.ServiceVersionKey] = settings.ServiceVersion;
values[TracerSettingKeyConstants.StartupDiagnosticLogEnabledKey] = settings.StartupDiagnosticLogEnabled;
values[TracerSettingKeyConstants.MaxTracesSubmittedPerSecondKey] = settings.MutableSettings.MaxTracesSubmittedPerSecond;
values[TracerSettingKeyConstants.ServiceNameKey] = settings.MutableSettings.ServiceName;
values[TracerSettingKeyConstants.ServiceVersionKey] = settings.MutableSettings.ServiceVersion;
values[TracerSettingKeyConstants.StartupDiagnosticLogEnabledKey] = settings.MutableSettings.StartupDiagnosticLogEnabled;
values[TracerSettingKeyConstants.StatsComputationEnabledKey] = settings.StatsComputationEnabled;
values[TracerSettingKeyConstants.TraceEnabledKey] = settings.TraceEnabled;
values[TracerSettingKeyConstants.TracerMetricsEnabledKey] = settings.TracerMetricsEnabled;
values[TracerSettingKeyConstants.TraceEnabledKey] = settings.MutableSettings.TraceEnabled;
values[TracerSettingKeyConstants.TracerMetricsEnabledKey] = settings.MutableSettings.TracerMetricsEnabled;

values[TracerSettingKeyConstants.GlobalTagsKey] = settings.GlobalTags;
values[TracerSettingKeyConstants.IntegrationSettingsKey] = BuildIntegrationSettings(settings.Integrations);
values[TracerSettingKeyConstants.GlobalTagsKey] = settings.MutableSettings.GlobalTags;
values[TracerSettingKeyConstants.IntegrationSettingsKey] = BuildIntegrationSettings(settings.MutableSettings.Integrations);
}

private static Dictionary<string, object?[]>? BuildIntegrationSettings(IntegrationSettingsCollection settings)
Expand Down
32 changes: 16 additions & 16 deletions ...dog.Trace/ClrProfiler/AutoInstrumentation/ManualInstrumentation/Tracer/CtorIntegration.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,30 +48,30 @@ internal static void PopulateSettings(Dictionary<string, object?> values, Tracer
// This key is used to detect if the settings have been populated _at all_, so should always be sent
values[TracerSettingKeyConstants.AgentUriKey] = settings.Exporter.AgentUri;
#pragma warning disable CS0618 // Type or member is obsolete
values[TracerSettingKeyConstants.AnalyticsEnabledKey] = settings.AnalyticsEnabled;
values[TracerSettingKeyConstants.AnalyticsEnabledKey] = settings.MutableSettings.AnalyticsEnabled;
#pragma warning restore CS0618 // Type or member is obsolete
values[TracerSettingKeyConstants.CustomSamplingRules] = settings.CustomSamplingRules;
values[TracerSettingKeyConstants.CustomSamplingRules] = settings.MutableSettings.CustomSamplingRules;
values[TracerSettingKeyConstants.DiagnosticSourceEnabledKey] = GlobalSettings.Instance.DiagnosticSourceEnabled;
values[TracerSettingKeyConstants.EnvironmentKey] = settings.Environment;
values[TracerSettingKeyConstants.GlobalSamplingRateKey] = settings.GlobalSamplingRate;
values[TracerSettingKeyConstants.KafkaCreateConsumerScopeEnabledKey] = settings.KafkaCreateConsumerScopeEnabled;
values[TracerSettingKeyConstants.EnvironmentKey] = settings.MutableSettings.Environment;
values[TracerSettingKeyConstants.GlobalSamplingRateKey] = settings.MutableSettings.GlobalSamplingRate;
values[TracerSettingKeyConstants.KafkaCreateConsumerScopeEnabledKey] = settings.MutableSettings.KafkaCreateConsumerScopeEnabled;
#pragma warning disable DD0002 // This API is only for public usage and should not be called internally (there's no internal version currently)
values[TracerSettingKeyConstants.LogsInjectionEnabledKey] = settings.LogsInjectionEnabled;
values[TracerSettingKeyConstants.LogsInjectionEnabledKey] = settings.MutableSettings.LogsInjectionEnabled;
#pragma warning restore DD0002
values[TracerSettingKeyConstants.MaxTracesSubmittedPerSecondKey] = settings.MaxTracesSubmittedPerSecond;
values[TracerSettingKeyConstants.ServiceNameKey] = settings.ServiceName;
values[TracerSettingKeyConstants.ServiceVersionKey] = settings.ServiceVersion;
values[TracerSettingKeyConstants.StartupDiagnosticLogEnabledKey] = settings.StartupDiagnosticLogEnabled;
values[TracerSettingKeyConstants.MaxTracesSubmittedPerSecondKey] = settings.MutableSettings.MaxTracesSubmittedPerSecond;
values[TracerSettingKeyConstants.ServiceNameKey] = settings.MutableSettings.ServiceName;
values[TracerSettingKeyConstants.ServiceVersionKey] = settings.MutableSettings.ServiceVersion;
values[TracerSettingKeyConstants.StartupDiagnosticLogEnabledKey] = settings.MutableSettings.StartupDiagnosticLogEnabled;
values[TracerSettingKeyConstants.StatsComputationEnabledKey] = settings.StatsComputationEnabled;
values[TracerSettingKeyConstants.TraceEnabledKey] = settings.TraceEnabled;
values[TracerSettingKeyConstants.TracerMetricsEnabledKey] = settings.TracerMetricsEnabled;
values[TracerSettingKeyConstants.TraceEnabledKey] = settings.MutableSettings.TraceEnabled;
values[TracerSettingKeyConstants.TracerMetricsEnabledKey] = settings.MutableSettings.TracerMetricsEnabled;

// probably don't _have_ to copy these dictionaries, but playing it safe
values[TracerSettingKeyConstants.GlobalTagsKey] = new ConcurrentDictionary<string, string>(settings.GlobalTags);
values[TracerSettingKeyConstants.GrpcTags] = new ConcurrentDictionary<string, string>(settings.GrpcTags);
values[TracerSettingKeyConstants.HeaderTags] = new ConcurrentDictionary<string, string>(settings.HeaderTags);
values[TracerSettingKeyConstants.GlobalTagsKey] = new ConcurrentDictionary<string, string>(settings.MutableSettings.GlobalTags);
values[TracerSettingKeyConstants.GrpcTags] = new ConcurrentDictionary<string, string>(settings.MutableSettings.GrpcTags);
values[TracerSettingKeyConstants.HeaderTags] = new ConcurrentDictionary<string, string>(settings.MutableSettings.HeaderTags);

values[TracerSettingKeyConstants.IntegrationSettingsKey] = BuildIntegrationSettings(settings.Integrations);
values[TracerSettingKeyConstants.IntegrationSettingsKey] = BuildIntegrationSettings(settings.MutableSettings.Integrations);
}

private static Dictionary<string, object?[]>? BuildIntegrationSettings(IntegrationSettingsCollection settings)
Expand Down
6 changes: 3 additions & 3 deletions tracer/src/Datadog.Trace/ClrProfiler/Instrumentation.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,14 +93,14 @@ private static void PropagateStableConfiguration()
_ => NativeInterop.ProfilingEnabled.Disabled
},

TracingEnabled = tracerSettings.TraceEnabled,
TracingEnabled = tracerSettings.MutableSettings.TraceEnabled,
IastEnabled = Iast.Iast.Instance.Settings.Enabled,
RaspEnabled = Security.Instance.Settings.RaspEnabled,
DynamicInstrumentationEnabled = false, // TODO: find where to get this value from but for the other native p/invoke call
RuntimeId = RuntimeId.Get(),
Environment = tracerSettings.Environment,
Environment = tracerSettings.MutableSettings.Environment,
ServiceName = tracer.DefaultServiceName,
Version = tracerSettings.ServiceVersion
Version = tracerSettings.MutableSettings.ServiceVersion
};

// Make sure nothing bubbles up, even if there are issues
Expand Down
2 changes: 1 addition & 1 deletion tracer/src/Datadog.Trace/Configuration/ConfigurationKeys.Logging.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ internal static partial class ConfigurationKeys
/// <summary>
/// Configuration key for enabling or disabling the diagnostic log at startup
/// </summary>
/// <seealso cref="TracerSettings.StartupDiagnosticLogEnabled"/>
/// <seealso cref="MutableSettings.StartupDiagnosticLogEnabled"/>
public const string StartupDiagnosticLogEnabled = "DD_TRACE_STARTUP_LOGS";

/// <summary>
Expand Down
Loading
Loading