Fix "cannot reduce resolution to custom buckets schema" panic in `rate` over native histograms with mix of custom and exponential buckets
Signed-off-by: Charles Korn <charles.korn@grafana.com>
This commit is contained in:
parent
f6e4b775e2
commit
424cefcf5e
|
@ -179,15 +179,21 @@ func extrapolatedRate(vals []parser.Value, args parser.Expressions, enh *EvalNod
|
||||||
// Otherwise, it returns the calculated histogram and an empty annotation.
|
// Otherwise, it returns the calculated histogram and an empty annotation.
|
||||||
func histogramRate(points []HPoint, isCounter bool, metricName string, pos posrange.PositionRange) (*histogram.FloatHistogram, annotations.Annotations) {
|
func histogramRate(points []HPoint, isCounter bool, metricName string, pos posrange.PositionRange) (*histogram.FloatHistogram, annotations.Annotations) {
|
||||||
prev := points[0].H
|
prev := points[0].H
|
||||||
|
usingCustomBuckets := prev.UsesCustomBuckets()
|
||||||
last := points[len(points)-1].H
|
last := points[len(points)-1].H
|
||||||
if last == nil {
|
if last == nil {
|
||||||
return nil, annotations.New().Add(annotations.NewMixedFloatsHistogramsWarning(metricName, pos))
|
return nil, annotations.New().Add(annotations.NewMixedFloatsHistogramsWarning(metricName, pos))
|
||||||
}
|
}
|
||||||
|
|
||||||
minSchema := prev.Schema
|
minSchema := prev.Schema
|
||||||
if last.Schema < minSchema {
|
if last.Schema < minSchema {
|
||||||
minSchema = last.Schema
|
minSchema = last.Schema
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if last.UsesCustomBuckets() != usingCustomBuckets {
|
||||||
|
return nil, annotations.New().Add(annotations.NewMixedExponentialCustomHistogramsWarning(metricName, pos))
|
||||||
|
}
|
||||||
|
|
||||||
var annos annotations.Annotations
|
var annos annotations.Annotations
|
||||||
|
|
||||||
// We check for gauge type histograms in the loop below, but the loop below does not run on the first and last point,
|
// We check for gauge type histograms in the loop below, but the loop below does not run on the first and last point,
|
||||||
|
@ -215,6 +221,9 @@ func histogramRate(points []HPoint, isCounter bool, metricName string, pos posra
|
||||||
if curr.Schema < minSchema {
|
if curr.Schema < minSchema {
|
||||||
minSchema = curr.Schema
|
minSchema = curr.Schema
|
||||||
}
|
}
|
||||||
|
if curr.UsesCustomBuckets() != usingCustomBuckets {
|
||||||
|
return nil, annotations.New().Add(annotations.NewMixedExponentialCustomHistogramsWarning(metricName, pos))
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
h := last.CopyToSchema(minSchema)
|
h := last.CopyToSchema(minSchema)
|
||||||
|
|
|
@ -762,3 +762,25 @@ eval_warn instant at 30s rate(some_metric[30s])
|
||||||
# Test the case where we have more than two points for rate
|
# Test the case where we have more than two points for rate
|
||||||
eval_warn instant at 1m rate(some_metric[1m])
|
eval_warn instant at 1m rate(some_metric[1m])
|
||||||
{} {{count:0.03333333333333333 sum:0.03333333333333333 buckets:[0.03333333333333333]}}
|
{} {{count:0.03333333333333333 sum:0.03333333333333333 buckets:[0.03333333333333333]}}
|
||||||
|
|
||||||
|
clear
|
||||||
|
|
||||||
|
# Test rate() over mixed exponential and custom buckets.
|
||||||
|
load 30s
|
||||||
|
some_metric {{schema:0 sum:1 count:1 buckets:[1]}} {{schema:-53 sum:1 count:1 custom_values:[5 10] buckets:[1]}} {{schema:0 sum:5 count:4 buckets:[1 2 1]}} {{schema:-53 sum:1 count:1 custom_values:[5 10] buckets:[1]}}
|
||||||
|
|
||||||
|
# Start and end with exponential, with custom in the middle.
|
||||||
|
eval_warn instant at 1m rate(some_metric[1m])
|
||||||
|
# Should produce no results.
|
||||||
|
|
||||||
|
# Start and end with custom, with exponential in the middle.
|
||||||
|
eval_warn instant at 1m30s rate(some_metric[1m])
|
||||||
|
# Should produce no results.
|
||||||
|
|
||||||
|
# Start with custom, end with exponential.
|
||||||
|
eval_warn instant at 1m rate(some_metric[30s])
|
||||||
|
# Should produce no results.
|
||||||
|
|
||||||
|
# Start with exponential, end with custom.
|
||||||
|
eval_warn instant at 30s rate(some_metric[30s])
|
||||||
|
# Should produce no results.
|
||||||
|
|
Loading…
Reference in New Issue