Skip to content

Commit 6429ae2

Browse files
authored
Reduce logger allocations by not using generic CreateLogger (#2256)
1 parent 3db1683 commit 6429ae2

8 files changed

+11
-11
lines changed

src/Grpc.Net.Client/Balancer/DnsResolver.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ public DnsResolver(Uri address, int defaultPort, ILoggerFactory loggerFactory, T
5959
_dnsAddress = addressParsed.Host;
6060
_port = addressParsed.Port == -1 ? defaultPort : addressParsed.Port;
6161
_refreshInterval = refreshInterval;
62-
_logger = loggerFactory.CreateLogger<DnsResolver>();
62+
_logger = loggerFactory.CreateLogger(typeof(DnsResolver));
6363
}
6464

6565
protected override void OnStarted()

src/Grpc.Net.Client/Balancer/Internal/BalancerHttpHandler.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#region Copyright notice and license
1+
#region Copyright notice and license
22

33
// Copyright 2019 The gRPC Authors
44
//
@@ -45,7 +45,7 @@ public BalancerHttpHandler(HttpMessageHandler innerHandler, ConnectionManager ma
4545
: base(innerHandler)
4646
{
4747
_manager = manager;
48-
_logger = manager.LoggerFactory.CreateLogger<BalancerHttpHandler>();
48+
_logger = manager.LoggerFactory.CreateLogger(typeof(BalancerHttpHandler));
4949
}
5050

5151
internal static bool IsSocketsHttpHandlerSetup(SocketsHttpHandler socketsHttpHandler)

src/Grpc.Net.Client/Balancer/Internal/ConnectionManager.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ internal ConnectionManager(
6161
_resolverStartedTcs = new TaskCompletionSource<object?>(TaskCreationOptions.RunContinuationsAsynchronously);
6262
_channelId = _channelIdProvider.GetNextChannelId();
6363

64-
Logger = loggerFactory.CreateLogger<ConnectionManager>();
64+
Logger = loggerFactory.CreateLogger(typeof(ConnectionManager));
6565
LoggerFactory = loggerFactory;
6666
BackoffPolicyFactory = backoffPolicyFactory;
6767
_subchannels = new List<Subchannel>();

src/Grpc.Net.Client/Balancer/Internal/SocketConnectivitySubchannelTransport.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ public SocketConnectivitySubchannelTransport(
6969
ILoggerFactory loggerFactory,
7070
Func<Socket, DnsEndPoint, CancellationToken, ValueTask>? socketConnect)
7171
{
72-
_logger = loggerFactory.CreateLogger<SocketConnectivitySubchannelTransport>();
72+
_logger = loggerFactory.CreateLogger(typeof(SocketConnectivitySubchannelTransport));
7373
_subchannel = subchannel;
7474
_socketPingInterval = socketPingInterval;
7575
ConnectTimeout = connectTimeout;

src/Grpc.Net.Client/Balancer/PickFirstBalancer.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ internal sealed class PickFirstBalancer : LoadBalancer
4949
public PickFirstBalancer(IChannelControlHelper controller, ILoggerFactory loggerFactory)
5050
{
5151
_controller = controller;
52-
_logger = loggerFactory.CreateLogger<PickFirstBalancer>();
52+
_logger = loggerFactory.CreateLogger(typeof(PickFirstBalancer));
5353
}
5454

5555
private void ResolverError(Status status)

src/Grpc.Net.Client/Balancer/PollingResolver.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ protected PollingResolver(ILoggerFactory loggerFactory, IBackoffPolicyFactory? b
7272
{
7373
ArgumentNullThrowHelper.ThrowIfNull(loggerFactory);
7474

75-
_logger = loggerFactory.CreateLogger<PollingResolver>();
75+
_logger = loggerFactory.CreateLogger(typeof(PollingResolver));
7676
_backoffPolicyFactory = backoffPolicyFactory;
7777
}
7878

src/Grpc.Net.Client/GrpcChannel.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ internal GrpcChannel(Uri address, GrpcChannelOptions channelOptions) : base(addr
118118
OperatingSystem = channelOptions.ResolveService<IOperatingSystem>(Internal.OperatingSystem.Instance);
119119
RandomGenerator = channelOptions.ResolveService<IRandomGenerator>(new RandomGenerator());
120120
Debugger = channelOptions.ResolveService<IDebugger>(new CachedDebugger());
121-
Logger = LoggerFactory.CreateLogger<GrpcChannel>();
121+
Logger = LoggerFactory.CreateLogger(typeof(GrpcChannel));
122122

123123
#if SUPPORT_LOAD_BALANCING
124124
InitialReconnectBackoff = channelOptions.InitialReconnectBackoff;

src/Grpc.Net.Client/Internal/Retry/ChannelRetryThrottling.cs

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#region Copyright notice and license
1+
#region Copyright notice and license
22

33
// Copyright 2019 The gRPC Authors
44
//
@@ -26,7 +26,7 @@ internal class ChannelRetryThrottling
2626
private readonly object _lock = new object();
2727
private readonly double _tokenRatio;
2828
private readonly int _maxTokens;
29-
private readonly ILogger<ChannelRetryThrottling> _logger;
29+
private readonly ILogger _logger;
3030

3131
private double _tokenCount;
3232
private readonly double _tokenThreshold;
@@ -41,7 +41,7 @@ public ChannelRetryThrottling(int maxTokens, double tokenRatio, ILoggerFactory l
4141
_maxTokens = maxTokens;
4242
_tokenCount = maxTokens;
4343
_tokenThreshold = _tokenCount / 2;
44-
_logger = loggerFactory.CreateLogger<ChannelRetryThrottling>();
44+
_logger = loggerFactory.CreateLogger(typeof(ChannelRetryThrottling));
4545
}
4646

4747
public bool IsRetryThrottlingActive()

0 commit comments

Comments
 (0)