Use logging source generator in ClientOAuthProvider

Author: halter73

src/ModelContextProtocol.Core/Authentication/ClientOAuthProvider.cs

@@ -14,7 +14,7 @@ namespace ModelContextProtocol.Authentication;
 /// protection or caching - it acquires a token and server metadata and holds it in memory.
 /// This is suitable for demonstration and development purposes.
 /// </summary>
-internal sealed class ClientOAuthProvider
+internal sealed partial class ClientOAuthProvider
 {
     /// <summary>
     /// The Bearer authentication scheme.
@@ -207,7 +207,7 @@ private async Task PerformOAuthAuthorizationAsync(
             ThrowFailedToHandleUnauthorizedResponse($"Authorization server selector returned a server not in the available list: {selectedAuthServer}. Available servers: {string.Join(", ", availableAuthorizationServers)}");
         }
 
-        _logger.LogInformation("Selected authorization server: {Server} from {Count} available servers", selectedAuthServer, availableAuthorizationServers.Count);
+        LogSelectedAuthorizationServer(selectedAuthServer, availableAuthorizationServers.Count);
 
         // Get auth server metadata
         var authServerMetadata = await GetAuthServerMetadataAsync(selectedAuthServer, cancellationToken).ConfigureAwait(false);
@@ -235,7 +235,7 @@ private async Task PerformOAuthAuthorizationAsync(
         }
 
         _token = token;
-        _logger.LogInformation("OAuth authorization completed successfully");
+        LogOAuthAuthorizationCompleted();
     }
 
     private async Task<AuthorizationServerMetadata?> GetAuthServerMetadataAsync(Uri authServerUri, CancellationToken cancellationToken)
@@ -270,7 +270,7 @@ private async Task PerformOAuthAuthorizationAsync(
             }
             catch (Exception ex)
             {
-                _logger.LogError(ex, "Error fetching auth server metadata from {Path}", path);
+                LogErrorFetchingAuthServerMetadata(ex, path);
             }
         }
 
@@ -435,7 +435,7 @@ private async Task PerformDynamicClientRegistrationAsync(
             ThrowFailedToHandleUnauthorizedResponse("Authorization server does not support dynamic client registration");
         }
 
-        _logger.LogInformation("Performing dynamic client registration with {RegistrationEndpoint}", authServerMetadata.RegistrationEndpoint);
+        LogPerformingDynamicClientRegistration(authServerMetadata.RegistrationEndpoint);
 
         var registrationRequest = new DynamicClientRegistrationRequest
         {
@@ -482,7 +482,7 @@ private async Task PerformDynamicClientRegistrationAsync(
             _clientSecret = registrationResponse.ClientSecret;
         }
 
-        _logger.LogInformation("Dynamic client registration successful. Client ID: {ClientId}", _clientId);
+        LogDynamicClientRegistrationSuccessful(_clientId!);
     }
 
     /// <summary>
@@ -581,7 +581,7 @@ private async Task<ProtectedResourceMetadata> ExtractProtectedResourceMetadata(H
 
         // Per RFC: The resource value must be identical to the URL that the client used
         // to make the request to the resource server
-        _logger.LogDebug($"Validating resource metadata against original server URL: {serverUrl}");
+        LogValidatingResourceMetadata(serverUrl);
 
         if (!VerifyResourceMatch(metadata, serverUrl))
         {
@@ -666,4 +666,22 @@ private static void ThrowIfNotBearerScheme(string scheme)
     [DoesNotReturn]
     private static void ThrowFailedToHandleUnauthorizedResponse(string message) =>
         throw new McpException($"Failed to handle unauthorized response with 'Bearer' scheme. {message}");
+
+    [LoggerMessage(Level = LogLevel.Information, Message = "Selected authorization server: {Server} from {Count} available servers")]
+    partial void LogSelectedAuthorizationServer(Uri server, int count);
+
+    [LoggerMessage(Level = LogLevel.Information, Message = "OAuth authorization completed successfully")]
+    partial void LogOAuthAuthorizationCompleted();
+
+    [LoggerMessage(Level = LogLevel.Error, Message = "Error fetching auth server metadata from {Path}")]
+    partial void LogErrorFetchingAuthServerMetadata(Exception ex, string path);
+
+    [LoggerMessage(Level = LogLevel.Information, Message = "Performing dynamic client registration with {RegistrationEndpoint}")]
+    partial void LogPerformingDynamicClientRegistration(Uri registrationEndpoint);
+
+    [LoggerMessage(Level = LogLevel.Information, Message = "Dynamic client registration successful. Client ID: {ClientId}")]
+    partial void LogDynamicClientRegistrationSuccessful(string clientId);
+
+    [LoggerMessage(Level = LogLevel.Debug, Message = "Validating resource metadata against original server URL: {ServerUrl}")]
+    partial void LogValidatingResourceMetadata(Uri serverUrl);
 }

src/ModelContextProtocol.Core/Client/SseClientTransport.cs

@@ -16,10 +16,11 @@ namespace ModelContextProtocol.Client;
 public sealed class SseClientTransport : IClientTransport, IAsyncDisposable
 {
     private readonly SseClientTransportOptions _options;
-    private readonly HttpClient? _httpClient;
     private readonly McpHttpClient _mcpHttpClient;
     private readonly ILoggerFactory? _loggerFactory;
 
+    private readonly HttpClient? _ownedHttpClient;
+
     /// <summary>
     /// Initializes a new instance of the <see cref="SseClientTransport"/> class.
     /// </summary>
@@ -61,7 +62,7 @@ public SseClientTransport(SseClientTransportOptions transportOptions, HttpClient
 
         if (ownsHttpClient)
         {
-            _httpClient = httpClient;
+            _ownedHttpClient = httpClient;
         }
     }
 
@@ -99,7 +100,7 @@ private async Task<ITransport> ConnectSseTransportAsync(CancellationToken cancel
     /// <inheritdoc />
     public ValueTask DisposeAsync()
     {
-        _httpClient?.Dispose();
+        _ownedHttpClient?.Dispose();
         return default;
     }
 }