sampling/pubsub: minor fixes #5568
Merged
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
Revise the pubsub API so that the PublishSampledTraceIDs method is long-lived and accepts a channel of trace IDs; this brings it closer to the API of SubscribeSampledTraceIDs, and ensures we properly close the BulkIndexer used by the publisher when it exits.
Write HTTP response from the handler goroutine, rather than in another goroutine which waits for the request. This avoids a race in the existing test code, where the client receives the response and closes the connection, causing the server's handler context to be cancelled before the handler returns.
💚 Build Succeeded
Expand to view the summary
Build stats
Test stats 🧪
Trends 🧪 |
mergify bot
pushed a commit
that referenced
this pull request
Jun 30, 2021
* sampling/pubsub: close BulkIndexer Revise the pubsub API so that the PublishSampledTraceIDs method is long-lived and accepts a channel of trace IDs; this brings it closer to the API of SubscribeSampledTraceIDs, and ensures we properly close the BulkIndexer used by the publisher when it exits. * sampling/pubsub: fix double WriteHeader in test Write HTTP response from the handler goroutine, rather than in another goroutine which waits for the request. This avoids a race in the existing test code, where the client receives the response and closes the connection, causing the server's handler context to be cancelled before the handler returns. (cherry picked from commit 0a985aa)
axw
added a commit
that referenced
this pull request
Jun 30, 2021
* sampling/pubsub: close BulkIndexer Revise the pubsub API so that the PublishSampledTraceIDs method is long-lived and accepts a channel of trace IDs; this brings it closer to the API of SubscribeSampledTraceIDs, and ensures we properly close the BulkIndexer used by the publisher when it exits. * sampling/pubsub: fix double WriteHeader in test Write HTTP response from the handler goroutine, rather than in another goroutine which waits for the request. This avoids a race in the existing test code, where the client receives the response and closes the connection, causing the server's handler context to be cancelled before the handler returns. (cherry picked from commit 0a985aa) Co-authored-by: Andrew Wilkins <[email protected]>
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.
Motivation/summary
Revise the pubsub API so that the PublishSampledTraceIDs method is long-lived and accepts a channel of trace IDs. This brings PublishSampledTraceIDs closer to the API of SubscribeSampledTraceIDs, and ensures we properly close the BulkIndexer used by the publisher when it exits.
Also, fix a race in the pubsub tests. We now write HTTP response from the handler goroutine rather than in another goroutine which waits for the request. This avoids a race in the existing test code, where the client receives the response and closes the connection, causing the server's handler context to be cancelled before the handler returns.
Related issues
Closes #5493
Closes #5480