From 2fb67906b3d17c8c7605cffc7dd0665ee61aab25 Mon Sep 17 00:00:00 2001 From: pavelsavara Date: Mon, 23 Jun 2025 16:04:27 +0200 Subject: [PATCH 1/2] one instance of ActivitySource --- src/Components/Components/src/ComponentsActivitySource.cs | 2 +- src/Components/Server/src/Circuits/CircuitActivitySource.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Components/Components/src/ComponentsActivitySource.cs b/src/Components/Components/src/ComponentsActivitySource.cs index bf17ea8ae0ee..1f4078d6540c 100644 --- a/src/Components/Components/src/ComponentsActivitySource.cs +++ b/src/Components/Components/src/ComponentsActivitySource.cs @@ -15,7 +15,7 @@ internal class ComponentsActivitySource internal const string OnRouteName = $"{Name}.RouteChange"; internal const string OnEventName = $"{Name}.HandleEvent"; - private ActivitySource ActivitySource { get; } = new ActivitySource(Name); + private static ActivitySource ActivitySource { get; } = new ActivitySource(Name); private ComponentsActivityLinkStore? _componentsActivityLinkStore; public void Init(ComponentsActivityLinkStore store) diff --git a/src/Components/Server/src/Circuits/CircuitActivitySource.cs b/src/Components/Server/src/Circuits/CircuitActivitySource.cs index ad554bad2e7c..ad0946ccbe84 100644 --- a/src/Components/Server/src/Circuits/CircuitActivitySource.cs +++ b/src/Components/Server/src/Circuits/CircuitActivitySource.cs @@ -11,7 +11,7 @@ internal class CircuitActivitySource private ComponentsActivityLinkStore? _activityLinkStore; - private ActivitySource ActivitySource { get; } = new ActivitySource(Name); + private static ActivitySource ActivitySource { get; } = new ActivitySource(Name); public void Init(ComponentsActivityLinkStore store) { From 0e3d9b9673c7853c7d6099beba17c14d702ba085 Mon Sep 17 00:00:00 2001 From: pavelsavara Date: Mon, 23 Jun 2025 16:31:45 +0200 Subject: [PATCH 2/2] fix --- .../Components/src/ComponentsActivitySource.cs | 2 +- src/Components/Components/src/RenderTree/Renderer.cs | 2 +- .../Components/test/ComponentsActivitySourceTest.cs | 10 +++++----- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/Components/Components/src/ComponentsActivitySource.cs b/src/Components/Components/src/ComponentsActivitySource.cs index 1f4078d6540c..77e8caeff27d 100644 --- a/src/Components/Components/src/ComponentsActivitySource.cs +++ b/src/Components/Components/src/ComponentsActivitySource.cs @@ -59,7 +59,7 @@ public void StopRouteActivity(ComponentsActivityHandle activityHandle, Exception StopComponentActivity(ComponentsActivityLinkStore.Route, activityHandle, ex); } - public ComponentsActivityHandle StartEventActivity(string? componentType, string? methodName, string? attributeName) + public static ComponentsActivityHandle StartEventActivity(string? componentType, string? methodName, string? attributeName) { var activity = ActivitySource.CreateActivity(OnEventName, ActivityKind.Internal, parentId: null, null, null); diff --git a/src/Components/Components/src/RenderTree/Renderer.cs b/src/Components/Components/src/RenderTree/Renderer.cs index d0a62f240059..f5ea90bc304f 100644 --- a/src/Components/Components/src/RenderTree/Renderer.cs +++ b/src/Components/Components/src/RenderTree/Renderer.cs @@ -461,7 +461,7 @@ public virtual Task DispatchEventAsync(ulong eventHandlerId, EventFieldInfo? fie { receiverName ??= (callback.Receiver?.GetType() ?? callback.Delegate.Target?.GetType())?.FullName; methodName ??= callback.Delegate.Method?.Name; - activityHandle = ComponentActivitySource.StartEventActivity(receiverName, methodName, attributeName); + activityHandle = ComponentsActivitySource.StartEventActivity(receiverName, methodName, attributeName); } var eventStartTimestamp = ComponentMetrics != null && ComponentMetrics.IsEventEnabled ? Stopwatch.GetTimestamp() : 0; diff --git a/src/Components/Components/test/ComponentsActivitySourceTest.cs b/src/Components/Components/test/ComponentsActivitySourceTest.cs index f51b5fac4f89..2496844885d7 100644 --- a/src/Components/Components/test/ComponentsActivitySourceTest.cs +++ b/src/Components/Components/test/ComponentsActivitySourceTest.cs @@ -86,7 +86,7 @@ public void StartEventActivity_CreatesAndStartsActivity() componentsActivitySource.StartRouteActivity("ParentComponent", "/parent"); // Act - var activityHandle = componentsActivitySource.StartEventActivity(componentType, methodName, attributeName); + var activityHandle = ComponentsActivitySource.StartEventActivity(componentType, methodName, attributeName); var activity = activityHandle.Activity; // Assert @@ -113,7 +113,7 @@ public void FailEventActivity_SetsErrorStatusAndStopsActivity() var componentsActivitySource = new ComponentsActivitySource(); var linkstore = new ComponentsActivityLinkStore(null); componentsActivitySource.Init(linkstore); - var activityHandle = componentsActivitySource.StartEventActivity("TestComponent", "OnClick", "onclick"); + var activityHandle = ComponentsActivitySource.StartEventActivity("TestComponent", "OnClick", "onclick"); var activity = activityHandle.Activity; var exception = new InvalidOperationException("Test exception"); @@ -133,7 +133,7 @@ public async Task CaptureEventStopAsync_StopsActivityOnSuccessfulTask() var componentsActivitySource = new ComponentsActivitySource(); var linkstore = new ComponentsActivityLinkStore(null); componentsActivitySource.Init(linkstore); - var activityHandle = componentsActivitySource.StartEventActivity("TestComponent", "OnClick", "onclick"); + var activityHandle = ComponentsActivitySource.StartEventActivity("TestComponent", "OnClick", "onclick"); var activity = activityHandle.Activity; var task = Task.CompletedTask; @@ -152,7 +152,7 @@ public async Task CaptureEventStopAsync_FailsActivityOnException() var componentsActivitySource = new ComponentsActivitySource(); var linkstore = new ComponentsActivityLinkStore(null); componentsActivitySource.Init(linkstore); - var activityHandle = componentsActivitySource.StartEventActivity("TestComponent", "OnClick", "onclick"); + var activityHandle = ComponentsActivitySource.StartEventActivity("TestComponent", "OnClick", "onclick"); var activity = activityHandle.Activity; var exception = new InvalidOperationException("Test exception"); var task = Task.FromException(exception); @@ -192,7 +192,7 @@ public void StartEventActivity_HandlesNullValues() componentsActivitySource.Init(linkstore); // Act - var activityHandle = componentsActivitySource.StartEventActivity(null, null, null); + var activityHandle = ComponentsActivitySource.StartEventActivity(null, null, null); var activity = activityHandle.Activity; // Assert