mudhorn/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2025-02-02 08:31:11 -08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Merge pull request #10025 from prometheus/beorn7/histogram-sum

Browse source 
promql: Add a guard against a nil histogram in sum aggregation
This commit is contained in:
Björn Rabenstein 2021-12-15 15:12:40 +01:00 committed by GitHub
parent 6f33ab2b35 53ca375345
commit 7e2fa88a1d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
promql/engine.go
View file

@ -2321,7 +2321,12 @@ func (ev *evaluator) aggregation(op parser.ItemType, grouping []string, without
case parser.SUM: case parser.SUM:
if s.H != nil { if s.H != nil {
group.hasHistogram = true group.hasHistogram = true
group.histogramValue.Add(s.H) if group.histogramValue != nil {
group.histogramValue.Add(s.H)
}
// Otherwise the aggregation contained floats
// previously and will be invalid anyway. No
// point in copying the histogram in that case.
} else { } else {
group.hasFloat = true group.hasFloat = true
group.value += s.V group.value += s.V