Fix timestamps in steps

Signed-off-by: 🌲 Harry 🌊 John 🏔 <[email protected]>

engine/engine.go

@@ -307,6 +307,9 @@ func (e *Engine) MakeInstantQuery(ctx context.Context, q storage.Queryable, opts
 		t:          InstantQuery,
 		resultSort: resultSort,
 		scanners:   scanners,
+		start:      ts,
+		end:        ts,
+		step:       0,
 	}, nil
 }
 
@@ -354,6 +357,9 @@ func (e *Engine) MakeInstantQueryFromPlan(ctx context.Context, q storage.Queryab
 		// TODO(fpetkovski): Infer the sort order from the plan, ideally without copying the newResultSort function.
 		resultSort: noSortResultSort{},
 		scanners:   scnrs,
+		start:      ts,
+		end:        ts,
+		step:       0,
 	}, nil
 }
 
@@ -406,6 +412,9 @@ func (e *Engine) MakeRangeQuery(ctx context.Context, q storage.Queryable, opts *
 		warns:    warns,
 		t:        RangeQuery,
 		scanners: scnrs,
+		start:    start,
+		end:      end,
+		step:     step,
 	}, nil
 }
 
@@ -448,6 +457,9 @@ func (e *Engine) MakeRangeQueryFromPlan(ctx context.Context, q storage.Queryable
 		warns:    warns,
 		t:        RangeQuery,
 		scanners: scnrs,
+		start:    start,
+		end:      end,
+		step:     step,
 	}, nil
 }
 
@@ -536,6 +548,9 @@ type compatibilityQuery struct {
 	plan   logicalplan.Plan
 	ts     time.Time // Empty for range queries.
 	warns  annotations.Annotations
+	start  time.Time
+	end    time.Time
+	step   time.Duration
 
 	t          QueryType
 	resultSort resultSorter
@@ -709,6 +724,10 @@ func (q *compatibilityQuery) Stats() *stats.Statistics {
 
 	analysis := q.Analyze()
 	samples := stats.NewQuerySamples(enablePerStepStats)
+	if enablePerStepStats {
+		samples.InitStepTracking(q.start.UnixMilli(), q.end.UnixMilli(), telemetry.StepTrackingInterval(q.step))
+	}
+
 	if analysis != nil {
 		samples.PeakSamples = int(analysis.PeakSamples())
 		samples.TotalSamples = analysis.TotalSamples()

engine/engine_test.go

@@ -5780,13 +5780,13 @@ var (
 		if x.TotalSamples != y.TotalSamples {
 			return false
 		}
-		if len(x.TotalSamplesPerStep) != len(y.TotalSamplesPerStep) {
+
+		if !cmp.Equal(x.TotalSamplesPerStep, y.TotalSamplesPerStep) {
 			return false
 		}
-		for i, xSample := range x.TotalSamplesPerStep {
-			if y.TotalSamplesPerStep[i] != xSample {
-				return false
-			}
+
+		if !cmp.Equal(x.TotalSamplesPerStepMap(), y.TotalSamplesPerStepMap()) {
+			return false
 		}
 		return true
 	})

execution/telemetry/telemetry.go

@@ -77,15 +77,15 @@ type TrackedTelemetry struct {
 
 func NewTrackedTelemetry(operator fmt.Stringer, opts *query.Options, logicalPlanNode logicalplan.Node) *TrackedTelemetry {
 	ss := stats.NewQuerySamples(opts.EnablePerStepStats)
-	ss.InitStepTracking(opts.Start.UnixMilli(), opts.End.UnixMilli(), stepTrackingInterval(opts.Step))
+	ss.InitStepTracking(opts.Start.UnixMilli(), opts.End.UnixMilli(), StepTrackingInterval(opts.Step))
 	return &TrackedTelemetry{
 		Stringer:      operator,
 		LoadedSamples: ss,
 		logicalNode:   logicalPlanNode,
 	}
 }
 
-func stepTrackingInterval(step time.Duration) int64 {
+func StepTrackingInterval(step time.Duration) int64 {
 	if step == 0 {
 		return 1
 	}