Skip to content

Commit c344de6

Browse files
pavelsavarapavelsavara
committed
rename methods
1 parent f7d1691 commit c344de6

File tree

4 files changed

+26
-26
lines changed

4 files changed

+26
-26
lines changed

‎src/Components/Components/src/ComponentsActivitySource.cs‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ public void Init(ComponentsActivityLinkStore store)
2323
_componentsActivityLinkStore = store;
2424
}
2525

26-
public ComponentsActivityHandle StartRouteActivity(string componentType, string route)
26+
public ComponentsActivityHandle StartNavigateActivity(string componentType, string route)
2727
{
2828
var activity = ActivitySource.CreateActivity(OnRouteName, ActivityKind.Internal, parentId: null, null, null);
2929
if (activity is not null)
@@ -54,12 +54,12 @@ public ComponentsActivityHandle StartRouteActivity(string componentType, string
5454
return default;
5555
}
5656

57-
public void StopRouteActivity(ComponentsActivityHandle activityHandle, Exception? ex)
57+
public void StopNavigateActivity(ComponentsActivityHandle activityHandle, Exception? ex)
5858
{
5959
StopComponentActivity(ComponentsActivityLinkStore.Route, activityHandle, ex);
6060
}
6161

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

@@ -91,21 +91,21 @@ public static ComponentsActivityHandle StartEventActivity(string? componentType,
9191
return default;
9292
}
9393

94-
public void StopEventActivity(ComponentsActivityHandle activityHandle, Exception? ex)
94+
public void StopHandleEventActivity(ComponentsActivityHandle activityHandle, Exception? ex)
9595
{
9696
StopComponentActivity(ComponentsActivityLinkStore.Event, activityHandle, ex);
9797
}
9898

99-
public async Task CaptureEventStopAsync(Task task, ComponentsActivityHandle activityHandle)
99+
public async Task CaptureHandleEventStopAsync(Task task, ComponentsActivityHandle activityHandle)
100100
{
101101
try
102102
{
103103
await task;
104-
StopEventActivity(activityHandle, null);
104+
StopHandleEventActivity(activityHandle, null);
105105
}
106106
catch (Exception ex)
107107
{
108-
StopEventActivity(activityHandle, ex);
108+
StopHandleEventActivity(activityHandle, ex);
109109
}
110110
}
111111

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

Lines changed: 3 additions & 3 deletions
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 = ComponentsActivitySource.StartEventActivity(receiverName, methodName, attributeName);
464+
activityHandle = ComponentsActivitySource.StartHandleEventActivity(receiverName, methodName, attributeName);
465465
}
466466

467467
var eventStartTimestamp = ComponentMetrics != null && ComponentMetrics.IsEventEnabled ? Stopwatch.GetTimestamp() : 0;
@@ -518,7 +518,7 @@ public virtual Task DispatchEventAsync(ulong eventHandlerId, EventFieldInfo? fie
518518
// stop activity/trace
519519
if (ComponentActivitySource != null && activityHandle.Activity != null)
520520
{
521-
_ = ComponentActivitySource.CaptureEventStopAsync(task, activityHandle);
521+
_ = ComponentActivitySource.CaptureHandleEventStopAsync(task, activityHandle);
522522
}
523523
}
524524
catch (Exception e)
@@ -532,7 +532,7 @@ public virtual Task DispatchEventAsync(ulong eventHandlerId, EventFieldInfo? fie
532532

533533
if (ComponentActivitySource != null && activityHandle.Activity != null)
534534
{
535-
ComponentActivitySource.StopEventActivity(activityHandle, e);
535+
ComponentActivitySource.StopHandleEventActivity(activityHandle, e);
536536
}
537537

538538
HandleExceptionViaErrorBoundary(e, receiverComponentState);

‎src/Components/Components/src/Routing/Router.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,7 @@ internal virtual void Refresh(bool isNavigationIntercepted)
246246
endpointRouteData = RouteTable.ProcessParameters(endpointRouteData);
247247
_renderHandle.Render(Found(endpointRouteData));
248248

249-
_renderHandle.ComponentActivitySource?.StopRouteActivity(activityHandle, null);
249+
_renderHandle.ComponentActivitySource?.StopNavigateActivity(activityHandle, null);
250250
return;
251251
}
252252

@@ -301,15 +301,15 @@ internal virtual void Refresh(bool isNavigationIntercepted)
301301
NavigationManager.NavigateTo(_locationAbsolute, forceLoad: true);
302302
}
303303
}
304-
_renderHandle.ComponentActivitySource?.StopRouteActivity(activityHandle, null);
304+
_renderHandle.ComponentActivitySource?.StopNavigateActivity(activityHandle, null);
305305
}
306306

307307
private ComponentsActivityHandle RecordDiagnostics(string componentType, string template)
308308
{
309309
ComponentsActivityHandle activityHandle = default;
310310
if (_renderHandle.ComponentActivitySource != null)
311311
{
312-
activityHandle = _renderHandle.ComponentActivitySource.StartRouteActivity(componentType, template);
312+
activityHandle = _renderHandle.ComponentActivitySource.StartNavigateActivity(componentType, template);
313313
}
314314

315315
if (_renderHandle.ComponentMetrics != null && _renderHandle.ComponentMetrics.IsNavigationEnabled)

‎src/Components/Components/test/ComponentsActivitySourceTest.cs‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ public void StartRouteActivity_CreatesAndStartsActivity()
5050
linkstore.SetActivityContext(ComponentsActivityLinkStore.Circuit, new ActivityContext(ActivityTraceId.CreateRandom(), ActivitySpanId.CreateRandom(), ActivityTraceFlags.Recorded), new KeyValuePair<string, object>("aspnetcore.components.circuit.id", "test-circuit-id"));
5151

5252
// Act
53-
var activityHandle = componentsActivitySource.StartRouteActivity(componentType, route);
53+
var activityHandle = componentsActivitySource.StartNavigateActivity(componentType, route);
5454
var activity = activityHandle.Activity;
5555

5656
// Assert
@@ -63,7 +63,7 @@ public void StartRouteActivity_CreatesAndStartsActivity()
6363
Assert.Equal(route, activity.GetTagItem("aspnetcore.components.route"));
6464
Assert.False(activity.IsStopped);
6565

66-
componentsActivitySource.StopRouteActivity(activityHandle, null);
66+
componentsActivitySource.StopNavigateActivity(activityHandle, null);
6767
Assert.True(activity.IsStopped);
6868
Assert.Equal("test-circuit-id", activity.GetTagItem("aspnetcore.components.circuit.id"));
6969
Assert.Single(activity.Links);
@@ -83,10 +83,10 @@ public void StartEventActivity_CreatesAndStartsActivity()
8383

8484
// First set up a circuit and route context
8585
linkstore.SetActivityContext(ComponentsActivityLinkStore.Circuit, default, new KeyValuePair<string, object>("aspnetcore.components.circuit.id", "test-circuit-id"));
86-
componentsActivitySource.StartRouteActivity("ParentComponent", "/parent");
86+
componentsActivitySource.StartNavigateActivity("ParentComponent", "/parent");
8787

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

9292
// Assert
@@ -100,7 +100,7 @@ public void StartEventActivity_CreatesAndStartsActivity()
100100
Assert.Equal(attributeName, activity.GetTagItem("aspnetcore.components.attribute.name"));
101101
Assert.False(activity.IsStopped);
102102

103-
componentsActivitySource.StopRouteActivity(activityHandle, null);
103+
componentsActivitySource.StopNavigateActivity(activityHandle, null);
104104
Assert.True(activity.IsStopped);
105105
Assert.Equal("test-circuit-id", activity.GetTagItem("aspnetcore.components.circuit.id"));
106106
Assert.Empty(activity.Links);
@@ -113,12 +113,12 @@ 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.StartHandleEventActivity("TestComponent", "OnClick", "onclick");
117117
var activity = activityHandle.Activity;
118118
var exception = new InvalidOperationException("Test exception");
119119

120120
// Act
121-
componentsActivitySource.StopEventActivity(activityHandle, exception);
121+
componentsActivitySource.StopHandleEventActivity(activityHandle, exception);
122122

123123
// Assert
124124
Assert.True(activity!.IsStopped);
@@ -133,12 +133,12 @@ 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.StartHandleEventActivity("TestComponent", "OnClick", "onclick");
137137
var activity = activityHandle.Activity;
138138
var task = Task.CompletedTask;
139139

140140
// Act
141-
await componentsActivitySource.CaptureEventStopAsync(task, activityHandle);
141+
await componentsActivitySource.CaptureHandleEventStopAsync(task, activityHandle);
142142

143143
// Assert
144144
Assert.True(activity!.IsStopped);
@@ -152,13 +152,13 @@ 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.StartHandleEventActivity("TestComponent", "OnClick", "onclick");
156156
var activity = activityHandle.Activity;
157157
var exception = new InvalidOperationException("Test exception");
158158
var task = Task.FromException(exception);
159159

160160
// Act
161-
await componentsActivitySource.CaptureEventStopAsync(task, activityHandle);
161+
await componentsActivitySource.CaptureHandleEventStopAsync(task, activityHandle);
162162

163163
// Assert
164164
Assert.True(activity!.IsStopped);
@@ -175,7 +175,7 @@ public void StartRouteActivity_HandlesNullValues()
175175
componentsActivitySource.Init(linkstore);
176176

177177
// Act
178-
var activityHandle = componentsActivitySource.StartRouteActivity(null, null);
178+
var activityHandle = componentsActivitySource.StartNavigateActivity(null, null);
179179
var activity = activityHandle.Activity;
180180

181181
// Assert
@@ -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.StartHandleEventActivity(null, null, null);
196196
var activity = activityHandle.Activity;
197197

198198
// Assert

0 commit comments

Comments
 (0)