update go.mod

go.mod

@@ -2,158 +2,90 @@ module github.com/micro/go-micro
 
 require (
 	cloud.google.com/go v0.39.0 // indirect
-	contrib.go.opencensus.io/exporter/ocagent v0.5.0 // indirect
-	github.com/Azure/azure-sdk-for-go v30.0.0+incompatible // indirect
-	github.com/Azure/go-autorest v12.1.0+incompatible // indirect
 	github.com/BurntSushi/toml v0.3.1
-	github.com/DataDog/dd-trace-go v1.14.0 // indirect
-	github.com/DataDog/zstd v1.4.0 // indirect
-	github.com/Jeffail/gabs v1.4.0 // indirect
-	github.com/Microsoft/go-winio v0.4.12 // indirect
-	github.com/NYTimes/gziphandler v1.1.1 // indirect
 	github.com/OneOfOne/xxhash v1.2.5 // indirect
-	github.com/PuerkitoBio/purell v1.1.1 // indirect
+	github.com/armon/go-metrics v0.0.0-20190430140413-ec5e00d3c878 // indirect
-	github.com/SAP/go-hdb v0.14.1 // indirect
+	github.com/beevik/ntp v0.2.0
-	github.com/Shopify/sarama v1.22.1 // indirect
-	github.com/StackExchange/wmi v0.0.0-20190523213315-cbe66965904d // indirect
-	github.com/aliyun/alibaba-cloud-sdk-go v0.0.0-20190530073359-dfac1ef71ffa // indirect
-	github.com/aliyun/aliyun-oss-go-sdk v1.9.8 // indirect
-	github.com/araddon/gou v0.0.0-20190110011759-c797efecbb61 // indirect
-	github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a // indirect
-	github.com/aws/aws-sdk-go v1.19.41 // indirect
 	github.com/bitly/go-simplejson v0.5.0
-	github.com/boombuler/barcode v1.0.0 // indirect
+	github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869 // indirect
-	github.com/chrismalek/oktasdk-go v0.0.0-20181212195951-3430665dfaa0 // indirect
+	github.com/bradfitz/gomemcache v0.0.0-20190329173943-551aad21a668
+	github.com/bwmarrin/discordgo v0.19.0
 	github.com/containerd/continuity v0.0.0-20190426062206-aaeac12a7ffc // indirect
-	github.com/coredns/coredns v1.5.0 // indirect
+	github.com/coreos/bbolt v1.3.2 // indirect
-	github.com/coreos/etcd v3.3.13+incompatible // indirect
+	github.com/coreos/etcd v3.3.13+incompatible
 	github.com/coreos/go-semver v0.3.0 // indirect
 	github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e // indirect
-	github.com/dancannon/gorethink v4.0.0+incompatible // indirect
+	github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f // indirect
-	github.com/denisenkom/go-mssqldb v0.0.0-20190515213511-eb9f6a1743f3 // indirect
+	github.com/dgrijalva/jwt-go v3.2.0+incompatible // indirect
-	github.com/denverdino/aliyungo v0.0.0-20190410085603-611ead8a6fed // indirect
 	github.com/dgryski/go-sip13 v0.0.0-20190329191031-25c5027a8c7b // indirect
-	github.com/digitalocean/godo v1.15.0 // indirect
+	github.com/emirpasic/gods v1.12.0 // indirect
-	github.com/dnaeon/go-vcr v1.0.1 // indirect
+	github.com/forestgiant/sliceutil v0.0.0-20160425183142-94783f95db6c
-	github.com/dnstap/golang-dnstap v0.1.0 // indirect
-	github.com/docker/go-connections v0.4.0 // indirect
-	github.com/docker/go-units v0.4.0 // indirect
-	github.com/docker/spdystream v0.0.0-20181023171402-6480d4af844c // indirect
-	github.com/elazarl/go-bindata-assetfs v1.0.0 // indirect
-	github.com/elazarl/goproxy v0.0.0-20190421051319-9d40249d3c2f // indirect
-	github.com/emicklei/go-restful v2.9.5+incompatible // indirect
-	github.com/envoyproxy/go-control-plane v0.8.0 // indirect
-	github.com/evanphx/json-patch v4.2.0+incompatible // indirect
-	github.com/farsightsec/golang-framestream v0.0.0-20190425193708-fa4b164d59b8 // indirect
 	github.com/fsnotify/fsnotify v1.4.7
-	github.com/fullsailor/pkcs7 v0.0.0-20190404230743-d7302db945fa // indirect
+	github.com/fsouza/go-dockerclient v1.4.1
-	github.com/gammazero/workerpool v0.0.0-20190521015540-3b91a70bc0a1 // indirect
 	github.com/garyburd/redigo v1.6.0 // indirect
 	github.com/ghodss/yaml v1.0.0
-	github.com/go-acme/lego v2.6.0+incompatible // indirect
+	github.com/gliderlabs/ssh v0.1.4 // indirect
-	github.com/go-ldap/ldap v3.0.3+incompatible // indirect
 	github.com/go-log/log v0.1.0
-	github.com/go-ole/go-ole v1.2.4 // indirect
+	github.com/go-redsync/redsync v1.2.0
-	github.com/go-openapi/jsonpointer v0.19.0 // indirect
+	github.com/go-telegram-bot-api/telegram-bot-api v4.6.4+incompatible // indirect
-	github.com/go-openapi/jsonreference v0.19.0 // indirect
+	github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef // indirect
-	github.com/go-openapi/spec v0.19.0 // indirect
-	github.com/go-openapi/swag v0.19.0 // indirect
-	github.com/go-sql-driver/mysql v1.4.1 // indirect
-	github.com/go-stomp/stomp v2.0.3+incompatible // indirect
-	github.com/gocql/gocql v0.0.0-20190523124812-0680bfb96414 // indirect
-	github.com/gogo/googleapis v1.2.0 // indirect
 	github.com/golang/mock v1.3.1 // indirect
 	github.com/golang/protobuf v1.3.1
+	github.com/gomodule/redigo v2.0.0+incompatible
 	github.com/google/btree v1.0.0 // indirect
-	github.com/google/gofuzz v1.0.0 // indirect
 	github.com/google/pprof v0.0.0-20190515194954-54271f7e092f // indirect
 	github.com/google/uuid v1.1.1
-	github.com/gophercloud/gophercloud v0.1.0 // indirect
+	github.com/grpc-ecosystem/go-grpc-middleware v1.0.0 // indirect
-	github.com/gopherjs/gopherjs v0.0.0-20190430165422-3e4dfb77656c // indirect
+	github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
-	github.com/gorilla/mux v1.7.2 // indirect
 	github.com/grpc-ecosystem/grpc-gateway v1.9.0 // indirect
-	github.com/hashicorp/consul v1.5.1
 	github.com/hashicorp/consul/api v1.1.0
-	github.com/hashicorp/go-checkpoint v0.5.0 // indirect
+	github.com/hashicorp/go-immutable-radix v1.1.0 // indirect
-	github.com/hashicorp/go-discover v0.0.0-20190522154730-8aba54d36e17 // indirect
+	github.com/hashicorp/go-msgpack v0.5.5 // indirect
-	github.com/hashicorp/go-hclog v0.9.2 // indirect
+	github.com/hashicorp/go-sockaddr v1.0.2 // indirect
-	github.com/hashicorp/go-memdb v1.0.3 // indirect
-	github.com/hashicorp/go-version v1.2.0 // indirect
 	github.com/hashicorp/hcl v1.0.0
-	github.com/hashicorp/hil v0.0.0-20190212132231-97b3a9cdfa93 // indirect
+	github.com/hashicorp/mdns v1.0.1 // indirect
 	github.com/hashicorp/memberlist v0.1.4
-	github.com/hashicorp/nomad/api v0.0.0-20190529164939-86a6569933bd // indirect
-	github.com/hashicorp/raft v1.1.0 // indirect
-	github.com/hashicorp/raft-boltdb v0.0.0-20171010151810-6e5ba93211ea // indirect
 	github.com/hashicorp/serf v0.8.3 // indirect
-	github.com/hashicorp/vault v1.1.2 // indirect
-	github.com/hashicorp/vault-plugin-auth-alicloud v0.5.1 // indirect
-	github.com/hashicorp/vault-plugin-auth-azure v0.5.1 // indirect
-	github.com/hashicorp/vault-plugin-auth-centrify v0.5.1 // indirect
-	github.com/hashicorp/vault-plugin-auth-jwt v0.5.1 // indirect
-	github.com/hashicorp/vault-plugin-auth-kubernetes v0.5.1 // indirect
-	github.com/hashicorp/vault-plugin-secrets-ad v0.5.1 // indirect
-	github.com/hashicorp/vault-plugin-secrets-alicloud v0.5.1 // indirect
-	github.com/hashicorp/vault-plugin-secrets-azure v0.5.1 // indirect
-	github.com/hashicorp/vault-plugin-secrets-gcp v0.5.2 // indirect
-	github.com/hashicorp/vault-plugin-secrets-gcpkms v0.5.1 // indirect
-	github.com/hashicorp/vault-plugin-secrets-kv v0.5.1 // indirect
-	github.com/hashicorp/vault/api v1.0.2 // indirect
-	github.com/hashicorp/vault/sdk v0.1.11 // indirect
 	github.com/imdario/mergo v0.3.7
-	github.com/influxdata/influxdb v1.7.6 // indirect
+	github.com/jonboulle/clockwork v0.1.0 // indirect
-	github.com/jarcoal/httpmock v1.0.4 // indirect
+	github.com/json-iterator/go v1.1.6 // indirect
-	github.com/jefferai/jsonx v1.0.0 // indirect
-	github.com/joyent/triton-go v0.0.0-20190112182421-51ffac552869 // indirect
-	github.com/keybase/go-crypto v0.0.0-20190416182011-b785b22cc757 // indirect
 	github.com/kisielk/errcheck v1.2.0 // indirect
-	github.com/klauspost/cpuid v1.2.1 // indirect
 	github.com/konsorten/go-windows-terminal-sequences v1.0.2 // indirect
 	github.com/kr/pty v1.1.4 // indirect
-	github.com/kylelemons/godebug v1.1.0 // indirect
+	github.com/lusis/go-slackbot v0.0.0-20180109053408-401027ccfef5 // indirect
-	github.com/lib/pq v1.1.1 // indirect
+	github.com/lusis/slack-test v0.0.0-20190426140909-c40012f20018 // indirect
-	github.com/linode/linodego v0.9.0 // indirect
-	github.com/lucas-clemente/quic-go v0.11.1 // indirect
-	github.com/lyft/protoc-gen-validate v0.0.14 // indirect
-	github.com/mailru/easyjson v0.0.0-20190403194419-1ea4449da983 // indirect
-	github.com/mattbaird/elastigo v0.0.0-20170123220020-2fe47fd29e4b // indirect
 	github.com/mattn/go-colorable v0.1.2 // indirect
-	github.com/mholt/caddy v1.0.0 // indirect
-	github.com/mholt/certmagic v0.5.1 // indirect
-	github.com/michaelklishin/rabbit-hole v1.5.0 // indirect
 	github.com/micro/cli v0.2.0
-	github.com/micro/go-micro/util/log v0.1.0
+	github.com/micro/go-log v0.1.0
 	github.com/micro/go-rcache v0.3.0
 	github.com/micro/mdns v0.1.0
-	github.com/micro/util v0.2.0
 	github.com/miekg/dns v1.1.13 // indirect
 	github.com/mitchellh/hashstructure v1.0.0
-	github.com/mitchellh/pointerstructure v0.0.0-20190430161007-f252a8fd71c8 // indirect
+	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
-	github.com/munnerz/goautoneg v0.0.0-20190414153302-2ae31c8b6b30 // indirect
+	github.com/modern-go/reflect2 v1.0.1 // indirect
-	github.com/opentracing/opentracing-go v1.1.0 // indirect
+	github.com/nlopes/slack v0.5.0
-	github.com/openzipkin/zipkin-go-opentracing v0.3.5 // indirect
+	github.com/onsi/ginkgo v1.8.0 // indirect
-	github.com/ory-am/common v0.4.0 // indirect
+	github.com/onsi/gomega v1.5.0 // indirect
 	github.com/pborman/uuid v1.2.0
 	github.com/pkg/errors v0.8.1
-	github.com/pquerna/otp v1.1.0 // indirect
 	github.com/prometheus/client_golang v0.9.3 // indirect
 	github.com/prometheus/common v0.4.1 // indirect
 	github.com/prometheus/procfs v0.0.1 // indirect
 	github.com/prometheus/tsdb v0.8.0 // indirect
 	github.com/rogpeppe/fastuuid v1.1.0 // indirect
-	github.com/russross/blackfriday v2.0.0+incompatible // indirect
-	github.com/samuel/go-zookeeper v0.0.0-20180130194729-c4fab1ac1bec // indirect
-	github.com/shirou/gopsutil v2.18.12+incompatible // indirect
 	github.com/sirupsen/logrus v1.4.2 // indirect
-	github.com/smartystreets/assertions v0.0.0-20190401211740-f487f9de1cd3 // indirect
+	github.com/soheilhy/cmux v0.1.4 // indirect
-	github.com/softlayer/softlayer-go v0.0.0-20190508182157-7c592eb2559c // indirect
 	github.com/spaolacci/murmur3 v1.1.0 // indirect
-	github.com/streadway/amqp v0.0.0-20190404075320-75d898a42a94 // indirect
 	github.com/stretchr/objx v0.2.0 // indirect
-	github.com/ugorji/go v1.1.5-pre // indirect
+	github.com/technoweenie/multipartstreamer v1.0.1 // indirect
-	github.com/vmware/govmomi v0.20.1 // indirect
+	github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5 // indirect
+	github.com/xanzy/ssh-agent v0.2.1 // indirect
+	github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2 // indirect
+	go.etcd.io/bbolt v1.3.2 // indirect
+	go.etcd.io/etcd v3.3.13+incompatible
 	go.opencensus.io v0.22.0 // indirect
 	go.uber.org/atomic v1.4.0 // indirect
+	go.uber.org/multierr v1.1.0 // indirect
 	go.uber.org/zap v1.10.0 // indirect
 	golang.org/x/crypto v0.0.0-20190530122614-20be4c3c3ed5 // indirect
 	golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522 // indirect
@@ -162,22 +94,19 @@ require (
 	golang.org/x/mobile v0.0.0-20190509164839-32b2708ab171 // indirect
 	golang.org/x/net v0.0.0-20190522155817-f3200d17e092
 	golang.org/x/oauth2 v0.0.0-20190523182746-aaccbc9213b0 // indirect
-	golang.org/x/sys v0.0.0-20190530182044-ad28b68e88f1 // indirect
+	golang.org/x/sys v0.0.0-20190531073156-46560c3f3c0a // indirect
+	golang.org/x/time v0.0.0-20190308202827-9d24e82272b4 // indirect
 	golang.org/x/tools v0.0.0-20190530215528-75312fb06703 // indirect
 	google.golang.org/appengine v1.6.0 // indirect
 	google.golang.org/genproto v0.0.0-20190530194941-fb225487d101 // indirect
 	google.golang.org/grpc v1.21.0 // indirect
-	gopkg.in/gorethink/gorethink.v4 v4.1.0 // indirect
+	gopkg.in/bsm/ratelimit.v1 v1.0.0-20160220154919-db14e161995a // indirect
-	gopkg.in/mgo.v2 v2.0.0-20180705113604-9856a29383ce // indirect
+	gopkg.in/redis.v3 v3.6.4
-	gopkg.in/ory-am/dockertest.v2 v2.2.3 // indirect
+	gopkg.in/src-d/go-billy.v4 v4.3.0 // indirect
+	gopkg.in/src-d/go-git-fixtures.v3 v3.5.0 // indirect
+	gopkg.in/src-d/go-git.v4 v4.11.0
+	gopkg.in/telegram-bot-api.v4 v4.6.4
 	honnef.co/go/tools v0.0.0-20190530170028-a1efa522b896 // indirect
-	k8s.io/api v0.0.0-20190528154508-67ef80593b24 // indirect
-	k8s.io/client-go v11.0.0+incompatible // indirect
-	k8s.io/gengo v0.0.0-20190327210449-e17681d19d3a // indirect
-	k8s.io/klog v0.3.2 // indirect
-	k8s.io/kube-openapi v0.0.0-20190530181030-b52b5b0f5a7c // indirect
-	k8s.io/utils v0.0.0-20190529001817-6999998975a7 // indirect
-	layeh.com/radius v0.0.0-20190322222518-890bc1058917 // indirect
 )
 
 replace github.com/golang/lint => github.com/golang/lint v0.0.0-20190227174305-8f45f776aaf1

sync/leader/etcd/etcd.go

@@ -6,9 +6,9 @@ import (
 	"path"
 	"strings"
 
+	client "github.com/coreos/etcd/clientv3"
+	cc "github.com/coreos/etcd/clientv3/concurrency"
 	"github.com/micro/go-micro/sync/leader"
-	client "go.etcd.io/etcd/clientv3"
-	cc "go.etcd.io/etcd/clientv3/concurrency"
 )
 
 type etcdLeader struct {

sync/lock/etcd/etcd.go

@@ -9,9 +9,9 @@ import (
 	"strings"
 	"sync"
 
+	client "github.com/coreos/etcd/clientv3"
+	cc "github.com/coreos/etcd/clientv3/concurrency"
 	"github.com/micro/go-micro/sync/lock"
-	client "go.etcd.io/etcd/clientv3"
-	cc "go.etcd.io/etcd/clientv3/concurrency"
 )
 
 type etcdLock struct {