check content type in preparedata

Author: amerjusupovic

src/Microsoft.Extensions.Configuration.AzureAppConfiguration/AzureAppConfigurationProvider.cs

@@ -13,6 +13,7 @@
 using System.Linq;
 using System.Net;
 using System.Net.Http;
+using System.Net.Mime;
 using System.Net.Sockets;
 using System.Security;
 using System.Text;
@@ -600,6 +601,31 @@ private async Task<Dictionary<string, string>> PrepareData(Dictionary<string, Co
             foreach (KeyValuePair<string, ConfigurationSetting> kvp in data)
             {
                 IEnumerable<KeyValuePair<string, string>> keyValuePairs = null;
+
+                if (_requestTracingEnabled && _requestTracingOptions != null)
+                {
+                    ContentType contentType = null;
+
+                    try
+                    {
+                        contentType = new ContentType(kvp.Value.ContentType.Trim());
+                    }
+                    catch (FormatException) { }
+
+                    if (contentType != null &&
+                        contentType.Parameters.ContainsKey("profile") &&
+                        !string.IsNullOrEmpty(contentType.Parameters["profile"]) &&
+                        contentType.Parameters["profile"].StartsWith(RequestTracingConstants.AIContentTypeProfile))
+                    {
+                        _requestTracingOptions.HasAIProfile = true;
+
+                        if (contentType.Parameters["profile"].StartsWith(RequestTracingConstants.AIChatCompletionContentTypeProfile))
+                        {
+                            _requestTracingOptions.HasAIChatCompletionProfile = true;
+                        }
+                    }
+                }
+
                 keyValuePairs = await ProcessAdapters(kvp.Value, cancellationToken).ConfigureAwait(false);
 
                 foreach (KeyValuePair<string, string> kv in keyValuePairs)
@@ -1053,8 +1079,7 @@ private void SetRequestTracingOptions()
                 IsKeyVaultConfigured = _options.IsKeyVaultConfigured,
                 IsKeyVaultRefreshConfigured = _options.IsKeyVaultRefreshConfigured,
                 FeatureFlagTracing = _options.FeatureFlagTracing,
-                IsLoadBalancingEnabled = _options.LoadBalancingEnabled,
-                ContentTypeTracing = _options.ContentTypeTracing
+                IsLoadBalancingEnabled = _options.LoadBalancingEnabled
             };
         }
 

src/Microsoft.Extensions.Configuration.AzureAppConfiguration/ContentTypeTracing.cs

@@ -22,13 +22,6 @@ internal class JsonKeyValueAdapter : IKeyValueAdapter
             KeyVaultConstants.ContentType
         };
 
-        private ContentTypeTracing _contentTypeTracing;
-
-        public JsonKeyValueAdapter(ContentTypeTracing contentTypeTracing)
-        {
-            _contentTypeTracing = contentTypeTracing;
-        }
-
         public Task<IEnumerable<KeyValuePair<string, string>>> ProcessKeyValue(ConfigurationSetting setting, Uri endpoint, Logger logger, CancellationToken cancellationToken)
         {
             if (setting == null)
@@ -73,31 +66,11 @@ public bool CanProcess(ConfigurationSetting setting)
             {
                 ContentType contentType = new ContentType(setting.ContentType.Trim());
                 mediaType = contentType.MediaType;
-
-                // Check for profile parameter in the content type
-                if (_contentTypeTracing != null &&
-                    contentType.Parameters.ContainsKey("profile") &&
-                    !string.IsNullOrEmpty(contentType.Parameters["profile"]) &&
-                    contentType.Parameters["profile"].StartsWith(RequestTracingConstants.AIContentTypeProfile))
-                {
-                    _contentTypeTracing.HasAIProfile = true;
-
-                    if (contentType.Parameters["profile"].StartsWith(RequestTracingConstants.AIChatCompletionContentTypeProfile))
-                    {
-                        _contentTypeTracing.HasAIChatCompletionProfile = true;
-                    }
-                }
             }
             catch (FormatException)
             {
                 return false;
             }
-            catch (IndexOutOfRangeException)
-            {
-                // Bug in System.Net.Mime.ContentType throws this if contentType is "xyz/"
-                // https://github.com/dotnet/runtime/issues/39337
-                return false;
-            }
 
             if (!ExcludedJsonContentTypes.Contains(mediaType, StringComparer.OrdinalIgnoreCase))
             {

src/Microsoft.Extensions.Configuration.AzureAppConfiguration/JsonKeyValueAdapter.cs

@@ -69,9 +69,16 @@ internal class RequestTracingOptions
         public bool IsPushRefreshUsed { get; set; } = false;
 
         /// <summary>
-        /// Indicates certain content types used by the application.
+        /// Flag to indicate whether any key-value uses the json content type and contains
+        /// a parameter indicating an AI profile.
         /// </summary>
-        public ContentTypeTracing ContentTypeTracing { get; set; } = new ContentTypeTracing();
+        public bool HasAIProfile { get; set; } = false;
+
+        /// <summary>
+        /// Flag to indicate whether any key-value uses the json content type and contains
+        /// a parameter indicating an AI chat completion profile.
+        /// </summary>
+        public bool HasAIChatCompletionProfile { get; set; } = false;
 
         /// <summary>
         /// Checks whether any tracing feature is used.
@@ -81,8 +88,8 @@ public bool UsesAnyTracingFeature()
         {
             return IsLoadBalancingEnabled ||
                 IsSignalRUsed ||
-                ContentTypeTracing.HasAIProfile ||
-                ContentTypeTracing.HasAIChatCompletionProfile;
+                HasAIProfile ||
+                HasAIChatCompletionProfile;
         }
 
         /// <summary>
@@ -113,7 +120,7 @@ public string CreateFeaturesString()
                 sb.Append(RequestTracingConstants.SignalRUsedTag);
             }
 
-            if (ContentTypeTracing.HasAIProfile)
+            if (HasAIProfile)
             {
                 if (sb.Length > 0)
                 {
@@ -123,7 +130,7 @@ public string CreateFeaturesString()
                 sb.Append(RequestTracingConstants.AIContentTypeProfileTag);
             }
 
-            if (ContentTypeTracing.HasAIChatCompletionProfile)
+            if (HasAIChatCompletionProfile)
             {
                 if (sb.Length > 0)
                 {