profilecli: exclude pre-window boundary point from query top totals (grafana#5359)

SelectSeries fetches one extra step before the window so the boundary
point at start renders as a complete bucket in charts; that point
aggregates (start-step, start]. query top uses step = window size and
summed it, roughly doubling reported totals. Skip points at or before
the window start; totals now match SelectMergeProfile exactly.

Author: aleks-p

cmd/profilecli/query-top.go

@@ -13,6 +13,7 @@ import (
 	"github.com/olekukonko/tablewriter"
 
 	querierv1 "github.com/grafana/pyroscope/api/gen/proto/go/querier/v1"
+	typesv1 "github.com/grafana/pyroscope/api/gen/proto/go/types/v1"
 	"github.com/grafana/pyroscope/v2/pkg/model"
 )
 
@@ -74,11 +75,9 @@ func queryTop(ctx context.Context, params *queryTopParams) error {
 	}
 
 	totals := make([]seriesTotal, 0, len(series))
+	startMs := from.UnixMilli()
 	for _, s := range series {
-		var total float64
-		for _, p := range s.Points {
-			total += p.Value
-		}
+		total := sumPointsAfter(s.Points, startMs)
 		lbls := model.Labels(s.Labels)
 		vals := make([]string, len(params.LabelNames))
 		for i, name := range params.LabelNames {
@@ -159,6 +158,22 @@ func queryTop(ctx context.Context, params *queryTopParams) error {
 	return nil
 }
 
+// sumPointsAfter sums point values with timestamps strictly after startMs.
+// SelectSeries fetches one extra step before the window so that the boundary
+// point at `start` renders as a complete bucket in charts; that point
+// aggregates (start-step, start], which lies entirely before the requested
+// window. With step = window size, counting it roughly doubles the total.
+func sumPointsAfter(points []*typesv1.Point, startMs int64) float64 {
+	var total float64
+	for _, p := range points {
+		if p.Timestamp <= startMs {
+			continue
+		}
+		total += p.Value
+	}
+	return total
+}
+
 func formatUnit(v float64, unit string) string {
 	switch unit {
 	case "nanoseconds":

cmd/profilecli/query-top_test.go

@@ -0,0 +1,35 @@
+package main
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/require"
+
+	typesv1 "github.com/grafana/pyroscope/api/gen/proto/go/types/v1"
+)
+
+func TestSumPointsAfter(t *testing.T) {
+	const startMs = int64(1_784_130_300_000) // window start
+	const stepMs = int64(3_600_000)
+
+	// SelectSeries with step = window size returns two points: the boundary
+	// point at `start` holding pre-window data, and the point at `end`
+	// holding the actual window total.
+	points := []*typesv1.Point{
+		{Timestamp: startMs, Value: 8_778_052_796_311},
+		{Timestamp: startMs + stepMs, Value: 4_005_116_752_500},
+	}
+	require.Equal(t, float64(4_005_116_752_500), sumPointsAfter(points, startMs))
+
+	t.Run("all points within window", func(t *testing.T) {
+		points := []*typesv1.Point{
+			{Timestamp: startMs + 1, Value: 1},
+			{Timestamp: startMs + 2, Value: 2},
+		}
+		require.Equal(t, float64(3), sumPointsAfter(points, startMs))
+	})
+
+	t.Run("no points", func(t *testing.T) {
+		require.Equal(t, float64(0), sumPointsAfter(nil, startMs))
+	})
+}