Update mimir-prometheus (#9358)

* Update mimir-prometheus * Run make generate-otlp
grafana · Sep 20, 2024 · 73b584c · 73b584c
1 parent 6be86e8
commit 73b584c
Show file tree

Hide file tree

Showing 9 changed files with 75 additions and 18 deletions.
diff --git a/go.mod b/go.mod
@@ -279,7 +279,7 @@ require (
 )
 
 // Using a fork of Prometheus with Mimir-specific changes.
-replace github.com/prometheus/prometheus => github.com/grafana/mimir-prometheus v0.0.0-20240917104844-e4312d119ad6
+replace github.com/prometheus/prometheus => github.com/grafana/mimir-prometheus v0.0.0-20240920170818-87bc81f0005c
 
 // client_golang v1.20.3 has some data races in histogram exemplars.
 // Stick to v1.19.1 until they are fixed.

diff --git a/go.sum b/go.sum
@@ -1265,8 +1265,8 @@ github.com/grafana/gomemcache v0.0.0-20240229205252-cd6a66d6fb56 h1:X8IKQ0wu40wp
 github.com/grafana/gomemcache v0.0.0-20240229205252-cd6a66d6fb56/go.mod h1:PGk3RjYHpxMM8HFPhKKo+vve3DdlPUELZLSDEFehPuU=
 github.com/grafana/memberlist v0.3.1-0.20220714140823-09ffed8adbbe h1:yIXAAbLswn7VNWBIvM71O2QsgfgW9fRXZNR0DXe6pDU=
 github.com/grafana/memberlist v0.3.1-0.20220714140823-09ffed8adbbe/go.mod h1:MS2lj3INKhZjWNqd3N0m3J+Jxf3DAOnAH9VT3Sh9MUE=
-github.com/grafana/mimir-prometheus v0.0.0-20240917104844-e4312d119ad6 h1:ytXRuYayyA9+LNmmeWmXeC/eDeyRM4YNVDntdJkYC40=
-github.com/grafana/mimir-prometheus v0.0.0-20240917104844-e4312d119ad6/go.mod h1:oyDm7JaLUh+QGuGkC7iXC8IyTUq5rlh1ba2CRm9DlVg=
+github.com/grafana/mimir-prometheus v0.0.0-20240920170818-87bc81f0005c h1:+Bs4f9RDbRpBAzq50oCnbkc9yZNFkKZl53uchHvCwmc=
+github.com/grafana/mimir-prometheus v0.0.0-20240920170818-87bc81f0005c/go.mod h1:oyDm7JaLUh+QGuGkC7iXC8IyTUq5rlh1ba2CRm9DlVg=
 github.com/grafana/opentracing-contrib-go-stdlib v0.0.0-20230509071955-f410e79da956 h1:em1oddjXL8c1tL0iFdtVtPloq2hRPen2MJQKoAWpxu0=
 github.com/grafana/opentracing-contrib-go-stdlib v0.0.0-20230509071955-f410e79da956/go.mod h1:qtI1ogk+2JhVPIXVc6q+NHziSmy2W5GbdQZFUHADCBU=
 github.com/grafana/prometheus-alertmanager v0.25.1-0.20240906122908-60521fae6a42 h1:01cldIKyxTrraTYroDWNBItBWWs9Bh07I4rSOakLilo=

diff --git a/pkg/distributor/otlp/helper_generated.go b/pkg/distributor/otlp/helper_generated.go
diff --git a/pkg/distributor/otlp/histograms_generated.go b/pkg/distributor/otlp/histograms_generated.go
diff --git a/...b.com/prometheus/prometheus/storage/remote/otlptranslator/prometheusremotewrite/helper.go b/...b.com/prometheus/prometheus/storage/remote/otlptranslator/prometheusremotewrite/helper.go
diff --git a/...m/prometheus/prometheus/storage/remote/otlptranslator/prometheusremotewrite/histograms.go b/...m/prometheus/prometheus/storage/remote/otlptranslator/prometheusremotewrite/histograms.go
diff --git a/vendor/github.com/prometheus/prometheus/tsdb/db.go b/vendor/github.com/prometheus/prometheus/tsdb/db.go
diff --git a/vendor/github.com/prometheus/prometheus/tsdb/ooo_head_read.go b/vendor/github.com/prometheus/prometheus/tsdb/ooo_head_read.go
diff --git a/vendor/modules.txt b/vendor/modules.txt