Skip to content

Commit c1310a3

Browse files
committed
deps: use forked grafana/mimir-prometheus, prometheus/common, prometheus/client_golang, opentelemetry-go, grafana/prometheus-alertmanager
1 parent 14a80ab commit c1310a3

Some content is hidden

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

56 files changed

+910
-508
lines changed

go.mod

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ require (
3333
github.com/prometheus/alertmanager v0.28.1
3434
github.com/prometheus/client_golang v1.22.0
3535
github.com/prometheus/client_model v0.6.2
36-
github.com/prometheus/common v0.64.0
36+
github.com/prometheus/common v0.65.0
3737
github.com/prometheus/prometheus v1.99.0
3838
github.com/segmentio/fasthash v1.0.3
3939
github.com/sirupsen/logrus v1.9.3
@@ -250,7 +250,7 @@ require (
250250
github.com/fsnotify/fsnotify v1.8.0 // indirect
251251
github.com/go-errors/errors v1.4.2 // indirect
252252
github.com/go-logfmt/logfmt v0.6.0 // indirect
253-
github.com/go-logr/logr v1.4.2 // indirect
253+
github.com/go-logr/logr v1.4.3 // indirect
254254
github.com/go-logr/stdr v1.2.2 // indirect
255255
github.com/go-openapi/analysis v0.23.0 // indirect
256256
github.com/go-openapi/errors v0.22.0 // indirect
@@ -344,7 +344,22 @@ require (
344344
sigs.k8s.io/yaml v1.4.0 // indirect
345345
)
346346

347-
replace github.com/prometheus/prometheus => github.com/grafana/mimir-prometheus v1.8.2-0.20250624141317-3b699fd79779
347+
// https://github.com/prometheus/common/pull/796
348+
replace github.com/prometheus/common => github.com/juliusmh/common v0.64.1-0.20250624113919-24e726159693
349+
350+
// https://github.com/grafana/mimir-prometheus/pull/892
351+
replace github.com/prometheus/prometheus => github.com/juliusmh/mimir-prometheus v1.8.2-0.20250624215857-6dc221c6fc87
352+
353+
// https://github.com/grafana/prometheus-alertmanager/pull/118
354+
replace github.com/prometheus/alertmanager => github.com/juliusmh/alertmanager v0.26.1-0.20250624114102-96969065f8d2
355+
356+
// https://github.com/prometheus/client_golang/pull/1822
357+
replace github.com/prometheus/client_golang => github.com/juliusmh/client_golang v1.22.1-0.20250624113640-ef1ee5d3e20d
358+
359+
// https://github.com/open-telemetry/opentelemetry-go/pull/6927
360+
replace go.opentelemetry.io/otel => github.com/juliusmh/opentelemetry-go v1.36.1-0.20250624112939-e5a689fa3af5
361+
362+
replace go.opentelemetry.io/otel/exporters/prometheus => github.com/juliusmh/opentelemetry-go/exporters/prometheus v0.58.1-0.20250624112939-e5a689fa3af5
348363

349364
// Replace memberlist with our fork which includes some fixes that haven't been
350365
// merged upstream yet:
@@ -370,9 +385,6 @@ replace github.com/opentracing-contrib/go-stdlib => github.com/grafana/opentraci
370385
// Replace opentracing-contrib/go-grpc with a fork until https://github.com/opentracing-contrib/go-grpc/pull/16 is merged.
371386
replace github.com/opentracing-contrib/go-grpc => github.com/charleskorn/go-grpc v0.0.0-20231024023642-e9298576254f
372387

373-
// Replacing prometheus/alertmanager with our fork.
374-
replace github.com/prometheus/alertmanager => github.com/grafana/prometheus-alertmanager v0.25.1-0.20250604130045-92c8f6389b36
375-
376388
// Use Mimir fork of prometheus/otlptranslator to allow for higher velocity of upstream development,
377389
// while allowing Mimir to move at a more conservative pace.
378390
replace github.com/prometheus/otlptranslator => github.com/grafana/mimir-otlptranslator v0.0.0-20250527173959-2573485683d5

go.sum

Lines changed: 55 additions & 74 deletions
Large diffs are not rendered by default.

vendor/github.com/go-logr/logr/.golangci.yaml

Lines changed: 9 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/go-logr/logr/funcr/funcr.go

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/prometheus/alertmanager/matchers/compat/parse.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/prometheus/client_golang/api/client.go

Lines changed: 8 additions & 19 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/prometheus/client_golang/prometheus/desc.go

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/prometheus/client_golang/prometheus/internal/difflib.go

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/prometheus/client_golang/prometheus/labels.go

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/prometheus/client_golang/prometheus/metric.go

Lines changed: 18 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)