Skip to content

[dotnet] Fix emitting of trace log messages from http client handler #17069

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nvborisenko merged 7 commits into from
Feb 9, 2026
Merged

[dotnet] Fix emitting of trace log messages from http client handler #17069

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
d58ab47
Always wrap http client handler
nvborisenko Feb 9, 2026
5c00663
Trace if enabled in runtime
nvborisenko Feb 9, 2026
b7575b6
Format
nvborisenko Feb 9, 2026
2c57be9
Format
nvborisenko Feb 9, 2026
ab80ff5
Redundant variable
nvborisenko Feb 9, 2026
b47f0b3
Merge remote-tracking branch 'upstream/trunk' into dotnet-fix-log-htt…
nvborisenko Feb 9, 2026
b4f1300
Rename local vars
nvborisenko Feb 9, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
57 changes: 29 additions & 28 deletions dotnet/src/webdriver/Remote/HttpCommandExecutor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,17 +249,12 @@ protected virtual HttpClientHandler CreateHttpClientHandler()
/// <returns>An instance of <see cref="HttpClient"/>.</returns>
protected virtual HttpClient CreateHttpClient()
{
var httpClientHandler = CreateHttpClientHandler()
HttpClientHandler httpClientHandler = CreateHttpClientHandler()
?? throw new InvalidOperationException($"{nameof(CreateHttpClientHandler)} method returned null");

HttpMessageHandler handler = httpClientHandler;
var diagnosticsHttpHandler = new DiagnosticsHttpHandler(httpClientHandler, _logger);

if (_logger.IsEnabled(LogEventLevel.Trace))
{
handler = new DiagnosticsHttpHandler(httpClientHandler, _logger);
}

var client = new HttpClient(handler);
var client = new HttpClient(diagnosticsHttpHandler);
Comment thread
nvborisenko marked this conversation as resolved.
Resolved

client.DefaultRequestHeaders.UserAgent.ParseAdd(this.UserAgent);
client.DefaultRequestHeaders.Accept.ParseAdd(RequestAcceptHeader);
Expand Down Expand Up @@ -440,41 +435,47 @@ public DiagnosticsHttpHandler(HttpMessageHandler messageHandler, ILogger logger)
/// <returns>The http response message content.</returns>
protected override async Task<HttpResponseMessage> SendAsync(HttpRequestMessage request, CancellationToken cancellationToken)
{
StringBuilder requestLogMessageBuilder = new();
requestLogMessageBuilder.AppendFormat(">> {0} {1}",
request.Method,
request.RequestUri?.ToString() ?? "null");

if (request.Content is not null)
if (_logger.IsEnabled(LogEventLevel.Trace))
{
StringBuilder requestLogMessageBuilder = new();
requestLogMessageBuilder.AppendFormat(">> {0} {1}",
request.Method,
request.RequestUri?.ToString() ?? "null");
Comment thread
nvborisenko marked this conversation as resolved.
Resolved

if (request.Content is not null)
{
#if NET8_0_OR_GREATER
var requestContent = await request.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false);
var requestContent = await request.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false);
#else
var requestContent = await request.Content.ReadAsStringAsync().ConfigureAwait(false);
var requestContent = await request.Content.ReadAsStringAsync().ConfigureAwait(false);
#endif
requestLogMessageBuilder.AppendFormat("{0}{1}", Environment.NewLine, requestContent);
}
requestLogMessageBuilder.AppendFormat("{0}{1}", Environment.NewLine, requestContent);
}

_logger.Trace(requestLogMessageBuilder.ToString());
_logger.Trace(requestLogMessageBuilder.ToString());
}

var response = await base.SendAsync(request, cancellationToken).ConfigureAwait(false);

StringBuilder responseLogMessageBuilder = new();
if (_logger.IsEnabled(LogEventLevel.Trace))
Comment thread
nvborisenko marked this conversation as resolved.
Resolved
{
StringBuilder responseLogMessageBuilder = new();

responseLogMessageBuilder.AppendFormat("<< {0} {1}", (int)response.StatusCode, response.ReasonPhrase);
responseLogMessageBuilder.AppendFormat("<< {0} {1}", (int)response.StatusCode, response.ReasonPhrase);

if (!response.IsSuccessStatusCode && response.Content != null)
{
if (!response.IsSuccessStatusCode && response.Content != null)
{
#if NET8_0_OR_GREATER
var responseContent = await response.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false);
var responseContent = await response.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false);
#else
var responseContent = await response.Content.ReadAsStringAsync().ConfigureAwait(false);
var responseContent = await response.Content.ReadAsStringAsync().ConfigureAwait(false);
#endif

responseLogMessageBuilder.AppendFormat("{0}{1}", Environment.NewLine, responseContent);
}
responseLogMessageBuilder.AppendFormat("{0}{1}", Environment.NewLine, responseContent);
Comment thread
nvborisenko marked this conversation as resolved.
Resolved
}

_logger.Trace(responseLogMessageBuilder.ToString());
_logger.Trace(responseLogMessageBuilder.ToString());
}

return response;
}
Expand Down