Skip to content

Preserve current activity for gRPC calls without diagnostics #2744

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

Open
mtaghavi2005 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Preserve current activity for gRPC calls without diagnostics #2744

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 2 additions & 3 deletions src/Grpc.Net.Client/Internal/GrpcCall.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -820,9 +820,8 @@ private void SetFailedResult(Status status)
// Set activity if:
// 1. Diagnostic source is enabled
// 2. Logging is enabled
// 3. There is an existing activity (to enable activity propagation)
// 4. ActivitySource has listeners
if (diagnosticSourceEnabled || Logger.IsEnabled(LogLevel.Critical) || Activity.Current != null || GrpcDiagnostics.ActivitySource.HasListeners())
// 3. ActivitySource has listeners
if (diagnosticSourceEnabled || Logger.IsEnabled(LogLevel.Critical) || GrpcDiagnostics.ActivitySource.HasListeners())
{
activity = GrpcDiagnostics.ActivitySource.CreateActivity(GrpcDiagnostics.ActivityName, ActivityKind.Client);

Expand Down
25 changes: 25 additions & 0 deletions test/Grpc.Net.Client.Tests/DiagnosticsTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,6 +218,31 @@ public void ActivitySource_MakeCall_ActivityHasNameAndDuration()
Assert.AreNotEqual(TimeSpan.Zero, activityDurationOnStop);
}

[Test]
public async Task CurrentActivity_MakeCallWithoutDiagnostics_PreservedDuringSend()
{
// Arrange
Activity? activityDuringSend = null;
var httpClient = ClientTestHelpers.CreateTestClient(async request =>
{
activityDuringSend = Activity.Current;

var streamContent = await ClientTestHelpers.CreateResponseContent(new HelloReply()).DefaultTimeout();
return ResponseUtils.CreateResponse(HttpStatusCode.OK, streamContent, grpcStatusCode: StatusCode.OK);
});
var invoker = HttpClientCallInvokerFactory.Create(httpClient);

// Act
using var parentActivity = new Activity("Parent").Start();

var call = invoker.AsyncUnaryCall(new HelloRequest());
await call.ResponseAsync.DefaultTimeout();

// Assert
Assert.AreSame(parentActivity, activityDuringSend);
Assert.AreSame(parentActivity, Activity.Current);
}

private static T GetValueFromAnonymousType<T>(object dataitem, string itemkey)
{
var type = dataitem.GetType();
Expand Down