Skip to content

Commit 6c7457d

Browse files
alanprotalanprot
authored
Updating Prometheus and Thanos (#6843)
* Updating Prometheus Signed-off-by: alanprot <alanprot@gmail.com> * lint Signed-off-by: alanprot <alanprot@gmail.com> * Run native histogram test with prometheus 3.3.1 * fix ruler integ test Signed-off-by: alanprot <alanprot@gmail.com> --------- Signed-off-by: alanprot <alanprot@gmail.com>
1 parent 7f107fe commit 6c7457d

File tree

1,282 files changed

+441283
-12258
lines changed

Some content is hidden

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

1,282 files changed

+441283
-12258
lines changed

‎go.mod‎

Lines changed: 68 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ go 1.24.0
55
require (
66
github.com/Masterminds/squirrel v1.5.4
77
github.com/alecthomas/units v0.0.0-20240927000941-0f3dac36c52b
8-
github.com/alicebob/miniredis/v2 v2.34.0
8+
github.com/alicebob/miniredis/v2 v2.35.0
99
github.com/armon/go-metrics v0.4.1
1010
github.com/aws/aws-sdk-go v1.55.7
1111
github.com/bradfitz/gomemcache v0.0.0-20250403215159-8d39553ac7cf
@@ -33,15 +33,15 @@ require (
3333
github.com/json-iterator/go v1.1.12
3434
github.com/klauspost/compress v1.18.0
3535
github.com/lib/pq v1.10.9
36-
github.com/minio/minio-go/v7 v7.0.82
36+
github.com/minio/minio-go/v7 v7.0.80
3737
github.com/mitchellh/go-wordwrap v1.0.1
38-
github.com/oklog/ulid v1.3.1
38+
github.com/oklog/ulid v1.3.1 // indirect
3939
github.com/opentracing-contrib/go-grpc v0.1.2
4040
github.com/opentracing-contrib/go-stdlib v1.1.0
4141
github.com/opentracing/opentracing-go v1.2.0
4242
github.com/pkg/errors v0.9.1
4343
github.com/prometheus/alertmanager v0.28.1
44-
github.com/prometheus/client_golang v1.21.1
44+
github.com/prometheus/client_golang v1.22.0
4545
github.com/prometheus/client_model v0.6.2
4646
github.com/prometheus/common v0.63.0
4747
// Prometheus maps version 2.x.y to tags v0.x.y.
@@ -52,7 +52,7 @@ require (
5252
github.com/stretchr/testify v1.10.0
5353
github.com/thanos-io/objstore v0.0.0-20250317105316-a0136a6f898d
5454
github.com/thanos-io/promql-engine v0.0.0-20250611170940-015ebeb7b5ff
55-
github.com/thanos-io/thanos v0.37.3-0.20250603135757-4ad45948cd10
55+
github.com/thanos-io/thanos v0.39.1-0.20250626092019-3727363b495d
5656
github.com/uber/jaeger-client-go v2.30.0+incompatible
5757
github.com/weaveworks/common v0.0.0-20230728070032-dd9e68f319d5
5858
go.etcd.io/etcd/api/v3 v3.5.17
@@ -66,10 +66,10 @@ require (
6666
go.opentelemetry.io/otel/sdk v1.36.0
6767
go.opentelemetry.io/otel/trace v1.36.0
6868
go.uber.org/atomic v1.11.0
69-
golang.org/x/net v0.40.0
70-
golang.org/x/sync v0.14.0
71-
golang.org/x/time v0.11.0
72-
google.golang.org/grpc v1.72.2
69+
golang.org/x/net v0.41.0
70+
golang.org/x/sync v0.15.0
71+
golang.org/x/time v0.12.0
72+
google.golang.org/grpc v1.73.0
7373
gopkg.in/yaml.v2 v2.4.0
7474
gopkg.in/yaml.v3 v3.0.1
7575
)
@@ -81,35 +81,40 @@ require (
8181
github.com/google/go-cmp v0.7.0
8282
github.com/hashicorp/golang-lru/v2 v2.0.7
8383
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822
84+
github.com/oklog/ulid/v2 v2.1.1
8485
github.com/parquet-go/parquet-go v0.25.1
8586
github.com/prometheus-community/parquet-common v0.0.0-20250610002942-dfd72bae1309
8687
github.com/prometheus/procfs v0.16.1
8788
github.com/sercand/kuberesolver/v5 v5.1.1
8889
github.com/tjhop/slog-gokit v0.1.4
89-
go.opentelemetry.io/collector/pdata v1.33.0
90+
go.opentelemetry.io/collector/pdata v1.34.0
9091
go.uber.org/automaxprocs v1.6.0
9192
google.golang.org/protobuf v1.36.6
9293
)
9394

9495
require (
95-
cloud.google.com/go v0.118.0 // indirect
96+
cel.dev/expr v0.23.1 // indirect
97+
cloud.google.com/go v0.118.1 // indirect
9698
cloud.google.com/go/auth v0.15.1-0.20250317171031-671eed979bfd // indirect
9799
cloud.google.com/go/auth/oauth2adapt v0.2.8 // indirect
98100
cloud.google.com/go/compute/metadata v0.7.0 // indirect
99101
cloud.google.com/go/iam v1.3.1 // indirect
100-
cloud.google.com/go/storage v1.43.0 // indirect
102+
cloud.google.com/go/monitoring v1.24.0 // indirect
103+
cloud.google.com/go/storage v1.50.0 // indirect
101104
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.18.0 // indirect
102105
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.10.0 // indirect
103106
github.com/Azure/azure-sdk-for-go/sdk/internal v1.11.1 // indirect
104107
github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v1.6.1 // indirect
105108
github.com/AzureAD/microsoft-authentication-library-for-go v1.4.2 // indirect
109+
github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.27.0 // indirect
110+
github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric v0.50.0 // indirect
111+
github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.52.0 // indirect
106112
github.com/alecthomas/kingpin/v2 v2.4.0 // indirect
107-
github.com/alicebob/gopher-json v0.0.0-20230218143504-906a9b012302 // indirect
108113
github.com/andybalholm/brotli v1.1.1 // indirect
109114
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
110115
github.com/aws/aws-sdk-go-v2 v1.36.3 // indirect
111-
github.com/aws/aws-sdk-go-v2/config v1.29.14 // indirect
112-
github.com/aws/aws-sdk-go-v2/credentials v1.17.67 // indirect
116+
github.com/aws/aws-sdk-go-v2/config v1.29.15 // indirect
117+
github.com/aws/aws-sdk-go-v2/credentials v1.17.68 // indirect
113118
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.30 // indirect
114119
github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.34 // indirect
115120
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.34 // indirect
@@ -118,13 +123,14 @@ require (
118123
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.15 // indirect
119124
github.com/aws/aws-sdk-go-v2/service/sso v1.25.3 // indirect
120125
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.30.1 // indirect
121-
github.com/aws/aws-sdk-go-v2/service/sts v1.33.19 // indirect
126+
github.com/aws/aws-sdk-go-v2/service/sts v1.33.20 // indirect
122127
github.com/aws/smithy-go v1.22.3 // indirect
123128
github.com/beorn7/perks v1.0.1 // indirect
124129
github.com/blang/semver/v4 v4.0.0 // indirect
125130
github.com/caio/go-tdigest v3.1.0+incompatible // indirect
126131
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
127132
github.com/cenkalti/backoff/v5 v5.0.2 // indirect
133+
github.com/cncf/xds/go v0.0.0-20250501225837-2ac532fd4443 // indirect
128134
github.com/coder/quartz v0.1.2 // indirect
129135
github.com/coreos/go-semver v0.3.0 // indirect
130136
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
@@ -136,12 +142,15 @@ require (
136142
github.com/docker/go-units v0.5.0 // indirect
137143
github.com/edsrzf/mmap-go v1.2.0 // indirect
138144
github.com/efficientgo/tools/extkingpin v0.0.0-20230505153745-6b7392939a60 // indirect
145+
github.com/envoyproxy/go-control-plane/envoy v1.32.4 // indirect
146+
github.com/envoyproxy/protoc-gen-validate v1.2.1 // indirect
139147
github.com/fatih/color v1.18.0 // indirect
140148
github.com/felixge/httpsnoop v1.0.4 // indirect
141149
github.com/fsnotify/fsnotify v1.9.0 // indirect
142150
github.com/go-ini/ini v1.67.0 // indirect
151+
github.com/go-jose/go-jose/v4 v4.0.5 // indirect
143152
github.com/go-logfmt/logfmt v0.6.0 // indirect
144-
github.com/go-logr/logr v1.4.2 // indirect
153+
github.com/go-logr/logr v1.4.3 // indirect
145154
github.com/go-logr/stdr v1.2.2 // indirect
146155
github.com/go-openapi/analysis v0.23.0 // indirect
147156
github.com/go-openapi/errors v0.22.1 // indirect
@@ -152,13 +161,14 @@ require (
152161
github.com/go-openapi/spec v0.21.0 // indirect
153162
github.com/go-openapi/validate v0.24.0 // indirect
154163
github.com/go-viper/mapstructure/v2 v2.2.1 // indirect
164+
github.com/gobwas/glob v0.2.3 // indirect
155165
github.com/goccy/go-json v0.10.5 // indirect
156166
github.com/gofrs/uuid v4.4.0+incompatible // indirect
157167
github.com/gogo/googleapis v1.4.1 // indirect
158168
github.com/golang-jwt/jwt/v5 v5.2.2 // indirect
159169
github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 // indirect
160170
github.com/google/btree v1.1.3 // indirect
161-
github.com/google/pprof v0.0.0-20250501235452-c0086092b71a // indirect
171+
github.com/google/pprof v0.0.0-20250607225305-033d6d78b36a // indirect
162172
github.com/google/s2a-go v0.1.9 // indirect
163173
github.com/google/uuid v1.6.0 // indirect
164174
github.com/googleapis/enterprise-certificate-proxy v0.3.6 // indirect
@@ -171,6 +181,7 @@ require (
171181
github.com/hashicorp/go-msgpack v0.5.5 // indirect
172182
github.com/hashicorp/go-multierror v1.1.1 // indirect
173183
github.com/hashicorp/go-rootcerts v1.0.2 // indirect
184+
github.com/hashicorp/go-version v1.7.0 // indirect
174185
github.com/hashicorp/golang-lru v0.6.0 // indirect
175186
github.com/hashicorp/serf v0.10.1 // indirect
176187
github.com/jessevdk/go-flags v1.6.1 // indirect
@@ -179,9 +190,9 @@ require (
179190
github.com/jpillora/backoff v1.0.0 // indirect
180191
github.com/julienschmidt/httprouter v1.3.0 // indirect
181192
github.com/klauspost/cpuid/v2 v2.2.10 // indirect
182-
github.com/knadh/koanf/maps v0.1.1 // indirect
183-
github.com/knadh/koanf/providers/confmap v0.1.0 // indirect
184-
github.com/knadh/koanf/v2 v2.1.2 // indirect
193+
github.com/knadh/koanf/maps v0.1.2 // indirect
194+
github.com/knadh/koanf/providers/confmap v1.0.0 // indirect
195+
github.com/knadh/koanf/v2 v2.2.1 // indirect
185196
github.com/kylelemons/godebug v1.1.0 // indirect
186197
github.com/lann/builder v0.0.0-20180802200727-47ae307949d0 // indirect
187198
github.com/lann/ps v0.0.0-20150810152359-62de8c46ede0 // indirect
@@ -204,16 +215,18 @@ require (
204215
github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f // indirect
205216
github.com/ncw/swift v1.0.53 // indirect
206217
github.com/oklog/run v1.1.0 // indirect
207-
github.com/open-telemetry/opentelemetry-collector-contrib/internal/exp/metrics v0.121.0 // indirect
208-
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.121.0 // indirect
209-
github.com/open-telemetry/opentelemetry-collector-contrib/processor/deltatocumulativeprocessor v0.121.0 // indirect
218+
github.com/open-telemetry/opentelemetry-collector-contrib/internal/exp/metrics v0.128.0 // indirect
219+
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.128.0 // indirect
220+
github.com/open-telemetry/opentelemetry-collector-contrib/processor/deltatocumulativeprocessor v0.128.0 // indirect
210221
github.com/pierrec/lz4/v4 v4.1.22 // indirect
211222
github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c // indirect
223+
github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10 // indirect
212224
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
213-
github.com/prometheus-community/prom-label-proxy v0.11.0 // indirect
225+
github.com/prometheus-community/prom-label-proxy v0.11.1 // indirect
214226
github.com/prometheus/exporter-toolkit v0.14.0 // indirect
215227
github.com/prometheus/sigv4 v0.1.2 // indirect
216-
github.com/redis/rueidis v1.0.60 // indirect
228+
github.com/puzpuzpuz/xsync/v3 v3.5.1 // indirect
229+
github.com/redis/rueidis v1.0.61 // indirect
217230
github.com/rs/cors v1.11.1 // indirect
218231
github.com/rs/xid v1.6.0 // indirect
219232
github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529 // indirect
@@ -222,54 +235,63 @@ require (
222235
github.com/shurcooL/vfsgen v0.0.0-20230704071429-0000e147ea92 // indirect
223236
github.com/sirupsen/logrus v1.9.3 // indirect
224237
github.com/soheilhy/cmux v0.1.5 // indirect
238+
github.com/spiffe/go-spiffe/v2 v2.5.0 // indirect
225239
github.com/stretchr/objx v0.5.2 // indirect
226240
github.com/trivago/tgo v1.0.7 // indirect
227241
github.com/uber/jaeger-lib v2.4.1+incompatible // indirect
228242
github.com/vimeo/galaxycache v1.3.1 // indirect
229243
github.com/weaveworks/promrus v1.2.0 // indirect
230244
github.com/xhit/go-str2duration/v2 v2.1.0 // indirect
231245
github.com/yuin/gopher-lua v1.1.1 // indirect
232-
go.mongodb.org/mongo-driver v1.17.3 // indirect
246+
github.com/zeebo/errs v1.4.0 // indirect
247+
go.mongodb.org/mongo-driver v1.17.4 // indirect
233248
go.opencensus.io v0.24.0 // indirect
234249
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
235-
go.opentelemetry.io/collector/component v1.27.0 // indirect
236-
go.opentelemetry.io/collector/confmap v1.27.0 // indirect
237-
go.opentelemetry.io/collector/confmap/xconfmap v0.121.0 // indirect
238-
go.opentelemetry.io/collector/consumer v1.27.0 // indirect
239-
go.opentelemetry.io/collector/pipeline v0.121.0 // indirect
240-
go.opentelemetry.io/collector/processor v0.121.0 // indirect
241-
go.opentelemetry.io/collector/semconv v0.127.0 // indirect
250+
go.opentelemetry.io/collector/component v1.34.0 // indirect
251+
go.opentelemetry.io/collector/confmap v1.34.0 // indirect
252+
go.opentelemetry.io/collector/confmap/xconfmap v0.128.0 // indirect
253+
go.opentelemetry.io/collector/consumer v1.34.0 // indirect
254+
go.opentelemetry.io/collector/featuregate v1.34.0 // indirect
255+
go.opentelemetry.io/collector/internal/telemetry v0.128.0 // indirect
256+
go.opentelemetry.io/collector/pipeline v0.128.0 // indirect
257+
go.opentelemetry.io/collector/processor v1.34.0 // indirect
258+
go.opentelemetry.io/collector/semconv v0.128.0 // indirect
259+
go.opentelemetry.io/contrib/bridges/otelzap v0.11.0 // indirect
260+
go.opentelemetry.io/contrib/detectors/gcp v1.35.0 // indirect
242261
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.61.0 // indirect
243262
go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace v0.61.0 // indirect
244263
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.61.0 // indirect
245264
go.opentelemetry.io/contrib/propagators/autoprop v0.61.0 // indirect
246265
go.opentelemetry.io/contrib/propagators/b3 v1.36.0 // indirect
247266
go.opentelemetry.io/contrib/propagators/jaeger v1.36.0 // indirect
248267
go.opentelemetry.io/contrib/propagators/ot v1.36.0 // indirect
268+
go.opentelemetry.io/otel/log v0.12.2 // indirect
249269
go.opentelemetry.io/otel/metric v1.36.0 // indirect
250-
go.opentelemetry.io/proto/otlp v1.6.0 // indirect
270+
go.opentelemetry.io/otel/sdk/metric v1.36.0 // indirect
271+
go.opentelemetry.io/proto/otlp v1.7.0 // indirect
251272
go.uber.org/goleak v1.3.0 // indirect
252273
go.uber.org/multierr v1.11.0 // indirect
253274
go.uber.org/zap v1.27.0 // indirect
254275
go4.org/intern v0.0.0-20230525184215-6c62f75575cb // indirect
255276
go4.org/unsafe/assume-no-moving-gc v0.0.0-20231121144256-b99613f794b6 // indirect
256-
golang.org/x/crypto v0.38.0 // indirect
257-
golang.org/x/exp v0.0.0-20250506013437-ce4c2cf36ca6 // indirect
258-
golang.org/x/mod v0.24.0 // indirect
277+
golang.org/x/crypto v0.39.0 // indirect
278+
golang.org/x/exp v0.0.0-20250606033433-dcc06ee1d476 // indirect
279+
golang.org/x/mod v0.25.0 // indirect
259280
golang.org/x/oauth2 v0.30.0 // indirect
260281
golang.org/x/sys v0.33.0 // indirect
261-
golang.org/x/text v0.25.0 // indirect
262-
golang.org/x/tools v0.33.0 // indirect
282+
golang.org/x/text v0.26.0 // indirect
283+
golang.org/x/tools v0.34.0 // indirect
263284
gonum.org/v1/gonum v0.16.0 // indirect
264285
google.golang.org/api v0.228.0 // indirect
265-
google.golang.org/genproto v0.0.0-20250122153221-138b5a5a4fd4 // indirect
266-
google.golang.org/genproto/googleapis/api v0.0.0-20250519155744-55703ea1f237 // indirect
267-
google.golang.org/genproto/googleapis/rpc v0.0.0-20250519155744-55703ea1f237 // indirect
286+
google.golang.org/genproto v0.0.0-20250204164813-702378808489 // indirect
287+
google.golang.org/genproto/googleapis/api v0.0.0-20250603155806-513f23925822 // indirect
288+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250603155806-513f23925822 // indirect
268289
gopkg.in/telebot.v3 v3.3.8 // indirect
269290
k8s.io/apimachinery v0.33.1 // indirect
270291
k8s.io/client-go v0.33.1 // indirect
271292
k8s.io/klog/v2 v2.130.1 // indirect
272-
k8s.io/utils v0.0.0-20250502105355-0f33e8f1c979 // indirect
293+
k8s.io/utils v0.0.0-20250604170112-4c0f3b243397 // indirect
294+
sigs.k8s.io/yaml v1.4.0 // indirect
273295
)
274296

275297
// Using cortex fork of weaveworks/common
@@ -301,6 +323,5 @@ replace gopkg.in/alecthomas/kingpin.v2 => github.com/alecthomas/kingpin v1.3.8-0
301323

302324
replace github.com/thanos-io/objstore => github.com/thanos-io/objstore v0.0.0-20241111205755-d1dd89d41f97
303325

304-
replace github.com/prometheus/prometheus => github.com/prometheus/prometheus v0.302.1
305-
306-
replace github.com/prometheus/common => github.com/prometheus/common v0.62.1-0.20250120132612-df14882cbf97
326+
// v3.3.1 with https://github.com/prometheus/prometheus/pull/16252. (same as thanos)
327+
replace github.com/prometheus/prometheus => github.com/thanos-io/thanos-prometheus v0.0.0-20250610133519-082594458a88

0 commit comments

Comments
 (0)