Skip to content

Commit 6545065

Browse files
authored
Downgrade loki and dskit to fix duplicate proto errors (#279)
1 parent 744b5e7 commit 6545065

File tree

341 files changed

+11538
-19831
lines changed

Some content is hidden

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

341 files changed

+11538
-19831
lines changed

go.mod

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,16 @@ go 1.21
55
require (
66
github.com/alecthomas/chroma v0.7.0
77
github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137
8-
github.com/cortexproject/cortex v1.15.2-0.20230901171400-63b372cbd008
9-
github.com/go-kit/kit v0.12.0
8+
github.com/cortexproject/cortex v1.15.2-0.20230628221417-9e783e7deab8
9+
github.com/go-kit/log v0.2.1
1010
github.com/gogo/protobuf v1.3.2
1111
github.com/golang/snappy v0.0.4
1212
github.com/gonum/stat v0.0.0-20181125101827-41a0da705a5b
1313
github.com/google/go-github/v32 v32.1.0
1414
github.com/gorilla/mux v1.8.0
1515
github.com/grafana-tools/sdk v0.0.0-20220203092117-edae16afa87b
16-
github.com/grafana/dskit v0.0.0-20230905112532-e4f33b342cb6
17-
github.com/grafana/loki v1.6.2-0.20230905071424-a60c1777ce15
16+
github.com/grafana/dskit v0.0.0-20230908075806-579cf66fbf9b
17+
github.com/grafana/loki v1.6.2-0.20230803180300-1221658fc5bb
1818
github.com/mitchellh/colorstring v0.0.0-20190213212951-d06e56a500db
1919
github.com/opentracing-contrib/go-stdlib v1.0.0
2020
github.com/pkg/errors v0.9.1
@@ -109,7 +109,7 @@ require (
109109
github.com/felixge/httpsnoop v1.0.3 // indirect
110110
github.com/fsnotify/fsnotify v1.6.0 // indirect
111111
github.com/fsouza/fake-gcs-server v1.7.0 // indirect
112-
github.com/go-kit/log v0.2.1 // indirect
112+
github.com/go-kit/kit v0.12.0 // indirect
113113
github.com/go-logfmt/logfmt v0.6.0 // indirect
114114
github.com/go-logr/logr v1.2.4 // indirect
115115
github.com/go-logr/stdr v1.2.2 // indirect
@@ -148,7 +148,7 @@ require (
148148
github.com/googleapis/gax-go/v2 v2.12.0 // indirect
149149
github.com/gosimple/slug v1.1.1 // indirect
150150
github.com/grafana/gomemcache v0.0.0-20230316202710-a081dae0aba9 // indirect
151-
github.com/grafana/loki/pkg/push v0.0.0-20230904150506-087b21fa5ec6 // indirect
151+
github.com/grafana/loki/pkg/push v0.0.0-20230717064328-15af77ba8370 // indirect
152152
github.com/grafana/regexp v0.0.0-20221122212121-6b5c0a4cb7fd // indirect
153153
github.com/grpc-ecosystem/go-grpc-middleware v1.4.0 // indirect
154154
github.com/grpc-ecosystem/grpc-opentracing v0.0.0-20180507213350-8e809c8a8645 // indirect
@@ -163,6 +163,7 @@ require (
163163
github.com/hashicorp/go-retryablehttp v0.7.4 // indirect
164164
github.com/hashicorp/go-rootcerts v1.0.2 // indirect
165165
github.com/hashicorp/go-sockaddr v1.0.2 // indirect
166+
github.com/hashicorp/go-version v1.6.0 // indirect
166167
github.com/hashicorp/golang-lru v0.6.0 // indirect
167168
github.com/hashicorp/memberlist v0.5.0 // indirect
168169
github.com/hashicorp/serf v0.10.1 // indirect
@@ -217,7 +218,7 @@ require (
217218
github.com/sony/gobreaker v0.5.0 // indirect
218219
github.com/spaolacci/murmur3 v1.1.0 // indirect
219220
github.com/spf13/afero v1.9.5 // indirect
220-
github.com/spf13/cast v1.3.1 // indirect
221+
github.com/spf13/cast v1.5.0 // indirect
221222
github.com/stretchr/objx v0.5.0 // indirect
222223
github.com/uber/jaeger-client-go v2.30.0+incompatible // indirect
223224
github.com/uber/jaeger-lib v2.4.1+incompatible // indirect
@@ -258,9 +259,6 @@ require (
258259
google.golang.org/protobuf v1.31.0 // indirect
259260
gopkg.in/inf.v0 v0.9.1 // indirect
260261
gopkg.in/ini.v1 v1.67.0 // indirect
261-
k8s.io/apimachinery v0.27.3 // indirect
262-
k8s.io/klog/v2 v2.100.1 // indirect
263-
k8s.io/utils v0.0.0-20230711102312-30195339c3c7 // indirect
264262
rsc.io/binaryregexp v0.2.0 // indirect
265263
)
266264

@@ -269,9 +267,11 @@ replace github.com/gocql/gocql => github.com/grafana/gocql v0.0.0-20200605141915
269267

270268
replace github.com/grafana-tools/sdk => github.com/colega/grafana-tools-sdk v0.0.0-20220323154849-711bca56d13f
271269

272-
replace github.com/prometheus/prometheus => github.com/prometheus/prometheus v0.45.0
270+
replace github.com/prometheus/prometheus => github.com/prometheus/prometheus v0.43.1-0.20230419161410-69155c6ba1e9
273271

274272
replace google.golang.org/grpc => google.golang.org/grpc v1.53.0
275273

276274
// Loki depends on this version
277275
replace github.com/sercand/kuberesolver/v4 => github.com/sercand/kuberesolver/v4 v4.0.0-20230228224450-d8a3bdc2c3f7
276+
277+
replace github.com/thanos-io/objstore => github.com/thanos-io/objstore v0.0.0-20230201072718-11ffbc490204

go.sum

Lines changed: 102 additions & 37 deletions
Large diffs are not rendered by default.

vendor/github.com/cortexproject/cortex/pkg/cortexpb/extensions.go

Lines changed: 0 additions & 107 deletions
This file was deleted.

vendor/github.com/cortexproject/cortex/pkg/storage/bucket/client.go

Lines changed: 4 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/cortexproject/cortex/pkg/storage/bucket/client_mock.go

Lines changed: 1 addition & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/cortexproject/cortex/pkg/storage/bucket/prefixed_bucket_client.go

Lines changed: 2 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/cortexproject/cortex/pkg/storage/bucket/s3/bucket_client.go

Lines changed: 2 additions & 21 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/cortexproject/cortex/pkg/storage/bucket/sse_bucket_client.go

Lines changed: 2 additions & 27 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)