Skip to content

Commit 756ef29

Browse files
committed
deps: use forked grafana/mimir-prometheus, prometheus/common, prometheus/client_golang, opentelemetry-go, grafana/prometheus-alertmanager
1 parent 37d2a49 commit 756ef29

File tree

35 files changed

+641
-379
lines changed

35 files changed

+641
-379
lines changed

go.mod

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -345,7 +345,22 @@ require (
345345
sigs.k8s.io/yaml v1.4.0 // indirect
346346
)
347347

348-
replace github.com/prometheus/prometheus => github.com/grafana/mimir-prometheus v1.8.2-0.20250630073342-cb2ea4c6e5ec
348+
// https://github.com/prometheus/common/pull/796
349+
replace github.com/prometheus/common => github.com/juliusmh/common v0.65.1-0.20250701090419-a09de840631d
350+
351+
// https://github.com/grafana/mimir-prometheus/pull/892
352+
replace github.com/prometheus/prometheus => github.com/juliusmh/mimir-prometheus v1.8.2-0.20250701114145-ef1d8b1a3baa
353+
354+
// https://github.com/grafana/prometheus-alertmanager/pull/118
355+
replace github.com/prometheus/alertmanager => github.com/juliusmh/alertmanager v0.26.1-0.20250624114102-96969065f8d2
356+
357+
// https://github.com/prometheus/client_golang/pull/1822
358+
replace github.com/prometheus/client_golang => github.com/juliusmh/client_golang v1.22.1-0.20250701110037-ceb5803cbf1f
359+
360+
// https://github.com/open-telemetry/opentelemetry-go/pull/6927
361+
replace go.opentelemetry.io/otel => github.com/juliusmh/opentelemetry-go v1.36.1-0.20250630105543-32a3e6508937
362+
363+
replace go.opentelemetry.io/otel/exporters/prometheus => github.com/juliusmh/opentelemetry-go/exporters/prometheus v0.58.1-0.20250630105543-32a3e6508937
349364

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

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

go.sum

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

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/prometheus/desc.go

Lines changed: 33 additions & 6 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/push/push.go

Lines changed: 30 additions & 13 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/registry.go

Lines changed: 30 additions & 8 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/testutil/lint.go

Lines changed: 5 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/client_golang/prometheus/testutil/promlint/promlint.go

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

0 commit comments

Comments
 (0)