Merge pull request #72 from nenoNaninu/f/attribute_connectionid

add connectionId attribute

Author: nenoNaninu

src/AspNetCore.SignalR.OpenTelemetry/HubInstrumentationFilter.cs

@@ -39,10 +39,11 @@ public HubInstrumentationFilter(ILoggerFactory loggerFactory, IOptions<HubInstru
 
         var hubName = invocationContext.Hub.GetType().Name;
         var methodName = invocationContext.HubMethodName;
+        var connectionId = invocationContext.Context.ConnectionId;
         var address = invocationContext.Context.GetHttpContext()?.Request.Host.Value;
 
         using var scope = HubLogger.BeginHubMethodInvocationScope(_logger, hubName, methodName);
-        using var activity = HubActivitySource.StartInvocationActivity(hubName, methodName, address);
+        using var activity = HubActivitySource.StartInvocationActivity(hubName, methodName, connectionId, address);
 
         try
         {
@@ -79,10 +80,11 @@ public HubInstrumentationFilter(ILoggerFactory loggerFactory, IOptions<HubInstru
     public async Task OnConnectedAsync(HubLifetimeContext context, Func<HubLifetimeContext, Task> next)
     {
         var hubName = context.Hub.GetType().Name;
+        var connectionId = context.Context.ConnectionId;
         var address = context.Context.GetHttpContext()?.Request.Host.Value;
 
         using var scope = HubLogger.BeginHubMethodInvocationScope(_logger, hubName, nameof(OnConnectedAsync));
-        using var activity = HubActivitySource.StartInvocationActivity(hubName, nameof(OnConnectedAsync), address);
+        using var activity = HubActivitySource.StartInvocationActivity(hubName, nameof(OnConnectedAsync), connectionId, address);
 
         try
         {
@@ -114,10 +116,11 @@ public async Task OnDisconnectedAsync(
         Func<HubLifetimeContext, Exception?, Task> next)
     {
         var hubName = context.Hub.GetType().Name;
+        var connectionId = context.Context.ConnectionId;
         var address = context.Context.GetHttpContext()?.Request.Host.Value;
 
         using var scope = HubLogger.BeginHubMethodInvocationScope(_logger, hubName, nameof(OnDisconnectedAsync));
-        using var activity = HubActivitySource.StartInvocationActivity(hubName, nameof(OnDisconnectedAsync), address);
+        using var activity = HubActivitySource.StartInvocationActivity(hubName, nameof(OnDisconnectedAsync), connectionId, address);
 
         try
         {

src/AspNetCore.SignalR.OpenTelemetry/Internal/HubActivitySource.cs

@@ -10,7 +10,7 @@ internal static class HubActivitySource
 
     private static readonly ActivitySource ActivitySource = new(Name, typeof(HubActivitySource).Assembly.GetPackageVersion());
 
-    internal static Activity? StartInvocationActivity(string hubName, string methodName, string? address)
+    internal static Activity? StartInvocationActivity(string hubName, string methodName, string connectionId, string? address)
     {
         // https://github.com/open-telemetry/semantic-conventions/blob/v1.25.0/docs/rpc/rpc-spans.md#span-name
         var activity = ActivitySource.CreateActivity($"{hubName}/{methodName}", ActivityKind.Server);
@@ -28,6 +28,8 @@ internal static class HubActivitySource
         activity.SetTag("rpc.service", hubName);
         activity.SetTag("rpc.method", methodName);
 
+        activity.SetTag("signalr.connection.id", connectionId);
+
         if (!string.IsNullOrEmpty(address))
         {
             activity.SetTag("server.address", address);