Skip to content
Merged
Changes from 1 commit
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
27 changes: 23 additions & 4 deletions dotnet/src/webdriver/Remote/HttpCommandExecutor.cs
Original file line number Diff line number Diff line change
Expand Up @@ -435,10 +435,13 @@ public DiagnosticsHttpHandler(HttpMessageHandler messageHandler, ILogger logger)
/// <returns>The http response message content.</returns>
protected override async Task<HttpResponseMessage> SendAsync(HttpRequestMessage request, CancellationToken cancellationToken)
{
string requestId = request.GetHashCode().ToString("x8");

Comment thread
nvborisenko marked this conversation as resolved.
Outdated
if (_logger.IsEnabled(LogEventLevel.Trace))
{
Comment thread
nvborisenko marked this conversation as resolved.
Outdated
StringBuilder requestLogMessageBuilder = new();
requestLogMessageBuilder.AppendFormat(">> {0} {1}",
requestLogMessageBuilder.AppendFormat(">> [{0}] {1} {2}",
requestId,
request.Method,
request.RequestUri?.ToString() ?? "null");

Expand All @@ -455,13 +458,29 @@ protected override async Task<HttpResponseMessage> SendAsync(HttpRequestMessage
_logger.Trace(requestLogMessageBuilder.ToString());
}

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

try
{
response = await base.SendAsync(request, cancellationToken).ConfigureAwait(false);
}
catch (Exception ex)
{
if (_logger.IsEnabled(LogEventLevel.Trace))
{
_logger.Trace($"<< [{requestId}] {ex}");
}

throw;
}

if (_logger.IsEnabled(LogEventLevel.Trace))
{
StringBuilder responseLogMessageBuilder = new();

responseLogMessageBuilder.AppendFormat("<< {0} {1}", (int)response.StatusCode, response.ReasonPhrase);
responseLogMessageBuilder.AppendFormat("<< [{0}] {1} {2}",
requestId,
(int)response.StatusCode,
response.ReasonPhrase);
Comment thread
nvborisenko marked this conversation as resolved.
Outdated
Comment thread
nvborisenko marked this conversation as resolved.

if (!response.IsSuccessStatusCode && response.Content != null)
{
Expand Down
Loading