update metadata resolver usage, fix tests

src/Libraries/Microsoft.Extensions.Http.Diagnostics/Http/DefaultHttpDependencyMetadataResolver.cs

@@ -9,13 +9,13 @@
 /// Default implementation of <see cref="HttpDependencyMetadataResolver"/> that uses the base
 /// trie-based lookup algorithm.
 /// </summary>
 public sealed class DefaultHttpDependencyMetadataResolver : HttpDependencyMetadataResolver
 {
     /// <summary>
     /// Initializes a new instance of the <see cref="DefaultHttpDependencyMetadataResolver"/> class.
     /// </summary>
     /// <param name="dependencyMetadata">A collection of HTTP dependency metadata used for request resolution.</param>
-    public DefaultHttpDependencyMetadataResolver(IEnumerable<IHttpDependencyMetadata> dependencyMetadata)
+    public DefaultHttpDependencyMetadataResolver(IEnumerable<IDownstreamDependencyMetadata> dependencyMetadata)
         : base(dependencyMetadata)
     {
     }

src/Libraries/Microsoft.Extensions.Http.Diagnostics/Http/HttpDependencyMetadataResolver.cs

@@ -19,7 +19,7 @@
 /// configured metadata using specialized trie-based data structures. This enables efficient lookup
 /// of service information, operation names, and other metadata for telemetry and policy application.
 /// </remarks>
 public abstract class HttpDependencyMetadataResolver
 {
     internal readonly struct ProcessedMetadata
     {
@@ -39,11 +39,11 @@
     /// </summary>
     /// <param name="dependencyMetadata">A collection of HTTP dependency metadata used for request resolution.</param>
     /// <exception cref="ArgumentNullException"><paramref name="dependencyMetadata"/> is <see langword="null"/>.</exception>
-    protected HttpDependencyMetadataResolver(IEnumerable<IHttpDependencyMetadata> dependencyMetadata)
+    protected HttpDependencyMetadataResolver(IEnumerable<IDownstreamDependencyMetadata> dependencyMetadata)
     {
         if (dependencyMetadata == null)
         {
             throw new ArgumentNullException(nameof(dependencyMetadata));
         }
 
         Dictionary<string, RequestMetadataTrieNode> dependencyTrieMap = [];
@@ -88,7 +88,7 @@
     {
         try
         {
             var hostMetadata = GetHostMetadata(requestMessage.RequestUri.Host);
             return GetRequestMetadataInternal(requestMessage.Method, requestMessage.RequestUri.AbsolutePath, hostMetadata);
         }
         catch (Exception)
@@ -304,7 +304,7 @@
         return null;
     }
 
-    private void AddDependency(IHttpDependencyMetadata dependencyMetadata, Dictionary<string, RequestMetadataTrieNode> dependencyTrieMap)
+    private void AddDependency(IDownstreamDependencyMetadata dependencyMetadata, Dictionary<string, RequestMetadataTrieNode> dependencyTrieMap)
     {
         foreach (var hostNameSuffix in dependencyMetadata.UniqueHostNameSuffixes)
         {

src/Libraries/Microsoft.Extensions.Http.Diagnostics/Http/HttpDiagnosticsServiceCollectionExtensions.cs

@@ -22,9 +22,10 @@
     public static IServiceCollection AddDownstreamDependencyMetadata(this IServiceCollection services, IDownstreamDependencyMetadata downstreamDependencyMetadata)
     {
         _ = Throw.IfNull(services);
-        services.TryAddSingleton<HttpDependencyMetadataResolver, DefaultHttpDependencyMetadataResolver>();
-        _ = services.AddSingleton(downstreamDependencyMetadata);
+        _ = Throw.IfNull(downstreamDependencyMetadata);
 
+        services.TryAddEnumerable(ServiceDescriptor.Singleton<IDownstreamDependencyMetadata>(downstreamDependencyMetadata));
+        services.TryAddSingleton<HttpDependencyMetadataResolver, DefaultHttpDependencyMetadataResolver>();
         return services;
     }
 
@@ -38,9 +39,8 @@
         where T : class, IDownstreamDependencyMetadata
     {
         _ = Throw.IfNull(services);
+        services.TryAddEnumerable(ServiceDescriptor.Singleton<IDownstreamDependencyMetadata, T>());
         services.TryAddSingleton<HttpDependencyMetadataResolver, DefaultHttpDependencyMetadataResolver>();
-        _ = services.AddSingleton<IDownstreamDependencyMetadata, T>();
-
         return services;
     }
 
@@ -59,19 +59,20 @@
     /// Adds services required for HTTP dependency metadata resolution with the specified metadata providers.
     /// </summary>
     /// <param name="services">The <see cref="IServiceCollection"/> to add the services to.</param>
-    /// <param name="metadataProviders">The HTTP dependency metadata providers to register.</param>
+    /// <param name="providers">The HTTP dependency metadata providers to register.</param>
     /// <returns>The <see cref="IServiceCollection"/> so that additional calls can be chained.</returns>
     public static IServiceCollection AddHttpDependencyMetadataResolver(
         this IServiceCollection services,
-        params IHttpDependencyMetadata[] metadataProviders)
+        params IDownstreamDependencyMetadata[] providers)
     {
-        foreach (var provider in metadataProviders)
+        _ = Throw.IfNull(services);
+
+        foreach (var provider in providers)
         {
-            services.TryAddEnumerable(ServiceDescriptor.Singleton<IHttpDependencyMetadata>(provider));
+            services.TryAddEnumerable(ServiceDescriptor.Singleton<IDownstreamDependencyMetadata>(provider));
         }
 
         services.TryAddSingleton<HttpDependencyMetadataResolver, DefaultHttpDependencyMetadataResolver>();
-
         return services;
     }
 }

src/Libraries/Microsoft.Extensions.Http.Diagnostics/Logging/Internal/HttpRequestReader.cs

@@ -12,7 +12,6 @@
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Http.Diagnostics;
 using Microsoft.Extensions.Options;
-using Microsoft.Extensions.Telemetry.Internal;
 using Microsoft.Shared.Diagnostics;
 using Microsoft.Shared.Pools;
 
@@ -43,23 +42,23 @@ internal sealed class HttpRequestReader : IHttpRequestReader
 
     private readonly OutgoingPathLoggingMode _outgoingPathLogMode;
     private readonly IOutgoingRequestContext _requestMetadataContext;
-    private readonly IDownstreamDependencyMetadataManager? _downstreamDependencyMetadataManager;
+    private readonly HttpDependencyMetadataResolver? _dependencyMetadataResolver;
 
     public HttpRequestReader(
         IServiceProvider serviceProvider,
         IOptionsMonitor<LoggingOptions> optionsMonitor,
         IHttpRouteFormatter routeFormatter,
         IHttpRouteParser httpRouteParser,
         IOutgoingRequestContext requestMetadataContext,
-        IDownstreamDependencyMetadataManager? downstreamDependencyMetadataManager = null,
+        HttpDependencyMetadataResolver? dependencyMetadataResolver = null,
         [ServiceKey] string? serviceKey = null)
         : this(
               optionsMonitor.GetKeyedOrCurrent(serviceKey),
               routeFormatter,
               httpRouteParser,
               serviceProvider.GetRequiredOrKeyedRequiredService<IHttpHeadersReader>(serviceKey),
               requestMetadataContext,
-              downstreamDependencyMetadataManager)
+              dependencyMetadataResolver)
     {
     }
 
@@ -69,15 +68,15 @@ internal HttpRequestReader(
         IHttpRouteParser httpRouteParser,
         IHttpHeadersReader httpHeadersReader,
         IOutgoingRequestContext requestMetadataContext,
-        IDownstreamDependencyMetadataManager? downstreamDependencyMetadataManager = null)
+        HttpDependencyMetadataResolver? dependencyMetadataResolver = null)
     {
         _outgoingPathLogMode = Throw.IfOutOfRange(options.RequestPathLoggingMode);
         _httpHeadersReader = httpHeadersReader;
 
         _routeFormatter = routeFormatter;
         _httpRouteParser = httpRouteParser;
         _requestMetadataContext = requestMetadataContext;
-        _downstreamDependencyMetadataManager = downstreamDependencyMetadataManager;
+        _dependencyMetadataResolver = dependencyMetadataResolver;
 
         _defaultSensitiveParameters = options.RouteParameterDataClasses.ToFrozenDictionary(StringComparer.Ordinal);
         _queryParameterDataClasses = options.RequestQueryParametersDataClasses.ToFrozenDictionary(StringComparer.Ordinal);
@@ -234,7 +233,7 @@ private void GetRedactedPathAndParameters(HttpRequestMessage request, LogRecord
 
         var requestMetadata = request.GetRequestMetadata() ??
             _requestMetadataContext.RequestMetadata ??
-            _downstreamDependencyMetadataManager?.GetRequestMetadata(request);
+            _dependencyMetadataResolver?.GetRequestMetadata(request);
 
         if (requestMetadata == null)
         {