Store the SettingsManager on the global TracerManager instance

Author: andrewlock

tracer/src/Datadog.Trace/Ci/TestOptimizationTracerManager.cs

@@ -44,7 +44,8 @@ public TestOptimizationTracerManager(
             IRemoteConfigurationManager remoteConfigurationManager,
             IDynamicConfigurationManager dynamicConfigurationManager,
             ITracerFlareManager tracerFlareManager,
-            ISpanEventsManager spanEventsManager)
+            ISpanEventsManager spanEventsManager,
+            SettingsManager settingsManager)
             : base(
                 settings,
                 agentWriter,
@@ -62,6 +63,7 @@ public TestOptimizationTracerManager(
                 dynamicConfigurationManager,
                 tracerFlareManager,
                 spanEventsManager,
+                settingsManager,
                 GetProcessors(settings.PartialFlushEnabled, agentWriter is CIVisibilityProtocolWriter))
         {
         }
@@ -160,7 +162,8 @@ public LockedManager(
                 IRemoteConfigurationManager remoteConfigurationManager,
                 IDynamicConfigurationManager dynamicConfigurationManager,
                 ITracerFlareManager tracerFlareManager,
-                ISpanEventsManager spanEventsManager)
+                ISpanEventsManager spanEventsManager,
+                SettingsManager settingsManager)
             : base(
                 settings,
                 agentWriter,
@@ -177,7 +180,8 @@ public LockedManager(
                 remoteConfigurationManager,
                 dynamicConfigurationManager,
                 tracerFlareManager,
-                spanEventsManager)
+                spanEventsManager,
+                settingsManager)
             {
             }
         }

tracer/src/Datadog.Trace/Ci/TestOptimizationTracerManagerFactory.cs

@@ -53,15 +53,16 @@ protected override TracerManager CreateTracerManagerFrom(
             IRemoteConfigurationManager remoteConfigurationManager,
             IDynamicConfigurationManager dynamicConfigurationManager,
             ITracerFlareManager tracerFlareManager,
-            ISpanEventsManager spanEventsManager)
+            ISpanEventsManager spanEventsManager,
+            SettingsManager settingsManager)
         {
             telemetry.RecordTestOptimizationSettings(_settings);
             if (_testOptimizationTracerManagement.UseLockedTracerManager)
             {
-                return new TestOptimizationTracerManager.LockedManager(settings, agentWriter, scopeManager, statsd, runtimeMetrics, logSubmissionManager, telemetry, discoveryService, dataStreamsManager, 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, settingsManager);
             }
 
-            return new TestOptimizationTracerManager(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, gitMetadataTagsProvider, traceSampler, spanSampler, remoteConfigurationManager, dynamicConfigurationManager, tracerFlareManager, spanEventsManager, settingsManager);
         }
 
         protected override ITelemetryController CreateTelemetryController(TracerSettings settings, IDiscoveryService discoveryService)

tracer/src/Datadog.Trace/Tracer.cs

@@ -52,7 +52,7 @@ public class Tracer : IDatadogTracer, IDatadogOpenTracingTracer
         /// The <see cref="TracerManager"/> created will be scoped specifically to this instance.
         /// </summary>
         internal Tracer(TracerSettings settings, IAgentWriter agentWriter, ITraceSampler sampler, IScopeManager scopeManager, IDogStatsd statsd, ITelemetryController telemetry = null, IDiscoveryService discoveryService = null)
-            : this(TracerManagerFactory.Instance.CreateTracerManager(settings, agentWriter, sampler, scopeManager, statsd, runtimeMetrics: null, logSubmissionManager: null, telemetry: telemetry ?? NullTelemetryController.Instance, discoveryService ?? NullDiscoveryService.Instance, dataStreamsManager: null, remoteConfigurationManager: null, dynamicConfigurationManager: null, tracerFlareManager: null, spanEventsManager: null))
+            : this(TracerManagerFactory.Instance.CreateTracerManager(settings, agentWriter, sampler, scopeManager, statsd, runtimeMetrics: null, logSubmissionManager: null, telemetry: telemetry ?? NullTelemetryController.Instance, discoveryService ?? NullDiscoveryService.Instance, dataStreamsManager: null, remoteConfigurationManager: null, dynamicConfigurationManager: null, tracerFlareManager: null, spanEventsManager: null, settingsManager: null))
         {
         }
 

tracer/src/Datadog.Trace/TracerManager.cs

@@ -70,6 +70,7 @@ public TracerManager(
             IDynamicConfigurationManager dynamicConfigurationManager,
             ITracerFlareManager tracerFlareManager,
             ISpanEventsManager spanEventsManager,
+            SettingsManager settingsManager,
             ITraceProcessor[] traceProcessors = null)
         {
             Settings = settings;
@@ -98,6 +99,7 @@ public TracerManager(
             RemoteConfigurationManager = remoteConfigurationManager;
             DynamicConfigurationManager = dynamicConfigurationManager;
             TracerFlareManager = tracerFlareManager;
+            SettingsManager = settingsManager;
             SpanEventsManager = new SpanEventsManager(discoveryService);
 
             var schema = new NamingSchema(settings.MetadataSchemaVersion, settings.PeerServiceTagsEnabled, settings.RemoveClientServiceNamesEnabled, settings.MutableSettings.DefaultServiceName, settings.MutableSettings.ServiceNameMappings, settings.PeerServiceNameMappings);
@@ -158,6 +160,8 @@ public static TracerManager Instance
 
         public ITracerFlareManager TracerFlareManager { get; }
 
+        public SettingsManager SettingsManager { get; }
+
         public RuntimeMetricsWriter RuntimeMetrics { get; }
 
         public ISpanEventsManager SpanEventsManager { get; }

tracer/src/Datadog.Trace/TracerManagerFactory.cs

@@ -68,7 +68,8 @@ internal TracerManager CreateTracerManager(TracerSettings settings, TracerManage
                 remoteConfigurationManager: null,
                 dynamicConfigurationManager: null,
                 tracerFlareManager: null,
-                spanEventsManager: null);
+                spanEventsManager: null,
+                settingsManager: previous?.SettingsManager);
 
             try
             {
@@ -107,7 +108,8 @@ internal TracerManager CreateTracerManager(
             IRemoteConfigurationManager remoteConfigurationManager,
             IDynamicConfigurationManager dynamicConfigurationManager,
             ITracerFlareManager tracerFlareManager,
-            ISpanEventsManager spanEventsManager)
+            ISpanEventsManager spanEventsManager,
+            SettingsManager settingsManager)
         {
             settings ??= TracerSettings.FromDefaultSourcesInternal();
             var result = GlobalConfigurationSource.CreationResult;
@@ -116,6 +118,9 @@ internal TracerManager CreateTracerManager(
                 Log.Warning(result.Exception, "Failed to create the global configuration source with status: {Status} and error message: {ErrorMessage}", result.Result.ToString(), result.ErrorMessage);
             }
 
+            // TODO: Move the initial settings from TracerSettings to be created in SettingsManager here and not exposed in TracerSettings
+            settingsManager ??= new SettingsManager(settings, settings.InitialMutableSettings, settings.Exporter);
+
             var libdatadogAvailaibility = LibDatadogAvailabilityHelper.IsLibDatadogAvailable;
             if (libdatadogAvailaibility.Exception is not null)
             {
@@ -232,7 +237,8 @@ internal TracerManager CreateTracerManager(
                 remoteConfigurationManager,
                 dynamicConfigurationManager,
                 tracerFlareManager,
-                spanEventsManager);
+                spanEventsManager,
+                settingsManager);
         }
 
         protected virtual ITelemetryController CreateTelemetryController(TracerSettings settings, IDiscoveryService discoveryService)
@@ -267,8 +273,9 @@ protected virtual TracerManager CreateTracerManagerFrom(
             IRemoteConfigurationManager remoteConfigurationManager,
             IDynamicConfigurationManager dynamicConfigurationManager,
             ITracerFlareManager tracerFlareManager,
-            ISpanEventsManager spanEventsManager)
-            => new TracerManager(settings, agentWriter, scopeManager, statsd, runtimeMetrics, logSubmissionManager, telemetry, discoveryService, dataStreamsManager, gitMetadataTagsProvider, traceSampler, spanSampler, remoteConfigurationManager, dynamicConfigurationManager, tracerFlareManager, spanEventsManager);
+            ISpanEventsManager spanEventsManager,
+            SettingsManager settingsManager)
+            => new TracerManager(settings, agentWriter, scopeManager, statsd, runtimeMetrics, logSubmissionManager, telemetry, discoveryService, dataStreamsManager, gitMetadataTagsProvider, traceSampler, spanSampler, remoteConfigurationManager, dynamicConfigurationManager, tracerFlareManager, spanEventsManager, settingsManager);
 
         protected virtual ITraceSampler GetSampler(TracerSettings settings)
         {

tracer/test/Datadog.Trace.Tests/TracerManagerFactoryTests.cs

@@ -119,7 +119,8 @@ private static TracerManager CreateTracerManager(TracerSettings settings)
             remoteConfigurationManager: null,
             dynamicConfigurationManager: null,
             tracerFlareManager: null,
-            spanEventsManager: null);
+            spanEventsManager: null,
+            settingsManager: null);
 
         static DirectLogSubmissionManager BuildLogSubmissionManager()
             => DirectLogSubmissionManager.Create(