Skip to content
Merged
Changes from all commits
Commits
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
14 changes: 11 additions & 3 deletions dotnet/src/webdriver/Remote/HttpCommandExecutor.cs
Original file line number Diff line number Diff line change
Expand Up @@ -440,8 +440,6 @@ public DiagnosticsHttpHandler(HttpMessageHandler messageHandler, ILogger logger)
/// <returns>The http response message content.</returns>
protected override async Task<HttpResponseMessage> SendAsync(HttpRequestMessage request, CancellationToken cancellationToken)
{
var responseTask = base.SendAsync(request, cancellationToken);

StringBuilder requestLogMessageBuilder = new();
requestLogMessageBuilder.AppendFormat(">> {0} RequestUri: {1}, Content: {2}, Headers: {3}",
request.Method,
Expand All @@ -451,20 +449,30 @@ protected override async Task<HttpResponseMessage> SendAsync(HttpRequestMessage

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

_logger.Trace(requestLogMessageBuilder.ToString());

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

StringBuilder responseLogMessageBuilder = new();

responseLogMessageBuilder.AppendFormat("<< StatusCode: {0}, ReasonPhrase: {1}, Content: {2}, Headers: {3}", (int)response.StatusCode, response.ReasonPhrase, response.Content, response.Headers?.Count());

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

responseLogMessageBuilder.AppendFormat("{0}{1}", Environment.NewLine, responseContent);
}

Expand Down