Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[7.x] sampling/pubsub: minor fixes (backport #5568) #5587

Merged
merged 1 commit into from
Jun 30, 2021
Merged

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jun 30, 2021

This is an automatic backport of pull request #5568 done by Mergify.


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.io/

* 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)
@mergify mergify bot assigned axw Jun 30, 2021
@apmmachine
Copy link
Contributor

💚 Build Succeeded

the below badges are clickable and redirect to their specific view in the CI or DOCS
Pipeline View Test View Changes Artifacts preview

Expand to view the summary

Build stats

  • Build Cause: Pull request #5587 opened

  • Start Time: 2021-06-30T09:26:58.052+0000

  • Duration: 38 min 38 sec

  • Commit: 8504c41

Test stats 🧪

Test Results
Failed 0
Passed 4658
Skipped 108
Total 4766

Trends 🧪

Image of Build Times

Image of Tests

@axw axw merged commit c378838 into 7.x Jun 30, 2021
@axw axw deleted the mergify/bp/7.x/pr-5568 branch June 30, 2021 11:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants