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

Revert latest gRPC changes to allow more flexibility in versions #2018

Merged
merged 2 commits into from
Jan 15, 2020

Conversation

yurishkuro
Copy link
Member

@yurishkuro yurishkuro commented Jan 15, 2020

Which problem is this PR solving?

  • in 1.26 gRPC renamed resolver.BuildOption to resolver.BuildOptions, and created deprecated aliases.
  • Upgrade dependencies dep ensure --update #2012 changed the code to remove deprecation failures from staticcheck
  • which makes it incompatible with repos that use older gRPC versions (like the internal build at Uber)

Short description of the changes

  • Revert struct names to pre-1.26 version and add lint:ignore comments to pass staticcheck

Signed-off-by: Yuri Shkuro <[email protected]>
Signed-off-by: Yuri Shkuro <[email protected]>
@yurishkuro yurishkuro changed the title WIP grpc to 1.25.1 Revert latest gRPC changes to allow more flexibility in versions Jan 15, 2020
@codecov
Copy link

codecov bot commented Jan 15, 2020

Codecov Report

Merging #2018 into master will decrease coverage by 0.03%.
The diff coverage is 50%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #2018      +/-   ##
==========================================
- Coverage   97.45%   97.41%   -0.04%     
==========================================
  Files         207      207              
  Lines       10243    10243              
==========================================
- Hits         9982     9978       -4     
- Misses        220      222       +2     
- Partials       41       43       +2
Impacted Files Coverage Δ
pkg/discovery/grpcresolver/grpc_resolver.go 98.57% <50%> (ø) ⬆️
cmd/query/app/static_handler.go 86.84% <0%> (-1.76%) ⬇️
plugin/storage/badger/spanstore/reader.go 96.15% <0%> (-0.65%) ⬇️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 43be2e7...e5de747. Read the comment docs.

@yurishkuro yurishkuro merged commit f605a34 into jaegertracing:master Jan 15, 2020
@yurishkuro yurishkuro deleted the pin-grpc branch January 15, 2020 22:27
yurishkuro pushed a commit to yurishkuro/jaeger that referenced this pull request Feb 18, 2020
yurishkuro added a commit that referenced this pull request Feb 19, 2020
* Revert "Revert latest gRPC changes to allow more flexibility in versions (#2018)"

This reverts commit f605a34.

Signed-off-by: Yuri Shkuro <[email protected]>

* bump

Signed-off-by: Yuri Shkuro <[email protected]>

* bump

Signed-off-by: Yuri Shkuro <[email protected]>
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