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

vendor: update thrift and zipkin-go-opentracing #33287

Merged

Conversation

nvanbenschoten
Copy link
Member

Fixes #30576.
Informs #30774.

openzipkin-contrib/zipkin-go-opentracing@4c9fbcb...f0f479a
apache/thrift@327ebb6...2b7365c

I audited every commit in the zipkin-go-opentracing diff and every
commit to the lib/go package of the thrift diff.

Release note (bug fix): Updated Zipkin library to avoid deadlock when
stopping Zipkin tracing.

Fixes cockroachdb#30576.
Informs cockroachdb#30774.

openzipkin-contrib/zipkin-go-opentracing@4c9fbcb...f0f479a
apache/thrift@327ebb6...2b7365c

I audited every commit in the zipkin-go-opentracing diff and every
commit to the `lib/go` package of the thrift diff.

Release note (bug fix): Updated Zipkin library to avoid deadlock when
stopping Zipkin tracing.
@nvanbenschoten nvanbenschoten requested review from RaduBerinde and a team December 19, 2018 21:27
@cockroach-teamcity
Copy link
Member

This change is Reviewable

@nvanbenschoten
Copy link
Member Author

bors r+

craig bot pushed a commit that referenced this pull request Dec 19, 2018
33287: vendor: update thrift and zipkin-go-opentracing r=nvanbenschoten a=nvanbenschoten

Fixes #30576.
Informs #30774.

openzipkin-contrib/zipkin-go-opentracing@4c9fbcb...f0f479a
apache/thrift@327ebb6...2b7365c

I audited every commit in the zipkin-go-opentracing diff and every
commit to the `lib/go` package of the thrift diff.

Release note (bug fix): Updated Zipkin library to avoid deadlock when
stopping Zipkin tracing.

Co-authored-by: Nathan VanBenschoten <nvanbenschoten@gmail.com>
@craig
Copy link
Contributor

craig bot commented Dec 19, 2018

Build succeeded

@craig craig bot merged commit 0c22865 into cockroachdb:master Dec 19, 2018
@nvanbenschoten nvanbenschoten deleted the nvanbenschoten/zipkinDeadlock branch January 3, 2019 16:10
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.

tracing: stopping Zipkin tracing causes deadlock
3 participants