plugin/grpc: fix span leak and deadline on error attempt#7487
Merged
Conversation
Always finish child spans on success and error paths. Add a test asserting spans finish and deadlines set. Signed-off-by: Ville Vesilehto <ville@vesilehto.fi>
Codecov Report✅ All modified and coverable lines are covered by tests. Additional details and impacted files@@ Coverage Diff @@
## master #7487 +/- ##
==========================================
+ Coverage 55.70% 60.15% +4.45%
==========================================
Files 224 274 +50
Lines 10016 18144 +8128
==========================================
+ Hits 5579 10914 +5335
- Misses 3978 6596 +2618
- Partials 459 634 +175 ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
yongtang
approved these changes
Sep 2, 2025
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
1. Why is this pull request needed and what does it do?
Fixes leaked child tracing spans in
grpc.ServeDNSon error paths. Previously spans were not always finished when a proxy attempt failed.Each attempt now derives a context with a deadline, derived from the overall request timeline. Previously there was no per-RPC deadline and the loop’s timeout was only evaluated after the call returned.
I added a test to validate the behaviour:
If you run the test against current
masteryou'll see that it fails:While at it, I also refactored the code to use
opentracing.StartSpanFromContextfor a bit cleaner span init.2. Which issues (if any) are related?
None found.
3. Which documentation changes (if any) need to be made?
None. Purely an implementation internal matter.
4. Does this introduce a backward incompatible change or deprecation?
No. Query handling and responses are unchanged; only tracing and timeout handling improved.