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

Upgrade gRPC to ^1.26 #2077

Merged
merged 3 commits into from
Feb 19, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 18 additions & 18 deletions Gopkg.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Gopkg.toml
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ required = [

[[constraint]]
name = "google.golang.org/grpc"
version = ">=1.20.1, <1.27"
version = "^1.26"

[[constraint]]
name = "gopkg.in/yaml.v2"
Expand Down
6 changes: 2 additions & 4 deletions pkg/discovery/grpcresolver/grpc_resolver.go
Original file line number Diff line number Diff line change
Expand Up @@ -85,8 +85,7 @@ func New(
}

// Build returns itself for Resolver, because it's both a builder and a resolver.
//lint:ignore SA1019 https://github.com/jaegertracing/jaeger/pull/2018
func (r *Resolver) Build(target resolver.Target, cc resolver.ClientConn, opts resolver.BuildOption) (resolver.Resolver, error) {
func (r *Resolver) Build(target resolver.Target, cc resolver.ClientConn, opts resolver.BuildOptions) (resolver.Resolver, error) {
r.cc = cc

// Update conn states if proactively updates already work
Expand All @@ -107,8 +106,7 @@ func (r *Resolver) Scheme() string {

// ResolveNow is a noop for Resolver since resolver is already firing r.cc.UpdatesState every time
// it receives updates of new instance from discoCh
//lint:ignore SA1019 https://github.com/jaegertracing/jaeger/pull/2018
func (r *Resolver) ResolveNow(o resolver.ResolveNowOption) {}
func (r *Resolver) ResolveNow(o resolver.ResolveNowOptions) {}

func (r *Resolver) watcher() {
defer r.closing.Done()
Expand Down
3 changes: 1 addition & 2 deletions pkg/discovery/grpcresolver/grpc_resolver_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -118,8 +118,7 @@ func TestErrorDiscoverer(t *testing.T) {
err: errMessage,
}
r := New(notifier, discoverer, zap.NewNop(), 2)
//lint:ignore SA1019 https://github.com/jaegertracing/jaeger/pull/2018
_, err := r.Build(resolver.Target{}, nil, resolver.BuildOption{})
_, err := r.Build(resolver.Target{}, nil, resolver.BuildOptions{})
assert.Equal(t, errMessage, err)
}

Expand Down