Skip to content

Commit 5fd721f

Browse files
Copilotstephentoub
andcommitted
Remove unnecessary IsEnabled guards from logging call sites
Since the arguments to logging calls are just passing existing variables (no expensive work), the external guards are redundant - the source-generated logger methods handle the IsEnabled check internally. Co-authored-by: stephentoub <2642209+stephentoub@users.noreply.github.com>
1 parent a3aa70b commit 5fd721f

4 files changed

Lines changed: 6 additions & 24 deletions

File tree

src/ModelContextProtocol.Core/Client/SseClientSessionTransport.cs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -195,10 +195,7 @@ private async Task ProcessSseMessage(string data, CancellationToken cancellation
195195
return;
196196
}
197197

198-
if (_logger.IsEnabled(LogLevel.Trace))
199-
{
200-
LogTransportReceivedMessageSensitive(Name, data);
201-
}
198+
LogTransportReceivedMessageSensitive(Name, data);
202199

203200
try
204201
{

src/ModelContextProtocol.Core/Client/StreamClientSessionTransport.cs

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -105,10 +105,7 @@ public override async Task SendMessageAsync(JsonRpcMessage message, Cancellation
105105

106106
var json = JsonSerializer.Serialize(message, McpJsonUtilities.JsonContext.Default.JsonRpcMessage);
107107

108-
if (Logger.IsEnabled(LogLevel.Trace))
109-
{
110-
LogTransportSendingMessageSensitive(Name, json);
111-
}
108+
LogTransportSendingMessageSensitive(Name, json);
112109

113110
using var _ = await _sendLock.LockAsync(cancellationToken).ConfigureAwait(false);
114111
try
@@ -148,10 +145,7 @@ private async Task ReadMessagesAsync(CancellationToken cancellationToken)
148145
continue;
149146
}
150147

151-
if (Logger.IsEnabled(LogLevel.Trace))
152-
{
153-
LogTransportReceivedMessageSensitive(Name, line);
154-
}
148+
LogTransportReceivedMessageSensitive(Name, line);
155149

156150
await ProcessMessageAsync(line, cancellationToken).ConfigureAwait(false);
157151
}

src/ModelContextProtocol.Core/Client/StreamableHttpClientSessionTransport.cs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -344,10 +344,7 @@ private async Task<SseResponse> ProcessSseResponseAsync(
344344

345345
private async Task<JsonRpcMessageWithId?> ProcessMessageAsync(string data, JsonRpcRequest? relatedRpcRequest, CancellationToken cancellationToken)
346346
{
347-
if (_logger.IsEnabled(LogLevel.Trace))
348-
{
349-
LogTransportReceivedMessageSensitive(Name, data);
350-
}
347+
LogTransportReceivedMessageSensitive(Name, data);
351348

352349
try
353350
{

src/ModelContextProtocol.Core/Server/StreamServerTransport.cs

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -75,10 +75,7 @@ public override async Task SendMessageAsync(JsonRpcMessage message, Cancellation
7575
try
7676
{
7777
var json = JsonSerializer.Serialize(message, McpJsonUtilities.JsonContext.Default.JsonRpcMessage);
78-
if (Logger.IsEnabled(LogLevel.Trace))
79-
{
80-
LogTransportSendingMessageSensitive(Name, json);
81-
}
78+
LogTransportSendingMessageSensitive(Name, json);
8279
await _outputStream.WriteAsync(Encoding.UTF8.GetBytes(json), cancellationToken).ConfigureAwait(false);
8380
await _outputStream.WriteAsync(s_newlineBytes, cancellationToken).ConfigureAwait(false);
8481
await _outputStream.FlushAsync(cancellationToken).ConfigureAwait(false);
@@ -112,10 +109,7 @@ private async Task ReadMessagesAsync()
112109
continue;
113110
}
114111

115-
if (Logger.IsEnabled(LogLevel.Trace))
116-
{
117-
LogTransportReceivedMessageSensitive(Name, line);
118-
}
112+
LogTransportReceivedMessageSensitive(Name, line);
119113

120114
try
121115
{

0 commit comments

Comments
 (0)