Skip to content

Commit c6347f0

Browse files
authored
upgrade thanos to latest main and update Prometheus (#6267)
Signed-off-by: Ben Ye <[email protected]>
1 parent 983413e commit c6347f0

File tree

444 files changed

+22546
-11179
lines changed

Some content is hidden

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

444 files changed

+22546
-11179
lines changed

go.mod

Lines changed: 36 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ require (
1212
github.com/cespare/xxhash v1.1.0
1313
github.com/cortexproject/promqlsmith v0.0.0-20240506042652-6cfdd9739a5e
1414
github.com/dustin/go-humanize v1.0.1
15-
github.com/efficientgo/core v1.0.0-rc.2
15+
github.com/efficientgo/core v1.0.0-rc.3
1616
github.com/facette/natsort v0.0.0-20181210072756-2cd4dd1e2dcb
1717
github.com/felixge/fgprof v0.9.5
1818
github.com/go-kit/log v0.2.1
@@ -46,14 +46,14 @@ require (
4646
github.com/prometheus/client_model v0.6.1
4747
github.com/prometheus/common v0.60.0
4848
// Prometheus maps version 2.x.y to tags v0.x.y.
49-
github.com/prometheus/prometheus v0.54.0-rc.0
49+
github.com/prometheus/prometheus v0.54.2-0.20240920164404-6f0d6038b7f9
5050
github.com/segmentio/fasthash v1.0.3
5151
github.com/sony/gobreaker v1.0.0
5252
github.com/spf13/afero v1.11.0
5353
github.com/stretchr/testify v1.9.0
54-
github.com/thanos-io/objstore v0.0.0-20240622095743-1afe5d4bc3cd
55-
github.com/thanos-io/promql-engine v0.0.0-20240718195911-cdbd6dfed36b
56-
github.com/thanos-io/thanos v0.35.2-0.20240904173945-09db52562de0
54+
github.com/thanos-io/objstore v0.0.0-20240913074259-63feed0da069
55+
github.com/thanos-io/promql-engine v0.0.0-20240921092401-37747eddbd31
56+
github.com/thanos-io/thanos v0.35.2-0.20241011111532-af0900bfd290
5757
github.com/uber/jaeger-client-go v2.30.0+incompatible
5858
github.com/weaveworks/common v0.0.0-20230728070032-dd9e68f319d5
5959
go.etcd.io/etcd/api/v3 v3.5.16
@@ -67,10 +67,10 @@ require (
6767
go.opentelemetry.io/otel/sdk v1.29.0
6868
go.opentelemetry.io/otel/trace v1.29.0
6969
go.uber.org/atomic v1.11.0
70-
golang.org/x/net v0.29.0
70+
golang.org/x/net v0.30.0
7171
golang.org/x/sync v0.8.0
7272
golang.org/x/time v0.6.0
73-
google.golang.org/grpc v1.65.0
73+
google.golang.org/grpc v1.66.0
7474
gopkg.in/yaml.v2 v2.4.0
7575
gopkg.in/yaml.v3 v3.0.1
7676
)
@@ -81,19 +81,19 @@ require (
8181
github.com/cespare/xxhash/v2 v2.3.0
8282
github.com/google/go-cmp v0.6.0
8383
github.com/sercand/kuberesolver/v4 v4.0.0
84-
go.opentelemetry.io/collector/pdata v1.13.0
84+
go.opentelemetry.io/collector/pdata v1.14.1
8585
golang.org/x/exp v0.0.0-20240613232115-7f521ea00fb8
8686
google.golang.org/protobuf v1.34.2
8787
)
8888

8989
require (
90-
cloud.google.com/go v0.115.0 // indirect
91-
cloud.google.com/go/auth v0.7.0 // indirect
92-
cloud.google.com/go/auth/oauth2adapt v0.2.2 // indirect
93-
cloud.google.com/go/compute/metadata v0.4.0 // indirect
94-
cloud.google.com/go/iam v1.1.10 // indirect
95-
cloud.google.com/go/storage v1.41.0 // indirect
96-
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.13.0 // indirect
90+
cloud.google.com/go v0.115.1 // indirect
91+
cloud.google.com/go/auth v0.9.3 // indirect
92+
cloud.google.com/go/auth/oauth2adapt v0.2.4 // indirect
93+
cloud.google.com/go/compute/metadata v0.5.0 // indirect
94+
cloud.google.com/go/iam v1.1.13 // indirect
95+
cloud.google.com/go/storage v1.43.0 // indirect
96+
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.14.0 // indirect
9797
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.7.0 // indirect
9898
github.com/Azure/azure-sdk-for-go/sdk/internal v1.10.0 // indirect
9999
github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v1.3.0 // indirect
@@ -121,6 +121,7 @@ require (
121121
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
122122
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
123123
github.com/dennwc/varint v1.0.0 // indirect
124+
github.com/dgryski/go-metro v0.0.0-20200812162917-85c65e2d0165 // indirect
124125
github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
125126
github.com/docker/go-units v0.5.0 // indirect
126127
github.com/edsrzf/mmap-go v1.1.0 // indirect
@@ -147,10 +148,10 @@ require (
147148
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
148149
github.com/google/btree v1.1.2 // indirect
149150
github.com/google/pprof v0.0.0-20240827171923-fa2c70bbbfe5 // indirect
150-
github.com/google/s2a-go v0.1.7 // indirect
151+
github.com/google/s2a-go v0.1.8 // indirect
151152
github.com/google/uuid v1.6.0 // indirect
152-
github.com/googleapis/enterprise-certificate-proxy v0.3.2 // indirect
153-
github.com/googleapis/gax-go/v2 v2.12.5 // indirect
153+
github.com/googleapis/enterprise-certificate-proxy v0.3.3 // indirect
154+
github.com/googleapis/gax-go/v2 v2.13.0 // indirect
154155
github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.1.0 // indirect
155156
github.com/grpc-ecosystem/grpc-gateway/v2 v2.22.0 // indirect
156157
github.com/hashicorp/errwrap v1.1.0 // indirect
@@ -175,6 +176,8 @@ require (
175176
github.com/mattn/go-colorable v0.1.13 // indirect
176177
github.com/mattn/go-isatty v0.0.20 // indirect
177178
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
179+
github.com/mdlayher/socket v0.4.1 // indirect
180+
github.com/mdlayher/vsock v1.2.1 // indirect
178181
github.com/metalmatze/signal v0.0.0-20210307161603-1c9aa721a97a // indirect
179182
github.com/miekg/dns v1.1.62 // indirect
180183
github.com/minio/md5-simd v1.1.2 // indirect
@@ -191,12 +194,13 @@ require (
191194
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
192195
github.com/prometheus-community/prom-label-proxy v0.8.1-0.20240127162815-c1195f9aabc0 // indirect
193196
github.com/prometheus/common/sigv4 v0.1.0 // indirect
194-
github.com/prometheus/exporter-toolkit v0.11.0 // indirect
197+
github.com/prometheus/exporter-toolkit v0.12.0 // indirect
195198
github.com/prometheus/procfs v0.15.1 // indirect
196-
github.com/redis/rueidis v1.0.14-go1.18 // indirect
199+
github.com/redis/rueidis v1.0.45-alpha.1 // indirect
197200
github.com/rs/cors v1.11.0 // indirect
198201
github.com/rs/xid v1.5.0 // indirect
199202
github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529 // indirect
203+
github.com/seiflotfy/cuckoofilter v0.0.0-20240715131351-a2f2c23f1771 // indirect
200204
github.com/shurcooL/httpfs v0.0.0-20230704072500-f1e31cf0ba5c // indirect
201205
github.com/shurcooL/vfsgen v0.0.0-20200824052919-0d455de96546 // indirect
202206
github.com/sirupsen/logrus v1.9.3 // indirect
@@ -209,7 +213,7 @@ require (
209213
github.com/zhangyunhao116/umap v0.0.0-20221211160557-cb7705fafa39 // indirect
210214
go.mongodb.org/mongo-driver v1.14.0 // indirect
211215
go.opencensus.io v0.24.0 // indirect
212-
go.opentelemetry.io/collector/semconv v0.105.0 // indirect
216+
go.opentelemetry.io/collector/semconv v0.108.1 // indirect
213217
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0 // indirect
214218
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0 // indirect
215219
go.opentelemetry.io/contrib/propagators/autoprop v0.54.0 // indirect
@@ -223,23 +227,23 @@ require (
223227
go.uber.org/zap v1.21.0 // indirect
224228
go4.org/intern v0.0.0-20230525184215-6c62f75575cb // indirect
225229
go4.org/unsafe/assume-no-moving-gc v0.0.0-20230525183740-e7c30c78aeb2 // indirect
226-
golang.org/x/crypto v0.27.0 // indirect
227-
golang.org/x/mod v0.20.0 // indirect
230+
golang.org/x/crypto v0.28.0 // indirect
231+
golang.org/x/mod v0.21.0 // indirect
228232
golang.org/x/oauth2 v0.23.0 // indirect
229-
golang.org/x/sys v0.25.0 // indirect
230-
golang.org/x/text v0.18.0 // indirect
233+
golang.org/x/sys v0.26.0 // indirect
234+
golang.org/x/text v0.19.0 // indirect
231235
golang.org/x/tools v0.24.0 // indirect
232236
gonum.org/v1/gonum v0.15.0 // indirect
233-
google.golang.org/api v0.188.0 // indirect
234-
google.golang.org/genproto v0.0.0-20240708141625-4ad9e859172b // indirect
235-
google.golang.org/genproto/googleapis/api v0.0.0-20240822170219-fc7c04adadcd // indirect
236-
google.golang.org/genproto/googleapis/rpc v0.0.0-20240822170219-fc7c04adadcd // indirect
237+
google.golang.org/api v0.195.0 // indirect
238+
google.golang.org/genproto v0.0.0-20240823204242-4ba0660f739c // indirect
239+
google.golang.org/genproto/googleapis/api v0.0.0-20240827150818-7e3bb234dfed // indirect
240+
google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1 // indirect
237241
gopkg.in/alecthomas/kingpin.v2 v2.2.6 // indirect
238242
gopkg.in/telebot.v3 v3.2.1 // indirect
239-
k8s.io/apimachinery v0.30.2 // indirect
240-
k8s.io/client-go v0.30.2 // indirect
243+
k8s.io/apimachinery v0.31.1 // indirect
244+
k8s.io/client-go v0.31.0 // indirect
241245
k8s.io/klog/v2 v2.130.1 // indirect
242-
k8s.io/utils v0.0.0-20240502163921-fe8a2dddb1d0 // indirect
246+
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 // indirect
243247
)
244248

245249
// Override since git.apache.org is down. The docs say to fetch from github.

0 commit comments

Comments
 (0)