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.

Sign up for GitHub

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

Jump to bottom

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

Merged
merged 2 commits into from
Jan 15, 2020
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5a5bb2b
Pin grpc to 1.25.1
Jan 15, 2020
e5de747
Ignore lint errors
Jan 15, 2020
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
6 changes: 4 additions & 2 deletions pkg/discovery/grpcresolver/grpc_resolver.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,8 @@ func New(
}

// Build returns itself for Resolver, because it's both a builder and a resolver.
func (r *Resolver) Build(target resolver.Target, cc resolver.ClientConn, opts resolver.BuildOptions) (resolver.Resolver, error) {
//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) {
r.cc = cc

// Update conn states if proactively updates already work
Expand All @@ -106,7 +107,8 @@ 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
func (r *Resolver) ResolveNow(o resolver.ResolveNowOptions) {}
//lint:ignore SA1019 https://github.com/jaegertracing/jaeger/pull/2018
func (r *Resolver) ResolveNow(o resolver.ResolveNowOption) {}

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

Expand Down