From 5a5bb2b2d781d719591da4524ab4c042eb9ae0ed Mon Sep 17 00:00:00 2001 From: Yuri Shkuro Date: Wed, 15 Jan 2020 16:21:44 -0500 Subject: [PATCH 1/2] Pin grpc to 1.25.1 Signed-off-by: Yuri Shkuro --- Gopkg.lock | 11 +++++------ Gopkg.toml | 2 +- pkg/discovery/grpcresolver/grpc_resolver.go | 4 ++-- pkg/discovery/grpcresolver/grpc_resolver_test.go | 2 +- 4 files changed, 9 insertions(+), 10 deletions(-) diff --git a/Gopkg.lock b/Gopkg.lock index 281c59d95b4..718a6d98f08 100644 --- a/Gopkg.lock +++ b/Gopkg.lock @@ -1145,7 +1145,7 @@ "internal/semver", ] pruneopts = "UT" - revision = "fdfa0def04cc58c406724040930652748fdf97ab" + revision = "f04f2c82d09b716585c8205f5cd482d1eca2aa3d" [[projects]] branch = "master" @@ -1156,14 +1156,13 @@ "googleapis/rpc/status", ] pruneopts = "UT" - revision = "e1de0a7b01eb2fc11d735e4bfb79d2e53ec9edb3" + revision = "ca5a22157cba8746e7aa978de1b1ac4085150840" [[projects]] - digest = "1:b2c9ea388537a402c7f618e11eda34ec5358b67c3c6aef9df113c7022b46e0b1" + digest = "1:917ecef30fa6af8f2d3ccc1b24b570676aca53e6b7087955925e48235b196c1b" name = "google.golang.org/grpc" packages = [ ".", - "attributes", "backoff", "balancer", "balancer/base", @@ -1205,8 +1204,8 @@ "test/grpc_testing", ] pruneopts = "UT" - revision = "f5b0812e6fe574d90da76b205e9eb51f6ddb1919" - version = "v1.26.0" + revision = "1a3960e4bd028ac0cec0a2afd27d7d8e67c11514" + version = "v1.25.1" [[projects]] digest = "1:2d1fbdc6777e5408cabeb02bf336305e724b925ff4546ded0fa8715a7267922a" diff --git a/Gopkg.toml b/Gopkg.toml index 0e66a8e4d69..b85d565e219 100644 --- a/Gopkg.toml +++ b/Gopkg.toml @@ -121,7 +121,7 @@ required = [ [[constraint]] name = "google.golang.org/grpc" - version = "^1.20.1" + version = "=1.25.1" [[constraint]] name = "gopkg.in/yaml.v2" diff --git a/pkg/discovery/grpcresolver/grpc_resolver.go b/pkg/discovery/grpcresolver/grpc_resolver.go index ba345c90280..a8aefddb9ed 100644 --- a/pkg/discovery/grpcresolver/grpc_resolver.go +++ b/pkg/discovery/grpcresolver/grpc_resolver.go @@ -85,7 +85,7 @@ 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) { +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 +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 -func (r *Resolver) ResolveNow(o resolver.ResolveNowOptions) {} +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..4593f712a62 100644 --- a/pkg/discovery/grpcresolver/grpc_resolver_test.go +++ b/pkg/discovery/grpcresolver/grpc_resolver_test.go @@ -118,7 +118,7 @@ func TestErrorDiscoverer(t *testing.T) { err: errMessage, } r := New(notifier, discoverer, zap.NewNop(), 2) - _, err := r.Build(resolver.Target{}, nil, resolver.BuildOptions{}) + _, err := r.Build(resolver.Target{}, nil, resolver.BuildOption{}) assert.Equal(t, errMessage, err) } From e5de747247e2c4fe55772ddaa786da9c00600bd4 Mon Sep 17 00:00:00 2001 From: Yuri Shkuro Date: Wed, 15 Jan 2020 16:46:58 -0500 Subject: [PATCH 2/2] Ignore lint errors Signed-off-by: Yuri Shkuro --- Gopkg.lock | 11 ++++++----- Gopkg.toml | 2 +- pkg/discovery/grpcresolver/grpc_resolver.go | 2 ++ pkg/discovery/grpcresolver/grpc_resolver_test.go | 1 + 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/Gopkg.lock b/Gopkg.lock index 718a6d98f08..281c59d95b4 100644 --- a/Gopkg.lock +++ b/Gopkg.lock @@ -1145,7 +1145,7 @@ "internal/semver", ] pruneopts = "UT" - revision = "f04f2c82d09b716585c8205f5cd482d1eca2aa3d" + revision = "fdfa0def04cc58c406724040930652748fdf97ab" [[projects]] branch = "master" @@ -1156,13 +1156,14 @@ "googleapis/rpc/status", ] pruneopts = "UT" - revision = "ca5a22157cba8746e7aa978de1b1ac4085150840" + revision = "e1de0a7b01eb2fc11d735e4bfb79d2e53ec9edb3" [[projects]] - digest = "1:917ecef30fa6af8f2d3ccc1b24b570676aca53e6b7087955925e48235b196c1b" + digest = "1:b2c9ea388537a402c7f618e11eda34ec5358b67c3c6aef9df113c7022b46e0b1" name = "google.golang.org/grpc" packages = [ ".", + "attributes", "backoff", "balancer", "balancer/base", @@ -1204,8 +1205,8 @@ "test/grpc_testing", ] pruneopts = "UT" - revision = "1a3960e4bd028ac0cec0a2afd27d7d8e67c11514" - version = "v1.25.1" + revision = "f5b0812e6fe574d90da76b205e9eb51f6ddb1919" + version = "v1.26.0" [[projects]] digest = "1:2d1fbdc6777e5408cabeb02bf336305e724b925ff4546ded0fa8715a7267922a" diff --git a/Gopkg.toml b/Gopkg.toml index b85d565e219..0e66a8e4d69 100644 --- a/Gopkg.toml +++ b/Gopkg.toml @@ -121,7 +121,7 @@ required = [ [[constraint]] name = "google.golang.org/grpc" - version = "=1.25.1" + version = "^1.20.1" [[constraint]] name = "gopkg.in/yaml.v2" diff --git a/pkg/discovery/grpcresolver/grpc_resolver.go b/pkg/discovery/grpcresolver/grpc_resolver.go index a8aefddb9ed..8ce73bed5bb 100644 --- a/pkg/discovery/grpcresolver/grpc_resolver.go +++ b/pkg/discovery/grpcresolver/grpc_resolver.go @@ -85,6 +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) { r.cc = cc @@ -106,6 +107,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) watcher() { diff --git a/pkg/discovery/grpcresolver/grpc_resolver_test.go b/pkg/discovery/grpcresolver/grpc_resolver_test.go index 4593f712a62..dd0ff89cedc 100644 --- a/pkg/discovery/grpcresolver/grpc_resolver_test.go +++ b/pkg/discovery/grpcresolver/grpc_resolver_test.go @@ -118,6 +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{}) assert.Equal(t, errMessage, err) }