From ece82d32f046e931ab93c7f67dd64a3398074cc8 Mon Sep 17 00:00:00 2001 From: Sebastian Rabenhorst Date: Wed, 15 Feb 2023 17:32:40 +0100 Subject: [PATCH] Fixed PrometheusResponse minTime for histograms in qfe Signed-off-by: Sebastian Rabenhorst --- .../cortex/querier/queryrange/query_range.go | 20 +++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/internal/cortex/querier/queryrange/query_range.go b/internal/cortex/querier/queryrange/query_range.go index 9001c9eaf36..de946038630 100644 --- a/internal/cortex/querier/queryrange/query_range.go +++ b/internal/cortex/querier/queryrange/query_range.go @@ -154,10 +154,26 @@ func (resp *PrometheusResponse) minTime() int64 { if len(result) == 0 { return -1 } - if len(result[0].Samples) == 0 { + if len(result[0].Samples) == 0 && len(result[0].Histograms) == 0 { return -1 } - return result[0].Samples[0].TimestampMs + + if len(result[0].Samples) == 0 { + return result[0].Histograms[0].Timestamp + } + + if len(result[0].Histograms) == 0 { + return result[0].Samples[0].TimestampMs + } + + return minInt64(result[0].Samples[0].TimestampMs, result[0].Histograms[0].Timestamp) +} + +func minInt64(a, b int64) int64 { + if a < b { + return a + } + return b } func (resp *PrometheusResponse) GetStats() *PrometheusResponseStats {