contrib/google.golang.org/grpc: fix client stream context propagation #919
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
Fix the client stream context returned by method Context() on the traced client stream. It now correctly returns the context containing the grpc.client span instead of its parent context. This was leading to misconnected or orphan grpc.message spans.
knusbaum
requested changes
May 26, 2021
| defer rig.Close() | ||
| client := rig.client | ||
|
|
||
| { |
There was a problem hiding this comment.
What is the reason for this block?
There was a problem hiding this comment.
same as explained above
|
|
||
| var serverSpan, clientSpan mocktracer.Span | ||
| { |
There was a problem hiding this comment.
What is the reason for putting this in a block?
There was a problem hiding this comment.
The following rootSpan type is tracer.Span and then come the assertions with the tracer mockup spans which have different types. So I created a new separate scope to avoid having two types of spans in the function scope.
Happy to put it in a separate function if you prefer.
knusbaum
approved these changes
Jun 29, 2021
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.
Fix the client stream context returned by method Context() on the traced
client stream. It now correctly returns the context containing the
grpc.client span instead of its parent context.
This was leading to misconnected or orphan grpc.message spans.
Fixes APMS-5154.