Re-vendored prometheus/common

Signed-off-by: Marco Pracucci <[email protected]>
grafana · Jun 10, 2024 · a487bbc · a487bbc
1 parent 03bedbe
commit a487bbc
Show file tree

Hide file tree

Showing 4 changed files with 65 additions and 905 deletions.
diff --git a/go.mod b/go.mod
@@ -34,7 +34,7 @@ require (
 	github.com/prometheus/alertmanager v0.27.0
 	github.com/prometheus/client_golang v1.19.1
 	github.com/prometheus/client_model v0.6.1
-	github.com/prometheus/common v0.54.1-0.20240607102757-92fc65e59ca5
+	github.com/prometheus/common v0.54.1-0.20240608102853-1c9da3533702
 	github.com/prometheus/prometheus v1.99.0
 	github.com/segmentio/fasthash v1.0.3
 	github.com/sirupsen/logrus v1.9.3
@@ -256,9 +256,6 @@ require (
 	sigs.k8s.io/yaml v1.4.0 // indirect
 )
 
-// Using a fork of Prometheus common until https://github.com/prometheus/common/pull/651 is merged.
-replace github.com/prometheus/common => github.com/pracucci/prometheus-common v0.54.1-0.20240607143336-d310c4aff49a
-
 // Using a fork of Prometheus with Mimir-specific changes.
 replace github.com/prometheus/prometheus => github.com/grafana/mimir-prometheus v0.0.0-20240607080100-fce8e33d8a64