This repository has been archived by the owner on Nov 21, 2022. It is now read-only.
WIP: Fix header propagation #20
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This is inspired by the behavior of HttpClient's DiagnosticsHandler: https://github.com/dotnet/runtime/blob/main/src/libraries/System.Net.Http/src/System/Net/Http/DiagnosticsHandler.cs#L64-L70
This is done for two reasons: 1. OutgoingLogicalMessageDiagnostics always adds ICurrentActivity to the outgoing message context, and thus the TryGet will always return true making it so that the value of Activity.Curent will never be retrieved 2. With the update to OutgoingLogicalMessageDiagnostics, the ICurrentActivity will contain a child activity to Activity.Current even if there are no listeners to the event source.
The call to NServiceBusActivitySource.ActivitySource.StartActivity returns null if no listeners are registered. This change makes it so that an activity is created if the parentId header contains valid data for the creation of ActivityContext. It also sets the parent based on TraceId and SpanId, making the created activity belong to the correct trace etc.
The test depended on Activity.Current fallback, which has been removed in previous commit.
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR aims to address the issues in #18.
I'm confident in the changes made in the outgoing behaviors and I have verified that an activity with correct
TraceIdandSpanIdis created when the code enters the new if block inIncomingPhysicalMessageDiagnostics.However, I have not tried the flow with listeners registered to the ActivitySource. But as this code is untouched, I assume it works as expected. Perhaps there is a way to restructure the control flow?
I note that two unit tests are failing. This is due to 85bdb7f and the fact that the test relied on
Activity.Current, not the activity passed in the message context. I fixed one test, and be happy to amend it to the previous commit. However, want your input on how to fix the other test. In this case theICurrentActivityis set onIOutgoingLogicalMessageContext. but the test creates a newIOutgoingPhysicalMessageContextthat does not contain that activity.