mudhorn/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2024-11-16 10:34:06 -08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Merge pull request #10562 from prometheus/beorn7/sparsehistogram

Browse source 
Histogram: Fix crash when compacting only empty buckets
This commit is contained in:
Björn Rabenstein 2022-04-07 16:52:36 +02:00 committed by GitHub
parent 08efde4de5 15583af9bb
commit f009e1c8f8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
model/histogram/float_histogram.go
View file

@ -471,7 +471,7 @@ func compactBuckets(buckets []float64, spans []Span, maxEmptyBuckets int) ([]flo
iSpan++
}
}
if maxEmptyBuckets == 0 {
if maxEmptyBuckets == 0 || len(buckets) == 0 {
return buckets, spans
}

16
model/histogram/float_histogram_test.go
View file

@ -889,6 +889,22 @@ func TestFloatHistogramCompact(t *testing.T) {
NegativeBuckets: []float64{3.1, 3, 0, 0, 0, 1.234e5, 1000, 0, 3, 4},
},
},
{
"only empty buckets and maxEmptyBuckets greater zero",
&FloatHistogram{
PositiveSpans: []Span{{-4, 6}, {3, 3}},
PositiveBuckets: []float64{0, 0, 0, 0, 0, 0, 0, 0, 0},
NegativeSpans: []Span{{0, 7}},
NegativeBuckets: []float64{0, 0, 0, 0, 0, 0, 0},
},
3,
&FloatHistogram{
PositiveSpans: []Span{},
PositiveBuckets: []float64{},
NegativeSpans: []Span{},
NegativeBuckets: []float64{},
},
},
}
for _, c := range cases {