From 0538433beef201eb7e7cba7581356cb8b71aea6b Mon Sep 17 00:00:00 2001 From: Yuri Shkuro Date: Tue, 18 Feb 2020 17:37:32 -0500 Subject: [PATCH] Revert "Revert latest gRPC changes to allow more flexibility in versions (#2018)" This reverts commit f605a34be775ba9ec37f93d67e8e1fda7c779f2a. Signed-off-by: Yuri Shkuro --- pkg/discovery/grpcresolver/grpc_resolver.go | 6 ++---- pkg/discovery/grpcresolver/grpc_resolver_test.go | 3 +-- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/pkg/discovery/grpcresolver/grpc_resolver.go b/pkg/discovery/grpcresolver/grpc_resolver.go index 8ce73bed5bb..ba345c90280 100644 --- a/pkg/discovery/grpcresolver/grpc_resolver.go +++ b/pkg/discovery/grpcresolver/grpc_resolver.go @@ -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 @@ -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() diff --git a/pkg/discovery/grpcresolver/grpc_resolver_test.go b/pkg/discovery/grpcresolver/grpc_resolver_test.go index 408b3ab3065..f6bcdd7cf67 100644 --- a/pkg/discovery/grpcresolver/grpc_resolver_test.go +++ b/pkg/discovery/grpcresolver/grpc_resolver_test.go @@ -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) }