Merge pull request #354 from grafana/20221024_distributor-validate-timestamp

Set timestamp in profile, if not set

Author: simonswine

pkg/pprof/pprof.go

@@ -7,6 +7,7 @@ import (
 	"os"
 	"sort"
 	"sync"
+	"time"
 
 	"github.com/cespare/xxhash/v2"
 	"github.com/klauspost/compress/gzip"
@@ -188,14 +189,24 @@ func (s *sortedSample) Swap(i, j int) {
 	s.hashes[i], s.hashes[j] = s.hashes[j], s.hashes[i]
 }
 
+var (
+	currentTime = time.Now
+)
+
 // Normalize normalizes the profile by:
 //   - Removing all duplicate samples (summing their values).
 //   - Removing redundant profile labels (byte => unique of an allocation site)
 //     todo: We should reassess if this was a good choice because by merging duplicate stacktrace samples
 //     we cannot recompute the allocation per site ("bytes") profile label.
 //   - Removing empty samples.
 //   - Then remove unused references.
+//   - Ensure that the profile has a time_nanos set
 func (p *Profile) Normalize() {
+	// if the profile has no time, set it to now
+	if p.TimeNanos == 0 {
+		p.TimeNanos = currentTime().UnixNano()
+	}
+
 	// first we sort the samples location ids.
 	hashes := p.hasher.Hashes(p.Sample)
 

pkg/pprof/pprof_test.go

@@ -3,6 +3,7 @@ package pprof
 import (
 	"math/rand"
 	"testing"
+	"time"
 
 	"github.com/stretchr/testify/require"
 
@@ -11,6 +12,14 @@ import (
 )
 
 func TestNormalizeProfile(t *testing.T) {
+	currentTime = func() time.Time {
+		t, _ := time.Parse(time.RFC3339, "2020-01-01T00:00:00Z")
+		return t
+	}
+	defer func() {
+		currentTime = time.Now
+	}()
+
 	p := &profilev1.Profile{
 		SampleType: []*profilev1.ValueType{
 			{Type: 2, Unit: 1},
@@ -78,6 +87,7 @@ func TestNormalizeProfile(t *testing.T) {
 		},
 		PeriodType:        &profilev1.ValueType{Type: 0, Unit: 1},
 		Comment:           []int64{},
+		TimeNanos:         1577836800000000000,
 		DefaultSampleType: 0,
 	})
 }