Skip to content

Commit f2cc5db

Browse files
aknuds1aknuds1
committed
Revert "Use kv package from github.com/grafana/dskit (#4436)"
This reverts commit 32b1b40. Signed-off-by: Arve Knudsen <[email protected]>
1 parent a71ff2a commit f2cc5db

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

72 files changed

+2663
-174
lines changed

‎go.mod

+9
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ require (
1111
github.com/NYTimes/gziphandler v1.1.1
1212
github.com/alecthomas/units v0.0.0-20210927113745-59d0afb8317a
1313
github.com/alicebob/miniredis/v2 v2.14.3
14+
github.com/armon/go-metrics v0.3.9
1415
github.com/aws/aws-sdk-go v1.42.8
1516
github.com/bradfitz/gomemcache v0.0.0-20190913173617-a41fca850d0b
1617
github.com/cespare/xxhash v1.1.0
@@ -28,9 +29,14 @@ require (
2829
github.com/golang-migrate/migrate/v4 v4.7.0
2930
github.com/golang/protobuf v1.5.2
3031
github.com/golang/snappy v0.0.4
32+
github.com/google/btree v1.0.1 // indirect
3133
github.com/gorilla/mux v1.8.0
3234
github.com/grafana/dskit v0.0.0-20220105080720-01ce9286d7d5
3335
github.com/grpc-ecosystem/go-grpc-middleware v1.3.0
36+
github.com/hashicorp/consul/api v1.11.0
37+
github.com/hashicorp/go-cleanhttp v0.5.2
38+
github.com/hashicorp/go-sockaddr v1.0.2
39+
github.com/hashicorp/memberlist v0.2.4
3440
github.com/json-iterator/go v1.1.12
3541
github.com/lib/pq v1.3.0
3642
github.com/minio/minio-go/v7 v7.0.10
@@ -54,6 +60,9 @@ require (
5460
github.com/uber/jaeger-client-go v2.29.1+incompatible
5561
github.com/weaveworks/common v0.0.0-20210913144402-035033b78a78
5662
go.etcd.io/bbolt v1.3.6
63+
go.etcd.io/etcd v3.3.25+incompatible
64+
go.etcd.io/etcd/api/v3 v3.5.0
65+
go.etcd.io/etcd/client/v3 v3.5.0
5766
go.uber.org/atomic v1.9.0
5867
golang.org/x/net v0.0.0-20211020060615-d418f374d309
5968
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c

‎go.sum

+2-1
Original file line numberDiff line numberDiff line change
@@ -778,8 +778,9 @@ github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM=
778778
github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
779779
github.com/golangci/lint-1 v0.0.0-20181222135242-d2cdd8c08219/go.mod h1:/X8TswGSh1pIozq4ZwCfxS0WA5JGXguxk94ar/4c87Y=
780780
github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
781-
github.com/google/btree v1.0.0 h1:0udJVsspx3VBr5FwtLhQQtuAsVc79tTq0ocGIPAU6qo=
782781
github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
782+
github.com/google/btree v1.0.1 h1:gK4Kx5IaGY9CD5sPJ36FHiBJ6ZXl0kilRiiCj+jdYp4=
783+
github.com/google/btree v1.0.1/go.mod h1:xXMiIv4Fb/0kKde4SpL7qlzvu5cMJDRkFDxJfI9uaxA=
783784
github.com/google/flatbuffers v1.11.0/go.mod h1:1AeVuKshWv4vARoZatz6mlQ0JxURH0Kv5+zNeJKJCa8=
784785
github.com/google/flatbuffers v2.0.0+incompatible/go.mod h1:1AeVuKshWv4vARoZatz6mlQ0JxURH0Kv5+zNeJKJCa8=
785786
github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=

‎integration/kv_test.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,16 @@ import (
1212
"time"
1313

1414
"github.com/go-kit/log"
15-
"github.com/grafana/dskit/kv"
16-
"github.com/grafana/dskit/kv/consul"
17-
"github.com/grafana/dskit/kv/etcd"
1815
"github.com/prometheus/client_golang/prometheus"
1916
dto "github.com/prometheus/client_model/go"
2017
"github.com/stretchr/testify/assert"
2118
"github.com/stretchr/testify/require"
2219

2320
"github.com/cortexproject/cortex/integration/e2e"
2421
e2edb "github.com/cortexproject/cortex/integration/e2e/db"
22+
"github.com/cortexproject/cortex/pkg/ring/kv"
23+
"github.com/cortexproject/cortex/pkg/ring/kv/consul"
24+
"github.com/cortexproject/cortex/pkg/ring/kv/etcd"
2525
)
2626

2727
func TestKVList(t *testing.T) {

‎pkg/alertmanager/alertmanager_ring.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ import (
99
"github.com/go-kit/log"
1010
"github.com/go-kit/log/level"
1111
"github.com/grafana/dskit/flagext"
12-
"github.com/grafana/dskit/kv"
1312

1413
"github.com/cortexproject/cortex/pkg/ring"
14+
"github.com/cortexproject/cortex/pkg/ring/kv"
1515
util_log "github.com/cortexproject/cortex/pkg/util/log"
1616
)
1717

‎pkg/alertmanager/distributor_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@ import (
1515

1616
"github.com/go-kit/log"
1717
"github.com/grafana/dskit/flagext"
18-
"github.com/grafana/dskit/kv"
19-
"github.com/grafana/dskit/kv/consul"
2018
"github.com/grafana/dskit/services"
2119
"github.com/prometheus/client_golang/prometheus"
2220
"github.com/stretchr/testify/assert"
@@ -28,6 +26,8 @@ import (
2826

2927
"github.com/cortexproject/cortex/pkg/alertmanager/alertmanagerpb"
3028
"github.com/cortexproject/cortex/pkg/ring"
29+
"github.com/cortexproject/cortex/pkg/ring/kv"
30+
"github.com/cortexproject/cortex/pkg/ring/kv/consul"
3131
util_log "github.com/cortexproject/cortex/pkg/util/log"
3232
"github.com/cortexproject/cortex/pkg/util/test"
3333
)

‎pkg/alertmanager/multitenant.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ import (
1717
"github.com/go-kit/log/level"
1818
"github.com/grafana/dskit/concurrency"
1919
"github.com/grafana/dskit/flagext"
20-
"github.com/grafana/dskit/kv"
2120
"github.com/grafana/dskit/services"
2221
"github.com/pkg/errors"
2322
"github.com/prometheus/alertmanager/cluster"
@@ -36,6 +35,7 @@ import (
3635
"github.com/cortexproject/cortex/pkg/alertmanager/alertstore"
3736
"github.com/cortexproject/cortex/pkg/ring"
3837
"github.com/cortexproject/cortex/pkg/ring/client"
38+
"github.com/cortexproject/cortex/pkg/ring/kv"
3939
"github.com/cortexproject/cortex/pkg/tenant"
4040
"github.com/cortexproject/cortex/pkg/util"
4141
util_log "github.com/cortexproject/cortex/pkg/util/log"

‎pkg/alertmanager/multitenant_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ import (
2222
"github.com/go-kit/log"
2323
"github.com/grafana/dskit/concurrency"
2424
"github.com/grafana/dskit/flagext"
25-
"github.com/grafana/dskit/kv/consul"
2625
"github.com/grafana/dskit/services"
2726
"github.com/prometheus/alertmanager/cluster/clusterpb"
2827
"github.com/prometheus/alertmanager/notify"
@@ -45,6 +44,7 @@ import (
4544
"github.com/cortexproject/cortex/pkg/alertmanager/alertstore"
4645
"github.com/cortexproject/cortex/pkg/alertmanager/alertstore/bucketclient"
4746
"github.com/cortexproject/cortex/pkg/ring"
47+
"github.com/cortexproject/cortex/pkg/ring/kv/consul"
4848
"github.com/cortexproject/cortex/pkg/storage/bucket"
4949
"github.com/cortexproject/cortex/pkg/util"
5050
"github.com/cortexproject/cortex/pkg/util/test"

‎pkg/compactor/compactor_ring.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ import (
77

88
"github.com/go-kit/log/level"
99
"github.com/grafana/dskit/flagext"
10-
"github.com/grafana/dskit/kv"
1110

1211
"github.com/cortexproject/cortex/pkg/ring"
12+
"github.com/cortexproject/cortex/pkg/ring/kv"
1313
util_log "github.com/cortexproject/cortex/pkg/util/log"
1414
)
1515

‎pkg/compactor/compactor_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ import (
2020
"github.com/go-kit/log"
2121
"github.com/grafana/dskit/concurrency"
2222
"github.com/grafana/dskit/flagext"
23-
"github.com/grafana/dskit/kv/consul"
2423
"github.com/grafana/dskit/services"
2524
"github.com/oklog/ulid"
2625
"github.com/pkg/errors"
@@ -37,6 +36,7 @@ import (
3736
"gopkg.in/yaml.v2"
3837

3938
"github.com/cortexproject/cortex/pkg/ring"
39+
"github.com/cortexproject/cortex/pkg/ring/kv/consul"
4040
"github.com/cortexproject/cortex/pkg/storage/bucket"
4141
cortex_tsdb "github.com/cortexproject/cortex/pkg/storage/tsdb"
4242
cortex_testutil "github.com/cortexproject/cortex/pkg/util/test"

‎pkg/cortex/cortex.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ import (
1313
"github.com/go-kit/log"
1414
"github.com/go-kit/log/level"
1515
"github.com/grafana/dskit/flagext"
16-
"github.com/grafana/dskit/kv/memberlist"
1716
"github.com/grafana/dskit/modules"
1817
"github.com/grafana/dskit/services"
1918
"github.com/pkg/errors"
@@ -49,6 +48,7 @@ import (
4948
"github.com/cortexproject/cortex/pkg/querier/tenantfederation"
5049
querier_worker "github.com/cortexproject/cortex/pkg/querier/worker"
5150
"github.com/cortexproject/cortex/pkg/ring"
51+
"github.com/cortexproject/cortex/pkg/ring/kv/memberlist"
5252
"github.com/cortexproject/cortex/pkg/ruler"
5353
"github.com/cortexproject/cortex/pkg/ruler/rulestore"
5454
"github.com/cortexproject/cortex/pkg/scheduler"

‎pkg/cortex/cortex_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ import (
1313
"time"
1414

1515
"github.com/grafana/dskit/flagext"
16-
"github.com/grafana/dskit/kv"
1716
"github.com/grafana/dskit/services"
1817
"github.com/prometheus/client_golang/prometheus"
1918
"github.com/stretchr/testify/assert"
@@ -27,6 +26,7 @@ import (
2726
"github.com/cortexproject/cortex/pkg/frontend/v1/frontendv1pb"
2827
"github.com/cortexproject/cortex/pkg/ingester"
2928
"github.com/cortexproject/cortex/pkg/ring"
29+
"github.com/cortexproject/cortex/pkg/ring/kv"
3030
"github.com/cortexproject/cortex/pkg/ruler"
3131
"github.com/cortexproject/cortex/pkg/scheduler/schedulerpb"
3232
"github.com/cortexproject/cortex/pkg/storage/bucket"

‎pkg/cortex/modules.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@ import (
99
"time"
1010

1111
"github.com/go-kit/log/level"
12-
"github.com/grafana/dskit/kv/codec"
13-
"github.com/grafana/dskit/kv/memberlist"
1412
"github.com/grafana/dskit/modules"
1513
"github.com/grafana/dskit/services"
1614
"github.com/opentracing-contrib/go-stdlib/nethttp"
@@ -43,6 +41,8 @@ import (
4341
"github.com/cortexproject/cortex/pkg/querier/tenantfederation"
4442
querier_worker "github.com/cortexproject/cortex/pkg/querier/worker"
4543
"github.com/cortexproject/cortex/pkg/ring"
44+
"github.com/cortexproject/cortex/pkg/ring/kv/codec"
45+
"github.com/cortexproject/cortex/pkg/ring/kv/memberlist"
4646
"github.com/cortexproject/cortex/pkg/ruler"
4747
"github.com/cortexproject/cortex/pkg/scheduler"
4848
"github.com/cortexproject/cortex/pkg/storegateway"

‎pkg/cortex/runtime_config.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ import (
55
"io"
66
"net/http"
77

8-
"github.com/grafana/dskit/kv"
98
"gopkg.in/yaml.v2"
109

1110
"github.com/cortexproject/cortex/pkg/ingester"
11+
"github.com/cortexproject/cortex/pkg/ring/kv"
1212
"github.com/cortexproject/cortex/pkg/util"
1313
"github.com/cortexproject/cortex/pkg/util/runtimeconfig"
1414
"github.com/cortexproject/cortex/pkg/util/validation"

‎pkg/distributor/distributor_ring.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ import (
77

88
"github.com/go-kit/log/level"
99
"github.com/grafana/dskit/flagext"
10-
"github.com/grafana/dskit/kv"
1110

1211
"github.com/cortexproject/cortex/pkg/ring"
12+
"github.com/cortexproject/cortex/pkg/ring/kv"
1313
util_log "github.com/cortexproject/cortex/pkg/util/log"
1414
)
1515

‎pkg/distributor/distributor_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,6 @@ import (
1616

1717
"github.com/go-kit/log"
1818
"github.com/grafana/dskit/flagext"
19-
"github.com/grafana/dskit/kv"
20-
"github.com/grafana/dskit/kv/consul"
2119
"github.com/grafana/dskit/services"
2220
"github.com/prometheus/client_golang/prometheus"
2321
"github.com/prometheus/client_golang/prometheus/testutil"
@@ -39,6 +37,8 @@ import (
3937
"github.com/cortexproject/cortex/pkg/prom1/storage/metric"
4038
"github.com/cortexproject/cortex/pkg/ring"
4139
ring_client "github.com/cortexproject/cortex/pkg/ring/client"
40+
"github.com/cortexproject/cortex/pkg/ring/kv"
41+
"github.com/cortexproject/cortex/pkg/ring/kv/consul"
4242
"github.com/cortexproject/cortex/pkg/tenant"
4343
"github.com/cortexproject/cortex/pkg/util"
4444
"github.com/cortexproject/cortex/pkg/util/chunkcompat"

‎pkg/distributor/ha_tracker.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,14 @@ import (
1313
"github.com/go-kit/log"
1414
"github.com/go-kit/log/level"
1515
"github.com/gogo/protobuf/proto"
16-
"github.com/grafana/dskit/kv"
17-
"github.com/grafana/dskit/kv/codec"
1816
"github.com/grafana/dskit/services"
1917
"github.com/prometheus/client_golang/prometheus"
2018
"github.com/prometheus/client_golang/prometheus/promauto"
2119
"github.com/prometheus/prometheus/model/timestamp"
2220

2321
"github.com/cortexproject/cortex/pkg/cortexpb"
22+
"github.com/cortexproject/cortex/pkg/ring/kv"
23+
"github.com/cortexproject/cortex/pkg/ring/kv/codec"
2424
"github.com/cortexproject/cortex/pkg/util"
2525
)
2626

‎pkg/distributor/ha_tracker_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@ import (
99

1010
"github.com/go-kit/log"
1111
"github.com/grafana/dskit/flagext"
12-
"github.com/grafana/dskit/kv"
13-
"github.com/grafana/dskit/kv/consul"
1412
"github.com/grafana/dskit/services"
1513
"github.com/pkg/errors"
1614
"github.com/prometheus/client_golang/prometheus"
@@ -23,6 +21,8 @@ import (
2321

2422
"github.com/cortexproject/cortex/pkg/cortexpb"
2523
"github.com/cortexproject/cortex/pkg/ring"
24+
"github.com/cortexproject/cortex/pkg/ring/kv"
25+
"github.com/cortexproject/cortex/pkg/ring/kv/consul"
2626
"github.com/cortexproject/cortex/pkg/util"
2727
util_log "github.com/cortexproject/cortex/pkg/util/log"
2828
"github.com/cortexproject/cortex/pkg/util/test"

‎pkg/ingester/flush_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import (
99
"time"
1010

1111
"github.com/go-kit/log"
12-
"github.com/grafana/dskit/kv"
1312
"github.com/grafana/dskit/services"
1413
"github.com/prometheus/common/model"
1514
"github.com/prometheus/prometheus/model/labels"
@@ -21,6 +20,7 @@ import (
2120
"github.com/cortexproject/cortex/pkg/cortexpb"
2221
"github.com/cortexproject/cortex/pkg/ingester/client"
2322
"github.com/cortexproject/cortex/pkg/ring"
23+
"github.com/cortexproject/cortex/pkg/ring/kv"
2424
"github.com/cortexproject/cortex/pkg/util"
2525
"github.com/cortexproject/cortex/pkg/util/validation"
2626
)

‎pkg/ingester/lifecycle_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,6 @@ import (
1212

1313
"github.com/go-kit/log"
1414
"github.com/grafana/dskit/flagext"
15-
"github.com/grafana/dskit/kv"
16-
"github.com/grafana/dskit/kv/consul"
1715
"github.com/grafana/dskit/services"
1816
"github.com/prometheus/common/model"
1917
"github.com/prometheus/prometheus/model/labels"
@@ -27,6 +25,8 @@ import (
2725
"github.com/cortexproject/cortex/pkg/cortexpb"
2826
"github.com/cortexproject/cortex/pkg/ingester/client"
2927
"github.com/cortexproject/cortex/pkg/ring"
28+
"github.com/cortexproject/cortex/pkg/ring/kv"
29+
"github.com/cortexproject/cortex/pkg/ring/kv/consul"
3030
"github.com/cortexproject/cortex/pkg/util/test"
3131
"github.com/cortexproject/cortex/pkg/util/validation"
3232
)

‎pkg/querier/blocks_store_queryable.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ import (
1212
"github.com/go-kit/log"
1313
"github.com/go-kit/log/level"
1414
"github.com/gogo/protobuf/types"
15-
"github.com/grafana/dskit/kv"
1615
"github.com/grafana/dskit/services"
1716
"github.com/oklog/ulid"
1817
"github.com/pkg/errors"
@@ -33,6 +32,7 @@ import (
3332
"github.com/cortexproject/cortex/pkg/querier/series"
3433
"github.com/cortexproject/cortex/pkg/querier/stats"
3534
"github.com/cortexproject/cortex/pkg/ring"
35+
"github.com/cortexproject/cortex/pkg/ring/kv"
3636
"github.com/cortexproject/cortex/pkg/storage/bucket"
3737
cortex_tsdb "github.com/cortexproject/cortex/pkg/storage/tsdb"
3838
"github.com/cortexproject/cortex/pkg/storage/tsdb/bucketindex"

‎pkg/querier/blocks_store_replicated_set_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import (
99

1010
"github.com/go-kit/log"
1111
"github.com/grafana/dskit/flagext"
12-
"github.com/grafana/dskit/kv/consul"
1312
"github.com/grafana/dskit/services"
1413
"github.com/oklog/ulid"
1514
"github.com/prometheus/client_golang/prometheus"
@@ -18,6 +17,7 @@ import (
1817
"github.com/stretchr/testify/require"
1918

2019
"github.com/cortexproject/cortex/pkg/ring"
20+
"github.com/cortexproject/cortex/pkg/ring/kv/consul"
2121
cortex_tsdb "github.com/cortexproject/cortex/pkg/storage/tsdb"
2222
"github.com/cortexproject/cortex/pkg/util"
2323
"github.com/cortexproject/cortex/pkg/util/test"

‎pkg/ring/basic_lifecycler.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,11 @@ import (
99

1010
"github.com/go-kit/log"
1111
"github.com/go-kit/log/level"
12-
"github.com/grafana/dskit/kv"
1312
"github.com/grafana/dskit/services"
1413
"github.com/pkg/errors"
1514
"github.com/prometheus/client_golang/prometheus"
15+
16+
"github.com/cortexproject/cortex/pkg/ring/kv"
1617
)
1718

1819
type BasicLifecyclerDelegate interface {

‎pkg/ring/basic_lifecycler_test.go

+3-2
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,14 @@ import (
66
"time"
77

88
"github.com/go-kit/log"
9-
"github.com/grafana/dskit/kv"
10-
"github.com/grafana/dskit/kv/consul"
119
"github.com/grafana/dskit/services"
1210
"github.com/grafana/dskit/test"
1311
"github.com/prometheus/client_golang/prometheus/testutil"
1412
"github.com/stretchr/testify/assert"
1513
"github.com/stretchr/testify/require"
14+
15+
"github.com/cortexproject/cortex/pkg/ring/kv"
16+
"github.com/cortexproject/cortex/pkg/ring/kv/consul"
1617
)
1718

1819
const (

‎pkg/ring/bench/ring_memberlist_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@ import (
88

99
"github.com/go-kit/log"
1010
"github.com/grafana/dskit/flagext"
11-
"github.com/grafana/dskit/kv/codec"
12-
"github.com/grafana/dskit/kv/memberlist"
1311
"github.com/grafana/dskit/services"
1412
"github.com/prometheus/client_golang/prometheus"
1513
"github.com/stretchr/testify/require"
1614

1715
"github.com/cortexproject/cortex/pkg/ring"
16+
"github.com/cortexproject/cortex/pkg/ring/kv/codec"
17+
"github.com/cortexproject/cortex/pkg/ring/kv/memberlist"
1818
)
1919

2020
type dnsProviderMock struct {

0 commit comments

Comments
 (0)