diff --git a/src/AspNetCore.SignalR.OpenTelemetry/HubInstrumentationFilter.cs b/src/AspNetCore.SignalR.OpenTelemetry/HubInstrumentationFilter.cs index 3dd25e8..151c8d7 100644 --- a/src/AspNetCore.SignalR.OpenTelemetry/HubInstrumentationFilter.cs +++ b/src/AspNetCore.SignalR.OpenTelemetry/HubInstrumentationFilter.cs @@ -131,7 +131,9 @@ public async Task OnDisconnectedAsync( { var previousActivity = Activity.Current; - if (previousActivity is not null && !_options.UseParentTraceContext) + var shouldClearParentTraceContext = previousActivity is not null && !_options.UseParentTraceContext; + + if (shouldClearParentTraceContext) { Activity.Current = null; } @@ -173,8 +175,9 @@ public async Task OnDisconnectedAsync( } finally { - if (previousActivity is not null && !_options.UseParentTraceContext) + if (shouldClearParentTraceContext) { + // restore previous activity Activity.Current = previousActivity; } }