Update interval selection for brevity

cmd/tempo-vulture/main.go

@@ -154,40 +154,17 @@ func main() {
 }
 
 func selectPastTimestamp(start, stop time.Time, interval time.Duration, retention time.Duration) (newStart, ts time.Time) {
-	intervals := intervalsBetween(start, stop, interval, retention)
-	// pick past interval and re-generate trace
-	pick := generateRandomInt(0, int64(len(intervals)), newRand(intervals[0]))
-	return intervals[0], intervals[pick]
-}
-
-func intervalsBetween(start, stop time.Time, interval time.Duration, retention time.Duration) []time.Time {
-	if stop.Before(start) {
-		return nil
-	}
+	oldest := stop.Add(-retention)
 
-	intervals := []time.Time{start}
-	next := start.Round(interval)
-
-	for next.Before(stop) {
-		if next.After(start) {
-			intervals = append(intervals, next)
-		}
-		next = next.Add(interval)
+	if oldest.After(start) {
+		newStart = oldest
+	} else {
+		newStart = start
 	}
 
-	oldest := intervals[len(intervals)-1].Add(-retention)
-
-	for i, t := range intervals {
-		if t.Before(oldest) {
-			continue
-		}
-
-		if t.After(oldest) {
-			return intervals[i:]
-		}
-	}
+	ts = time.Unix(generateRandomInt(newStart.Unix(), stop.Unix(), newRand(start)), 0)
 
-	return intervals
+	return newStart.Round(interval), ts.Round(interval)
 }
 
 func newJaegerGRPCClient(endpoint string) (*jaeger_grpc.Reporter, error) {

cmd/tempo-vulture/main_test.go

@@ -206,43 +206,6 @@ func TestGenerateRandomLogs(t *testing.T) {
 	require.Equal(t, expected, result)
 }
 
-func TestIntervalsBetween(t *testing.T) {
-	nowish := time.Unix(1630010049, 0)
-
-	cases := []struct {
-		start     time.Time
-		stop      time.Time
-		interval  time.Duration
-		retention time.Duration
-		count     int
-	}{
-		{
-			start:     nowish.Add(-1 * time.Minute),
-			stop:      nowish,
-			interval:  11 * time.Second,
-			retention: 1 * time.Hour,
-			count:     6,
-		},
-		{
-			start:     nowish.Add(-1 * time.Hour),
-			stop:      nowish,
-			interval:  33 * time.Second,
-			retention: 1 * time.Hour,
-			count:     110,
-		},
-	}
-
-	for _, tc := range cases {
-		result := intervalsBetween(tc.start, tc.stop, tc.interval, tc.retention)
-		require.Equal(t, tc.count, len(result))
-
-		if tc.count > 0 {
-			require.Equal(t, tc.start, result[0])
-			require.True(t, result[len(result)-1].Before(tc.stop))
-		}
-	}
-}
-
 func TestNewRand(t *testing.T) {
 	now := time.Now()