Check for None result in gRPC (#3380) #3381
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
|
Thanks for the PR, could you please write a test for this to avoid regressions in the future? |
That was an adventure! Added a test that counts |
xrmx
reviewed
Mar 26, 2025
| @@ -43,6 +43,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 | |||
|
|
|||
| ### Fixed | |||
|
|
|||
| - `opentelemetry-instrumentation-grpc` Check for None result in gRPC | |||
There was a problem hiding this comment.
This need to be moved to the unreleased version
xrmx
reviewed
Mar 26, 2025
Comment on lines
+282
to
+295
| def counting_span_end(original_end): | ||
| def wrapper(*args, **kwargs): | ||
| nonlocal span_end_count | ||
| span_end_count += 1 | ||
| return original_end(*args, **kwargs) | ||
|
|
||
| return wrapper | ||
|
|
||
| def patched_start_span(*args, **kwargs): | ||
| span = original_start_span(*args, **kwargs) | ||
| span.end = counting_span_end(span.end) | ||
| return span | ||
|
|
||
| tracer.start_span = patched_start_span |
There was a problem hiding this comment.
Have you tried patching the end method of Span instead? something like with mock.patch.object(Span, "end") as span_end_mock: and then self.assertEqual(span_end_mock.call_count, 1)?
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.
Description
This is a fix for #3380 that checks explicitly for a
Noneresult rather than evaluating truthiness. PubSub results with zero messages evaluate toFalse, causingspan.end()to be called twice.Fixes #3380
Type of change
How Has This Been Tested?
Does This PR Require a Core Repo Change?
Checklist:
See contributing.md for styleguide, changelog guidelines, and more.