Merge branch 'main' into mohammad/mass_transit_intg

Author: chojomok

tracer/src/Datadog.Trace/Configuration/ConfigurationSources/JsonConfigurationSource.cs

@@ -29,26 +29,29 @@ internal class JsonConfigurationSource : IConfigurationSource
     {
         private static readonly IDatadogLogger Log = DatadogLogging.GetLoggerFor(typeof(JsonConfigurationSource));
         private readonly JToken? _configuration;
+        private readonly ConfigurationOrigins _origin;
 
-        internal JsonConfigurationSource(string json, ConfigurationOrigins origin)
-            : this(json, origin, j => (JToken?)JsonHelper.DeserializeObject(j))
+        /// <summary>
+        /// Initializes a new instance of the <see cref="JsonConfigurationSource"/>
+        /// class with the specified JSON string.
+        /// </summary>
+        /// <param name="json">A JSON string that contains configuration values.</param>
+        [PublicApi]
+        public JsonConfigurationSource(string json)
+            : this(json, ConfigurationOrigins.Code)
         {
+            TelemetryFactory.Metrics.Record(PublicApiUsage.JsonConfigurationSource_Ctor_Json);
         }
 
-        internal JsonConfigurationSource(string json, ConfigurationOrigins origin, string? filename)
-            : this(json, origin, j => (JToken?)JsonHelper.DeserializeObject(j))
+        internal JsonConfigurationSource(string json, ConfigurationOrigins origin)
+            : this(json, origin, j => (JToken?)JsonConvert.DeserializeObject(j))
         {
-            JsonConfigurationFilePath = filename;
         }
 
-        internal JsonConfigurationSource(JToken? configToken, ConfigurationOrigins origin, Func<JToken?, JToken?> extractConfig)
+        internal JsonConfigurationSource(string json, ConfigurationOrigins origin, string filename)
+            : this(json, origin, j => (JToken?)JsonConvert.DeserializeObject(j))
         {
-            if (configToken is null) { ThrowHelper.ThrowArgumentNullException(nameof(configToken)); }
-
-            if (extractConfig is null) { ThrowHelper.ThrowArgumentNullException(nameof(extractConfig)); }
-
-            _configuration = extractConfig(configToken);
-            Origin = origin;
+            ConfigurationSource = filename;
         }
 
         private protected JsonConfigurationSource(string json, ConfigurationOrigins origin, Func<string, JToken?> deserialize)
@@ -61,9 +64,7 @@ private protected JsonConfigurationSource(string json, ConfigurationOrigins orig
             Origin = origin;
         }
 
-        public ConfigurationOrigins Origin { get; }
-
-        internal string? JsonConfigurationFilePath { get; }
+        internal string ConfigurationSource { get; set; } = "N/A because Jsonconfigsource.cs";
 
         internal bool TreatNullDictionaryAsEmpty { get; set; } = true;
 
@@ -80,6 +81,17 @@ internal static JsonConfigurationSource FromFile(string filename, ConfigurationO
             return new JsonConfigurationSource(json, origin, filename);
         }
 
+        /// <summary>
+        /// Returns a string that represents the current object.
+        /// </summary>
+        /// <returns>
+        /// A string that indicates the source of the datadog.json configuration.
+        /// </returns>
+        public override string ToString()
+        {
+            return "The datadog.json configuration is coming from " + ConfigurationSource;
+        }
+
         /// <summary>
         /// Gets the value of the setting with the specified key and converts it into type <typeparamref name="T"/>.
         /// Supports JPath.

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

@@ -663,33 +663,7 @@ not null when string.Equals(value, "otlp", StringComparison.OrdinalIgnoreCase) =
                 DisabledAdoNetCommandTypes.UnionWith(userSplit);
             }
 
-            IsFlaggingProviderEnabled = config.WithKeys(ConfigurationKeys.FeatureFlags.FlaggingProviderEnabled)
-                                                       .AsBool(false);
-
-            if (source is CompositeConfigurationSource compositeSource)
-            {
-                foreach (var nestedSource in compositeSource)
-                {
-                    if (nestedSource is JsonConfigurationSource { JsonConfigurationFilePath: { } jsonFilePath }
-                     && !string.IsNullOrEmpty(jsonFilePath))
-                    {
-                        JsonConfigurationFilePaths.Add(jsonFilePath);
-                    }
-                }
-            }
-
-            OpenTelemetryMetricsEnabled = config
-                                    .WithKeys(ConfigurationKeys.FeatureFlags.OpenTelemetryMetricsEnabled)
-                                    .AsBool(defaultValue: false);
-
-            var enabledMeters = config.WithKeys(ConfigurationKeys.FeatureFlags.OpenTelemetryMeterNames).AsString();
-            OpenTelemetryMeterNames = !string.IsNullOrEmpty(enabledMeters)
-                ? new HashSet<string>(TrimSplitString(enabledMeters, commaSeparator), StringComparer.Ordinal)
-                : new HashSet<string>(StringComparer.Ordinal);
-
-            var disabledActivitySources = config.WithKeys(ConfigurationKeys.DisabledActivitySources).AsString();
-
-            DisabledActivitySources = !string.IsNullOrEmpty(disabledActivitySources) ? TrimSplitString(disabledActivitySources, commaSeparator) : [];
+            this.JsonConfigurationSource = source.ToString() ?? "N/A because Tracer Settings";
 
             // we "enrich" with these values which aren't _strictly_ configuration, but which we want to track as we tracked them in v1
             telemetry.Record(ConfigTelemetryData.NativeTracerVersion, Instrumentation.GetNativeTracerVersion(), recordValue: true, ConfigurationOrigins.Default);
@@ -1325,30 +1299,9 @@ not null when string.Equals(value, "otlp", StringComparison.OrdinalIgnoreCase) =
         /// </summary>
         internal HashSet<string> DisabledAdoNetCommandTypes { get; }
 
-        /// <summary>
-        /// Gets a value indicating whether remote Feature Flags Provider is enabled
-        /// </summary>
-        internal bool IsFlaggingProviderEnabled { get; }
-
-        /// <summary>
-        /// Gets a value indicating whether partial flush is enabled
-        /// </summary>
-        public bool PartialFlushEnabled { get; }
-
-        /// <summary>
-        /// Gets the minimum number of closed spans in a trace before it's partially flushed
-        /// </summary>
-        public int PartialFlushMinSpans { get; }
-
-        internal SettingsManager Manager { get; }
-
-        internal List<string> JsonConfigurationFilePaths { get; } = new();
+        internal ImmutableDynamicSettings DynamicSettings { get; init; } = new();
 
-        /// <summary>
-        /// Gets which GraphQL error extensions to capture.
-        /// A comma-separated list of extension keys to capture. Empty or not present means no extensions are captured.        /// </summary>
-        /// <seealso cref="ConfigurationKeys.GraphQLErrorExtensions"/>
-        internal string[] GraphQLErrorExtensions { get; }
+        internal string JsonConfigurationSource { get; set; } = "N/A from default";
 
         /// <summary>
         /// Gets a value indicating whether remote configuration is potentially available.

tracer/src/Datadog.Trace/TracerManager.cs

@@ -603,6 +603,9 @@ void WriteDictionary(IReadOnlyDictionary<string, string> dictionary)
                     writer.WritePropertyName("trace_propagation_behavior_extract");
                     writer.WriteValue(instanceSettings.PropagationBehaviorExtract);
 
+                    writer.WritePropertyName("tracer_datadog_json_configuration_source");
+                    writer.WriteValue(instanceSettings.JsonConfigurationSource);
+
                     writer.WritePropertyName("trace_propagation_style_inject");
                     writer.WriteStartArray();