fix after merge

Author: antonfirsov

src/libraries/System.Net.Http/src/System/Net/Http/SocketsHttpHandler/ConnectionPool/HttpConnectionPool.Http3.cs

@@ -87,11 +87,7 @@ internal sealed partial class HttpConnectionPool
                         ThrowGetVersionException(request, 3, reasonException);
                     }
 
-                    WaitForHttp3ConnectionActivity waitForConnectionActivity = new WaitForHttp3ConnectionActivity(Settings._metrics!, authority);
-                    long queueStartingTimestamp = HttpTelemetry.Log.IsEnabled() || (GlobalHttpSettings.MetricsHandler.IsGloballyEnabled && Settings._metrics!.RequestsQueueDuration.Enabled)
-                        ? Stopwatch.GetTimestamp()
-                        : 0;
-
+                    WaitForHttp3ConnectionActivity waitForConnectionActivity = new WaitForHttp3ConnectionActivity(Settings._metrics, authority);
                     if (!TryGetPooledHttp3Connection(request, out Http3Connection? connection, out http3ConnectionWaiter, out bool streamAvailable))
                     {
                         waitForConnectionActivity.Start();

src/libraries/System.Net.Http/src/System/Net/Http/SocketsHttpHandler/Http3Connection.cs

@@ -307,20 +307,6 @@ public async Task<HttpResponseMessage> SendAsync(HttpRequestMessage request, Wai
                 finally
                 {
                     waitForConnectionActivity.Stop(request, Pool, exception);
-                    waitForConnectionActivity?.Stop();
-                    if (queueStartingTimestamp != 0)
-                    {
-                        TimeSpan duration = Stopwatch.GetElapsedTime(queueStartingTimestamp);
-                        if (GlobalHttpSettings.MetricsHandler.IsGloballyEnabled)
-                        {
-                            _pool.Settings._metrics!.RequestLeftQueue(request, Pool, duration, versionMajor: 3);
-                        }
-
-                        if (HttpTelemetry.Log.IsEnabled())
-                        {
-                            HttpTelemetry.Log.RequestLeftQueue(versionMajor: 3, duration);
-                        }
-                    }
                 }
 
                 if (quicStream == null)
@@ -959,12 +945,12 @@ async ValueTask SkipUnknownPayloadAsync(long payloadLength)
     /// </summary>
     internal struct WaitForHttp3ConnectionActivity
     {
-        private readonly SocketsHttpHandlerMetrics _metrics;
+        private readonly SocketsHttpHandlerMetrics? _metrics;
         private readonly HttpAuthority _authority;
         private Activity? _activity;
         private long _startTimestamp;
 
-        public WaitForHttp3ConnectionActivity(SocketsHttpHandlerMetrics metrics, HttpAuthority authority)
+        public WaitForHttp3ConnectionActivity(SocketsHttpHandlerMetrics? metrics, HttpAuthority authority)
         {
             _metrics = metrics;
             _authority = authority;
@@ -975,7 +961,7 @@ public WaitForHttp3ConnectionActivity(SocketsHttpHandlerMetrics metrics, HttpAut
         public void Start()
         {
             Debug.Assert(!Started);
-            _startTimestamp = HttpTelemetry.Log.IsEnabled() || _metrics!.RequestsQueueDuration.Enabled ? Stopwatch.GetTimestamp() : 0;
+            _startTimestamp = HttpTelemetry.Log.IsEnabled() || (GlobalHttpSettings.MetricsHandler.IsGloballyEnabled && _metrics!.RequestsQueueDuration.Enabled) ? Stopwatch.GetTimestamp() : 0;
             _activity = ConnectionSetupDistributedTracing.StartWaitForConnectionActivity(_authority);
             Started = true;
         }
@@ -992,14 +978,19 @@ public void Stop(HttpRequestMessage request, HttpConnectionPool pool, Exception?
             if (_startTimestamp != 0)
             {
                 TimeSpan duration = Stopwatch.GetElapsedTime(_startTimestamp);
-                _metrics!.RequestLeftQueue(request, pool, duration, versionMajor: 3);
+
+                if (GlobalHttpSettings.MetricsHandler.IsGloballyEnabled)
+                {
+                    _metrics!.RequestLeftQueue(request, pool, duration, versionMajor: 3);
+                }
                 if (HttpTelemetry.Log.IsEnabled())
                 {
                     HttpTelemetry.Log.RequestLeftQueue(3, duration);
                 }
             }
         }
 
+        [Conditional("DEBUG")]
         public void AssertActivityNotRunning()
         {
             Debug.Assert(_activity?.IsStopped != false);