Upgrade gRPC to ^1.26 (#2077)

* Revert "Revert latest gRPC changes to allow more flexibility in versions (#2018)" This reverts commit f605a34. Signed-off-by: Yuri Shkuro <[email protected]> * bump Signed-off-by: Yuri Shkuro <[email protected]> * bump Signed-off-by: Yuri Shkuro <[email protected]>
jaegertracing · Feb 19, 2020 · 043b1ae · 043b1ae
1 parent c9e4c92
commit 043b1ae
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 25 deletions.
diff --git a/Gopkg.lock b/Gopkg.lock
diff --git a/Gopkg.toml b/Gopkg.toml
@@ -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"

diff --git 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
@@ -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)
 }