Move SettingsManager to live on TracerSettings for subseqent simplicity

Author: andrewlock

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

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

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

@@ -53,16 +53,15 @@ protected override TracerManager CreateTracerManagerFrom(
             IRemoteConfigurationManager remoteConfigurationManager,
             IDynamicConfigurationManager dynamicConfigurationManager,
             ITracerFlareManager tracerFlareManager,
-            ISpanEventsManager spanEventsManager,
-            SettingsManager settingsManager)
+            ISpanEventsManager spanEventsManager)
         {
             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, settingsManager);
+                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, 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);
         }
 
         protected override ITelemetryController CreateTelemetryController(TracerSettings settings, IDiscoveryService discoveryService)

tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/ManualInstrumentation/Tracer/ConfigureIntegration.cs

@@ -78,7 +78,7 @@ internal static void ConfigureSettingsWithManualOverrides(Dictionary<string, obj
         GlobalConfigurationSource.UpdateManualConfigurationSource(manualConfig);
         var dynamicConfig = GlobalConfigurationSource.DynamicConfigurationSource;
 
-        var wasUpdated = Datadog.Trace.Tracer.Instance.TracerManager.SettingsManager.UpdateSettings(dynamicConfig, manualConfig, TelemetryFactory.Config);
+        var wasUpdated = Datadog.Trace.Tracer.Instance.Settings.Manager.UpdateSettings(dynamicConfig, manualConfig, TelemetryFactory.Config);
         if (wasUpdated)
         {
             Log.Information("Setting updates made via configuration in code were applied");

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

@@ -79,7 +79,7 @@ private static void OnConfigurationChanged(IConfigurationSource dynamicConfig)
             // so that it can be picked up by other configuration updaters, e.g. config in code
             GlobalConfigurationSource.UpdateDynamicConfigConfigurationSource(dynamicConfig);
 
-            var wasUpdated = Tracer.Instance.TracerManager.SettingsManager.UpdateSettings(dynamicConfig, manualConfig, TelemetryFactory.Config);
+            var wasUpdated = Tracer.Instance.Settings.Manager.UpdateSettings(dynamicConfig, manualConfig, TelemetryFactory.Config);
             if (wasUpdated)
             {
                 Log.Information("Setting updates made via configuration in code were applied");