add parameter absent to every call to SummarizeValues

bookingcom · Nov 30, 2024 · 00788b3 · 00788b3
1 parent 62ec9ab
commit 00788b3
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/pkg/expr/functions/legendValue/function.go b/pkg/expr/functions/legendValue/function.go
@@ -57,7 +57,7 @@ func (f *legendValue) Do(ctx context.Context, e parser.Expr, from, until int32,
 	for _, a := range arg {
 		var values []string
 		for _, method := range methods {
-			summaryVal, _, err := helper.SummarizeValues(method, a.Values)
+			summaryVal, _, err := helper.SummarizeValues(method, a.Values, a.IsAbsent)
 			if err != nil {
 				return []*types.MetricData{}, err
 			}

diff --git a/pkg/expr/functions/sortBy/function.go b/pkg/expr/functions/sortBy/function.go
@@ -42,11 +42,11 @@ func (f *sortBy) Do(ctx context.Context, e parser.Expr, from, until int32, value
 	for i, a := range arg {
 		switch e.Target() {
 		case "sortByTotal":
-			vals[i], _, _ = helper.SummarizeValues("sum", a.Values)
+			vals[i], _, _ = helper.SummarizeValues("sum", a.Values, a.IsAbsent)
 		case "sortByMaxima":
-			vals[i], _, _ = helper.SummarizeValues("max", a.Values)
+			vals[i], _, _ = helper.SummarizeValues("max", a.Values, a.IsAbsent)
 		case "sortByMinima":
-			min, _, _ := helper.SummarizeValues("min", a.Values)
+			min, _, _ := helper.SummarizeValues("min", a.Values, a.IsAbsent)
 			vals[i] = 1 / min
 		}
 	}

diff --git a/pkg/expr/functions/summarize/function.go b/pkg/expr/functions/summarize/function.go
@@ -117,12 +117,14 @@ func (f *summarize) Do(ctx context.Context, e parser.Expr, from, until int32, va
 		t := arg.StartTime // unadjusted
 		bucketEnd := start + bucketSize
 		values := make([]float64, 0, bucketSize/arg.StepTime)
+		absent := make([]bool, 0, bucketSize/arg.StepTime)
 		ridx := 0
 		bucketItems := 0
 		for i, v := range arg.Values {
 			bucketItems++
 			if !arg.IsAbsent[i] {
 				values = append(values, v)
+				absent = append(absent, false)
 			}
 
 			t += arg.StepTime
@@ -132,20 +134,21 @@ func (f *summarize) Do(ctx context.Context, e parser.Expr, from, until int32, va
 			}
 
 			if t >= bucketEnd {
-				r.Values[ridx], r.IsAbsent[ridx], err = helper.SummarizeValues(summarizeFunction, values)
+				r.Values[ridx], r.IsAbsent[ridx], err = helper.SummarizeValues(summarizeFunction, values, absent)
 				if err != nil {
 					return []*types.MetricData{}, err
 				}
 				ridx++
 				bucketEnd += bucketSize
 				bucketItems = 0
 				values = values[:0]
+				absent = absent[:0]
 			}
 		}
 
 		// last partial bucket
 		if bucketItems > 0 {
-			r.Values[ridx], r.IsAbsent[ridx], err = helper.SummarizeValues(summarizeFunction, values)
+			r.Values[ridx], r.IsAbsent[ridx], err = helper.SummarizeValues(summarizeFunction, values, absent)
 			if err != nil {
 				return []*types.MetricData{}, err
 			}