Skip to content

Commit 3328b33

Browse files
Bump to latest mimir-prometheus
Version synced here: grafana/mimir-prometheus#818
1 parent ce6871c commit 3328b33

File tree

206 files changed

+7374
-9508
lines changed

Some content is hidden

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

206 files changed

+7374
-9508
lines changed

go.mod

+19-16
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ require (
4949
golang.org/x/net v0.33.0
5050
golang.org/x/sync v0.10.0
5151
golang.org/x/time v0.8.0
52-
google.golang.org/grpc v1.68.1
52+
google.golang.org/grpc v1.69.0
5353
gopkg.in/yaml.v2 v2.4.0
5454
gopkg.in/yaml.v3 v3.0.1
5555
)
@@ -85,18 +85,18 @@ require (
8585
github.com/twmb/franz-go/plugin/kprom v1.1.0
8686
github.com/xlab/treeprint v1.2.0
8787
go.opentelemetry.io/collector/pdata v1.22.0
88-
go.opentelemetry.io/otel v1.32.0
89-
go.opentelemetry.io/otel/trace v1.32.0
88+
go.opentelemetry.io/otel v1.33.0
89+
go.opentelemetry.io/otel/trace v1.33.0
9090
go.uber.org/multierr v1.11.0
9191
golang.org/x/term v0.27.0
92-
google.golang.org/api v0.209.0
92+
google.golang.org/api v0.213.0
9393
google.golang.org/protobuf v1.36.1
9494
sigs.k8s.io/kustomize/kyaml v0.18.1
9595
)
9696

9797
require (
98-
cloud.google.com/go/auth v0.10.2 // indirect
99-
cloud.google.com/go/auth/oauth2adapt v0.2.5 // indirect
98+
cloud.google.com/go/auth v0.13.0 // indirect
99+
cloud.google.com/go/auth/oauth2adapt v0.2.6 // indirect
100100
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.16.0 // indirect
101101
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.8.0 // indirect
102102
github.com/Azure/azure-sdk-for-go/sdk/internal v1.10.0 // indirect
@@ -138,8 +138,9 @@ require (
138138
github.com/tklauser/go-sysconf v0.3.12 // indirect
139139
github.com/tklauser/numcpus v0.6.1 // indirect
140140
github.com/yusufpapurcu/wmi v1.2.4 // indirect
141+
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
141142
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.54.0 // indirect
142-
go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace v0.57.0 // indirect
143+
go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace v0.58.0 // indirect
143144
go.opentelemetry.io/otel/sdk/metric v1.30.0 // indirect
144145
gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc // indirect
145146
gopkg.in/mail.v2 v2.3.1 // indirect
@@ -151,7 +152,7 @@ require (
151152

152153
require (
153154
cloud.google.com/go v0.116.0 // indirect
154-
cloud.google.com/go/compute/metadata v0.5.2 // indirect
155+
cloud.google.com/go/compute/metadata v0.6.0 // indirect
155156
cloud.google.com/go/iam v1.2.2 // indirect
156157
github.com/DmitriyVTitov/size v1.5.0 // indirect
157158
github.com/HdrHistogram/hdrhistogram-go v1.1.2 // indirect
@@ -186,14 +187,14 @@ require (
186187
github.com/facette/natsort v0.0.0-20181210072756-2cd4dd1e2dcb // indirect
187188
github.com/fatih/color v1.16.0 // indirect
188189
github.com/felixge/httpsnoop v1.0.4 // indirect
189-
github.com/fsnotify/fsnotify v1.7.0 // indirect
190+
github.com/fsnotify/fsnotify v1.8.0 // indirect
190191
github.com/go-errors/errors v1.4.2 // indirect
191192
github.com/go-logfmt/logfmt v0.6.0 // indirect
192193
github.com/go-logr/logr v1.4.2 // indirect
193194
github.com/go-logr/stdr v1.2.2 // indirect
194195
github.com/go-openapi/analysis v0.22.2 // indirect
195196
github.com/go-openapi/errors v0.22.0 // indirect
196-
github.com/go-openapi/jsonpointer v0.20.2 // indirect
197+
github.com/go-openapi/jsonpointer v0.21.0 // indirect
197198
github.com/go-openapi/jsonreference v0.20.4 // indirect
198199
github.com/go-openapi/loads v0.21.5 // indirect
199200
github.com/go-openapi/runtime v0.27.1 // indirect
@@ -204,7 +205,7 @@ require (
204205
github.com/gogo/googleapis v1.4.1 // indirect
205206
github.com/google/btree v1.1.2 // indirect
206207
github.com/google/go-querystring v1.1.0 // indirect
207-
github.com/google/pprof v0.0.0-20240711041743-f6c9dda6c6da // indirect
208+
github.com/google/pprof v0.0.0-20241210010833-40e02aabc2ad // indirect
208209
github.com/google/s2a-go v0.1.8 // indirect
209210
github.com/googleapis/enterprise-certificate-proxy v0.3.4 // indirect
210211
github.com/googleapis/gax-go/v2 v2.14.0 // indirect
@@ -250,7 +251,7 @@ require (
250251
github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c // indirect
251252
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
252253
github.com/prometheus/common/sigv4 v0.1.0 // indirect
253-
github.com/prometheus/exporter-toolkit v0.13.1 // indirect
254+
github.com/prometheus/exporter-toolkit v0.13.2 // indirect
254255
github.com/rainycape/unidecode v0.0.0-20150907023854-cb7f23ec59be // indirect
255256
github.com/rs/cors v1.11.0 // indirect
256257
github.com/rs/xid v1.6.0 // indirect
@@ -269,8 +270,8 @@ require (
269270
go.mongodb.org/mongo-driver v1.14.0 // indirect
270271
go.opencensus.io v0.24.0 // indirect
271272
go.opentelemetry.io/collector/semconv v0.116.0
272-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.57.0 // indirect
273-
go.opentelemetry.io/otel/metric v1.32.0 // indirect
273+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.58.0 // indirect
274+
go.opentelemetry.io/otel/metric v1.33.0 // indirect
274275
go.uber.org/zap v1.21.0 // indirect
275276
golang.org/x/exp v0.0.0-20241215155358-4a5509556b9e // indirect
276277
golang.org/x/mod v0.22.0 // indirect
@@ -279,14 +280,16 @@ require (
279280
golang.org/x/text v0.21.0 // indirect
280281
golang.org/x/tools v0.28.0 // indirect
281282
google.golang.org/genproto v0.0.0-20241113202542-65e8d215514f // indirect
282-
google.golang.org/genproto/googleapis/api v0.0.0-20241104194629-dd2ea8efbc28 // indirect
283+
google.golang.org/genproto/googleapis/api v0.0.0-20241216192217-9240e9c98484 // indirect
283284
google.golang.org/genproto/googleapis/rpc v0.0.0-20250102185135-69823020774d
284285
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
285286
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 // indirect
286287
sigs.k8s.io/yaml v1.4.0 // indirect
287288
)
288289

289-
replace github.com/prometheus/prometheus => github.com/grafana/mimir-prometheus v0.0.0-20250102152619-93fa7617c041
290+
// This points to https://github.com/grafana/mimir-prometheus/pull/818
291+
// TODO: Merge and change to the main branch
292+
replace github.com/prometheus/prometheus => github.com/grafana/mimir-prometheus v0.0.0-20250108205035-d1ab53027bf1
290293

291294
// Replace memberlist with our fork which includes some fixes that haven't been
292295
// merged upstream yet:

0 commit comments

Comments
 (0)