diff --git a/pkg/discovery/grpcresolver/grpc_resolver.go b/pkg/discovery/grpcresolver/grpc_resolver.go index ba345c90280..8ce73bed5bb 100644 --- a/pkg/discovery/grpcresolver/grpc_resolver.go +++ b/pkg/discovery/grpcresolver/grpc_resolver.go @@ -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 @@ -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() diff --git a/pkg/discovery/grpcresolver/grpc_resolver_test.go b/pkg/discovery/grpcresolver/grpc_resolver_test.go index da6dbe94d5a..dd0ff89cedc 100644 --- a/pkg/discovery/grpcresolver/grpc_resolver_test.go +++ b/pkg/discovery/grpcresolver/grpc_resolver_test.go @@ -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) }