Update to latest mimir-prometheus (#9523)

* Bump mimir-prometheus version * Generate OTLP code * Address changes
grafana · Oct 4, 2024 · 3d527ff · 3d527ff
1 parent 9e58fb8
commit 3d527ff
Show file tree

Hide file tree

Showing 11 changed files with 78 additions and 46 deletions.
diff --git a/go.mod b/go.mod
@@ -282,7 +282,7 @@ require (
 )
 
 // Using a fork of Prometheus with Mimir-specific changes.
-replace github.com/prometheus/prometheus => github.com/grafana/mimir-prometheus v0.0.0-20241003072550-24c9a629c6d7
+replace github.com/prometheus/prometheus => github.com/grafana/mimir-prometheus v0.0.0-20241003114040-35ec40c3b27a
 
 // 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
@@ -1262,8 +1262,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-20241003072550-24c9a629c6d7 h1:BXhk8YD7F0FUokP3LD2Oa+AtF1W38qLfqgrfpomVNj0=
-github.com/grafana/mimir-prometheus v0.0.0-20241003072550-24c9a629c6d7/go.mod h1:oyDm7JaLUh+QGuGkC7iXC8IyTUq5rlh1ba2CRm9DlVg=
+github.com/grafana/mimir-prometheus v0.0.0-20241003114040-35ec40c3b27a h1:Thi1mhNqRonfMLW6uQ9vVK+nmEfv0SDUGZWxhyWmO0Y=
+github.com/grafana/mimir-prometheus v0.0.0-20241003114040-35ec40c3b27a/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.20240924175849-b8b7c2c74eb6 h1:nT8QXdJo6wHMBcF0xEoXxEWkoUZOyzV/jyi/u9l7YEk=

diff --git a/pkg/api/handlers.go b/pkg/api/handlers.go
@@ -283,6 +283,7 @@ func NewQuerierHandler(
 		nil,
 		otlpEnabled,
 		true,
+		0,
 	)
 
 	api.InstallCodec(protobufCodec{})

diff --git a/pkg/distributor/otlp/helper_generated.go b/pkg/distributor/otlp/helper_generated.go
diff --git a/pkg/distributor/otlp/metrics_to_prw_generated.go b/pkg/distributor/otlp/metrics_to_prw_generated.go
diff --git a/pkg/querier/error_translate_queryable_test.go b/pkg/querier/error_translate_queryable_test.go
@@ -171,6 +171,7 @@ func createPrometheusAPI(q storage.SampleAndChunkQueryable) *route.Router {
 		nil,
 		false,
 		false,
+		0,
 	)
 
 	promRouter := route.New().WithPrefix("/api/v1")

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/...ometheus/prometheus/storage/remote/otlptranslator/prometheusremotewrite/metrics_to_prw.go b/...ometheus/prometheus/storage/remote/otlptranslator/prometheusremotewrite/metrics_to_prw.go
diff --git a/vendor/github.com/prometheus/prometheus/storage/remote/write_handler.go b/vendor/github.com/prometheus/prometheus/storage/remote/write_handler.go
diff --git a/vendor/github.com/prometheus/prometheus/web/api/v1/api.go b/vendor/github.com/prometheus/prometheus/web/api/v1/api.go
diff --git a/vendor/modules.txt b/vendor/modules.txt