Update mimir-prometheus vendor 20240703 (#8592)

* sync mimir-prometheus 5131622acfee927142b4123bf7f0e40069532cf2 * fix build error * run `make generate-otlp` to fix lint * update streamingpromql test case * update mimirpb with new custom values field * Temporarily disable any streaming promql tests with annotations * remove new custom_values field from the remote write struct --------- Co-authored-by: Joshua Hesketh <joshua.hesketh@grafana.com>
grafana · Jul 5, 2024 · fefc1d5 · fefc1d5
1 parent 6b0b900
commit fefc1d5
Show file tree

Hide file tree

Showing 46 changed files with 2,411 additions and 1,009 deletions.
diff --git a/go.mod b/go.mod
@@ -277,7 +277,7 @@ require (
 )
 
 // Using a fork of Prometheus with Mimir-specific changes.
-replace github.com/prometheus/prometheus => github.com/grafana/mimir-prometheus v0.0.0-20240625230403-ab397a980d39
+replace github.com/prometheus/prometheus => github.com/grafana/mimir-prometheus v0.0.0-20240703103907-5131622acfee
 
 // Replace memberlist with our fork which includes some fixes that haven't been
 // merged upstream yet:

diff --git a/go.sum b/go.sum
@@ -525,8 +525,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-20240625230403-ab397a980d39 h1:jxS8YGQsB7Bp8/KMyUk4r9mnavRdeLOOjAXpffRAlz0=
-github.com/grafana/mimir-prometheus v0.0.0-20240625230403-ab397a980d39/go.mod h1:ZrBwbXc+KqeAQT4QXHKfi68+7vaOzoSdrkk90RRgdkE=
+github.com/grafana/mimir-prometheus v0.0.0-20240703103907-5131622acfee h1:H6XAHAr8YzO61zZvmGmSWt8QFgkWHbXTWwxqCHf5Wy8=
+github.com/grafana/mimir-prometheus v0.0.0-20240703103907-5131622acfee/go.mod h1:DjC1WWVnO+kFTzxrvJ6uS3SvbtoRiW4/lgLFUd49OPg=
 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.20240625192351-66ec17e3aa45 h1:AJKOtDKAOg8XNFnIZSmqqqutoTSxVlRs6vekL2p2KEY=

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/pkg/mimirpb/mimir.pb.go b/pkg/mimirpb/mimir.pb.go
diff --git a/pkg/mimirpb/mimir.proto b/pkg/mimirpb/mimir.proto
@@ -173,6 +173,7 @@ message FloatHistogram {
   repeated BucketSpan negative_spans = 8 [(gogoproto.nullable) = false];
   repeated double positive_buckets = 13;
   repeated double negative_buckets = 10;
+  repeated double custom_values = 16;
 }
 
 // A BucketSpan defines a number of consecutive buckets with their

diff --git a/pkg/streamingpromql/operators/aggregation.go b/pkg/streamingpromql/operators/aggregation.go
@@ -316,7 +316,10 @@ func (a *Aggregation) accumulateSeriesIntoGroup(s types.InstantVectorSeriesData,
 			// of needing to loop again later like we do for floats.
 			seriesGroup.histogramPointCount++
 		} else {
-			seriesGroup.histogramSums[idx] = seriesGroup.histogramSums[idx].Add(p.H)
+			seriesGroup.histogramSums[idx], err = seriesGroup.histogramSums[idx].Add(p.H)
+			if err != nil {
+				return err
+			}
 		}
 	}
 

diff --git a/pkg/streamingpromql/testdata/ours/aggregators.test b/pkg/streamingpromql/testdata/ours/aggregators.test
@@ -90,7 +90,8 @@ load 1m
 	single_histogram{label="value2"}  {{sum:5 count:5 buckets:[1 3 1]}}
 
 # "If either operator has to aggregate a mix of histogram samples and float samples, the corresponding vector element is removed from the output vector entirely."
-eval instant at 1m sum(single_histogram)
+# TODO(jhesketh): Re-enable once we support annotations
+# eval_warn instant at 1m sum(single_histogram)
 
 clear
 
@@ -100,6 +101,7 @@ load 1m
 	single_histogram{label="value2"}   3
 
 # "If either operator has to aggregate a mix of histogram samples and float samples, the corresponding vector element is removed from the output vector entirely."
-eval instant at 1m sum(single_histogram)
+# TODO(jhesketh): Re-enable once we support annotations
+# eval_warn instant at 1m sum(single_histogram)
 
 clear