Update Grpc.Net.Client to use ActivitySource

build/dependencies.props

@@ -28,7 +28,7 @@
     <ProtobufNetGrpcPackageVersion>1.0.140</ProtobufNetGrpcPackageVersion>
     <SystemCommandLinePackageVersion>2.0.0-beta4.22272.1</SystemCommandLinePackageVersion>
     <SystemCommandLineRenderingPackageVersion>0.4.0-alpha.22272.1</SystemCommandLineRenderingPackageVersion>
-    <SystemDiagnosticsDiagnosticSourcePackageVersion>4.5.1</SystemDiagnosticsDiagnosticSourcePackageVersion>
+    <SystemDiagnosticsDiagnosticSourcePackageVersion>6.0.1</SystemDiagnosticsDiagnosticSourcePackageVersion>
     <SystemIOPipelinesPackageVersion>5.0.1</SystemIOPipelinesPackageVersion>
     <SystemMemoryPackageVersion>4.5.3</SystemMemoryPackageVersion>
     <SystemNetHttpWinHttpHandlerPackageVersion>7.0.0</SystemNetHttpWinHttpHandlerPackageVersion>

src/Grpc.Net.Client/Balancer/Internal/ConnectionManager.cs

@@ -1,4 +1,4 @@
-#region Copyright notice and license
+#region Copyright notice and license
 
 // Copyright 2019 The gRPC Authors
 //
@@ -17,17 +17,10 @@
 #endregion
 
 #if SUPPORT_LOAD_BALANCING
-using System;
-using System.Collections.Generic;
 using System.Diagnostics;
-using System.Linq;
-using System.Net;
-using System.Threading;
-using System.Threading.Tasks;
 using Grpc.Core;
 using Grpc.Net.Client.Configuration;
 using Grpc.Net.Client.Internal;
-using Grpc.Shared;
 using Microsoft.Extensions.Logging;
 
 namespace Grpc.Net.Client.Balancer.Internal;

src/Grpc.Net.Client/Balancer/Internal/SocketConnectivitySubchannelTransport.cs

@@ -17,17 +17,9 @@
 #endregion
 
 #if SUPPORT_LOAD_BALANCING
-using System;
-using System.Buffers;
-using System.Collections.Generic;
 using System.Diagnostics;
-using System.IO;
-using System.Linq;
 using System.Net;
-using System.Net.Http;
 using System.Net.Sockets;
-using System.Threading;
-using System.Threading.Tasks;
 using Grpc.Core;
 using Grpc.Shared;
 using Microsoft.Extensions.Logging;

src/Grpc.Net.Client/Balancer/Internal/StreamWrapper.cs

@@ -17,12 +17,6 @@
 #endregion
 
 #if SUPPORT_LOAD_BALANCING
-using System;
-using System.Diagnostics;
-using System.IO;
-using System.Threading;
-using System.Threading.Tasks;
-
 namespace Grpc.Net.Client.Balancer.Internal;
 
 internal sealed class StreamWrapper : Stream

src/Grpc.Net.Client/Balancer/RoundRobinBalancer.cs

@@ -1,4 +1,4 @@
-#region Copyright notice and license
+#region Copyright notice and license
 
 // Copyright 2019 The gRPC Authors
 //
@@ -17,9 +17,6 @@
 #endregion
 
 #if SUPPORT_LOAD_BALANCING
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading;
 using Grpc.Net.Client.Configuration;
 using Grpc.Net.Client.Internal;
 using Microsoft.Extensions.Logging;

src/Grpc.Net.Client/Balancer/Subchannel.cs

@@ -17,13 +17,6 @@
 #endregion
 
 #if SUPPORT_LOAD_BALANCING
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Linq;
-using System.Net;
-using System.Threading;
-using System.Threading.Tasks;
 using Grpc.Core;
 using Grpc.Net.Client.Balancer.Internal;
 using Microsoft.Extensions.Logging;

src/Grpc.Net.Client/Balancer/SubchannelsLoadBalancer.cs

@@ -1,4 +1,4 @@
-#region Copyright notice and license
+#region Copyright notice and license
 
 // Copyright 2019 The gRPC Authors
 //
@@ -17,11 +17,6 @@
 #endregion
 
 #if SUPPORT_LOAD_BALANCING
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Linq;
-using System.Net;
 using Grpc.Core;
 using Grpc.Net.Client.Balancer.Internal;
 using Microsoft.Extensions.Logging;

src/Grpc.Net.Client/Grpc.Net.Client.csproj

@@ -36,7 +36,6 @@
     <Compile Include="..\Shared\CommonGrpcProtocolHelpers.cs" Link="Internal\CommonGrpcProtocolHelpers.cs" />
     <Compile Include="..\Shared\DefaultDeserializationContext.cs" Link="Internal\DefaultDeserializationContext.cs" />
     <Compile Include="..\Shared\HttpHandlerFactory.cs" Link="Internal\Http\HttpHandlerFactory.cs" />
-    <Compile Include="..\Shared\TelemetryHeaderHandler.cs" Link="Internal\Http\TelemetryHeaderHandler.cs" />
     <Compile Include="..\Shared\HttpRequestHelpers.cs" Link="Internal\Http\HttpRequestHelpers.cs" />
     <Compile Include="..\Shared\TrailingHeadersHelpers.cs" Link="Internal\Http\TrailingHeadersHelpers.cs" />
     <Compile Include="..\Shared\CompatibilityHelpers.cs" Link="Internal\CompatibilityHelpers.cs" />

src/Grpc.Net.Client/GrpcChannel.cs

@@ -508,10 +508,6 @@ private HttpMessageInvoker CreateInternalHttpInvoker(HttpMessageHandler? handler
             }
         }
 
-#if NET5_0
-        handler = HttpHandlerFactory.EnsureTelemetryHandler(handler);
-#endif
-
 #if SUPPORT_LOAD_BALANCING
         BalancerHttpHandler balancerHttpHandler;
         handler = balancerHttpHandler = new BalancerHttpHandler(handler, ConnectionManager);

src/Grpc.Net.Client/Internal/GrpcCall.cs

@@ -811,9 +811,15 @@ private void SetFailedResult(Status status)
         // 1. Diagnostic source is enabled
         // 2. Logging is enabled
         // 3. There is an existing activity (to enable activity propagation)
-        if (diagnosticSourceEnabled || Logger.IsEnabled(LogLevel.Critical) || Activity.Current != null)
+        // 4. ActivitySource has listeners
+        if (diagnosticSourceEnabled || Logger.IsEnabled(LogLevel.Critical) || Activity.Current != null || GrpcDiagnostics.ActivitySource.HasListeners())
         {
-            activity = new Activity(GrpcDiagnostics.ActivityName);
+            activity = GrpcDiagnostics.ActivitySource.CreateActivity(GrpcDiagnostics.ActivityName, ActivityKind.Client);
+
+            // ActivitySource only returns an activity if someone is listening.
+            // We always want there to be an activity so fallback to creating the activity manually.
+            activity ??= new Activity(GrpcDiagnostics.ActivityName);
+
             activity.AddTag(GrpcDiagnostics.GrpcMethodTagName, Method.FullName);
             activity.Start();
 

src/Grpc.Net.Client/Internal/GrpcDiagnostics.cs

@@ -1,4 +1,4 @@
-#region Copyright notice and license
+#region Copyright notice and license
 
 // Copyright 2019 The gRPC Authors
 //
@@ -22,8 +22,9 @@ namespace Grpc.Net.Client.Internal;
 
 internal static class GrpcDiagnostics
 {
-    // This is a static on a non-generic class so it isn't re-created once for each type argument
+    // These are static on a non-generic class. We don't want these re-created for each type argument.
     public static readonly DiagnosticListener DiagnosticListener = new DiagnosticListener("Grpc.Net.Client");
+    public static readonly ActivitySource ActivitySource = new ActivitySource("Grpc.Net.Client");
 
     public const string ActivityName = "Grpc.Net.Client.GrpcOut";
 

src/Grpc.Net.ClientFactory/Grpc.Net.ClientFactory.csproj

@@ -15,7 +15,6 @@
 
     <Compile Include="..\Shared\IsExternalInit.cs" Link="Internal\IsExternalInit.cs" />
     <Compile Include="..\Shared\HttpHandlerFactory.cs" Link="Internal\HttpHandlerFactory.cs" />
-    <Compile Include="..\Shared\TelemetryHeaderHandler.cs" Link="Internal\TelemetryHeaderHandler.cs" />
     <Compile Include="..\Shared\CompatibilityHelpers.cs" Link="Internal\CompatibilityHelpers.cs" />
     <Compile Include="..\Shared\NullableAttributes.cs" Link="Internal\NullableAttributes.cs" />
     <Compile Include="..\Shared\HttpRequestHelpers.cs" Link="Internal\Http\HttpRequestHelpers.cs" />

src/Grpc.Net.ClientFactory/GrpcClientServiceExtensions.cs

@@ -335,9 +335,6 @@ private static IHttpClientBuilder AddGrpcHttpClient<
                         socketsHttpHandler.PooledConnectionLifetime = options.HandlerLifetime;
                     }
 #endif
-#if NET5_0
-                    handler = HttpHandlerFactory.EnsureTelemetryHandler(handler);
-#endif
 
                     builder.PrimaryHandler = handler;
                 }

src/Shared/HttpHandlerFactory.cs

@@ -50,27 +50,4 @@ public static HttpMessageHandler CreatePrimaryHandler()
         throw new PlatformNotSupportedException(message);
 #endif
     }
-
-#if NET5_0
-    public static HttpMessageHandler EnsureTelemetryHandler(HttpMessageHandler handler)
-    {
-        // HttpClientHandler has an internal handler that sets request telemetry header.
-        // If the handler is SocketsHttpHandler then we know that the header will never be set
-        // so wrap with a handler that is responsible for setting the telemetry header.
-        if (HttpRequestHelpers.HasHttpHandlerType<SocketsHttpHandler>(handler))
-        {
-            // Double check telemetry handler hasn't already been added by something else
-            // like the client factory when it created the primary handler.
-            //
-            // Check with type name because this handler can come from shared source
-            // in multiple assemblies.
-            if (!HttpRequestHelpers.HasHttpHandlerType(handler, typeof(TelemetryHeaderHandler).FullName!))
-            {
-                return new TelemetryHeaderHandler(handler);
-            }
-        }
-
-        return handler;
-    }
-#endif
 }