Expose MutableSettings on PerTraceSettings, as a way to provide the default service name

andrewlock · andrewlock · commit 75da55420cbd · 2025-09-18T11:47:58.000+01:00
diff --git a/tracer/src/Datadog.Trace/Ci/TestOptimizationTracerManager.cs b/tracer/src/Datadog.Trace/Ci/TestOptimizationTracerManager.cs
@@ -38,7 +38,6 @@ public TestOptimizationTracerManager(
             ITelemetryController telemetry,
             IDiscoveryService discoveryService,
             DataStreamsManager dataStreamsManager,
-            string defaultServiceName,
             IGitMetadataTagsProvider gitMetadataTagsProvider,
             ITraceSampler traceSampler,
             ISpanSampler spanSampler,
@@ -56,7 +55,6 @@ public TestOptimizationTracerManager(
                 telemetry,
                 discoveryService,
                 dataStreamsManager,
-                defaultServiceName,
                 gitMetadataTagsProvider,
                 traceSampler,
                 spanSampler,
@@ -156,7 +154,6 @@ public LockedManager(
                 ITelemetryController telemetry,
                 IDiscoveryService discoveryService,
                 DataStreamsManager dataStreamsManager,
-                string defaultServiceName,
                 IGitMetadataTagsProvider gitMetadataTagsProvider,
                 ITraceSampler traceSampler,
                 ISpanSampler spanSampler,
@@ -174,7 +171,6 @@ public LockedManager(
                 telemetry,
                 discoveryService,
                 dataStreamsManager,
-                defaultServiceName,
                 gitMetadataTagsProvider,
                 traceSampler,
                 spanSampler,
diff --git a/tracer/src/Datadog.Trace/Ci/TestOptimizationTracerManagerFactory.cs b/tracer/src/Datadog.Trace/Ci/TestOptimizationTracerManagerFactory.cs
@@ -47,7 +47,6 @@ protected override TracerManager CreateTracerManagerFrom(
             ITelemetryController telemetry,
             IDiscoveryService discoveryService,
             DataStreamsManager dataStreamsManager,
-            string defaultServiceName,
             IGitMetadataTagsProvider gitMetadataTagsProvider,
             ITraceSampler traceSampler,
             ISpanSampler spanSampler,
@@ -59,10 +58,10 @@ protected override TracerManager CreateTracerManagerFrom(
             telemetry.RecordTestOptimizationSettings(_settings);
             if (_testOptimizationTracerManagement.UseLockedTracerManager)
             {
-                return new TestOptimizationTracerManager.LockedManager(settings, agentWriter, scopeManager, statsd, runtimeMetrics, logSubmissionManager, telemetry, discoveryService, dataStreamsManager, defaultServiceName, gitMetadataTagsProvider, traceSampler, spanSampler, remoteConfigurationManager, dynamicConfigurationManager, tracerFlareManager, spanEventsManager);
+                return new TestOptimizationTracerManager.LockedManager(settings, agentWriter, scopeManager, statsd, runtimeMetrics, logSubmissionManager, telemetry, discoveryService, dataStreamsManager, gitMetadataTagsProvider, traceSampler, spanSampler, remoteConfigurationManager, dynamicConfigurationManager, tracerFlareManager, spanEventsManager);
             }
 
-            return new TestOptimizationTracerManager(settings, agentWriter, scopeManager, statsd, runtimeMetrics, logSubmissionManager, telemetry, discoveryService, dataStreamsManager, defaultServiceName, gitMetadataTagsProvider, traceSampler, spanSampler, remoteConfigurationManager, dynamicConfigurationManager, tracerFlareManager, spanEventsManager);
+            return new TestOptimizationTracerManager(settings, agentWriter, scopeManager, statsd, runtimeMetrics, logSubmissionManager, telemetry, discoveryService, dataStreamsManager, gitMetadataTagsProvider, traceSampler, spanSampler, remoteConfigurationManager, dynamicConfigurationManager, tracerFlareManager, spanEventsManager);
         }
 
         protected override ITelemetryController CreateTelemetryController(TracerSettings settings, IDiscoveryService discoveryService)
diff --git a/tracer/src/Datadog.Trace/Configuration/PerTraceSettings.cs b/tracer/src/Datadog.Trace/Configuration/PerTraceSettings.cs
@@ -16,13 +16,14 @@ internal class PerTraceSettings
     {
         private readonly ConcurrentDictionary<string, string> _serviceNameCache = new();
 
-        public PerTraceSettings(ITraceSampler? traceSampler, ISpanSampler? spanSampler, IReadOnlyDictionary<string, string> serviceNames, NamingSchema schema)
+        public PerTraceSettings(ITraceSampler? traceSampler, ISpanSampler? spanSampler, IReadOnlyDictionary<string, string> serviceNames, NamingSchema schema, MutableSettings mutableSettings)
         {
             TraceSampler = traceSampler;
             SpanSampler = spanSampler;
             ServiceNames = serviceNames;
             Schema = schema;
             HasResourceBasedSamplingRule = (traceSampler?.HasResourceBasedSamplingRule ?? false) || (spanSampler?.HasResourceBasedSamplingRule ?? false);
+            Settings = mutableSettings;
         }
 
         public ITraceSampler? TraceSampler { get; }
@@ -35,6 +36,8 @@ public PerTraceSettings(ITraceSampler? traceSampler, ISpanSampler? spanSampler,
 
         public bool HasResourceBasedSamplingRule { get; }
 
+        public MutableSettings Settings { get; }
+
         internal string GetServiceName(Tracer tracer, string serviceName)
         {
             if (ServiceNames.TryGetValue(serviceName, out var name))
diff --git a/tracer/src/Datadog.Trace/Debugger/DebuggerManager.cs b/tracer/src/Datadog.Trace/Debugger/DebuggerManager.cs
@@ -111,7 +111,7 @@ private string GetServiceName(TracerSettings tracerSettings)
             catch (Exception e)
             {
                 Log.Error(e, "Could not set `DynamicInstrumentationHelper.ServiceName`.");
-                return TracerManager.Instance.DefaultServiceName;
+                return tracerSettings.MutableSettings.DefaultServiceName;
             }
         }
 
diff --git a/tracer/src/Datadog.Trace/Tracer.cs b/tracer/src/Datadog.Trace/Tracer.cs
@@ -220,7 +220,7 @@ public IScope ActiveScope
         /// <summary>
         /// Gets the default service name for traces where a service name is not specified.
         /// </summary>
-        public string DefaultServiceName => TracerManager.DefaultServiceName;
+        public string DefaultServiceName => CurrentTraceSettings.Settings.DefaultServiceName;
 
         /// <summary>
         /// Gets the git metadata provider.
diff --git a/tracer/src/Datadog.Trace/TracerManager.cs b/tracer/src/Datadog.Trace/TracerManager.cs
@@ -63,7 +63,6 @@ public TracerManager(
             ITelemetryController telemetry,
             IDiscoveryService discoveryService,
             DataStreamsManager dataStreamsManager,
-            string defaultServiceName,
             IGitMetadataTagsProvider gitMetadataTagsProvider,
             ITraceSampler traceSampler,
             ISpanSampler spanSampler,
@@ -78,7 +77,6 @@ public TracerManager(
             ScopeManager = scopeManager;
             Statsd = statsd;
             RuntimeMetrics = runtimeMetricsWriter;
-            DefaultServiceName = defaultServiceName;
             GitMetadataTagsProvider = gitMetadataTagsProvider;
             DataStreamsManager = dataStreamsManager;
             DirectLogSubmission = directLogSubmission;
@@ -102,8 +100,8 @@ public TracerManager(
             TracerFlareManager = tracerFlareManager;
             SpanEventsManager = new SpanEventsManager(discoveryService);
 
-            var schema = new NamingSchema(settings.MetadataSchemaVersion, settings.PeerServiceTagsEnabled, settings.RemoveClientServiceNamesEnabled, defaultServiceName, settings.ServiceNameMappings, settings.PeerServiceNameMappings);
-            PerTraceSettings = new(traceSampler, spanSampler, settings.ServiceNameMappings, schema);
+            var schema = new NamingSchema(settings.MetadataSchemaVersion, settings.PeerServiceTagsEnabled, settings.RemoveClientServiceNamesEnabled, settings.MutableSettings.DefaultServiceName, settings.ServiceNameMappings, settings.PeerServiceNameMappings);
+            PerTraceSettings = new(traceSampler, spanSampler, settings.ServiceNameMappings, schema, settings.MutableSettings);
 
             SpanContextPropagator = SpanContextPropagatorFactory.GetSpanContextPropagator(settings.PropagationStyleInject, settings.PropagationStyleExtract, settings.PropagationExtractFirstOnly, settings.PropagationBehaviorExtract);
         }
@@ -123,11 +121,6 @@ public static TracerManager Instance
             }
         }
 
-        /// <summary>
-        /// Gets the default service name for traces where a service name is not specified.
-        /// </summary>
-        public string DefaultServiceName { get; }
-
         public IGitMetadataTagsProvider GitMetadataTagsProvider { get; }
 
         /// <summary>
@@ -390,7 +383,7 @@ void WriteDictionary(IReadOnlyDictionary<string, string> dictionary)
                     writer.WriteValue(instanceSettings.TraceEnabled);
 
                     writer.WritePropertyName("service");
-                    writer.WriteValue(instance.DefaultServiceName);
+                    writer.WriteValue(instance.PerTraceSettings.Settings.DefaultServiceName);
 
                     writer.WritePropertyName("agent_url");
                     writer.WriteValue(instanceSettings.Exporter.TraceAgentUriBase);
diff --git a/tracer/src/Datadog.Trace/TracerManagerFactory.cs b/tracer/src/Datadog.Trace/TracerManagerFactory.cs
@@ -74,7 +74,7 @@ internal TracerManager CreateTracerManager(TracerSettings settings, TracerManage
             {
                 if (Profiler.Instance.Status.IsProfilerReady)
                 {
-                    NativeInterop.SetApplicationInfoForAppDomain(RuntimeId.Get(), tracer.DefaultServiceName, tracer.Settings.Environment, tracer.Settings.ServiceVersion);
+                    NativeInterop.SetApplicationInfoForAppDomain(RuntimeId.Get(), tracer.PerTraceSettings.Settings.DefaultServiceName, tracer.Settings.Environment, tracer.Settings.ServiceVersion);
                 }
             }
             catch (Exception ex)
@@ -121,7 +121,7 @@ internal TracerManager CreateTracerManager(
                 Log.Warning(libdatadogAvailaibility.Exception, "An exception occurred while checking if libdatadog is available");
             }
 
-            var defaultServiceName = settings.MutableSettings.ServiceName ?? ApplicationNameHelpers.GetFallbackApplicationName(settings);
+            var defaultServiceName = settings.MutableSettings.DefaultServiceName;
 
             discoveryService ??= GetDiscoveryService(settings);
 
@@ -183,7 +183,7 @@ internal TracerManager CreateTracerManager(
                     var rcmApi = RemoteConfigurationApiFactory.Create(settings.Exporter, rcmSettings, discoveryService);
 
                     // Service Name must be lowercase, otherwise the agent will not be able to find the service
-                    var serviceName = TraceUtil.NormalizeTag(settings.ServiceName ?? defaultServiceName);
+                    var serviceName = TraceUtil.NormalizeTag(defaultServiceName);
 
                     remoteConfigurationManager =
                         RemoteConfigurationManager.Create(
@@ -225,7 +225,6 @@ internal TracerManager CreateTracerManager(
                 telemetry,
                 discoveryService,
                 dataStreamsManager,
-                defaultServiceName,
                 gitMetadataTagsProvider,
                 sampler,
                 GetSpanSampler(settings),
@@ -261,15 +260,14 @@ protected virtual TracerManager CreateTracerManagerFrom(
             ITelemetryController telemetry,
             IDiscoveryService discoveryService,
             DataStreamsManager dataStreamsManager,
-            string defaultServiceName,
             IGitMetadataTagsProvider gitMetadataTagsProvider,
             ITraceSampler traceSampler,
             ISpanSampler spanSampler,
             IRemoteConfigurationManager remoteConfigurationManager,
             IDynamicConfigurationManager dynamicConfigurationManager,
             ITracerFlareManager tracerFlareManager,
             ISpanEventsManager spanEventsManager)
-            => new TracerManager(settings, agentWriter, scopeManager, statsd, runtimeMetrics, logSubmissionManager, telemetry, discoveryService, dataStreamsManager, defaultServiceName, gitMetadataTagsProvider, traceSampler, spanSampler, remoteConfigurationManager, dynamicConfigurationManager, tracerFlareManager, spanEventsManager);
+            => new TracerManager(settings, agentWriter, scopeManager, statsd, runtimeMetrics, logSubmissionManager, telemetry, discoveryService, dataStreamsManager, gitMetadataTagsProvider, traceSampler, spanSampler, remoteConfigurationManager, dynamicConfigurationManager, tracerFlareManager, spanEventsManager);
 
         protected virtual ITraceSampler GetSampler(TracerSettings settings)
         {
diff --git a/tracer/test/Datadog.Trace.Tests/TracerInstanceTest.cs b/tracer/test/Datadog.Trace.Tests/TracerInstanceTest.cs
@@ -121,7 +121,7 @@ internal LockedTracer()
         private class LockedTracerManager : TracerManager, ILockedTracer
         {
             public LockedTracerManager()
-                : base(new TracerSettings(), null, null, null, null, null, null, null, null, null, null, null, null, Mock.Of<IRemoteConfigurationManager>(), Mock.Of<IDynamicConfigurationManager>(), Mock.Of<ITracerFlareManager>(), Mock.Of<ISpanEventsManager>())
+                : base(new TracerSettings(), null, null, null, null, null, null, null, null, null, null, null, Mock.Of<IRemoteConfigurationManager>(), Mock.Of<IDynamicConfigurationManager>(), Mock.Of<ITracerFlareManager>(), Mock.Of<ISpanEventsManager>())
             {
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,6 @@ protected override TracerManager CreateTracerManagerFrom(`
`47`	`47`	`ITelemetryController telemetry,`
`48`	`48`	`IDiscoveryService discoveryService,`
`49`	`49`	`DataStreamsManager dataStreamsManager,`
`50`		`- string defaultServiceName,`
`51`	`50`	`IGitMetadataTagsProvider gitMetadataTagsProvider,`
`52`	`51`	`ITraceSampler traceSampler,`
`53`	`52`	`ISpanSampler spanSampler,`
`@@ -59,10 +58,10 @@ protected override TracerManager CreateTracerManagerFrom(`
`59`	`58`	`telemetry.RecordTestOptimizationSettings(_settings);`
`60`	`59`	`if (_testOptimizationTracerManagement.UseLockedTracerManager)`
`61`	`60`	`{`
`62`		`- return new TestOptimizationTracerManager.LockedManager(settings, agentWriter, scopeManager, statsd, runtimeMetrics, logSubmissionManager, telemetry, discoveryService, dataStreamsManager, defaultServiceName, gitMetadataTagsProvider, traceSampler, spanSampler, remoteConfigurationManager, dynamicConfigurationManager, tracerFlareManager, spanEventsManager);`
	`61`	`+ return new TestOptimizationTracerManager.LockedManager(settings, agentWriter, scopeManager, statsd, runtimeMetrics, logSubmissionManager, telemetry, discoveryService, dataStreamsManager, gitMetadataTagsProvider, traceSampler, spanSampler, remoteConfigurationManager, dynamicConfigurationManager, tracerFlareManager, spanEventsManager);`
`63`	`62`	`}`
`64`	`63`
`65`		`- return new TestOptimizationTracerManager(settings, agentWriter, scopeManager, statsd, runtimeMetrics, logSubmissionManager, telemetry, discoveryService, dataStreamsManager, defaultServiceName, gitMetadataTagsProvider, traceSampler, spanSampler, remoteConfigurationManager, dynamicConfigurationManager, tracerFlareManager, spanEventsManager);`
	`64`	`+ return new TestOptimizationTracerManager(settings, agentWriter, scopeManager, statsd, runtimeMetrics, logSubmissionManager, telemetry, discoveryService, dataStreamsManager, gitMetadataTagsProvider, traceSampler, spanSampler, remoteConfigurationManager, dynamicConfigurationManager, tracerFlareManager, spanEventsManager);`
`66`	`65`	`}`
`67`	`66`
`68`	`67`	`protected override ITelemetryController CreateTelemetryController(TracerSettings settings, IDiscoveryService discoveryService)`
Original file line number	Diff line number	Diff line change
`@@ -16,13 +16,14 @@ internal class PerTraceSettings`
`16`	`16`	`{`
`17`	`17`	`private readonly ConcurrentDictionary<string, string> _serviceNameCache = new();`
`18`	`18`
`19`		`- public PerTraceSettings(ITraceSampler? traceSampler, ISpanSampler? spanSampler, IReadOnlyDictionary<string, string> serviceNames, NamingSchema schema)`
	`19`	`+ public PerTraceSettings(ITraceSampler? traceSampler, ISpanSampler? spanSampler, IReadOnlyDictionary<string, string> serviceNames, NamingSchema schema, MutableSettings mutableSettings)`
`20`	`20`	`{`
`21`	`21`	`TraceSampler = traceSampler;`
`22`	`22`	`SpanSampler = spanSampler;`
`23`	`23`	`ServiceNames = serviceNames;`
`24`	`24`	`Schema = schema;`
`25`	`25`	`HasResourceBasedSamplingRule = (traceSampler?.HasResourceBasedSamplingRule ?? false) \|\| (spanSampler?.HasResourceBasedSamplingRule ?? false);`
	`26`	`+ Settings = mutableSettings;`
`26`	`27`	`}`
`27`	`28`
`28`	`29`	`public ITraceSampler? TraceSampler { get; }`
`@@ -35,6 +36,8 @@ public PerTraceSettings(ITraceSampler? traceSampler, ISpanSampler? spanSampler,`
`35`	`36`
`36`	`37`	`public bool HasResourceBasedSamplingRule { get; }`
`37`	`38`
	`39`	`+ public MutableSettings Settings { get; }`
	`40`	`+`
`38`	`41`	`internal string GetServiceName(Tracer tracer, string serviceName)`
`39`	`42`	`{`
`40`	`43`	`if (ServiceNames.TryGetValue(serviceName, out var name))`
Original file line number	Diff line number	Diff line change
`@@ -111,7 +111,7 @@ private string GetServiceName(TracerSettings tracerSettings)`
`111`	`111`	`catch (Exception e)`
`112`	`112`	`{`
`113`	`113`	Log.Error(e, "Could not set `DynamicInstrumentationHelper.ServiceName`.");
`114`		`- return TracerManager.Instance.DefaultServiceName;`
	`114`	`+ return tracerSettings.MutableSettings.DefaultServiceName;`
`115`	`115`	`}`
`116`	`116`	`}`
`117`	`117`
Original file line number	Diff line number	Diff line change
`@@ -121,7 +121,7 @@ internal LockedTracer()`
`121`	`121`	`private class LockedTracerManager : TracerManager, ILockedTracer`
`122`	`122`	`{`
`123`	`123`	`public LockedTracerManager()`
`124`		`- : base(new TracerSettings(), null, null, null, null, null, null, null, null, null, null, null, null, Mock.Of<IRemoteConfigurationManager>(), Mock.Of<IDynamicConfigurationManager>(), Mock.Of<ITracerFlareManager>(), Mock.Of<ISpanEventsManager>())`
	`124`	`+ : base(new TracerSettings(), null, null, null, null, null, null, null, null, null, null, null, Mock.Of<IRemoteConfigurationManager>(), Mock.Of<IDynamicConfigurationManager>(), Mock.Of<ITracerFlareManager>(), Mock.Of<ISpanEventsManager>())`
`125`	`125`	`{`
`126`	`126`	`}`
`127`	`127`	`}`