Skip to content

[blazor] shared instances of ActivitySource #62439

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jun 24, 2025
Merged

[blazor] shared instances of ActivitySource #62439

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2fb6790
one instance of ActivitySource
pavelsavara Jun 23, 2025
0e3d9b9
fix
pavelsavara Jun 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/Components/Components/src/ComponentsActivitySource.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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);

Expand Down
2 changes: 1 addition & 1 deletion src/Components/Components/src/RenderTree/Renderer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
10 changes: 5 additions & 5 deletions src/Components/Components/test/ComponentsActivitySourceTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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");

Expand All @@ -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;

Expand All @@ -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);
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/Components/Server/src/Circuits/CircuitActivitySource.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand Down
Loading