Use cached logger instances (#53200)

gfoidl · web-flow · commit 6dfaf9e2cff6 · 2024-03-29T23:03:26.000Z
diff --git a/src/Mvc/Mvc.Core/src/Filters/DisableRequestSizeLimitFilter.cs b/src/Mvc/Mvc.Core/src/Filters/DisableRequestSizeLimitFilter.cs
@@ -19,7 +19,7 @@ internal sealed partial class DisableRequestSizeLimitFilter : IAuthorizationFilt
     /// </summary>
     public DisableRequestSizeLimitFilter(ILoggerFactory loggerFactory)
     {
-        _logger = loggerFactory.CreateLogger<DisableRequestSizeLimitFilter>();
+        _logger = loggerFactory.CreateLogger(typeof(DisableRequestSizeLimitFilter));
     }
 
     /// <summary>
diff --git a/src/Mvc/Mvc.Core/src/Filters/RequestFormLimitsFilter.cs b/src/Mvc/Mvc.Core/src/Filters/RequestFormLimitsFilter.cs
@@ -15,7 +15,7 @@ internal sealed partial class RequestFormLimitsFilter : IAuthorizationFilter, IR
 
     public RequestFormLimitsFilter(ILoggerFactory loggerFactory)
     {
-        _logger = loggerFactory.CreateLogger<RequestFormLimitsFilter>();
+        _logger = loggerFactory.CreateLogger(typeof(RequestFormLimitsFilter));
     }
 
     public FormOptions FormOptions { get; set; } = default!;
diff --git a/src/Mvc/Mvc.Core/src/Filters/RequestSizeLimitFilter.cs b/src/Mvc/Mvc.Core/src/Filters/RequestSizeLimitFilter.cs
@@ -20,7 +20,7 @@ internal sealed partial class RequestSizeLimitFilter : IAuthorizationFilter, IRe
     /// </summary>
     public RequestSizeLimitFilter(ILoggerFactory loggerFactory)
     {
-        _logger = loggerFactory.CreateLogger<RequestSizeLimitFilter>();
+        _logger = loggerFactory.CreateLogger(typeof(RequestSizeLimitFilter));
     }
 
     public long Bytes { get; set; }
diff --git a/src/Mvc/Mvc.Core/src/Infrastructure/ControllerActionInvokerProvider.cs b/src/Mvc/Mvc.Core/src/Infrastructure/ControllerActionInvokerProvider.cs
@@ -48,7 +48,7 @@ public ControllerActionInvokerProvider(
         _maxModelValidationErrors = optionsAccessor.Value.MaxModelValidationErrors;
         _maxValidationDepth = optionsAccessor.Value.MaxValidationDepth;
         _maxModelBindingRecursionDepth = optionsAccessor.Value.MaxModelBindingRecursionDepth;
-        _logger = loggerFactory.CreateLogger<ControllerActionInvoker>();
+        _logger = loggerFactory.CreateLogger(typeof(ControllerActionInvoker));
         _diagnosticListener = diagnosticListener;
         _mapper = mapper;
         _actionContextAccessor = actionContextAccessor ?? ActionContextAccessor.Null;
diff --git a/src/Mvc/Mvc.Core/src/Infrastructure/ModelStateInvalidFilterFactory.cs b/src/Mvc/Mvc.Core/src/Infrastructure/ModelStateInvalidFilterFactory.cs
@@ -21,6 +21,6 @@ public IFilterMetadata CreateInstance(IServiceProvider serviceProvider)
         var options = serviceProvider.GetRequiredService<IOptions<ApiBehaviorOptions>>();
         var loggerFactory = serviceProvider.GetRequiredService<ILoggerFactory>();
 
-        return new ModelStateInvalidFilter(options.Value, loggerFactory.CreateLogger<ModelStateInvalidFilter>());
+        return new ModelStateInvalidFilter(options.Value, loggerFactory.CreateLogger(typeof(ModelStateInvalidFilter)));
     }
 }
diff --git a/src/Mvc/Mvc.Core/src/ModelBinding/Binders/BodyModelBinder.cs b/src/Mvc/Mvc.Core/src/ModelBinding/Binders/BodyModelBinder.cs
@@ -76,7 +76,7 @@ public BodyModelBinder(
         _formatters = formatters;
         _readerFactory = readerFactory.CreateReader;
 
-        _logger = loggerFactory?.CreateLogger<BodyModelBinder>() ?? NullLogger<BodyModelBinder>.Instance;
+        _logger = loggerFactory?.CreateLogger(typeof(BodyModelBinder)) ?? NullLogger<BodyModelBinder>.Instance;
 
         _options = options;
     }
diff --git a/src/Mvc/Mvc.Core/src/ModelBinding/Binders/ByteArrayModelBinder.cs b/src/Mvc/Mvc.Core/src/ModelBinding/Binders/ByteArrayModelBinder.cs
@@ -22,7 +22,7 @@ public ByteArrayModelBinder(ILoggerFactory loggerFactory)
     {
         ArgumentNullException.ThrowIfNull(loggerFactory);
 
-        _logger = loggerFactory.CreateLogger<ByteArrayModelBinder>();
+        _logger = loggerFactory.CreateLogger(typeof(ByteArrayModelBinder));
     }
 
     /// <inheritdoc />
diff --git a/src/Mvc/Mvc.Core/src/ModelBinding/Binders/ComplexObjectModelBinder.cs b/src/Mvc/Mvc.Core/src/ModelBinding/Binders/ComplexObjectModelBinder.cs
@@ -38,7 +38,7 @@ public sealed partial class ComplexObjectModelBinder : IModelBinder
     internal ComplexObjectModelBinder(
         IDictionary<ModelMetadata, IModelBinder> propertyBinders,
         IReadOnlyList<IModelBinder> parameterBinders,
-        ILogger<ComplexObjectModelBinder> logger)
+        ILogger logger)
     {
         _propertyBinders = propertyBinders;
         _parameterBinders = parameterBinders;
diff --git a/src/Mvc/Mvc.Core/src/ModelBinding/Binders/ComplexObjectModelBinderProvider.cs b/src/Mvc/Mvc.Core/src/ModelBinding/Binders/ComplexObjectModelBinderProvider.cs
@@ -22,7 +22,7 @@ public class ComplexObjectModelBinderProvider : IModelBinderProvider
         if (metadata.IsComplexType && !metadata.IsCollectionType)
         {
             var loggerFactory = context.Services.GetRequiredService<ILoggerFactory>();
-            var logger = loggerFactory.CreateLogger<ComplexObjectModelBinder>();
+            var logger = loggerFactory.CreateLogger(typeof(ComplexObjectModelBinder));
             var parameterBinders = GetParameterBinders(context);
 
             var propertyBinders = new Dictionary<ModelMetadata, IModelBinder>();
diff --git a/src/Mvc/Mvc.Core/src/ModelBinding/Binders/ComplexTypeModelBinder.cs b/src/Mvc/Mvc.Core/src/ModelBinding/Binders/ComplexTypeModelBinder.cs
@@ -71,7 +71,7 @@ public ComplexTypeModelBinder(
         ArgumentNullException.ThrowIfNull(loggerFactory);
 
         _propertyBinders = propertyBinders;
-        _logger = loggerFactory.CreateLogger<ComplexTypeModelBinder>();
+        _logger = loggerFactory.CreateLogger(typeof(ComplexTypeModelBinder));
     }
 
     /// <inheritdoc/>
diff --git a/src/Mvc/Mvc.Core/src/ModelBinding/Binders/DateTimeModelBinder.cs b/src/Mvc/Mvc.Core/src/ModelBinding/Binders/DateTimeModelBinder.cs
@@ -26,7 +26,7 @@ public DateTimeModelBinder(DateTimeStyles supportedStyles, ILoggerFactory logger
         ArgumentNullException.ThrowIfNull(loggerFactory);
 
         _supportedStyles = supportedStyles;
-        _logger = loggerFactory.CreateLogger<DateTimeModelBinder>();
+        _logger = loggerFactory.CreateLogger(typeof(DateTimeModelBinder));
     }
 
     /// <inheritdoc />
diff --git a/src/Mvc/Mvc.Core/src/ModelBinding/Binders/DecimalModelBinder.cs b/src/Mvc/Mvc.Core/src/ModelBinding/Binders/DecimalModelBinder.cs
@@ -28,7 +28,7 @@ public DecimalModelBinder(NumberStyles supportedStyles, ILoggerFactory loggerFac
         ArgumentNullException.ThrowIfNull(loggerFactory);
 
         _supportedStyles = supportedStyles;
-        _logger = loggerFactory.CreateLogger<DecimalModelBinder>();
+        _logger = loggerFactory.CreateLogger(typeof(DecimalModelBinder));
     }
 
     /// <inheritdoc />
diff --git a/src/Mvc/Mvc.Core/src/ModelBinding/Binders/DoubleModelBinder.cs b/src/Mvc/Mvc.Core/src/ModelBinding/Binders/DoubleModelBinder.cs
@@ -28,7 +28,7 @@ public DoubleModelBinder(NumberStyles supportedStyles, ILoggerFactory loggerFact
         ArgumentNullException.ThrowIfNull(loggerFactory);
 
         _supportedStyles = supportedStyles;
-        _logger = loggerFactory.CreateLogger<DoubleModelBinder>();
+        _logger = loggerFactory.CreateLogger(typeof(DoubleModelBinder));
     }
 
     /// <inheritdoc />
diff --git a/src/Mvc/Mvc.Core/src/ModelBinding/Binders/FloatModelBinder.cs b/src/Mvc/Mvc.Core/src/ModelBinding/Binders/FloatModelBinder.cs
@@ -28,7 +28,7 @@ public FloatModelBinder(NumberStyles supportedStyles, ILoggerFactory loggerFacto
         ArgumentNullException.ThrowIfNull(loggerFactory);
 
         _supportedStyles = supportedStyles;
-        _logger = loggerFactory.CreateLogger<FloatModelBinder>();
+        _logger = loggerFactory.CreateLogger(typeof(FloatModelBinder));
     }
 
     /// <inheritdoc />
diff --git a/src/Mvc/Mvc.Core/src/ModelBinding/Binders/FormCollectionModelBinder.cs b/src/Mvc/Mvc.Core/src/ModelBinding/Binders/FormCollectionModelBinder.cs
@@ -26,7 +26,7 @@ public FormCollectionModelBinder(ILoggerFactory loggerFactory)
     {
         ArgumentNullException.ThrowIfNull(loggerFactory);
 
-        _logger = loggerFactory.CreateLogger<FormCollectionModelBinder>();
+        _logger = loggerFactory.CreateLogger(typeof(FormCollectionModelBinder));
     }
 
     /// <inheritdoc />
diff --git a/src/Mvc/Mvc.Core/src/ModelBinding/Binders/FormFileModelBinder.cs b/src/Mvc/Mvc.Core/src/ModelBinding/Binders/FormFileModelBinder.cs
@@ -27,7 +27,7 @@ public FormFileModelBinder(ILoggerFactory loggerFactory)
     {
         ArgumentNullException.ThrowIfNull(loggerFactory);
 
-        _logger = loggerFactory.CreateLogger<FormFileModelBinder>();
+        _logger = loggerFactory.CreateLogger(typeof(FormFileModelBinder));
     }
 
     /// <inheritdoc />
diff --git a/src/Mvc/Mvc.Core/src/ModelBinding/Binders/HeaderModelBinder.cs b/src/Mvc/Mvc.Core/src/ModelBinding/Binders/HeaderModelBinder.cs
@@ -24,7 +24,7 @@ public class HeaderModelBinder : IModelBinder
     /// <param name="loggerFactory">The <see cref="ILoggerFactory"/>.</param>
     public HeaderModelBinder(ILoggerFactory loggerFactory)
     {
-        _logger = loggerFactory.CreateLogger<HeaderModelBinder>();
+        _logger = loggerFactory.CreateLogger(typeof(HeaderModelBinder));
     }
 
     /// <summary>
@@ -38,7 +38,7 @@ public HeaderModelBinder(ILoggerFactory loggerFactory, IModelBinder innerModelBi
         ArgumentNullException.ThrowIfNull(loggerFactory);
         ArgumentNullException.ThrowIfNull(innerModelBinder);
 
-        _logger = loggerFactory.CreateLogger<HeaderModelBinder>();
+        _logger = loggerFactory.CreateLogger(typeof(HeaderModelBinder));
         InnerModelBinder = innerModelBinder;
     }
 
diff --git a/src/Mvc/Mvc.Core/src/ModelBinding/Binders/HeaderModelBinderProvider.cs b/src/Mvc/Mvc.Core/src/ModelBinding/Binders/HeaderModelBinderProvider.cs
@@ -27,7 +27,7 @@ public partial class HeaderModelBinderProvider : IModelBinderProvider
 
         var modelMetadata = context.Metadata;
         var loggerFactory = context.Services.GetRequiredService<ILoggerFactory>();
-        var logger = loggerFactory.CreateLogger<HeaderModelBinderProvider>();
+        var logger = loggerFactory.CreateLogger(typeof(HeaderModelBinderProvider));
 
         if (!IsSimpleType(modelMetadata))
         {
diff --git a/src/Mvc/Mvc.Core/src/ModelBinding/Binders/KeyValuePairModelBinder.cs b/src/Mvc/Mvc.Core/src/ModelBinding/Binders/KeyValuePairModelBinder.cs
@@ -32,7 +32,7 @@ public KeyValuePairModelBinder(IModelBinder keyBinder, IModelBinder valueBinder,
 
         _keyBinder = keyBinder;
         _valueBinder = valueBinder;
-        _logger = loggerFactory.CreateLogger<KeyValuePairModelBinder<TKey, TValue>>();
+        _logger = loggerFactory.CreateLogger(typeof(KeyValuePairModelBinder<TKey, TValue>));
     }
 
     /// <inheritdoc />
diff --git a/src/Mvc/Mvc.Core/src/ModelBinding/Binders/SimpleTypeModelBinder.cs b/src/Mvc/Mvc.Core/src/ModelBinding/Binders/SimpleTypeModelBinder.cs
@@ -28,7 +28,7 @@ public SimpleTypeModelBinder(Type type, ILoggerFactory loggerFactory)
         ArgumentNullException.ThrowIfNull(loggerFactory);
 
         _typeConverter = TypeDescriptor.GetConverter(type);
-        _logger = loggerFactory.CreateLogger<SimpleTypeModelBinder>();
+        _logger = loggerFactory.CreateLogger(typeof(SimpleTypeModelBinder));
     }
 
     /// <inheritdoc />
diff --git a/src/Mvc/Mvc.Core/src/ModelBinding/Binders/TryParseModelBinder.cs b/src/Mvc/Mvc.Core/src/ModelBinding/Binders/TryParseModelBinder.cs
@@ -36,7 +36,7 @@ public TryParseModelBinder(Type modelType, ILoggerFactory loggerFactory)
         ArgumentNullException.ThrowIfNull(loggerFactory);
 
         _tryParseOperation = CreateTryParseOperation(modelType);
-        _logger = loggerFactory.CreateLogger<TryParseModelBinder>();
+        _logger = loggerFactory.CreateLogger(typeof(TryParseModelBinder));
     }
 
     /// <inheritdoc />
diff --git a/src/Mvc/Mvc.Core/src/Routing/MvcAttributeRouteHandler.cs b/src/Mvc/Mvc.Core/src/Routing/MvcAttributeRouteHandler.cs
@@ -26,7 +26,7 @@ public MvcAttributeRouteHandler(
         _actionInvokerFactory = actionInvokerFactory;
         _actionSelector = actionSelector;
         _diagnosticListener = diagnosticListener;
-        _logger = loggerFactory.CreateLogger<MvcAttributeRouteHandler>();
+        _logger = loggerFactory.CreateLogger(typeof(MvcAttributeRouteHandler));
     }
 
     public ActionDescriptor[]? Actions { get; set; }
diff --git a/src/Mvc/Mvc.NewtonsoftJson/src/DependencyInjection/NewtonsoftJsonMvcOptionsSetup.cs b/src/Mvc/Mvc.NewtonsoftJson/src/DependencyInjection/NewtonsoftJsonMvcOptionsSetup.cs
@@ -50,7 +50,7 @@ public void Configure(MvcOptions options)
         // Register JsonPatchInputFormatter before JsonInputFormatter, otherwise
         // JsonInputFormatter would consume "application/json-patch+json" requests
         // before JsonPatchInputFormatter gets to see them.
-        var jsonInputPatchLogger = _loggerFactory.CreateLogger<NewtonsoftJsonPatchInputFormatter>();
+        var jsonInputPatchLogger = _loggerFactory.CreateLogger(typeof(NewtonsoftJsonPatchInputFormatter));
         options.InputFormatters.Add(new NewtonsoftJsonPatchInputFormatter(
             jsonInputPatchLogger,
             _jsonOptions.SerializerSettings,
@@ -59,7 +59,7 @@ public void Configure(MvcOptions options)
             options,
             _jsonOptions));
 
-        var jsonInputLogger = _loggerFactory.CreateLogger<NewtonsoftJsonInputFormatter>();
+        var jsonInputLogger = _loggerFactory.CreateLogger(typeof(NewtonsoftJsonInputFormatter));
         options.InputFormatters.Add(new NewtonsoftJsonInputFormatter(
             jsonInputLogger,
             _jsonOptions.SerializerSettings,
diff --git a/src/SignalR/clients/csharp/Client.Core/src/HubConnection.cs b/src/SignalR/clients/csharp/Client.Core/src/HubConnection.cs
@@ -230,7 +230,7 @@ public HubConnection(IConnectionFactory connectionFactory,
         _serviceProvider = serviceProvider ?? throw new ArgumentNullException(nameof(serviceProvider));
 
         _loggerFactory = loggerFactory ?? NullLoggerFactory.Instance;
-        _logger = _loggerFactory.CreateLogger<HubConnection>();
+        _logger = _loggerFactory.CreateLogger(typeof(HubConnection));
         _state = new ReconnectingConnectionState(_logger);
 
         _logScope = new ConnectionLogScope();
diff --git a/src/SignalR/clients/csharp/Http.Connections.Client/src/HttpConnection.cs b/src/SignalR/clients/csharp/Http.Connections.Client/src/HttpConnection.cs
@@ -142,7 +142,7 @@ public HttpConnection(HttpConnectionOptions httpConnectionOptions, ILoggerFactor
 
         _loggerFactory = loggerFactory ?? NullLoggerFactory.Instance;
 
-        _logger = _loggerFactory.CreateLogger<HttpConnection>();
+        _logger = _loggerFactory.CreateLogger(typeof(HttpConnection));
         _httpConnectionOptions = httpConnectionOptions;
 
         _url = _httpConnectionOptions.Url;
diff --git a/src/SignalR/clients/csharp/Http.Connections.Client/src/Internal/LoggingHttpMessageHandler.cs b/src/SignalR/clients/csharp/Http.Connections.Client/src/Internal/LoggingHttpMessageHandler.cs
@@ -13,13 +13,13 @@ namespace Microsoft.AspNetCore.Http.Connections.Client.Internal;
 
 internal sealed partial class LoggingHttpMessageHandler : DelegatingHandler
 {
-    private readonly ILogger<LoggingHttpMessageHandler> _logger;
+    private readonly ILogger _logger;
 
     public LoggingHttpMessageHandler(HttpMessageHandler inner, ILoggerFactory loggerFactory) : base(inner)
     {
         ArgumentNullThrowHelper.ThrowIfNull(loggerFactory);
 
-        _logger = loggerFactory.CreateLogger<LoggingHttpMessageHandler>();
+        _logger = loggerFactory.CreateLogger(typeof(LoggingHttpMessageHandler));
     }
 
     protected override async Task<HttpResponseMessage> SendAsync(HttpRequestMessage request, CancellationToken cancellationToken)
diff --git a/src/SignalR/clients/csharp/Http.Connections.Client/src/Internal/LongPollingTransport.cs b/src/SignalR/clients/csharp/Http.Connections.Client/src/Internal/LongPollingTransport.cs
@@ -35,7 +35,7 @@ internal sealed partial class LongPollingTransport : ITransport
     public LongPollingTransport(HttpClient httpClient, HttpConnectionOptions? httpConnectionOptions = null, ILoggerFactory? loggerFactory = null)
     {
         _httpClient = httpClient;
-        _logger = (loggerFactory ?? NullLoggerFactory.Instance).CreateLogger<LongPollingTransport>();
+        _logger = (loggerFactory ?? NullLoggerFactory.Instance).CreateLogger(typeof(LongPollingTransport));
         _httpConnectionOptions = httpConnectionOptions ?? new();
     }
 
diff --git a/src/SignalR/clients/csharp/Http.Connections.Client/src/Internal/ServerSentEventsTransport.cs b/src/SignalR/clients/csharp/Http.Connections.Client/src/Internal/ServerSentEventsTransport.cs
@@ -40,7 +40,7 @@ public ServerSentEventsTransport(HttpClient httpClient, HttpConnectionOptions? h
         ArgumentNullThrowHelper.ThrowIfNull(httpClient);
 
         _httpClient = httpClient;
-        _logger = (loggerFactory ?? NullLoggerFactory.Instance).CreateLogger<ServerSentEventsTransport>();
+        _logger = (loggerFactory ?? NullLoggerFactory.Instance).CreateLogger(typeof(ServerSentEventsTransport));
         _httpConnectionOptions = httpConnectionOptions ?? new();
     }
 
diff --git a/src/SignalR/clients/csharp/Http.Connections.Client/src/Internal/WebSocketsTransport.cs b/src/SignalR/clients/csharp/Http.Connections.Client/src/Internal/WebSocketsTransport.cs
@@ -75,7 +75,7 @@ public WebSocketsTransport(HttpConnectionOptions httpConnectionOptions, ILoggerF
         bool useStatefulReconnect = false)
     {
         _useStatefulReconnect = useStatefulReconnect;
-        _logger = (loggerFactory ?? NullLoggerFactory.Instance).CreateLogger<WebSocketsTransport>();
+        _logger = (loggerFactory ?? NullLoggerFactory.Instance).CreateLogger(typeof(WebSocketsTransport));
         _httpConnectionOptions = httpConnectionOptions ?? new HttpConnectionOptions();
 
         _closeTimeout = _httpConnectionOptions.CloseTimeout;
diff --git a/src/SignalR/server/Core/src/HubConnectionContext.cs b/src/SignalR/server/Core/src/HubConnectionContext.cs
@@ -75,7 +75,7 @@ public HubConnectionContext(ConnectionContext connectionContext, HubConnectionCo
         _statefulReconnectBufferSize = contextOptions.StatefulReconnectBufferSize;
 
         _connectionContext = connectionContext;
-        _logger = loggerFactory.CreateLogger<HubConnectionContext>();
+        _logger = loggerFactory.CreateLogger(typeof(HubConnectionContext));
         ConnectionAborted = _connectionAbortedTokenSource.Token;
         _closedRegistration = connectionContext.ConnectionClosed.Register(static (state) => ((HubConnectionContext)state!).Abort(), this);
 

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ internal sealed partial class DisableRequestSizeLimitFilter : IAuthorizationFilt`
`19`	`19`	`/// </summary>`
`20`	`20`	`public DisableRequestSizeLimitFilter(ILoggerFactory loggerFactory)`
`21`	`21`	`{`
`22`		`- _logger = loggerFactory.CreateLogger<DisableRequestSizeLimitFilter>();`
	`22`	`+ _logger = loggerFactory.CreateLogger(typeof(DisableRequestSizeLimitFilter));`
`23`	`23`	`}`
`24`	`24`
`25`	`25`	`/// <summary>`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ internal sealed partial class RequestFormLimitsFilter : IAuthorizationFilter, IR`
`15`	`15`
`16`	`16`	`public RequestFormLimitsFilter(ILoggerFactory loggerFactory)`
`17`	`17`	`{`
`18`		`- _logger = loggerFactory.CreateLogger<RequestFormLimitsFilter>();`
	`18`	`+ _logger = loggerFactory.CreateLogger(typeof(RequestFormLimitsFilter));`
`19`	`19`	`}`
`20`	`20`
`21`	`21`	`public FormOptions FormOptions { get; set; } = default!;`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ internal sealed partial class RequestSizeLimitFilter : IAuthorizationFilter, IRe`
`20`	`20`	`/// </summary>`
`21`	`21`	`public RequestSizeLimitFilter(ILoggerFactory loggerFactory)`
`22`	`22`	`{`
`23`		`- _logger = loggerFactory.CreateLogger<RequestSizeLimitFilter>();`
	`23`	`+ _logger = loggerFactory.CreateLogger(typeof(RequestSizeLimitFilter));`
`24`	`24`	`}`
`25`	`25`
`26`	`26`	`public long Bytes { get; set; }`
Original file line number	Diff line number	Diff line change
`@@ -21,6 +21,6 @@ public IFilterMetadata CreateInstance(IServiceProvider serviceProvider)`
`21`	`21`	`var options = serviceProvider.GetRequiredService<IOptions<ApiBehaviorOptions>>();`
`22`	`22`	`var loggerFactory = serviceProvider.GetRequiredService<ILoggerFactory>();`
`23`	`23`
`24`		`- return new ModelStateInvalidFilter(options.Value, loggerFactory.CreateLogger<ModelStateInvalidFilter>());`
	`24`	`+ return new ModelStateInvalidFilter(options.Value, loggerFactory.CreateLogger(typeof(ModelStateInvalidFilter)));`
`25`	`25`	`}`
`26`	`26`	`}`
Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,7 @@ public BodyModelBinder(`
`76`	`76`	`_formatters = formatters;`
`77`	`77`	`_readerFactory = readerFactory.CreateReader;`
`78`	`78`
`79`		`- _logger = loggerFactory?.CreateLogger<BodyModelBinder>() ?? NullLogger<BodyModelBinder>.Instance;`
	`79`	`+ _logger = loggerFactory?.CreateLogger(typeof(BodyModelBinder)) ?? NullLogger<BodyModelBinder>.Instance;`
`80`	`80`
`81`	`81`	`_options = options;`
`82`	`82`	`}`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ public ByteArrayModelBinder(ILoggerFactory loggerFactory)`
`22`	`22`	`{`
`23`	`23`	`ArgumentNullException.ThrowIfNull(loggerFactory);`
`24`	`24`
`25`		`- _logger = loggerFactory.CreateLogger<ByteArrayModelBinder>();`
	`25`	`+ _logger = loggerFactory.CreateLogger(typeof(ByteArrayModelBinder));`
`26`	`26`	`}`
`27`	`27`
`28`	`28`	`/// <inheritdoc />`
Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ public sealed partial class ComplexObjectModelBinder : IModelBinder`
`38`	`38`	`internal ComplexObjectModelBinder(`
`39`	`39`	`IDictionary<ModelMetadata, IModelBinder> propertyBinders,`
`40`	`40`	`IReadOnlyList<IModelBinder> parameterBinders,`
`41`		`- ILogger<ComplexObjectModelBinder> logger)`
	`41`	`+ ILogger logger)`
`42`	`42`	`{`
`43`	`43`	`_propertyBinders = propertyBinders;`
`44`	`44`	`_parameterBinders = parameterBinders;`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ public class ComplexObjectModelBinderProvider : IModelBinderProvider`
`22`	`22`	`if (metadata.IsComplexType && !metadata.IsCollectionType)`
`23`	`23`	`{`
`24`	`24`	`var loggerFactory = context.Services.GetRequiredService<ILoggerFactory>();`
`25`		`- var logger = loggerFactory.CreateLogger<ComplexObjectModelBinder>();`
	`25`	`+ var logger = loggerFactory.CreateLogger(typeof(ComplexObjectModelBinder));`
`26`	`26`	`var parameterBinders = GetParameterBinders(context);`
`27`	`27`
`28`	`28`	`var propertyBinders = new Dictionary<ModelMetadata, IModelBinder>();`
Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,7 @@ public ComplexTypeModelBinder(`
`71`	`71`	`ArgumentNullException.ThrowIfNull(loggerFactory);`
`72`	`72`
`73`	`73`	`_propertyBinders = propertyBinders;`
`74`		`- _logger = loggerFactory.CreateLogger<ComplexTypeModelBinder>();`
	`74`	`+ _logger = loggerFactory.CreateLogger(typeof(ComplexTypeModelBinder));`
`75`	`75`	`}`
`76`	`76`
`77`	`77`	`/// <inheritdoc/>`