Update etcd to v3 (#1067) (#1097)

go.mod

@@ -21,7 +21,8 @@ require (
 	github.com/franela/goreq v0.0.0-20171204163338-bcd34c9993f8 // indirect
 	github.com/go-logfmt/logfmt v0.5.0
 	github.com/go-stack/stack v1.8.0
-	github.com/golang/protobuf v1.4.2
+	github.com/golang/protobuf v1.5.2
+	github.com/google/btree v1.0.0 // indirect
 	github.com/gorilla/mux v1.7.3
 	github.com/hashicorp/consul/api v1.3.0
 	github.com/hashicorp/go-version v1.2.0 // indirect
@@ -42,20 +43,22 @@ require (
 	github.com/pborman/uuid v1.2.0
 	github.com/performancecopilot/speed v3.0.0+incompatible
 	github.com/pkg/errors v0.8.1
-	github.com/prometheus/client_golang v1.3.0
+	github.com/prometheus/client_golang v1.5.1
 	github.com/samuel/go-zookeeper v0.0.0-20190923202752-2cc03de413da
 	github.com/sirupsen/logrus v1.4.2
 	github.com/smartystreets/goconvey v1.6.4 // indirect
 	github.com/sony/gobreaker v0.4.1
 	github.com/streadway/amqp v0.0.0-20190827072141-edfb9018d271
 	github.com/streadway/handy v0.0.0-20190108123426-d5acb3125c2a
-	go.etcd.io/etcd v0.0.0-20191023171146-3cf2f69b5738
+	go.etcd.io/etcd/client/pkg/v3 v3.5.0-beta.4
+	go.etcd.io/etcd/client/v2 v2.305.0-beta.4
+	go.etcd.io/etcd/client/v3 v3.5.0-beta.4
 	go.opencensus.io v0.22.3
-	go.uber.org/zap v1.13.0
-	golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e
+	go.uber.org/zap v1.16.1-0.20210329175301-c23abee72d19
+	golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9
 	golang.org/x/time v0.0.0-20200416051211-89c76fbcd5d1
-	golang.org/x/tools v0.0.0-20200103221440-774c71fcf114
-	google.golang.org/grpc v1.26.0
+	golang.org/x/tools v0.0.0-20210106214847-113979e3529a
+	google.golang.org/grpc v1.37.0
 	gopkg.in/gcfg.v1 v1.2.3 // indirect
 	gopkg.in/warnings.v0 v0.1.2 // indirect
 	sourcegraph.com/sourcegraph/appdash v0.0.0-20190731080439-ebfcffb1b5c0

sd/etcd/client.go

@@ -10,7 +10,7 @@ import (
 	"net/http"
 	"time"
 
-	etcd "go.etcd.io/etcd/client"
+	etcd "go.etcd.io/etcd/client/v2"
 )
 
 var (

sd/etcd/client_test.go

@@ -1,13 +1,13 @@
 package etcd
 
 import (
+	"context"
 	"errors"
 	"reflect"
 	"testing"
 	"time"
-	"context"
 
-	etcd "go.etcd.io/etcd/client"
+	etcd "go.etcd.io/etcd/client/v2"
 )
 
 func TestNewClient(t *testing.T) {

sd/etcd/instancer_test.go

@@ -4,7 +4,7 @@ import (
 	"errors"
 	"testing"
 
-	stdetcd "go.etcd.io/etcd/client"
+	stdetcd "go.etcd.io/etcd/client/v2"
 
 	"github.com/go-kit/kit/log"
 	"github.com/go-kit/kit/sd"

sd/etcd/registrar.go

@@ -4,7 +4,7 @@ import (
 	"sync"
 	"time"
 
-	etcd "go.etcd.io/etcd/client"
+	etcd "go.etcd.io/etcd/client/v2"
 
 	"github.com/go-kit/kit/log"
 )

sd/etcdv3/client.go

@@ -6,8 +6,8 @@ import (
 	"errors"
 	"time"
 
-	"go.etcd.io/etcd/clientv3"
-	"go.etcd.io/etcd/pkg/transport"
+	"go.etcd.io/etcd/client/pkg/v3/transport"
+	clientv3 "go.etcd.io/etcd/client/v3"
 	"google.golang.org/grpc"
 )