Skip to content

Commit

Permalink
Downgrade loki and dskit to fix duplicate proto errors (#279)
Browse files Browse the repository at this point in the history
  • Loading branch information
shantanualsi committed Sep 8, 2023
1 parent 744b5e7 commit 6545065
Show file tree
Hide file tree
Showing 341 changed files with 11,538 additions and 19,831 deletions.
22 changes: 11 additions & 11 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,16 @@ go 1.21
require (
github.com/alecthomas/chroma v0.7.0
github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137
github.com/cortexproject/cortex v1.15.2-0.20230901171400-63b372cbd008
github.com/go-kit/kit v0.12.0
github.com/cortexproject/cortex v1.15.2-0.20230628221417-9e783e7deab8
github.com/go-kit/log v0.2.1
github.com/gogo/protobuf v1.3.2
github.com/golang/snappy v0.0.4
github.com/gonum/stat v0.0.0-20181125101827-41a0da705a5b
github.com/google/go-github/v32 v32.1.0
github.com/gorilla/mux v1.8.0
github.com/grafana-tools/sdk v0.0.0-20220203092117-edae16afa87b
github.com/grafana/dskit v0.0.0-20230905112532-e4f33b342cb6
github.com/grafana/loki v1.6.2-0.20230905071424-a60c1777ce15
github.com/grafana/dskit v0.0.0-20230908075806-579cf66fbf9b
github.com/grafana/loki v1.6.2-0.20230803180300-1221658fc5bb
github.com/mitchellh/colorstring v0.0.0-20190213212951-d06e56a500db
github.com/opentracing-contrib/go-stdlib v1.0.0
github.com/pkg/errors v0.9.1
Expand Down Expand Up @@ -109,7 +109,7 @@ require (
github.com/felixge/httpsnoop v1.0.3 // indirect
github.com/fsnotify/fsnotify v1.6.0 // indirect
github.com/fsouza/fake-gcs-server v1.7.0 // indirect
github.com/go-kit/log v0.2.1 // indirect
github.com/go-kit/kit v0.12.0 // indirect
github.com/go-logfmt/logfmt v0.6.0 // indirect
github.com/go-logr/logr v1.2.4 // indirect
github.com/go-logr/stdr v1.2.2 // indirect
Expand Down Expand Up @@ -148,7 +148,7 @@ require (
github.com/googleapis/gax-go/v2 v2.12.0 // indirect
github.com/gosimple/slug v1.1.1 // indirect
github.com/grafana/gomemcache v0.0.0-20230316202710-a081dae0aba9 // indirect
github.com/grafana/loki/pkg/push v0.0.0-20230904150506-087b21fa5ec6 // indirect
github.com/grafana/loki/pkg/push v0.0.0-20230717064328-15af77ba8370 // indirect
github.com/grafana/regexp v0.0.0-20221122212121-6b5c0a4cb7fd // indirect
github.com/grpc-ecosystem/go-grpc-middleware v1.4.0 // indirect
github.com/grpc-ecosystem/grpc-opentracing v0.0.0-20180507213350-8e809c8a8645 // indirect
Expand All @@ -163,6 +163,7 @@ require (
github.com/hashicorp/go-retryablehttp v0.7.4 // indirect
github.com/hashicorp/go-rootcerts v1.0.2 // indirect
github.com/hashicorp/go-sockaddr v1.0.2 // indirect
github.com/hashicorp/go-version v1.6.0 // indirect
github.com/hashicorp/golang-lru v0.6.0 // indirect
github.com/hashicorp/memberlist v0.5.0 // indirect
github.com/hashicorp/serf v0.10.1 // indirect
Expand Down Expand Up @@ -217,7 +218,7 @@ require (
github.com/sony/gobreaker v0.5.0 // indirect
github.com/spaolacci/murmur3 v1.1.0 // indirect
github.com/spf13/afero v1.9.5 // indirect
github.com/spf13/cast v1.3.1 // indirect
github.com/spf13/cast v1.5.0 // indirect
github.com/stretchr/objx v0.5.0 // indirect
github.com/uber/jaeger-client-go v2.30.0+incompatible // indirect
github.com/uber/jaeger-lib v2.4.1+incompatible // indirect
Expand Down Expand Up @@ -258,9 +259,6 @@ require (
google.golang.org/protobuf v1.31.0 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/ini.v1 v1.67.0 // indirect
k8s.io/apimachinery v0.27.3 // indirect
k8s.io/klog/v2 v2.100.1 // indirect
k8s.io/utils v0.0.0-20230711102312-30195339c3c7 // indirect
rsc.io/binaryregexp v0.2.0 // indirect
)

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

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

replace github.com/prometheus/prometheus => github.com/prometheus/prometheus v0.45.0
replace github.com/prometheus/prometheus => github.com/prometheus/prometheus v0.43.1-0.20230419161410-69155c6ba1e9

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

// Loki depends on this version
replace github.com/sercand/kuberesolver/v4 => github.com/sercand/kuberesolver/v4 v4.0.0-20230228224450-d8a3bdc2c3f7

replace github.com/thanos-io/objstore => github.com/thanos-io/objstore v0.0.0-20230201072718-11ffbc490204
139 changes: 102 additions & 37 deletions go.sum

Large diffs are not rendered by default.

107 changes: 0 additions & 107 deletions vendor/github.com/cortexproject/cortex/pkg/cortexpb/extensions.go

This file was deleted.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 6545065

Please sign in to comment.