[Backport 7.11] Fix Client Diagnostics following upgrade to DiagnosticSource 5.0.0 #5327
Conversation
This file contains hidden or 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
![github-actions[bot]](https://avatars.githubusercontent.com/in/15368?s=60&v=4){kind=small}
…5326) Relates: elastic/apm-agent-dotnet#1094 This commit fixes a rather pernicious bug with Diagnostics from the clients, following the upgrade to System.Diagnostics.DiagnosticSource 5.0.0. `Diagnostic` and `Diagnostic<TState, TStateEnd>` derived from System.Diagnostics.Activity, implementing IDisposable to make them nicer to work with. In System.Diagnostics.DiagnosticSource 5.0.0, Activity now implements IDisposable, so the impl was updated to override `Dispose(bool)`. A problem arises from now deriving from Activity in that for an activity that is not finished, `Dispose()` calls `Stop()` which in turn will notify the ActivitySource that it has stopped **and** sets `Activity.Current` to the parent Activity (null if there's no parent). Now, when calling into overridden `Dispose(bool)`, the DiagnosticSource is notified that the `Activity` has stopped, allowing for listeners to take action. If a listener is getting the Activity through `Activity.Current` as Elastic APM's integration does however, `Activity.Current` no longer represents the Activity that has stopped, but its parent, with no nice way to reference the stopped Activity. This commit removes deriving from `Activity` and introduces a private field in which to hold an Activity that is started, and ended on Dispose. Starting and stopping the activity sets the start and end times, respectively.
|
Since this is a community submitted pull request, a Jenkins build has not been kicked off automatically. Can an Elastic organization member please verify the contents of this patch and then kick off a build manually? |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Backport de2174d from #5326