Skip to content

Commit 45635b6

Browse files
authored
[blazor] shared instances of ActivitySource (#62439)
1 parent 403d216 commit 45635b6

File tree

4 files changed

+9
-9
lines changed

4 files changed

+9
-9
lines changed

src/Components/Components/src/ComponentsActivitySource.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ internal class ComponentsActivitySource
1515
internal const string OnRouteName = $"{Name}.RouteChange";
1616
internal const string OnEventName = $"{Name}.HandleEvent";
1717

18-
private ActivitySource ActivitySource { get; } = new ActivitySource(Name);
18+
private static ActivitySource ActivitySource { get; } = new ActivitySource(Name);
1919
private ComponentsActivityLinkStore? _componentsActivityLinkStore;
2020

2121
public void Init(ComponentsActivityLinkStore store)
@@ -59,7 +59,7 @@ public void StopRouteActivity(ComponentsActivityHandle activityHandle, Exception
5959
StopComponentActivity(ComponentsActivityLinkStore.Route, activityHandle, ex);
6060
}
6161

62-
public ComponentsActivityHandle StartEventActivity(string? componentType, string? methodName, string? attributeName)
62+
public static ComponentsActivityHandle StartEventActivity(string? componentType, string? methodName, string? attributeName)
6363
{
6464
var activity = ActivitySource.CreateActivity(OnEventName, ActivityKind.Internal, parentId: null, null, null);
6565

src/Components/Components/src/RenderTree/Renderer.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -461,7 +461,7 @@ public virtual Task DispatchEventAsync(ulong eventHandlerId, EventFieldInfo? fie
461461
{
462462
receiverName ??= (callback.Receiver?.GetType() ?? callback.Delegate.Target?.GetType())?.FullName;
463463
methodName ??= callback.Delegate.Method?.Name;
464-
activityHandle = ComponentActivitySource.StartEventActivity(receiverName, methodName, attributeName);
464+
activityHandle = ComponentsActivitySource.StartEventActivity(receiverName, methodName, attributeName);
465465
}
466466

467467
var eventStartTimestamp = ComponentMetrics != null && ComponentMetrics.IsEventEnabled ? Stopwatch.GetTimestamp() : 0;

src/Components/Components/test/ComponentsActivitySourceTest.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ public void StartEventActivity_CreatesAndStartsActivity()
8686
componentsActivitySource.StartRouteActivity("ParentComponent", "/parent");
8787

8888
// Act
89-
var activityHandle = componentsActivitySource.StartEventActivity(componentType, methodName, attributeName);
89+
var activityHandle = ComponentsActivitySource.StartEventActivity(componentType, methodName, attributeName);
9090
var activity = activityHandle.Activity;
9191

9292
// Assert
@@ -113,7 +113,7 @@ public void FailEventActivity_SetsErrorStatusAndStopsActivity()
113113
var componentsActivitySource = new ComponentsActivitySource();
114114
var linkstore = new ComponentsActivityLinkStore(null);
115115
componentsActivitySource.Init(linkstore);
116-
var activityHandle = componentsActivitySource.StartEventActivity("TestComponent", "OnClick", "onclick");
116+
var activityHandle = ComponentsActivitySource.StartEventActivity("TestComponent", "OnClick", "onclick");
117117
var activity = activityHandle.Activity;
118118
var exception = new InvalidOperationException("Test exception");
119119

@@ -133,7 +133,7 @@ public async Task CaptureEventStopAsync_StopsActivityOnSuccessfulTask()
133133
var componentsActivitySource = new ComponentsActivitySource();
134134
var linkstore = new ComponentsActivityLinkStore(null);
135135
componentsActivitySource.Init(linkstore);
136-
var activityHandle = componentsActivitySource.StartEventActivity("TestComponent", "OnClick", "onclick");
136+
var activityHandle = ComponentsActivitySource.StartEventActivity("TestComponent", "OnClick", "onclick");
137137
var activity = activityHandle.Activity;
138138
var task = Task.CompletedTask;
139139

@@ -152,7 +152,7 @@ public async Task CaptureEventStopAsync_FailsActivityOnException()
152152
var componentsActivitySource = new ComponentsActivitySource();
153153
var linkstore = new ComponentsActivityLinkStore(null);
154154
componentsActivitySource.Init(linkstore);
155-
var activityHandle = componentsActivitySource.StartEventActivity("TestComponent", "OnClick", "onclick");
155+
var activityHandle = ComponentsActivitySource.StartEventActivity("TestComponent", "OnClick", "onclick");
156156
var activity = activityHandle.Activity;
157157
var exception = new InvalidOperationException("Test exception");
158158
var task = Task.FromException(exception);
@@ -192,7 +192,7 @@ public void StartEventActivity_HandlesNullValues()
192192
componentsActivitySource.Init(linkstore);
193193

194194
// Act
195-
var activityHandle = componentsActivitySource.StartEventActivity(null, null, null);
195+
var activityHandle = ComponentsActivitySource.StartEventActivity(null, null, null);
196196
var activity = activityHandle.Activity;
197197

198198
// Assert

src/Components/Server/src/Circuits/CircuitActivitySource.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ internal class CircuitActivitySource
1111

1212
private ComponentsActivityLinkStore? _activityLinkStore;
1313

14-
private ActivitySource ActivitySource { get; } = new ActivitySource(Name);
14+
private static ActivitySource ActivitySource { get; } = new ActivitySource(Name);
1515

1616
public void Init(ComponentsActivityLinkStore store)
1717
{

0 commit comments

Comments
 (0)