Implement Activity linking from Renderer to Components

Co-authored-by: javiercn <6995051+javiercn@users.noreply.github.com>

Author: Copilot

src/Components/Components/src/ComponentsActivitySource.cs

@@ -14,7 +14,6 @@ internal class ComponentsActivitySource
     internal const string OnRouteName = $"{Name}.RouteChange";
     internal const string OnEventName = $"{Name}.HandleEvent";
 
-    private ActivityContext _httpContext;
     private ActivityContext _routeContext;
     private Activity? _capturedActivity;
 
@@ -27,20 +26,6 @@ internal class ComponentsActivitySource
     public void Initialize(Activity? capturedActivity)
     {
         _capturedActivity = capturedActivity;
-        _httpContext = CaptureHttpContext();
-    }
-
-    /// <summary>
-    /// Captures the current HTTP context activity.
-    /// </summary>
-    public static ActivityContext CaptureHttpContext()
-    {
-        var parentActivity = Activity.Current;
-        if (parentActivity is not null && parentActivity.OperationName == "Microsoft.AspNetCore.Hosting.HttpRequestIn" && parentActivity.Recorded)
-        {
-            return parentActivity.Context;
-        }
-        return default;
     }
 
     public Activity? StartRouteActivity(string componentType, string route)
@@ -64,10 +49,6 @@ public static ActivityContext CaptureHttpContext()
                 {
                     activity.SetTag("aspnetcore.components.route", route);
                 }
-                if (_httpContext != default)
-                {
-                    activity.AddLink(new ActivityLink(_httpContext));
-                }
                 if (_capturedActivity != null)
                 {
                     activity.AddLink(new ActivityLink(_capturedActivity.Context));
@@ -106,10 +87,6 @@ public static ActivityContext CaptureHttpContext()
                 {
                     activity.SetTag("aspnetcore.components.attribute.name", attributeName);
                 }
-                if (_httpContext != default)
-                {
-                    activity.AddLink(new ActivityLink(_httpContext));
-                }
                 if (_capturedActivity != null)
                 {
                     activity.AddLink(new ActivityLink(_capturedActivity.Context));

src/Components/Server/src/Circuits/CircuitFactory.cs

@@ -70,8 +70,8 @@ public async ValueTask<CircuitHost> CreateCircuitHostAsync(
         }
         var componentsActivitySource = scope.ServiceProvider.GetService<ComponentsActivitySource>();
 
-        // Initialize the components activity source with the circuit activity if available
-        componentsActivitySource?.Initialize(circuitActivity);
+        // We don't need to explicitly initialize the ComponentsActivitySource here anymore
+        // since the RemoteRenderer will capture Activity.Current and initialize it
 
         var circuitActivitySource = scope.ServiceProvider.GetService<CircuitActivitySource>();
 

src/Components/Server/src/Circuits/RemoteRenderer.cs

@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System.Collections.Concurrent;
+using System.Diagnostics;
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using Microsoft.AspNetCore.Components.RenderTree;
@@ -28,6 +29,7 @@ internal partial class RemoteRenderer : WebRenderer
     internal readonly ConcurrentQueue<UnacknowledgedRenderBatch> _unacknowledgedRenderBatches = new ConcurrentQueue<UnacknowledgedRenderBatch>();
     private long _nextRenderId = 1;
     private bool _disposing;
+    private readonly Activity? _capturedActivity;
 
     /// <summary>
     /// Notifies when a rendering exception occurred.
@@ -54,6 +56,11 @@ public RemoteRenderer(
         _serverComponentDeserializer = serverComponentDeserializer;
         _logger = logger;
         _resourceCollection = resourceCollection;
+        _capturedActivity = Activity.Current; // Capture the current activity
+
+        // Initialize ComponentsActivitySource with the captured activity
+        var componentsActivitySource = serviceProvider.GetService<ComponentsActivitySource>();
+        componentsActivitySource?.Initialize(_capturedActivity);
 
         ElementReferenceContext = jsRuntime.ElementReferenceContext;
     }
@@ -369,7 +376,7 @@ private async Task CaptureAsyncExceptions(Task task)
         }
     }
 
-    private static new partial class Log
+    private static partial class Log
     {
         [LoggerMessage(100, LogLevel.Warning, "Unhandled exception rendering component: {Message}", EventName = "ExceptionRenderingComponent")]
         private static partial void UnhandledExceptionRenderingComponent(ILogger logger, string message, Exception exception);

src/Components/Server/src/ComponentHub.cs

@@ -65,7 +65,7 @@ public ComponentHub(
         _circuitHandleRegistry = circuitHandleRegistry;
         _circuitActivitySource = circuitActivitySource;
         _logger = logger;
-        _httpContext = CircuitActivitySource.CaptureHttpContext();
+        _httpContext = CaptureHttpContext();
     }
 
     /// <summary>
@@ -430,4 +430,14 @@ public static void InvalidCircuitId(ILogger logger, string circuitSecret)
             InvalidCircuitIdCore(logger, circuitSecret);
         }
     }
+    
+    private static ActivityContext CaptureHttpContext()
+    {
+        var parentActivity = Activity.Current;
+        if (parentActivity is not null && parentActivity.OperationName == "Microsoft.AspNetCore.Hosting.HttpRequestIn" && parentActivity.Recorded)
+        {
+            return parentActivity.Context;
+        }
+        return default;
+    }
 }