Skip to content

Commit 691bf0f

Browse files
JamesNKJamesNK
committed
Fix merge
1 parent aa96745 commit 691bf0f

File tree

2 files changed

+22
-27
lines changed

2 files changed

+22
-27
lines changed

‎src/SignalR/clients/csharp/Client/test/FunctionalTests/HubConnectionTests.Tracing.cs

Lines changed: 22 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ public async Task InvokeAsync_SendTraceHeader(string protocolName, HttpTransport
3434
{
3535
var serverChannel = Channel.CreateUnbounded<Activity>();
3636
var clientChannel = Channel.CreateUnbounded<Activity>();
37-
var serverSource = server.Services.GetRequiredService<SignalRActivitySource>().ActivitySource;
37+
var serverSource = server.Services.GetRequiredService<SignalRServerActivitySource>().ActivitySource;
3838
var clientSourceContainer = new SignalRClientActivitySource();
3939

4040
using var listener = new ActivityListener
@@ -140,16 +140,18 @@ public async Task InvokeAsync_SendTraceHeader(string protocolName, HttpTransport
140140
Assert.Collection(serverActivities,
141141
a =>
142142
{
143-
Assert.Equal($"{serverHubName}/OnConnectedAsync", a.OperationName);
143+
Assert.Equal(SignalRServerActivitySource.OnConnected, a.OperationName);
144+
Assert.Equal($"{serverHubName}/OnConnectedAsync", a.DisplayName);
144145
Assert.Equal("Microsoft.AspNetCore.Hosting.HttpRequestIn", a.Parent.OperationName);
145-
Assert.Equal(ActivityKind.Server, a.Kind);
146+
Assert.Equal(ActivityKind.Internal, a.Kind);
146147
Assert.False(a.HasRemoteParent);
147148
Assert.Equal(ActivityStatusCode.Unset, a.Status);
148149
Assert.Empty(a.Baggage);
149150
},
150151
a =>
151152
{
152-
Assert.Equal($"{serverHubName}/HelloWorld", a.OperationName);
153+
Assert.Equal(SignalRServerActivitySource.InvocationIn, a.OperationName);
154+
Assert.Equal($"{serverHubName}/HelloWorld", a.DisplayName);
153155
Assert.Equal(clientActivity1.Id, a.ParentId);
154156
Assert.Equal(ActivityKind.Server, a.Kind);
155157
Assert.True(a.HasRemoteParent);
@@ -160,7 +162,8 @@ public async Task InvokeAsync_SendTraceHeader(string protocolName, HttpTransport
160162
},
161163
a =>
162164
{
163-
Assert.Equal($"{serverHubName}/HelloWorld", a.OperationName);
165+
Assert.Equal(SignalRServerActivitySource.InvocationIn, a.OperationName);
166+
Assert.Equal($"{serverHubName}/HelloWorld", a.DisplayName);
164167
Assert.Equal(clientActivity2.Id, a.ParentId);
165168
Assert.Equal(ActivityKind.Server, a.Kind);
166169
Assert.True(a.HasRemoteParent);
@@ -171,9 +174,10 @@ public async Task InvokeAsync_SendTraceHeader(string protocolName, HttpTransport
171174
},
172175
a =>
173176
{
174-
Assert.Equal($"{serverHubName}/OnDisconnectedAsync", a.OperationName);
177+
Assert.Equal(SignalRServerActivitySource.OnDisconnected, a.OperationName);
178+
Assert.Equal($"{serverHubName}/OnDisconnectedAsync", a.DisplayName);
175179
Assert.Equal("Microsoft.AspNetCore.Hosting.HttpRequestIn", a.Parent.OperationName);
176-
Assert.Equal(ActivityKind.Server, a.Kind);
180+
Assert.Equal(ActivityKind.Internal, a.Kind);
177181
Assert.False(a.HasRemoteParent);
178182
Assert.Empty(a.Baggage);
179183
Assert.Equal(ActivityStatusCode.Unset, a.Status);
@@ -225,7 +229,7 @@ public async Task StreamAsyncCore_SendTraceHeader(string protocolName, HttpTrans
225229
var serverChannel = Channel.CreateUnbounded<Activity>();
226230
var clientActivityTcs = new TaskCompletionSource<Activity>();
227231
Activity clientActivity = null;
228-
var serverSource = server.Services.GetRequiredService<SignalRActivitySource>().ActivitySource;
232+
var serverSource = server.Services.GetRequiredService<SignalRServerActivitySource>().ActivitySource;
229233
var clientSourceContainer = new SignalRClientActivitySource();
230234

231235
using var listener = new ActivityListener
@@ -308,9 +312,9 @@ public async Task StreamAsyncCore_SendTraceHeader(string protocolName, HttpTrans
308312
Assert.Collection(serverActivities,
309313
a =>
310314
{
311-
Assert.Equal($"{hubName}/OnConnectedAsync", a.OperationName);
315+
Assert.Equal(SignalRServerActivitySource.OnConnected, a.OperationName);
312316
Assert.Equal($"{hubName}/OnConnectedAsync", a.DisplayName);
313-
Assert.Equal(ActivityKind.Server, a.Kind);
317+
Assert.Equal(ActivityKind.Internal, a.Kind);
314318
Assert.Equal("Microsoft.AspNetCore.Hosting.HttpRequestIn", a.Parent.OperationName);
315319
Assert.Equal(ActivityStatusCode.Unset, a.Status);
316320
Assert.False(a.HasRemoteParent);
@@ -319,7 +323,7 @@ public async Task StreamAsyncCore_SendTraceHeader(string protocolName, HttpTrans
319323
},
320324
a =>
321325
{
322-
Assert.Equal($"{hubName}/Stream", a.OperationName);
326+
Assert.Equal(SignalRServerActivitySource.InvocationIn, a.OperationName);
323327
Assert.Equal($"{hubName}/Stream", a.DisplayName);
324328
Assert.Equal(ActivityKind.Server, a.Kind);
325329
Assert.Equal(clientActivity.Id, a.ParentId);
@@ -332,9 +336,9 @@ public async Task StreamAsyncCore_SendTraceHeader(string protocolName, HttpTrans
332336
},
333337
a =>
334338
{
335-
Assert.Equal($"{hubName}/OnDisconnectedAsync", a.OperationName);
339+
Assert.Equal(SignalRServerActivitySource.OnDisconnected, a.OperationName);
336340
Assert.Equal($"{hubName}/OnDisconnectedAsync", a.DisplayName);
337-
Assert.Equal(ActivityKind.Server, a.Kind);
341+
Assert.Equal(ActivityKind.Internal, a.Kind);
338342
Assert.Equal("Microsoft.AspNetCore.Hosting.HttpRequestIn", a.Parent.OperationName);
339343
Assert.Equal(ActivityStatusCode.Unset, a.Status);
340344
Assert.False(a.HasRemoteParent);
@@ -371,7 +375,7 @@ public async Task StreamAsyncCanBeCanceled_Tracing(string protocolName, HttpTran
371375
{
372376
var serverChannel = Channel.CreateUnbounded<Activity>();
373377
var clientActivityTcs = new TaskCompletionSource<Activity>();
374-
var serverSource = server.Services.GetRequiredService<SignalRActivitySource>().ActivitySource;
378+
var serverSource = server.Services.GetRequiredService<SignalRServerActivitySource>().ActivitySource;
375379
var clientSourceContainer = new SignalRClientActivitySource();
376380

377381
using var listener = new ActivityListener
@@ -447,7 +451,7 @@ await Assert.ThrowsAsync<TaskCanceledException>(async () =>
447451
var tags = clientActivity.TagObjects.ToDictionary();
448452
Assert.Equal(typeof(OperationCanceledException).FullName, tags["error.type"]);
449453
},
450-
a => Assert.Equal($"{hubName}/OnDisconnectedAsync", a.OperationName));
454+
a => Assert.Equal($"{hubName}/OnDisconnectedAsync", a.DisplayName));
451455

452456
Assert.Equal($"{clientHubName}/Stream", clientActivity.DisplayName);
453457
Assert.Equal(ActivityKind.Client, clientActivity.Kind);
@@ -474,7 +478,7 @@ bool ExpectedErrors(WriteContext writeContext)
474478
{
475479
var serverChannel = Channel.CreateUnbounded<Activity>();
476480
var clientActivityTcs = new TaskCompletionSource<Activity>();
477-
var serverSource = server.Services.GetRequiredService<SignalRActivitySource>().ActivitySource;
481+
var serverSource = server.Services.GetRequiredService<SignalRServerActivitySource>().ActivitySource;
478482
var clientSourceContainer = new SignalRClientActivitySource();
479483

480484
using var listener = new ActivityListener
@@ -570,7 +574,7 @@ bool ExpectedErrors(WriteContext writeContext)
570574
{
571575
var serverChannel = Channel.CreateUnbounded<Activity>();
572576
var clientActivityTcs = new TaskCompletionSource<Activity>();
573-
var serverSource = server.Services.GetRequiredService<SignalRActivitySource>().ActivitySource;
577+
var serverSource = server.Services.GetRequiredService<SignalRServerActivitySource>().ActivitySource;
574578
var clientSourceContainer = new SignalRClientActivitySource();
575579

576580
using var listener = new ActivityListener
@@ -660,7 +664,7 @@ public async Task SendAsync_Tracing(string protocolName, HttpTransportType trans
660664
{
661665
var serverChannel = Channel.CreateUnbounded<Activity>();
662666
var clientActivityTcs = new TaskCompletionSource<Activity>();
663-
var serverSource = server.Services.GetRequiredService<SignalRActivitySource>().ActivitySource;
667+
var serverSource = server.Services.GetRequiredService<SignalRServerActivitySource>().ActivitySource;
664668
var clientSourceContainer = new SignalRClientActivitySource();
665669

666670
using var listener = new ActivityListener

‎src/SignalR/clients/csharp/Client/test/FunctionalTests/HubConnectionTests.cs

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -116,11 +116,6 @@ public async Task CheckFixedMessage(string protocolName, HttpTransportType trans
116116
{
117117
await connection.DisposeAsync().DefaultTimeout();
118118
}
119-
var serverSource = server.Services.GetRequiredService<SignalRActivitySource>().ActivitySource;
120-
Assert.Equal($"{hubName}/OnConnectedAsync", a.OperationName);
121-
Assert.Equal($"{hubName}/HelloWorld", a.OperationName);
122-
Assert.Equal($"{hubName}/HelloWorld", a.OperationName);
123-
Assert.Equal($"{hubName}/OnDisconnectedAsync", a.OperationName);
124119
}
125120
}
126121

@@ -481,10 +476,6 @@ public async Task StreamAsyncCoreTest(string protocolName, HttpTransportType tra
481476
}
482477

483478
[Theory]
484-
var serverSource = server.Services.GetRequiredService<SignalRActivitySource>().ActivitySource;
485-
Assert.Equal($"{hubName}/OnConnectedAsync", a.OperationName);
486-
Assert.Equal($"{hubName}/Stream", a.OperationName);
487-
Assert.Equal($"{hubName}/OnDisconnectedAsync", a.OperationName);
488479
[InlineData("json")]
489480
[InlineData("messagepack")]
490481
public async Task CanStreamToHubWithIAsyncEnumerableMethodArg(string protocolName)

0 commit comments

Comments
 (0)