Clean up logging in configuration-based service endpoint provider

Author: ReubenBond

src/Microsoft.Extensions.ServiceDiscovery/Configuration/ConfigurationServiceEndPointResolver.Log.cs

@@ -1,7 +1,6 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-using System.Globalization;
 using System.Text;
 using Microsoft.Extensions.Logging;
 
@@ -14,60 +13,38 @@ private sealed partial class Log
         [LoggerMessage(1, LogLevel.Debug, "Skipping endpoint resolution for service '{ServiceName}': '{Reason}'.", EventName = "SkippedResolution")]
         public static partial void SkippedResolution(ILogger logger, string serviceName, string reason);
 
-        [LoggerMessage(2, LogLevel.Debug, "Matching endpoints using endpoint names for service '{ServiceName}' since endpoint names are specified in configuration.", EventName = "MatchingEndPointNames")]
-        public static partial void MatchingEndPointNames(ILogger logger, string serviceName);
-
-        [LoggerMessage(3, LogLevel.Debug, "Ignoring endpoints using endpoint names for service '{ServiceName}' since no endpoint names are specified in configuration.", EventName = "IgnoringEndPointNames")]
-        public static partial void IgnoringEndPointNames(ILogger logger, string serviceName);
-
-        public static void EndPointNameMatchSelection(ILogger logger, string serviceName, bool matchEndPointNames)
-        {
-            if (!logger.IsEnabled(LogLevel.Debug))
-            {
-                return;
-            }
-
-            if (matchEndPointNames)
-            {
-                MatchingEndPointNames(logger, serviceName);
-            }
-            else
-            {
-                IgnoringEndPointNames(logger, serviceName);
-            }
-        }
-
-        [LoggerMessage(4, LogLevel.Debug, "Using configuration from path '{Path}' to resolve endpoint '{EndpointName}' for service '{ServiceName}'.", EventName = "UsingConfigurationPath")]
+        [LoggerMessage(2, LogLevel.Debug, "Using configuration from path '{Path}' to resolve endpoint '{EndpointName}' for service '{ServiceName}'.", EventName = "UsingConfigurationPath")]
         public static partial void UsingConfigurationPath(ILogger logger, string path, string endpointName, string serviceName);
 
-        [LoggerMessage(5, LogLevel.Debug, "No valid endpoint configuration was found for service '{ServiceName}' from path '{Path}'.", EventName = "ServiceConfigurationNotFound")]
+        [LoggerMessage(3, LogLevel.Debug, "No valid endpoint configuration was found for service '{ServiceName}' from path '{Path}'.", EventName = "ServiceConfigurationNotFound")]
         internal static partial void ServiceConfigurationNotFound(ILogger logger, string serviceName, string path);
 
-        [LoggerMessage(6, LogLevel.Debug, "Endpoints configured for service '{ServiceName}' from path '{Path}': {ConfiguredEndPoints}.", EventName = "ConfiguredEndPoints")]
+        [LoggerMessage(4, LogLevel.Debug, "Endpoints configured for service '{ServiceName}' from path '{Path}': {ConfiguredEndPoints}.", EventName = "ConfiguredEndPoints")]
         internal static partial void ConfiguredEndPoints(ILogger logger, string serviceName, string path, string configuredEndPoints);
-        public static void ConfiguredEndPoints(ILogger logger, string serviceName, string path, List<ServiceEndPointQuery> parsedValues)
+
+        internal static void ConfiguredEndPoints(ILogger logger, string serviceName, string path, IList<ServiceEndPoint> endpoints, int added)
         {
             if (!logger.IsEnabled(LogLevel.Debug))
             {
                 return;
             }
 
             StringBuilder endpointValues = new();
-            for (var i = 0; i < parsedValues.Count; i++)
+            for (var i = endpoints.Count - added; i < endpoints.Count; i++)
             {
                 if (endpointValues.Length > 0)
                 {
                     endpointValues.Append(", ");
                 }
 
-                endpointValues.Append(CultureInfo.InvariantCulture, $"({parsedValues[i]})");
+                endpointValues.Append(endpoints[i].ToString());
             }
 
             var configuredEndPoints = endpointValues.ToString();
             ConfiguredEndPoints(logger, serviceName, path, configuredEndPoints);
         }
 
-        [LoggerMessage(7, LogLevel.Debug, "No valid endpoint configuration was found for endpoint '{EndpointName}' on service '{ServiceName}' from path '{Path}'.", EventName = "EndpointConfigurationNotFound")]
+        [LoggerMessage(5, LogLevel.Debug, "No valid endpoint configuration was found for endpoint '{EndpointName}' on service '{ServiceName}' from path '{Path}'.", EventName = "EndpointConfigurationNotFound")]
         internal static partial void EndpointConfigurationNotFound(ILogger logger, string endpointName, string serviceName, string path);
     }
 }

src/Microsoft.Extensions.ServiceDiscovery/Configuration/ConfigurationServiceEndPointResolver.cs

@@ -106,7 +106,7 @@ public ValueTask ResolveAsync(ServiceEndPointCollectionSource endPoints, Cancell
         var configPath = $"{_options.Value.SectionName}:{_serviceName}:{endpointName}";
         if (!namedSection.Exists())
         {
-            Log.ServiceConfigurationNotFound(_logger, _serviceName, $"{_options.Value.SectionName}:{_serviceName}");
+            Log.EndpointConfigurationNotFound(_logger, endpointName, _serviceName, configPath);
             return default;
         }
 
@@ -170,6 +170,10 @@ public ValueTask ResolveAsync(ServiceEndPointCollectionSource endPoints, Cancell
         {
             Log.ServiceConfigurationNotFound(_logger, _serviceName, configPath);
         }
+        else
+        {
+            Log.ConfiguredEndPoints(_logger, _serviceName, configPath, endPoints.EndPoints, added);
+        }
 
         return default;
     }