Skip to content

Commit e6ec9dd

Browse files
authored
update mimir-prometheus at grafana/mimir-prometheus@53cf3fb (#9148)
* Vendor update mimir-prometheus at 53cf3fb8e7e3 * Add Close method to activity trackers Followup to prometheus/prometheus#14064 * Pass logger to otlp FromMetrics Followup to grafana/mimir-prometheus#689 * Pin google GRPC to 1.65 for the time being Possible performance regression: Ref: grafana/dskit#581 Also has breaking API changes for the experimental buffers. * Remove workaround in test Follow up to: prometheus/prometheus#14772 Signed-off-by: György Krajcsovits <[email protected]>
1 parent a791c54 commit e6ec9dd

File tree

157 files changed

+13133
-10155
lines changed

Some content is hidden

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

157 files changed

+13133
-10155
lines changed

go.mod

Lines changed: 30 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/grafana/mimir
22

3-
go 1.22
3+
go 1.22.0
44

55
// Please note that this directive is ignored when building with the Mimir build image,
66
// that will always use its bundled toolchain.
@@ -34,9 +34,9 @@ require (
3434
github.com/opentracing/opentracing-go v1.2.1-0.20220228012449-10b1cf09e00b
3535
github.com/pkg/errors v0.9.1
3636
github.com/prometheus/alertmanager v0.27.0
37-
github.com/prometheus/client_golang v1.20.0
37+
github.com/prometheus/client_golang v1.20.3
3838
github.com/prometheus/client_model v0.6.1
39-
github.com/prometheus/common v0.56.0
39+
github.com/prometheus/common v0.58.0
4040
github.com/prometheus/prometheus v1.99.0
4141
github.com/segmentio/fasthash v1.0.3
4242
github.com/sirupsen/logrus v1.9.3
@@ -48,14 +48,14 @@ require (
4848
golang.org/x/crypto v0.26.0
4949
golang.org/x/net v0.28.0
5050
golang.org/x/sync v0.8.0
51-
golang.org/x/time v0.5.0
52-
google.golang.org/grpc v1.65.0
51+
golang.org/x/time v0.6.0
52+
google.golang.org/grpc v1.66.0
5353
gopkg.in/yaml.v2 v2.4.0
5454
gopkg.in/yaml.v3 v3.0.1
5555
)
5656

5757
require (
58-
cloud.google.com/go/storage v1.41.0
58+
cloud.google.com/go/storage v1.43.0
5959
github.com/alecthomas/chroma/v2 v2.12.0
6060
github.com/alecthomas/kingpin/v2 v2.4.0
6161
github.com/aws/aws-sdk-go v1.55.5
@@ -83,19 +83,19 @@ require (
8383
github.com/twmb/franz-go/plugin/kprom v1.1.0
8484
github.com/xlab/treeprint v1.2.0
8585
go.opentelemetry.io/collector/pdata v1.12.0
86-
go.opentelemetry.io/otel v1.28.0
87-
go.opentelemetry.io/otel/trace v1.28.0
86+
go.opentelemetry.io/otel v1.29.0
87+
go.opentelemetry.io/otel/trace v1.29.0
8888
go.uber.org/multierr v1.11.0
8989
golang.org/x/exp v0.0.0-20240823005443-9b4947da3948
90-
google.golang.org/api v0.190.0
90+
google.golang.org/api v0.196.0
9191
google.golang.org/protobuf v1.34.2
9292
sigs.k8s.io/kustomize/kyaml v0.16.0
9393
)
9494

9595
require (
96-
cloud.google.com/go/auth v0.7.3 // indirect
97-
cloud.google.com/go/auth/oauth2adapt v0.2.3 // indirect
98-
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.13.0 // indirect
96+
cloud.google.com/go/auth v0.9.3 // indirect
97+
cloud.google.com/go/auth/oauth2adapt v0.2.4 // indirect
98+
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.14.0 // indirect
9999
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.7.0 // indirect
100100
github.com/Azure/azure-sdk-for-go/sdk/internal v1.10.0 // indirect
101101
github.com/AzureAD/microsoft-authentication-library-for-go v1.2.2 // indirect
@@ -132,7 +132,7 @@ require (
132132
github.com/tklauser/go-sysconf v0.3.12 // indirect
133133
github.com/tklauser/numcpus v0.6.1 // indirect
134134
github.com/yusufpapurcu/wmi v1.2.4 // indirect
135-
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0 // indirect
135+
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.54.0 // indirect
136136
gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc // indirect
137137
gopkg.in/mail.v2 v2.3.1 // indirect
138138
gopkg.in/telebot.v3 v3.2.1 // indirect
@@ -142,9 +142,9 @@ require (
142142
)
143143

144144
require (
145-
cloud.google.com/go v0.115.0 // indirect
145+
cloud.google.com/go v0.115.1 // indirect
146146
cloud.google.com/go/compute/metadata v0.5.0 // indirect
147-
cloud.google.com/go/iam v1.1.12 // indirect
147+
cloud.google.com/go/iam v1.2.0 // indirect
148148
github.com/DmitriyVTitov/size v1.5.0 // indirect
149149
github.com/HdrHistogram/hdrhistogram-go v1.1.2 // indirect
150150
github.com/armon/go-metrics v0.4.1 // indirect
@@ -199,11 +199,11 @@ require (
199199
github.com/google/go-querystring v1.1.0 // indirect
200200
github.com/google/pprof v0.0.0-20240711041743-f6c9dda6c6da // indirect
201201
github.com/google/s2a-go v0.1.8 // indirect
202-
github.com/googleapis/enterprise-certificate-proxy v0.3.2 // indirect
202+
github.com/googleapis/enterprise-certificate-proxy v0.3.3 // indirect
203203
github.com/googleapis/gax-go/v2 v2.13.0 // indirect
204204
github.com/gosimple/slug v1.1.1 // indirect
205205
github.com/grafana/gomemcache v0.0.0-20240229205252-cd6a66d6fb56 // indirect
206-
github.com/hashicorp/consul/api v1.29.2 // indirect
206+
github.com/hashicorp/consul/api v1.29.4 // indirect
207207
github.com/hashicorp/errwrap v1.1.0 // indirect
208208
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
209209
github.com/hashicorp/go-hclog v1.6.3 // indirect
@@ -262,26 +262,26 @@ require (
262262
go.mongodb.org/mongo-driver v1.14.0 // indirect
263263
go.opencensus.io v0.24.0 // indirect
264264
go.opentelemetry.io/collector/semconv v0.105.0
265-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0 // indirect
266-
go.opentelemetry.io/otel/metric v1.28.0 // indirect
265+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.54.0 // indirect
266+
go.opentelemetry.io/otel/metric v1.29.0 // indirect
267267
go.uber.org/zap v1.21.0 // indirect
268268
golang.org/x/mod v0.20.0 // indirect
269-
golang.org/x/oauth2 v0.21.0 // indirect
270-
golang.org/x/sys v0.24.0 // indirect
269+
golang.org/x/oauth2 v0.22.0 // indirect
270+
golang.org/x/sys v0.25.0 // indirect
271271
golang.org/x/text v0.17.0 // indirect
272272
golang.org/x/tools v0.24.0 // indirect
273-
google.golang.org/genproto v0.0.0-20240730163845-b1a4ccb954bf // indirect
274-
google.golang.org/genproto/googleapis/api v0.0.0-20240725223205-93522f1f2a9f // indirect
275-
google.golang.org/genproto/googleapis/rpc v0.0.0-20240823204242-4ba0660f739c
273+
google.golang.org/genproto v0.0.0-20240903143218-8af14fe29dc1 // indirect
274+
google.golang.org/genproto/googleapis/api v0.0.0-20240827150818-7e3bb234dfed // indirect
275+
google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1
276276
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
277277
k8s.io/utils v0.0.0-20230726121419-3b25d923346b // indirect
278278
sigs.k8s.io/yaml v1.4.0 // indirect
279279
)
280280

281281
// Using a fork of Prometheus with Mimir-specific changes.
282-
replace github.com/prometheus/prometheus => github.com/grafana/mimir-prometheus v0.0.0-20240830150301-6b342fac9c48
282+
replace github.com/prometheus/prometheus => github.com/grafana/mimir-prometheus v0.0.0-20240906072158-53cf3fb8e7e3
283283

284-
// client_golang v1.20.0 has some bugs https://github.com/prometheus/client_golang/issues/1605, https://github.com/prometheus/client_golang/issues/1607
284+
// client_golang v1.20.3 has some data races in histogram exemplars.
285285
// Stick to v1.19.1 until they are fixed.
286286
replace github.com/prometheus/client_golang => github.com/prometheus/client_golang v1.19.1
287287

@@ -311,3 +311,7 @@ replace github.com/opentracing-contrib/go-grpc => github.com/charleskorn/go-grpc
311311

312312
// Replacing prometheus/alertmanager with our fork.
313313
replace github.com/prometheus/alertmanager => github.com/grafana/prometheus-alertmanager v0.25.1-0.20240625192351-66ec17e3aa45
314+
315+
// Pin Google GRPC to v1.65.0 as v1.66.0 has API changes and also potentially performance regressions.
316+
// Following https://github.com/grafana/dskit/pull/581
317+
replace google.golang.org/grpc => google.golang.org/grpc v1.65.0

0 commit comments

Comments
 (0)