Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Replace unmaintained zk library with drop-in replacement #1120

Merged
merged 1 commit into from Jun 24, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion go.mod
Expand Up @@ -21,6 +21,7 @@ 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/go-zookeeper/zk v1.0.2
github.com/google/btree v1.0.0 // indirect
github.com/hashicorp/consul/api v1.3.0
github.com/hashicorp/golang-lru v0.5.1 // indirect
Expand All @@ -34,7 +35,6 @@ require (
github.com/performancecopilot/speed v3.0.0+incompatible
github.com/pkg/errors v0.9.1
github.com/prometheus/client_golang v1.11.0
github.com/samuel/go-zookeeper v0.0.0-20190923202752-2cc03de413da
github.com/sirupsen/logrus v1.6.0
github.com/smartystreets/goconvey v1.6.4 // indirect
github.com/sony/gobreaker v0.4.1
Expand Down
4 changes: 2 additions & 2 deletions go.sum
Expand Up @@ -89,6 +89,8 @@ github.com/go-logfmt/logfmt v0.5.0 h1:TrB8swr/68K7m9CcGut2g3UOihhbcbiMAYiuTXdEih
github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A=
github.com/go-stack/stack v1.8.0 h1:5SgMzNM5HxrEjV0ww2lTmX6E2Izsfxas4+YHWRs3Lsk=
github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
github.com/go-zookeeper/zk v1.0.2 h1:4mx0EYENAdX/B/rbunjlt5+4RTA/a9SMHBRuSKdGxPM=
github.com/go-zookeeper/zk v1.0.2/go.mod h1:nOB03cncLtlp4t+UAkGSV+9beXP/akpekBwL+UX1Qcw=
github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
github.com/gogo/googleapis v1.1.0/go.mod h1:gf4bu3Q80BeJ6H1S1vYPm8/ELATdvryBaNFGgqEef3s=
github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
Expand Down Expand Up @@ -287,8 +289,6 @@ github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod h1:bCqn
github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ=
github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts=
github.com/samuel/go-zookeeper v0.0.0-20190923202752-2cc03de413da h1:p3Vo3i64TCLY7gIfzeQaUJ+kppEO5WQG3cL8iE8tGHU=
github.com/samuel/go-zookeeper v0.0.0-20190923202752-2cc03de413da/go.mod h1:gi+0XIa01GRL2eRQVjQkKGqKF3SF9vZR/HnPullcV2E=
github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529 h1:nn5Wsu0esKSJiIVhscUtVbo7ada43DJhG55ua/hjS5I=
github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc=
github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc=
Expand Down
2 changes: 1 addition & 1 deletion sd/zk/client.go
Expand Up @@ -6,7 +6,7 @@ import (
"strings"
"time"

"github.com/samuel/go-zookeeper/zk"
"github.com/go-zookeeper/zk"

"github.com/go-kit/kit/log"
)
Expand Down
2 changes: 1 addition & 1 deletion sd/zk/client_test.go
Expand Up @@ -5,7 +5,7 @@ import (
"testing"
"time"

stdzk "github.com/samuel/go-zookeeper/zk"
stdzk "github.com/go-zookeeper/zk"

"github.com/go-kit/kit/log"
)
Expand Down
2 changes: 1 addition & 1 deletion sd/zk/instancer.go
@@ -1,7 +1,7 @@
package zk

import (
"github.com/samuel/go-zookeeper/zk"
"github.com/go-zookeeper/zk"

"github.com/go-kit/kit/log"
"github.com/go-kit/kit/sd"
Expand Down
2 changes: 1 addition & 1 deletion sd/zk/integration_test.go
Expand Up @@ -8,7 +8,7 @@ import (
"testing"
"time"

stdzk "github.com/samuel/go-zookeeper/zk"
stdzk "github.com/go-zookeeper/zk"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion sd/zk/logwrapper.go
Expand Up @@ -3,7 +3,7 @@ package zk
import (
"fmt"

"github.com/samuel/go-zookeeper/zk"
"github.com/go-zookeeper/zk"

"github.com/go-kit/kit/log"
)
Expand Down
2 changes: 1 addition & 1 deletion sd/zk/util_test.go
Expand Up @@ -8,7 +8,7 @@ import (
"sync"
"time"

"github.com/samuel/go-zookeeper/zk"
"github.com/go-zookeeper/zk"

"github.com/go-kit/kit/endpoint"
"github.com/go-kit/kit/log"
Expand Down