From 6122bba00988c8f0c125815324a7008fab1e493e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marie=20P=C3=ADchov=C3=A1?=
 <11718369+ManickaP@users.noreply.github.com>
Date: Tue, 19 Oct 2021 20:14:48 +0200
Subject: [PATCH] Unified request/response logging for H/2 and H/3 (#60418)

---
 .../src/System/Net/Http/SocketsHttpHandler/Http2Connection.cs  | 2 +-
 .../src/System/Net/Http/SocketsHttpHandler/Http2Stream.cs      | 3 ++-
 .../src/System/Net/Http/SocketsHttpHandler/Http3Connection.cs  | 2 ++
 .../System/Net/Http/SocketsHttpHandler/Http3RequestStream.cs   | 1 +
 4 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/libraries/System.Net.Http/src/System/Net/Http/SocketsHttpHandler/Http2Connection.cs b/src/libraries/System.Net.Http/src/System/Net/Http/SocketsHttpHandler/Http2Connection.cs
index b632761f168..0f849d3d3aa 100644
--- a/src/libraries/System.Net.Http/src/System/Net/Http/SocketsHttpHandler/Http2Connection.cs
+++ b/src/libraries/System.Net.Http/src/System/Net/Http/SocketsHttpHandler/Http2Connection.cs
@@ -1900,7 +1900,7 @@ private enum SettingId : ushort
         public async Task<HttpResponseMessage> SendAsync(HttpRequestMessage request, bool async, CancellationToken cancellationToken)
         {
             Debug.Assert(async);
-            if (NetEventSource.Log.IsEnabled()) Trace($"{request}");
+            if (NetEventSource.Log.IsEnabled()) Trace($"Sending request: {request}");
 
             try
             {
diff --git a/src/libraries/System.Net.Http/src/System/Net/Http/SocketsHttpHandler/Http2Stream.cs b/src/libraries/System.Net.Http/src/System/Net/Http/SocketsHttpHandler/Http2Stream.cs
index b9afa990d96..5c3fde8ea8f 100644
--- a/src/libraries/System.Net.Http/src/System/Net/Http/SocketsHttpHandler/Http2Stream.cs
+++ b/src/libraries/System.Net.Http/src/System/Net/Http/SocketsHttpHandler/Http2Stream.cs
@@ -140,7 +140,7 @@ public void Initialize(int streamId, int initialWindowSize)
             {
                 StreamId = streamId;
                 _availableCredit = initialWindowSize;
-                if (NetEventSource.Log.IsEnabled()) Trace($"{_request}, {nameof(initialWindowSize)}={initialWindowSize}");
+                if (NetEventSource.Log.IsEnabled()) Trace($"{nameof(initialWindowSize)}={initialWindowSize}");
             }
 
             public int StreamId { get; private set; }
@@ -1029,6 +1029,7 @@ public async Task ReadResponseHeadersAsync(CancellationToken cancellationToken)
                 {
                     responseContent.SetStream(new Http2ReadStream(this));
                 }
+                if (NetEventSource.Log.IsEnabled()) Trace($"Received response: {_response}");
 
                 // Process Set-Cookie headers.
                 if (_connection._pool.Settings._useCookies)
diff --git a/src/libraries/System.Net.Http/src/System/Net/Http/SocketsHttpHandler/Http3Connection.cs b/src/libraries/System.Net.Http/src/System/Net/Http/SocketsHttpHandler/Http3Connection.cs
index 2e0047e6ce9..3c053ca9262 100644
--- a/src/libraries/System.Net.Http/src/System/Net/Http/SocketsHttpHandler/Http3Connection.cs
+++ b/src/libraries/System.Net.Http/src/System/Net/Http/SocketsHttpHandler/Http3Connection.cs
@@ -203,6 +203,8 @@ public async Task<HttpResponseMessage> SendAsync(HttpRequestMessage request, boo
                     throw new HttpRequestException(SR.net_http_request_aborted, null, RequestRetryType.RetryOnConnectionFailure);
                 }
 
+                if (NetEventSource.Log.IsEnabled()) Trace($"Sending request: {request}");
+
                 Task<HttpResponseMessage> responseTask = requestStream.SendAsync(cancellationToken);
 
                 // null out requestStream to avoid disposing in finally block. It is now in charge of disposing itself.
diff --git a/src/libraries/System.Net.Http/src/System/Net/Http/SocketsHttpHandler/Http3RequestStream.cs b/src/libraries/System.Net.Http/src/System/Net/Http/SocketsHttpHandler/Http3RequestStream.cs
index 498b04b0b13..64f9833e0aa 100644
--- a/src/libraries/System.Net.Http/src/System/Net/Http/SocketsHttpHandler/Http3RequestStream.cs
+++ b/src/libraries/System.Net.Http/src/System/Net/Http/SocketsHttpHandler/Http3RequestStream.cs
@@ -235,6 +235,7 @@ public async Task<HttpResponseMessage> SendAsync(CancellationToken cancellationT
                     // A read stream is required to finish up the request.
                     responseContent.SetStream(new Http3ReadStream(this));
                 }
+                if (NetEventSource.Log.IsEnabled()) Trace($"Received response: {_response}");
 
                 // Process any Set-Cookie headers.
                 if (_connection.Pool.Settings._useCookies)
-- 
GitLab