Upgrade to v1.14.1 #36
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -3,11 +3,11 @@ module github.com/cortexproject/cortex-tools | |
| go 1.22.2 | ||
|
|
||
| require ( | ||
| cloud.google.com/go/storage v1.27.0 | ||
| github.com/alecthomas/chroma v0.7.0 | ||
| github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137 | ||
| github.com/cortexproject/cortex v1.14.1 | ||
| 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 | ||
|
|
@@ -21,39 +21,46 @@ require ( | |
| github.com/opentracing-contrib/go-stdlib v1.0.0 | ||
| github.com/pkg/errors v0.9.1 | ||
| github.com/prometheus/alertmanager v0.24.0 | ||
| github.com/prometheus/client_golang v1.13.0 | ||
| github.com/prometheus/common v0.37.0 | ||
| github.com/prometheus/prometheus v0.39.1 | ||
| github.com/sirupsen/logrus v1.9.0 | ||
| github.com/stretchr/testify v1.8.0 | ||
| github.com/thanos-io/objstore v0.0.0-20221006135717-79dcec7fe604 | ||
| github.com/thanos-io/thanos v0.29.1-0.20221115064008-fe45cfc66b7d | ||
| github.com/weaveworks/common v0.0.0-20220706100410-67d27ed40fae | ||
| golang.org/x/sync v0.0.0-20220907140024-f12130a52804 | ||
| google.golang.org/api v0.97.0 | ||
| gopkg.in/alecthomas/kingpin.v2 v2.2.6 | ||
| gopkg.in/yaml.v2 v2.4.0 | ||
| gopkg.in/yaml.v3 v3.0.1 | ||
| gotest.tools v2.2.0+incompatible | ||
| ) | ||
|
|
||
| require ( | ||
| cloud.google.com/go v0.104.0 // indirect | ||
| cloud.google.com/go/compute v1.7.0 // indirect | ||
| cloud.google.com/go/iam v0.3.0 // indirect | ||
| github.com/Azure/azure-sdk-for-go/sdk/azcore v1.1.0 // indirect | ||
| github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.1.0 // indirect | ||
| github.com/Azure/azure-sdk-for-go/sdk/internal v1.0.0 // indirect | ||
| github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v0.4.1 // indirect | ||
| github.com/AzureAD/microsoft-authentication-library-for-go v0.5.1 // indirect | ||
| github.com/alecthomas/repr v0.0.0-20181024024818-d37bc2a10ba1 // indirect | ||
| github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751 // indirect | ||
| github.com/armon/go-metrics v0.4.0 // indirect | ||
| github.com/aws/aws-sdk-go v1.44.109 // indirect | ||
| github.com/aws/aws-sdk-go-v2 v1.16.0 // indirect | ||
| github.com/aws/aws-sdk-go-v2/config v1.15.1 // indirect | ||
| github.com/aws/aws-sdk-go-v2/credentials v1.11.0 // indirect | ||
| github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.12.1 // indirect | ||
| github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.7 // indirect | ||
| github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.1 // indirect | ||
| github.com/aws/aws-sdk-go-v2/internal/ini v1.3.8 // indirect | ||
| github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.1 // indirect | ||
| github.com/aws/aws-sdk-go-v2/service/sso v1.11.1 // indirect | ||
| github.com/aws/aws-sdk-go-v2/service/sts v1.16.1 // indirect | ||
| github.com/aws/smithy-go v1.11.1 // indirect | ||
| github.com/beorn7/perks v1.0.1 // indirect | ||
| github.com/blang/semver/v4 v4.0.0 // indirect | ||
| github.com/bradfitz/gomemcache v0.0.0-20190913173617-a41fca850d0b // indirect | ||
|
|
@@ -65,20 +72,21 @@ require ( | |
| github.com/davecgh/go-spew v1.1.1 // indirect | ||
| github.com/dennwc/varint v1.0.0 // indirect | ||
| github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect | ||
| github.com/dlclark/regexp2 v1.2.0 // indirect | ||
| github.com/dustin/go-humanize v1.0.0 // indirect | ||
| github.com/edsrzf/mmap-go v1.1.0 // indirect | ||
| github.com/efficientgo/tools/core v0.0.0-20220817170617-6c25e3b627dd // indirect | ||
| github.com/facette/natsort v0.0.0-20181210072756-2cd4dd1e2dcb // indirect | ||
| github.com/fatih/color v1.13.0 // indirect | ||
| github.com/felixge/httpsnoop v1.0.3 // indirect | ||
| github.com/fsnotify/fsnotify v1.5.4 // indirect | ||
| github.com/go-logfmt/logfmt v0.5.1 // indirect | ||
| github.com/go-logr/logr v1.2.3 // indirect | ||
| github.com/go-logr/stdr v1.2.2 // indirect | ||
| github.com/go-redis/redis/v8 v8.11.5 // indirect | ||
| github.com/gogo/googleapis v1.4.0 // indirect | ||
| github.com/gogo/status v1.1.1 // indirect | ||
| github.com/golang-jwt/jwt v3.2.1+incompatible // indirect | ||
| github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect | ||
| github.com/golang/protobuf v1.5.2 // indirect | ||
| github.com/gonum/blas v0.0.0-20181208220705-f22b278b28ac // indirect | ||
|
|
@@ -88,15 +96,16 @@ require ( | |
| github.com/gonum/lapack v0.0.0-20181123203213-e4cdc5a0bff9 // indirect | ||
| github.com/gonum/matrix v0.0.0-20181209220409-c518dec07be9 // indirect | ||
| github.com/google/btree v1.0.1 // indirect | ||
| github.com/google/go-cmp v0.5.9 // indirect | ||
| github.com/google/go-querystring v1.1.0 // indirect | ||
| github.com/google/uuid v1.3.0 // indirect | ||
| github.com/googleapis/enterprise-certificate-proxy v0.1.0 // indirect | ||
| github.com/googleapis/gax-go/v2 v2.5.1 // indirect | ||
| github.com/gosimple/slug v1.1.1 // indirect | ||
| github.com/grafana/regexp v0.0.0-20221005093135-b4c2bcb0a4b6 // indirect | ||
| github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 // indirect | ||
| github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.0.0-rc.2.0.20201207153454-9f6bf00c00a7 // indirect | ||
| github.com/hashicorp/consul/api v1.15.2 // indirect | ||
| github.com/hashicorp/errwrap v1.1.0 // indirect | ||
| github.com/hashicorp/go-cleanhttp v0.5.2 // indirect | ||
| github.com/hashicorp/go-hclog v0.16.2 // indirect | ||
|
|
@@ -107,90 +116,103 @@ require ( | |
| github.com/hashicorp/go-sockaddr v1.0.2 // indirect | ||
| github.com/hashicorp/golang-lru v0.5.4 // indirect | ||
| github.com/hashicorp/memberlist v0.3.1 // indirect | ||
| github.com/hashicorp/serf v0.9.7 // indirect | ||
| github.com/jmespath/go-jmespath v0.4.0 // indirect | ||
| github.com/jpillora/backoff v1.0.0 // indirect | ||
| github.com/json-iterator/go v1.1.12 // indirect | ||
| github.com/julienschmidt/httprouter v1.3.0 // indirect | ||
| github.com/klauspost/compress v1.15.9 // indirect | ||
| github.com/klauspost/cpuid/v2 v2.1.0 // indirect | ||
| github.com/kylelemons/godebug v1.1.0 // indirect | ||
| github.com/mattn/go-colorable v0.1.12 // indirect | ||
| github.com/mattn/go-isatty v0.0.14 // indirect | ||
| github.com/miekg/dns v1.1.50 // indirect | ||
| github.com/minio/md5-simd v1.1.2 // indirect | ||
| github.com/minio/minio-go/v7 v7.0.37 // indirect | ||
| github.com/minio/sha256-simd v1.0.0 // indirect | ||
| github.com/mitchellh/go-homedir v1.1.0 // indirect | ||
| github.com/mitchellh/mapstructure v1.5.0 // indirect | ||
| github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect | ||
| github.com/modern-go/reflect2 v1.0.2 // indirect | ||
| github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f // indirect | ||
| github.com/ncw/swift v1.0.53 // indirect | ||
| github.com/opentracing-contrib/go-grpc v0.0.0-20210225150812-73cb765af46e // indirect | ||
| github.com/opentracing/opentracing-go v1.2.0 // indirect | ||
| github.com/pkg/browser v0.0.0-20210115035449-ce105d075bb4 // indirect | ||
| github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect | ||
| github.com/prometheus/client_model v0.2.0 // indirect | ||
| github.com/prometheus/common/sigv4 v0.1.0 // indirect | ||
| github.com/prometheus/exporter-toolkit v0.7.1 // indirect | ||
| github.com/prometheus/procfs v0.8.0 // indirect | ||
| github.com/rainycape/unidecode v0.0.0-20150907023854-cb7f23ec59be // indirect | ||
| github.com/rs/xid v1.4.0 // indirect | ||
| github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529 // indirect | ||
| github.com/sercand/kuberesolver v2.4.0+incompatible // indirect | ||
| github.com/shurcooL/httpfs v0.0.0-20190707220628-8d4bc4ba7749 // indirect | ||
| github.com/shurcooL/vfsgen v0.0.0-20200824052919-0d455de96546 // indirect | ||
| github.com/stretchr/objx v0.4.0 // indirect | ||
| github.com/uber/jaeger-client-go v2.30.0+incompatible // indirect | ||
| github.com/uber/jaeger-lib v2.4.1+incompatible // indirect | ||
| github.com/vimeo/galaxycache v0.0.0-20210323154928-b7e5d71c067a // indirect | ||
| github.com/weaveworks/promrus v1.2.0 // indirect | ||
| go.etcd.io/etcd/api/v3 v3.5.4 // indirect | ||
| go.etcd.io/etcd/client/pkg/v3 v3.5.4 // indirect | ||
| go.etcd.io/etcd/client/v3 v3.5.4 // indirect | ||
| go.opencensus.io v0.23.0 // indirect | ||
| go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.0 // indirect | ||
| go.opentelemetry.io/contrib/propagators/autoprop v0.34.0 // indirect | ||
| go.opentelemetry.io/contrib/propagators/aws v1.9.0 // indirect | ||
| go.opentelemetry.io/contrib/propagators/b3 v1.9.0 // indirect | ||
| go.opentelemetry.io/contrib/propagators/jaeger v1.9.0 // indirect | ||
| go.opentelemetry.io/contrib/propagators/ot v1.9.0 // indirect | ||
| go.opentelemetry.io/otel v1.11.0 // indirect | ||
| go.opentelemetry.io/otel/bridge/opentracing v1.11.1-0.20221013154440-84e28fd3bdb1 // indirect | ||
| go.opentelemetry.io/otel/metric v0.32.0 // indirect | ||
| go.opentelemetry.io/otel/sdk v1.11.0 // indirect | ||
| go.opentelemetry.io/otel/trace v1.11.0 // indirect | ||
| go.uber.org/atomic v1.10.0 // indirect | ||
| go.uber.org/goleak v1.2.0 // indirect | ||
| go.uber.org/multierr v1.8.0 // indirect | ||
| go.uber.org/zap v1.21.0 // indirect | ||
| golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa // indirect | ||
| golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 // indirect | ||
| golang.org/x/net v0.0.0-20220920203100-d0c6ba3f52d9 // indirect | ||
| golang.org/x/oauth2 v0.0.0-20220909003341-f21342109be1 // indirect | ||
| golang.org/x/sys v0.0.0-20220919091848-fb04ddd9f9c8 // indirect | ||
| golang.org/x/text v0.3.7 // indirect | ||
| golang.org/x/time v0.0.0-20220920022843-2ce7c2934d45 // indirect | ||
| golang.org/x/tools v0.1.12 // indirect | ||
| golang.org/x/xerrors v0.0.0-20220609144429-65e65417b02f // indirect | ||
| google.golang.org/appengine v1.6.7 // indirect | ||
| google.golang.org/genproto v0.0.0-20220920201722-2b89144ce006 // indirect | ||
| google.golang.org/grpc v1.49.0 // indirect | ||
| google.golang.org/protobuf v1.28.1 // indirect | ||
| gopkg.in/ini.v1 v1.66.6 // indirect | ||
| ) | ||
|
|
||
| // Override since git.apache.org is down. The docs say to fetch from github. | ||
| replace git.apache.org/thrift.git => github.com/apache/thrift v0.0.0-20180902110319-2566ecd5d999 | ||
|
|
||
| // Use fork of gocql that has gokit logs and Prometheus metrics. | ||
| replace github.com/gocql/gocql => github.com/grafana/gocql v0.0.0-20200605141915-ba5dc39ece85 | ||
|
|
||
| // Using a 3rd-party branch for custom dialer - see https://github.com/bradfitz/gomemcache/pull/86 | ||
| replace github.com/bradfitz/gomemcache => github.com/themihai/gomemcache v0.0.0-20180902122335-24332e2d58ab | ||
|
|
||
| // Replace memberlist with Grafana's fork which includes some fixes that haven't been merged upstream yet | ||
| replace github.com/hashicorp/memberlist => github.com/grafana/memberlist v0.2.5-0.20211201083710-c7bc8e9df94b | ||
|
There was a problem hiding this comment. I don't think this is needed here. There was a problem hiding this comment. we are better using the same version cortex uses cortex-tools/pkg/bench/ring_check.go Line 14 in f2909a3 |
||
|
|
||
| // Replace grpc as weaveworks common needs to update this first | ||
| // vendor/github.com/weaveworks/common/httpgrpc/server/server.go:137:3: undefined: grpc.WithBalancerName | ||
| replace google.golang.org/grpc => google.golang.org/grpc v1.45.0 | ||
friedrichg marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
|
||
| // Same version being used by thanos | ||
| replace github.com/vimeo/galaxycache => github.com/thanos-community/galaxycache v0.0.0-20211122094458-3a32041a1f1e | ||
|
|
||
| // v0.20.5 caused go mod checksum error | ||
| replace github.com/go-openapi/spec => github.com/go-openapi/spec v0.20.6 | ||
friedrichg marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
|
||
| // the v6.0.5851 Prometheus depends on doesn't seem to exist anymore? | ||
| replace github.com/ionos-cloud/sdk-go/v6 => github.com/ionos-cloud/sdk-go/v6 v6.0.4 | ||
friedrichg marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
|
||
| replace github.com/googleapis/gnostic => github.com/google/gnostic v0.6.9 | ||
friedrichg marked this conversation as resolved.
Show resolved
Hide resolved
|
||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This version has been retracted due to googleapis/google-cloud-go#6857. Let's use a newer version that fixes the bug, e.g.
v1.28.0?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
it's the version used by cortex v1.14.1 https://github.com/cortexproject/cortex/blob/v1.14.1/go.mod#L78
will not touch this