Activities for Http Connections, Dns, Sockets and SslStream

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

@@ -677,10 +677,9 @@ private async ValueTask<Stream> ConnectToTcpHostAsync(string host, int port, Htt
                         }
                         else
                         {
-                            IPAddress[] addresses = Dns.GetHostAddresses(host);
                             using (cancellationToken.UnsafeRegister(static s => ((Socket)s!).Dispose(), socket))
                             {
-                                socket.Connect(addresses, port);
+                                socket.Connect(endPoint);
                             }
                         }
 

src/libraries/System.Net.NameResolution/src/System/Net/Dns.cs

@@ -653,9 +653,10 @@ private static bool LogFailure(object hostNameOrAddress, in NameResolutionActivi
         /// </remarks>
         private static Task<TResult> RunAsync<TResult>(Func<object, NameResolutionActivity, TResult> func, object key, CancellationToken cancellationToken)
         {
-            Activity? activityToRestore = NameResolutionActivity.IsTracingEnabled() ? Activity.Current : null;
+            bool tracingEnabled = NameResolutionActivity.IsTracingEnabled();
+            Activity? activityToRestore = tracingEnabled ? Activity.Current : null;
             NameResolutionActivity activity = NameResolutionTelemetry.Log.BeforeResolution(key);
-            if (NameResolutionActivity.IsTracingEnabled())
+            if (tracingEnabled)
             {
                 // Do not overwrite Activity.Current in the caller's ExecutionContext.
                 Activity.Current = activityToRestore;

src/libraries/System.Net.Security/src/System/Net/Security/SslStream.IO.cs

@@ -111,30 +111,32 @@ private Task ProcessAuthenticationAsync(bool isAsync = false, CancellationToken
         {
             ThrowIfExceptional();
 
-            Activity? activity = s_activitySource.StartActivity(ActivityName, IsServer ? ActivityKind.Server : ActivityKind.Client);
-            try
+            if (NetSecurityTelemetry.Log.IsEnabled() || s_activitySource.HasListeners())
             {
-                if (NetSecurityTelemetry.Log.IsEnabled())
-                {
-                    return ProcessAuthenticationWithTelemetryAsync(isAsync, cancellationToken);
-                }
-                else
-                {
-                    return isAsync ?
-                        ForceAuthenticationAsync<AsyncReadWriteAdapter>(IsServer, null, cancellationToken) :
-                        ForceAuthenticationAsync<SyncReadWriteAdapter>(IsServer, null, cancellationToken);
-                }
+                return ProcessAuthenticationWithTelemetryAsync(isAsync, cancellationToken);
             }
-            finally
+            else
             {
-                activity?.Stop();
+                return isAsync ?
+                    ForceAuthenticationAsync<AsyncReadWriteAdapter>(IsServer, null, cancellationToken) :
+                    ForceAuthenticationAsync<SyncReadWriteAdapter>(IsServer, null, cancellationToken);
             }
         }
 
         private async Task ProcessAuthenticationWithTelemetryAsync(bool isAsync, CancellationToken cancellationToken)
         {
-            NetSecurityTelemetry.Log.HandshakeStart(IsServer, _sslAuthenticationOptions.TargetHost);
-            long startingTimestamp = Stopwatch.GetTimestamp();
+            long startingTimestamp;
+            if (NetSecurityTelemetry.Log.IsEnabled())
+            {
+                NetSecurityTelemetry.Log.HandshakeStart(IsServer, _sslAuthenticationOptions.TargetHost);
+                startingTimestamp = Stopwatch.GetTimestamp();
+            }
+            else
+            {
+                startingTimestamp = 0;
+            }
+
+            Activity? activity = s_activitySource.StartActivity(ActivityName, IsServer ? ActivityKind.Server : ActivityKind.Client);
 
             try
             {
@@ -144,17 +146,27 @@ private async Task ProcessAuthenticationWithTelemetryAsync(bool isAsync, Cancell
 
                 await task.ConfigureAwait(false);
 
-                // SslStream could already have been disposed at this point, in which case _connectionOpenedStatus == 2
-                // Make sure that we increment the open connection counter only if it is guaranteed to be decremented in dispose/finalize
-                bool connectionOpen = Interlocked.CompareExchange(ref _connectionOpenedStatus, 1, 0) == 0;
-
-                NetSecurityTelemetry.Log.HandshakeCompleted(GetSslProtocolInternal(), startingTimestamp, connectionOpen);
+                if (startingTimestamp is not 0)
+                {
+                    // SslStream could already have been disposed at this point, in which case _connectionOpenedStatus == 2
+                    // Make sure that we increment the open connection counter only if it is guaranteed to be decremented in dispose/finalize
+                    bool connectionOpen = Interlocked.CompareExchange(ref _connectionOpenedStatus, 1, 0) == 0;
+                    NetSecurityTelemetry.Log.HandshakeCompleted(GetSslProtocolInternal(), startingTimestamp, connectionOpen);
+                }
             }
             catch (Exception ex)
             {
-                NetSecurityTelemetry.Log.HandshakeFailed(IsServer, startingTimestamp, ex.Message);
+                if (startingTimestamp is not 0)
+                {
+                    NetSecurityTelemetry.Log.HandshakeFailed(IsServer, startingTimestamp, ex.Message);
+                }
+
                 throw;
             }
+            finally
+            {
+                activity?.Stop();
+            }
         }
 
         //

src/libraries/System.Net.Security/tests/FunctionalTests/TelemetryTest.cs

@@ -31,19 +31,24 @@ public static void EventSource_ExistsWithCorrectId()
             Assert.NotEmpty(EventSource.GenerateManifest(esType, esType.Assembly.Location));
         }
 
-        [ConditionalFact(typeof(RemoteExecutor), nameof(RemoteExecutor.IsSupported))]
+        [ConditionalTheory(typeof(RemoteExecutor), nameof(RemoteExecutor.IsSupported))]
         [SkipOnPlatform(TestPlatforms.iOS | TestPlatforms.tvOS, "X509 certificate store is not supported on iOS or tvOS.")] // Match SslStream_StreamToStream_Authentication_Success
-        public async Task SuccessfulHandshake_ActivityRecorded()
+        [InlineData(false)]
+        [InlineData(true)]
+        public async Task SuccessfulHandshake_ActivityRecorded(bool synchronousApi)
         {
-            await RemoteExecutor.Invoke(async () =>
+            await RemoteExecutor.Invoke(async synchronousApiStr =>
             {
                 using ActivityRecorder recorder = new ActivityRecorder(ActivitySourceName, ActivityName);
 
-                var test = new SslStreamStreamToStreamTest_Async();
+                SslStreamStreamToStreamTest test = bool.Parse(synchronousApiStr)
+                    ? new SslStreamStreamToStreamTest_SyncParameters()
+                    : new SslStreamStreamToStreamTest_Async();
                 await test.SslStream_StreamToStream_Authentication_Success();
 
                 recorder.VerifyActivityRecorded(2); // client + server
-            }).DisposeAsync();
+                Assert.True(recorder.LastFinishedActivity.Duration > TimeSpan.Zero);
+            }, synchronousApi.ToString()).DisposeAsync();
         }
 
         [ConditionalFact(typeof(RemoteExecutor), nameof(RemoteExecutor.IsSupported))]