diff --git a/sdk/metric/internal/aggregate/aggregate_test.go b/sdk/metric/internal/aggregate/aggregate_test.go index 1afb8a99258..37c310a60e3 100644 --- a/sdk/metric/internal/aggregate/aggregate_test.go +++ b/sdk/metric/internal/aggregate/aggregate_test.go @@ -6,6 +6,7 @@ package aggregate // import "go.opentelemetry.io/otel/sdk/metric/internal/aggreg import ( "context" "strconv" + "sync/atomic" "testing" "time" @@ -39,16 +40,39 @@ var ( fltrBob = attribute.NewSet(userBob) // Sat Jan 01 2000 00:00:00 GMT+0000. - staticTime = time.Unix(946684800, 0) - staticNowFunc = func() time.Time { return staticTime } - // Pass to t.Cleanup to override the now function with staticNowFunc and - // revert once the test completes. E.g. t.Cleanup(mockTime(now)). - mockTime = func(orig func() time.Time) (cleanup func()) { - now = staticNowFunc - return func() { now = orig } - } + y2k = time.Unix(946684800, 0) ) +// y2kPlus returns the timestamp at n seconds past Sat Jan 01 2000 00:00:00 GMT+0000. +func y2kPlus(n int64) time.Time { + d := time.Duration(n) * time.Second + return y2k.Add(d) +} + +// clock is a test clock. It provides a predictable value for now() that can be +// reset. +type clock struct { + ticks atomic.Int64 +} + +// Now returns the mocked time starting at y2kPlus(0). Each call to Now will +// increment the returned value by one second. +func (c *clock) Now() time.Time { + old := c.ticks.Add(1) - 1 + return y2kPlus(old) +} + +// Reset resets the clock c to tick from y2kPlus(0). +func (c *clock) Reset() { c.ticks.Store(0) } + +// Register registers clock c's Now method as the now var. It returns an +// unregister func that should be called to restore the original now value. +func (c *clock) Register() (unregister func()) { + orig := now + now = c.Now + return func() { now = orig } +} + func dropExemplars[N int64 | float64]() exemplar.Reservoir { return exemplar.Drop() } diff --git a/sdk/metric/internal/aggregate/exponential_histogram_test.go b/sdk/metric/internal/aggregate/exponential_histogram_test.go index bea3f771615..2ffd3ebf0bf 100644 --- a/sdk/metric/internal/aggregate/exponential_histogram_test.go +++ b/sdk/metric/internal/aggregate/exponential_histogram_test.go @@ -727,11 +727,18 @@ func TestSubNormal(t *testing.T) { } func TestExponentialHistogramAggregation(t *testing.T) { - t.Cleanup(mockTime(now)) + c := new(clock) + t.Cleanup(c.Register()) t.Run("Int64/Delta", testDeltaExpoHist[int64]()) + c.Reset() + t.Run("Float64/Delta", testDeltaExpoHist[float64]()) + c.Reset() + t.Run("Int64/Cumulative", testCumulativeExpoHist[int64]()) + c.Reset() + t.Run("Float64/Cumulative", testCumulativeExpoHist[float64]()) } @@ -770,8 +777,8 @@ func testDeltaExpoHist[N int64 | float64]() func(t *testing.T) { DataPoints: []metricdata.ExponentialHistogramDataPoint[N]{ { Attributes: fltrAlice, - StartTime: staticTime, - Time: staticTime, + StartTime: y2kPlus(1), + Time: y2kPlus(9), Count: 7, Min: metricdata.NewExtrema[N](-1), Max: metricdata.NewExtrema[N](16), @@ -825,8 +832,8 @@ func testDeltaExpoHist[N int64 | float64]() func(t *testing.T) { DataPoints: []metricdata.ExponentialHistogramDataPoint[N]{ { Attributes: fltrAlice, - StartTime: staticTime, - Time: staticTime, + StartTime: y2kPlus(10), + Time: y2kPlus(24), Count: 7, Min: metricdata.NewExtrema[N](-1), Max: metricdata.NewExtrema[N](16), @@ -843,8 +850,8 @@ func testDeltaExpoHist[N int64 | float64]() func(t *testing.T) { }, { Attributes: overflowSet, - StartTime: staticTime, - Time: staticTime, + StartTime: y2kPlus(10), + Time: y2kPlus(24), Count: 6, Min: metricdata.NewExtrema[N](1), Max: metricdata.NewExtrema[N](16), @@ -897,8 +904,8 @@ func testCumulativeExpoHist[N int64 | float64]() func(t *testing.T) { DataPoints: []metricdata.ExponentialHistogramDataPoint[N]{ { Attributes: fltrAlice, - StartTime: staticTime, - Time: staticTime, + StartTime: y2kPlus(0), + Time: y2kPlus(9), Count: 7, Min: metricdata.NewExtrema[N](-1), Max: metricdata.NewExtrema[N](16), @@ -930,8 +937,8 @@ func testCumulativeExpoHist[N int64 | float64]() func(t *testing.T) { DataPoints: []metricdata.ExponentialHistogramDataPoint[N]{ { Attributes: fltrAlice, - StartTime: staticTime, - Time: staticTime, + StartTime: y2kPlus(0), + Time: y2kPlus(13), Count: 10, Min: metricdata.NewExtrema[N](-1), Max: metricdata.NewExtrema[N](16), @@ -959,8 +966,8 @@ func testCumulativeExpoHist[N int64 | float64]() func(t *testing.T) { DataPoints: []metricdata.ExponentialHistogramDataPoint[N]{ { Attributes: fltrAlice, - StartTime: staticTime, - Time: staticTime, + StartTime: y2kPlus(0), + Time: y2kPlus(14), Count: 10, Min: metricdata.NewExtrema[N](-1), Max: metricdata.NewExtrema[N](16), @@ -996,8 +1003,8 @@ func testCumulativeExpoHist[N int64 | float64]() func(t *testing.T) { DataPoints: []metricdata.ExponentialHistogramDataPoint[N]{ { Attributes: fltrAlice, - StartTime: staticTime, - Time: staticTime, + StartTime: y2kPlus(0), + Time: y2kPlus(21), Count: 10, Min: metricdata.NewExtrema[N](-1), Max: metricdata.NewExtrema[N](16), @@ -1014,8 +1021,8 @@ func testCumulativeExpoHist[N int64 | float64]() func(t *testing.T) { }, { Attributes: overflowSet, - StartTime: staticTime, - Time: staticTime, + StartTime: y2kPlus(0), + Time: y2kPlus(21), Count: 6, Min: metricdata.NewExtrema[N](1), Max: metricdata.NewExtrema[N](16), diff --git a/sdk/metric/internal/aggregate/histogram_test.go b/sdk/metric/internal/aggregate/histogram_test.go index aeedc55d91b..38ba1229eb2 100644 --- a/sdk/metric/internal/aggregate/histogram_test.go +++ b/sdk/metric/internal/aggregate/histogram_test.go @@ -7,6 +7,7 @@ import ( "context" "sort" "testing" + "time" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" @@ -22,22 +23,30 @@ var ( ) func TestHistogram(t *testing.T) { - t.Cleanup(mockTime(now)) + c := new(clock) + t.Cleanup(c.Register()) t.Run("Int64/Delta/Sum", testDeltaHist[int64](conf[int64]{hPt: hPointSummed[int64]})) + c.Reset() t.Run("Int64/Delta/NoSum", testDeltaHist[int64](conf[int64]{noSum: true, hPt: hPoint[int64]})) + c.Reset() t.Run("Float64/Delta/Sum", testDeltaHist[float64](conf[float64]{hPt: hPointSummed[float64]})) + c.Reset() t.Run("Float64/Delta/NoSum", testDeltaHist[float64](conf[float64]{noSum: true, hPt: hPoint[float64]})) + c.Reset() t.Run("Int64/Cumulative/Sum", testCumulativeHist[int64](conf[int64]{hPt: hPointSummed[int64]})) + c.Reset() t.Run("Int64/Cumulative/NoSum", testCumulativeHist[int64](conf[int64]{noSum: true, hPt: hPoint[int64]})) + c.Reset() t.Run("Float64/Cumulative/Sum", testCumulativeHist[float64](conf[float64]{hPt: hPointSummed[float64]})) + c.Reset() t.Run("Float64/Cumulative/NoSum", testCumulativeHist[float64](conf[float64]{noSum: true, hPt: hPoint[float64]})) } type conf[N int64 | float64] struct { noSum bool - hPt func(attribute.Set, N, uint64) metricdata.HistogramDataPoint[N] + hPt func(attribute.Set, N, uint64, time.Time, time.Time) metricdata.HistogramDataPoint[N] } func testDeltaHist[N int64 | float64](c conf[N]) func(t *testing.T) { @@ -71,8 +80,8 @@ func testDeltaHist[N int64 | float64](c conf[N]) func(t *testing.T) { agg: metricdata.Histogram[N]{ Temporality: metricdata.DeltaTemporality, DataPoints: []metricdata.HistogramDataPoint[N]{ - c.hPt(fltrAlice, 2, 3), - c.hPt(fltrBob, 10, 2), + c.hPt(fltrAlice, 2, 3, y2kPlus(1), y2kPlus(7)), + c.hPt(fltrBob, 10, 2, y2kPlus(1), y2kPlus(7)), }, }, }, @@ -87,8 +96,8 @@ func testDeltaHist[N int64 | float64](c conf[N]) func(t *testing.T) { agg: metricdata.Histogram[N]{ Temporality: metricdata.DeltaTemporality, DataPoints: []metricdata.HistogramDataPoint[N]{ - c.hPt(fltrAlice, 10, 1), - c.hPt(fltrBob, 3, 1), + c.hPt(fltrAlice, 10, 1, y2kPlus(7), y2kPlus(10)), + c.hPt(fltrBob, 3, 1, y2kPlus(7), y2kPlus(10)), }, }, }, @@ -117,9 +126,9 @@ func testDeltaHist[N int64 | float64](c conf[N]) func(t *testing.T) { agg: metricdata.Histogram[N]{ Temporality: metricdata.DeltaTemporality, DataPoints: []metricdata.HistogramDataPoint[N]{ - c.hPt(fltrAlice, 1, 1), - c.hPt(fltrBob, 1, 1), - c.hPt(overflowSet, 1, 2), + c.hPt(fltrAlice, 1, 1, y2kPlus(11), y2kPlus(16)), + c.hPt(fltrBob, 1, 1, y2kPlus(11), y2kPlus(16)), + c.hPt(overflowSet, 1, 2, y2kPlus(11), y2kPlus(16)), }, }, }, @@ -158,8 +167,8 @@ func testCumulativeHist[N int64 | float64](c conf[N]) func(t *testing.T) { agg: metricdata.Histogram[N]{ Temporality: metricdata.CumulativeTemporality, DataPoints: []metricdata.HistogramDataPoint[N]{ - c.hPt(fltrAlice, 2, 3), - c.hPt(fltrBob, 10, 2), + c.hPt(fltrAlice, 2, 3, y2kPlus(0), y2kPlus(7)), + c.hPt(fltrBob, 10, 2, y2kPlus(0), y2kPlus(7)), }, }, }, @@ -174,8 +183,8 @@ func testCumulativeHist[N int64 | float64](c conf[N]) func(t *testing.T) { agg: metricdata.Histogram[N]{ Temporality: metricdata.CumulativeTemporality, DataPoints: []metricdata.HistogramDataPoint[N]{ - c.hPt(fltrAlice, 2, 4), - c.hPt(fltrBob, 10, 3), + c.hPt(fltrAlice, 2, 4, y2kPlus(0), y2kPlus(10)), + c.hPt(fltrBob, 10, 3, y2kPlus(0), y2kPlus(10)), }, }, }, @@ -187,8 +196,8 @@ func testCumulativeHist[N int64 | float64](c conf[N]) func(t *testing.T) { agg: metricdata.Histogram[N]{ Temporality: metricdata.CumulativeTemporality, DataPoints: []metricdata.HistogramDataPoint[N]{ - c.hPt(fltrAlice, 2, 4), - c.hPt(fltrBob, 10, 3), + c.hPt(fltrAlice, 2, 4, y2kPlus(0), y2kPlus(11)), + c.hPt(fltrBob, 10, 3, y2kPlus(0), y2kPlus(11)), }, }, }, @@ -204,9 +213,9 @@ func testCumulativeHist[N int64 | float64](c conf[N]) func(t *testing.T) { agg: metricdata.Histogram[N]{ Temporality: metricdata.CumulativeTemporality, DataPoints: []metricdata.HistogramDataPoint[N]{ - c.hPt(fltrAlice, 2, 4), - c.hPt(fltrBob, 10, 3), - c.hPt(overflowSet, 1, 2), + c.hPt(fltrAlice, 2, 4, y2kPlus(0), y2kPlus(14)), + c.hPt(fltrBob, 10, 3, y2kPlus(0), y2kPlus(14)), + c.hPt(overflowSet, 1, 2, y2kPlus(0), y2kPlus(14)), }, }, }, @@ -216,14 +225,14 @@ func testCumulativeHist[N int64 | float64](c conf[N]) func(t *testing.T) { // hPointSummed returns an HistogramDataPoint that started and ended now with // multi number of measurements values v. It includes a min and max (set to v). -func hPointSummed[N int64 | float64](a attribute.Set, v N, multi uint64) metricdata.HistogramDataPoint[N] { +func hPointSummed[N int64 | float64](a attribute.Set, v N, multi uint64, start, t time.Time) metricdata.HistogramDataPoint[N] { idx := sort.SearchFloat64s(bounds, float64(v)) counts := make([]uint64, len(bounds)+1) counts[idx] += multi return metricdata.HistogramDataPoint[N]{ Attributes: a, - StartTime: now(), - Time: now(), + StartTime: start, + Time: t, Count: multi, Bounds: bounds, BucketCounts: counts, @@ -235,14 +244,14 @@ func hPointSummed[N int64 | float64](a attribute.Set, v N, multi uint64) metricd // hPoint returns an HistogramDataPoint that started and ended now with multi // number of measurements values v. It includes a min and max (set to v). -func hPoint[N int64 | float64](a attribute.Set, v N, multi uint64) metricdata.HistogramDataPoint[N] { +func hPoint[N int64 | float64](a attribute.Set, v N, multi uint64, start, t time.Time) metricdata.HistogramDataPoint[N] { idx := sort.SearchFloat64s(bounds, float64(v)) counts := make([]uint64, len(bounds)+1) counts[idx] += multi return metricdata.HistogramDataPoint[N]{ Attributes: a, - StartTime: now(), - Time: now(), + StartTime: start, + Time: t, Count: multi, Bounds: bounds, BucketCounts: counts, @@ -334,7 +343,9 @@ func TestCumulativeHistogramImutableCounts(t *testing.T) { } func TestDeltaHistogramReset(t *testing.T) { - t.Cleanup(mockTime(now)) + orig := now + now = func() time.Time { return y2k } + t.Cleanup(func() { now = orig }) h := newHistogram[int64](bounds, noMinMax, false, 0, dropExemplars[int64]) @@ -345,7 +356,7 @@ func TestDeltaHistogramReset(t *testing.T) { h.measure(context.Background(), 1, alice, nil) expect := metricdata.Histogram[int64]{Temporality: metricdata.DeltaTemporality} - expect.DataPoints = []metricdata.HistogramDataPoint[int64]{hPointSummed[int64](alice, 1, 1)} + expect.DataPoints = []metricdata.HistogramDataPoint[int64]{hPointSummed[int64](alice, 1, 1, now(), now())} h.delta(&data) metricdatatest.AssertAggregationsEqual(t, expect, data) @@ -356,7 +367,7 @@ func TestDeltaHistogramReset(t *testing.T) { // Aggregating another set should not affect the original (alice). h.measure(context.Background(), 1, bob, nil) - expect.DataPoints = []metricdata.HistogramDataPoint[int64]{hPointSummed[int64](bob, 1, 1)} + expect.DataPoints = []metricdata.HistogramDataPoint[int64]{hPointSummed[int64](bob, 1, 1, now(), now())} h.delta(&data) metricdatatest.AssertAggregationsEqual(t, expect, data) } diff --git a/sdk/metric/internal/aggregate/lastvalue_test.go b/sdk/metric/internal/aggregate/lastvalue_test.go index 66ef3e785ab..4aae11e7d21 100644 --- a/sdk/metric/internal/aggregate/lastvalue_test.go +++ b/sdk/metric/internal/aggregate/lastvalue_test.go @@ -11,9 +11,12 @@ import ( ) func TestLastValue(t *testing.T) { - t.Cleanup(mockTime(now)) + c := new(clock) + t.Cleanup(c.Register()) t.Run("Int64", testLastValue[int64]()) + c.Reset() + t.Run("Float64", testLastValue[float64]()) } @@ -42,12 +45,12 @@ func testLastValue[N int64 | float64]() func(*testing.T) { DataPoints: []metricdata.DataPoint[N]{ { Attributes: fltrAlice, - Time: staticTime, + Time: y2kPlus(3), Value: 2, }, { Attributes: fltrBob, - Time: staticTime, + Time: y2kPlus(4), Value: -10, }, }, @@ -68,12 +71,12 @@ func testLastValue[N int64 | float64]() func(*testing.T) { DataPoints: []metricdata.DataPoint[N]{ { Attributes: fltrAlice, - Time: staticTime, + Time: y2kPlus(5), Value: 10, }, { Attributes: fltrBob, - Time: staticTime, + Time: y2kPlus(6), Value: 3, }, }, @@ -93,17 +96,17 @@ func testLastValue[N int64 | float64]() func(*testing.T) { DataPoints: []metricdata.DataPoint[N]{ { Attributes: fltrAlice, - Time: staticTime, + Time: y2kPlus(7), Value: 1, }, { Attributes: fltrBob, - Time: staticTime, + Time: y2kPlus(8), Value: 1, }, { Attributes: overflowSet, - Time: staticTime, + Time: y2kPlus(10), Value: 1, }, }, diff --git a/sdk/metric/internal/aggregate/sum_test.go b/sdk/metric/internal/aggregate/sum_test.go index c7bb47e650d..c20adaed500 100644 --- a/sdk/metric/internal/aggregate/sum_test.go +++ b/sdk/metric/internal/aggregate/sum_test.go @@ -11,18 +11,30 @@ import ( ) func TestSum(t *testing.T) { - t.Cleanup(mockTime(now)) + c := new(clock) + t.Cleanup(c.Register()) t.Run("Int64/DeltaSum", testDeltaSum[int64]()) + c.Reset() + t.Run("Float64/DeltaSum", testDeltaSum[float64]()) + c.Reset() t.Run("Int64/CumulativeSum", testCumulativeSum[int64]()) + c.Reset() + t.Run("Float64/CumulativeSum", testCumulativeSum[float64]()) + c.Reset() t.Run("Int64/DeltaPrecomputedSum", testDeltaPrecomputedSum[int64]()) + c.Reset() + t.Run("Float64/DeltaPrecomputedSum", testDeltaPrecomputedSum[float64]()) + c.Reset() t.Run("Int64/CumulativePrecomputedSum", testCumulativePrecomputedSum[int64]()) + c.Reset() + t.Run("Float64/CumulativePrecomputedSum", testCumulativePrecomputedSum[float64]()) } @@ -62,14 +74,14 @@ func testDeltaSum[N int64 | float64]() func(t *testing.T) { DataPoints: []metricdata.DataPoint[N]{ { Attributes: fltrAlice, - StartTime: staticTime, - Time: staticTime, + StartTime: y2kPlus(1), + Time: y2kPlus(7), Value: 4, }, { Attributes: fltrBob, - StartTime: staticTime, - Time: staticTime, + StartTime: y2kPlus(1), + Time: y2kPlus(7), Value: -11, }, }, @@ -89,14 +101,14 @@ func testDeltaSum[N int64 | float64]() func(t *testing.T) { DataPoints: []metricdata.DataPoint[N]{ { Attributes: fltrAlice, - StartTime: staticTime, - Time: staticTime, + StartTime: y2kPlus(7), + Time: y2kPlus(10), Value: 10, }, { Attributes: fltrBob, - StartTime: staticTime, - Time: staticTime, + StartTime: y2kPlus(7), + Time: y2kPlus(10), Value: 3, }, }, @@ -131,20 +143,20 @@ func testDeltaSum[N int64 | float64]() func(t *testing.T) { DataPoints: []metricdata.DataPoint[N]{ { Attributes: fltrAlice, - StartTime: staticTime, - Time: staticTime, + StartTime: y2kPlus(11), + Time: y2kPlus(16), Value: 1, }, { Attributes: fltrBob, - StartTime: staticTime, - Time: staticTime, + StartTime: y2kPlus(11), + Time: y2kPlus(16), Value: 1, }, { Attributes: overflowSet, - StartTime: staticTime, - Time: staticTime, + StartTime: y2kPlus(11), + Time: y2kPlus(16), Value: 2, }, }, @@ -190,14 +202,14 @@ func testCumulativeSum[N int64 | float64]() func(t *testing.T) { DataPoints: []metricdata.DataPoint[N]{ { Attributes: fltrAlice, - StartTime: staticTime, - Time: staticTime, + StartTime: y2kPlus(0), + Time: y2kPlus(7), Value: 4, }, { Attributes: fltrBob, - StartTime: staticTime, - Time: staticTime, + StartTime: y2kPlus(0), + Time: y2kPlus(7), Value: -11, }, }, @@ -217,14 +229,14 @@ func testCumulativeSum[N int64 | float64]() func(t *testing.T) { DataPoints: []metricdata.DataPoint[N]{ { Attributes: fltrAlice, - StartTime: staticTime, - Time: staticTime, + StartTime: y2kPlus(0), + Time: y2kPlus(10), Value: 14, }, { Attributes: fltrBob, - StartTime: staticTime, - Time: staticTime, + StartTime: y2kPlus(0), + Time: y2kPlus(10), Value: -8, }, }, @@ -245,20 +257,20 @@ func testCumulativeSum[N int64 | float64]() func(t *testing.T) { DataPoints: []metricdata.DataPoint[N]{ { Attributes: fltrAlice, - StartTime: staticTime, - Time: staticTime, + StartTime: y2kPlus(0), + Time: y2kPlus(13), Value: 14, }, { Attributes: fltrBob, - StartTime: staticTime, - Time: staticTime, + StartTime: y2kPlus(0), + Time: y2kPlus(13), Value: -8, }, { Attributes: overflowSet, - StartTime: staticTime, - Time: staticTime, + StartTime: y2kPlus(0), + Time: y2kPlus(13), Value: 2, }, }, @@ -304,14 +316,14 @@ func testDeltaPrecomputedSum[N int64 | float64]() func(t *testing.T) { DataPoints: []metricdata.DataPoint[N]{ { Attributes: fltrAlice, - StartTime: staticTime, - Time: staticTime, + StartTime: y2kPlus(1), + Time: y2kPlus(7), Value: 4, }, { Attributes: fltrBob, - StartTime: staticTime, - Time: staticTime, + StartTime: y2kPlus(1), + Time: y2kPlus(7), Value: -11, }, }, @@ -332,14 +344,14 @@ func testDeltaPrecomputedSum[N int64 | float64]() func(t *testing.T) { DataPoints: []metricdata.DataPoint[N]{ { Attributes: fltrAlice, - StartTime: staticTime, - Time: staticTime, + StartTime: y2kPlus(7), + Time: y2kPlus(11), Value: 7, }, { Attributes: fltrBob, - StartTime: staticTime, - Time: staticTime, + StartTime: y2kPlus(7), + Time: y2kPlus(11), Value: 14, }, }, @@ -374,20 +386,20 @@ func testDeltaPrecomputedSum[N int64 | float64]() func(t *testing.T) { DataPoints: []metricdata.DataPoint[N]{ { Attributes: fltrAlice, - StartTime: staticTime, - Time: staticTime, + StartTime: y2kPlus(12), + Time: y2kPlus(17), Value: 1, }, { Attributes: fltrBob, - StartTime: staticTime, - Time: staticTime, + StartTime: y2kPlus(12), + Time: y2kPlus(17), Value: 1, }, { Attributes: overflowSet, - StartTime: staticTime, - Time: staticTime, + StartTime: y2kPlus(12), + Time: y2kPlus(17), Value: 2, }, }, @@ -433,14 +445,14 @@ func testCumulativePrecomputedSum[N int64 | float64]() func(t *testing.T) { DataPoints: []metricdata.DataPoint[N]{ { Attributes: fltrAlice, - StartTime: staticTime, - Time: staticTime, + StartTime: y2kPlus(0), + Time: y2kPlus(7), Value: 4, }, { Attributes: fltrBob, - StartTime: staticTime, - Time: staticTime, + StartTime: y2kPlus(0), + Time: y2kPlus(7), Value: -11, }, }, @@ -461,14 +473,14 @@ func testCumulativePrecomputedSum[N int64 | float64]() func(t *testing.T) { DataPoints: []metricdata.DataPoint[N]{ { Attributes: fltrAlice, - StartTime: staticTime, - Time: staticTime, + StartTime: y2kPlus(0), + Time: y2kPlus(11), Value: 11, }, { Attributes: fltrBob, - StartTime: staticTime, - Time: staticTime, + StartTime: y2kPlus(0), + Time: y2kPlus(11), Value: 3, }, }, @@ -503,20 +515,20 @@ func testCumulativePrecomputedSum[N int64 | float64]() func(t *testing.T) { DataPoints: []metricdata.DataPoint[N]{ { Attributes: fltrAlice, - StartTime: staticTime, - Time: staticTime, + StartTime: y2kPlus(0), + Time: y2kPlus(17), Value: 1, }, { Attributes: fltrBob, - StartTime: staticTime, - Time: staticTime, + StartTime: y2kPlus(0), + Time: y2kPlus(17), Value: 1, }, { Attributes: overflowSet, - StartTime: staticTime, - Time: staticTime, + StartTime: y2kPlus(0), + Time: y2kPlus(17), Value: 2, }, },