Skip to content

Commit 7220c24

Browse files
committed
Ensure we record the config sources immediately
1 parent 4502854 commit 7220c24

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,9 @@ internal static void ConfigureSettingsWithManualOverrides(Dictionary<string, obj
5252
? new ManualInstrumentationLegacyConfigurationSource(values, isFromDefaults)
5353
: new ManualInstrumentationConfigurationSource(values, isFromDefaults);
5454

55+
// We need to save this immediately, even if there's no manifest changes in the final settings
56+
GlobalConfigurationSource.UpdateManualConfigurationSource(manualConfig);
57+
5558
var tracerSettings = Datadog.Trace.Tracer.Instance.Settings;
5659
var dynamicConfig = GlobalConfigurationSource.DynamicConfigurationSource;
5760
var initialSettings = isFromDefaults
@@ -91,8 +94,6 @@ internal static void ConfigureSettingsWithManualOverrides(Dictionary<string, obj
9194
}
9295

9396
Log.Information("Applying new configuration in code");
94-
GlobalConfigurationSource.UpdateManualConfigurationSource(manualConfig);
95-
9697
TracerSettings newSettings;
9798
if (isSameExporterSettings)
9899
{

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,9 @@ private static void OnConfigurationChanged(IConfigurationSource dynamicConfig)
7070
? tracerSettings.InitialMutableSettings
7171
: MutableSettings.CreateWithoutDefaultSources(tracerSettings);
7272

73+
// We save this immediately, even if there's no manifest changes in the final settings
74+
GlobalConfigurationSource.UpdateDynamicConfigConfigurationSource(dynamicConfig);
75+
7376
OnConfigurationChanged(
7477
dynamicConfig,
7578
manualSource,
@@ -105,8 +108,6 @@ private static void OnConfigurationChanged(
105108
}
106109

107110
Log.Information("Applying new dynamic configuration");
108-
GlobalConfigurationSource.UpdateDynamicConfigConfigurationSource(dynamicConfig);
109-
110111
var newSettings = tracerSettings with { MutableSettings = newMutableSettings };
111112

112113
/*

0 commit comments

Comments
 (0)