fix time, update testdata

grafana · Jan 26, 2024 · a376027 · a376027
1 parent 2d7477a
commit a376027
Show file tree

Hide file tree

Showing 42 changed files with 16 additions and 1 deletion.
diff --git a/parser/testdata/FastSlow_2024_01_16_180855_0_process_cpu_cpu__nanoseconds_expected.txt.gz b/parser/testdata/FastSlow_2024_01_16_180855_0_process_cpu_cpu__nanoseconds_expected.txt.gz
diff --git a/parser/testdata/FastSlow_2024_01_16_180855_1_wall_wall__nanoseconds_expected.txt.gz b/parser/testdata/FastSlow_2024_01_16_180855_1_wall_wall__nanoseconds_expected.txt.gz
diff --git a/..._0_memory_alloc_in_new_tlab_objects__count alloc_in_new_tlab_bytes__bytes_expected.txt.gz b/..._0_memory_alloc_in_new_tlab_objects__count alloc_in_new_tlab_bytes__bytes_expected.txt.gz
diff --git a/..._memory_alloc_outside_tlab_objects__count alloc_outside_tlab_bytes__bytes_expected.txt.gz b/..._memory_alloc_outside_tlab_objects__count alloc_outside_tlab_bytes__bytes_expected.txt.gz
diff --git a/parser/testdata/async-profiler_2_process_cpu_cpu__nanoseconds_expected.txt.gz b/parser/testdata/async-profiler_2_process_cpu_cpu__nanoseconds_expected.txt.gz
diff --git a/...er/testdata/cortex-dev-01__kafka-0__cpu__0_0_process_cpu_cpu__nanoseconds_expected.txt.gz b/...er/testdata/cortex-dev-01__kafka-0__cpu__0_0_process_cpu_cpu__nanoseconds_expected.txt.gz
diff --git a/...er/testdata/cortex-dev-01__kafka-0__cpu__1_0_process_cpu_cpu__nanoseconds_expected.txt.gz b/...er/testdata/cortex-dev-01__kafka-0__cpu__1_0_process_cpu_cpu__nanoseconds_expected.txt.gz
diff --git a/...er/testdata/cortex-dev-01__kafka-0__cpu__2_0_process_cpu_cpu__nanoseconds_expected.txt.gz b/...er/testdata/cortex-dev-01__kafka-0__cpu__2_0_process_cpu_cpu__nanoseconds_expected.txt.gz
diff --git a/...er/testdata/cortex-dev-01__kafka-0__cpu__3_0_process_cpu_cpu__nanoseconds_expected.txt.gz b/...er/testdata/cortex-dev-01__kafka-0__cpu__3_0_process_cpu_cpu__nanoseconds_expected.txt.gz
diff --git a/...afka-0__cpu_lock0_alloc0__0_0_block_contentions__count delay__nanoseconds_expected.txt.gz b/...afka-0__cpu_lock0_alloc0__0_0_block_contentions__count delay__nanoseconds_expected.txt.gz
diff --git a/..._1_memory_alloc_in_new_tlab_objects__count alloc_in_new_tlab_bytes__bytes_expected.txt.gz b/..._1_memory_alloc_in_new_tlab_objects__count alloc_in_new_tlab_bytes__bytes_expected.txt.gz
diff --git a/..._memory_alloc_outside_tlab_objects__count alloc_outside_tlab_bytes__bytes_expected.txt.gz b/..._memory_alloc_outside_tlab_objects__count alloc_outside_tlab_bytes__bytes_expected.txt.gz
diff --git a/...afka-0__cpu_lock0_alloc0__0_3_mutex_contentions__count delay__nanoseconds_expected.txt.gz b/...afka-0__cpu_lock0_alloc0__0_3_mutex_contentions__count delay__nanoseconds_expected.txt.gz
diff --git a/...ortex-dev-01__kafka-0__cpu_lock0_alloc0__0_4_process_cpu_cpu__nanoseconds_expected.txt.gz b/...ortex-dev-01__kafka-0__cpu_lock0_alloc0__0_4_process_cpu_cpu__nanoseconds_expected.txt.gz
diff --git a/..._0_memory_alloc_in_new_tlab_objects__count alloc_in_new_tlab_bytes__bytes_expected.txt.gz b/..._0_memory_alloc_in_new_tlab_objects__count alloc_in_new_tlab_bytes__bytes_expected.txt.gz
diff --git a/.../cortex-dev-01__kafka-0__cpu_lock_alloc__0_1_process_cpu_cpu__nanoseconds_expected.txt.gz b/.../cortex-dev-01__kafka-0__cpu_lock_alloc__0_1_process_cpu_cpu__nanoseconds_expected.txt.gz
diff --git a/..._0_memory_alloc_in_new_tlab_objects__count alloc_in_new_tlab_bytes__bytes_expected.txt.gz b/..._0_memory_alloc_in_new_tlab_objects__count alloc_in_new_tlab_bytes__bytes_expected.txt.gz
diff --git a/.../cortex-dev-01__kafka-0__cpu_lock_alloc__1_1_process_cpu_cpu__nanoseconds_expected.txt.gz b/.../cortex-dev-01__kafka-0__cpu_lock_alloc__1_1_process_cpu_cpu__nanoseconds_expected.txt.gz
diff --git a/..._0_memory_alloc_in_new_tlab_objects__count alloc_in_new_tlab_bytes__bytes_expected.txt.gz b/..._0_memory_alloc_in_new_tlab_objects__count alloc_in_new_tlab_bytes__bytes_expected.txt.gz
diff --git a/.../cortex-dev-01__kafka-0__cpu_lock_alloc__2_1_process_cpu_cpu__nanoseconds_expected.txt.gz b/.../cortex-dev-01__kafka-0__cpu_lock_alloc__2_1_process_cpu_cpu__nanoseconds_expected.txt.gz
diff --git a/..._0_memory_alloc_in_new_tlab_objects__count alloc_in_new_tlab_bytes__bytes_expected.txt.gz b/..._0_memory_alloc_in_new_tlab_objects__count alloc_in_new_tlab_bytes__bytes_expected.txt.gz
diff --git a/.../cortex-dev-01__kafka-0__cpu_lock_alloc__3_1_process_cpu_cpu__nanoseconds_expected.txt.gz b/.../cortex-dev-01__kafka-0__cpu_lock_alloc__3_1_process_cpu_cpu__nanoseconds_expected.txt.gz
diff --git a/parser/testdata/dump1_0_process_cpu_cpu__nanoseconds_expected.txt.gz b/parser/testdata/dump1_0_process_cpu_cpu__nanoseconds_expected.txt.gz
diff --git a/..._0_memory_alloc_in_new_tlab_objects__count alloc_in_new_tlab_bytes__bytes_expected.txt.gz b/..._0_memory_alloc_in_new_tlab_objects__count alloc_in_new_tlab_bytes__bytes_expected.txt.gz
diff --git a/parser/testdata/dump2_1_memory_live__count_expected.txt.gz b/parser/testdata/dump2_1_memory_live__count_expected.txt.gz
diff --git a/parser/testdata/dump2_2_process_cpu_cpu__nanoseconds_expected.txt.gz b/parser/testdata/dump2_2_process_cpu_cpu__nanoseconds_expected.txt.gz
diff --git a/parser/testdata/dump2_3_wall_wall__nanoseconds_expected.txt.gz b/parser/testdata/dump2_3_wall_wall__nanoseconds_expected.txt.gz
diff --git a/..._0_memory_alloc_in_new_tlab_objects__count alloc_in_new_tlab_bytes__bytes_expected.txt.gz b/..._0_memory_alloc_in_new_tlab_objects__count alloc_in_new_tlab_bytes__bytes_expected.txt.gz
diff --git a/..._memory_alloc_outside_tlab_objects__count alloc_outside_tlab_bytes__bytes_expected.txt.gz b/..._memory_alloc_outside_tlab_objects__count alloc_outside_tlab_bytes__bytes_expected.txt.gz
diff --git a/parser/testdata/example_2_mutex_contentions__count delay__nanoseconds_expected.txt.gz b/parser/testdata/example_2_mutex_contentions__count delay__nanoseconds_expected.txt.gz
diff --git a/parser/testdata/example_3_process_cpu_cpu__nanoseconds_expected.txt.gz b/parser/testdata/example_3_process_cpu_cpu__nanoseconds_expected.txt.gz
diff --git a/.../testdata/goland-multichunk_0_block_contentions__count delay__nanoseconds_expected.txt.gz b/.../testdata/goland-multichunk_0_block_contentions__count delay__nanoseconds_expected.txt.gz
diff --git a/..._1_memory_alloc_in_new_tlab_objects__count alloc_in_new_tlab_bytes__bytes_expected.txt.gz b/..._1_memory_alloc_in_new_tlab_objects__count alloc_in_new_tlab_bytes__bytes_expected.txt.gz
diff --git a/..._memory_alloc_outside_tlab_objects__count alloc_outside_tlab_bytes__bytes_expected.txt.gz b/..._memory_alloc_outside_tlab_objects__count alloc_outside_tlab_bytes__bytes_expected.txt.gz
diff --git a/.../testdata/goland-multichunk_3_mutex_contentions__count delay__nanoseconds_expected.txt.gz b/.../testdata/goland-multichunk_3_mutex_contentions__count delay__nanoseconds_expected.txt.gz
diff --git a/parser/testdata/goland-multichunk_4_process_cpu_cpu__nanoseconds_expected.txt.gz b/parser/testdata/goland-multichunk_4_process_cpu_cpu__nanoseconds_expected.txt.gz
diff --git a/parser/testdata/goland_0_block_contentions__count delay__nanoseconds_expected.txt.gz b/parser/testdata/goland_0_block_contentions__count delay__nanoseconds_expected.txt.gz
diff --git a/..._1_memory_alloc_in_new_tlab_objects__count alloc_in_new_tlab_bytes__bytes_expected.txt.gz b/..._1_memory_alloc_in_new_tlab_objects__count alloc_in_new_tlab_bytes__bytes_expected.txt.gz
diff --git a/..._memory_alloc_outside_tlab_objects__count alloc_outside_tlab_bytes__bytes_expected.txt.gz b/..._memory_alloc_outside_tlab_objects__count alloc_outside_tlab_bytes__bytes_expected.txt.gz
diff --git a/parser/testdata/goland_3_mutex_contentions__count delay__nanoseconds_expected.txt.gz b/parser/testdata/goland_3_mutex_contentions__count delay__nanoseconds_expected.txt.gz
diff --git a/parser/testdata/goland_4_process_cpu_cpu__nanoseconds_expected.txt.gz b/parser/testdata/goland_4_process_cpu_cpu__nanoseconds_expected.txt.gz
diff --git a/pprof/parser_test.go b/pprof/parser_test.go
@@ -5,9 +5,11 @@ import (
 	"fmt"
 	"io/ioutil"
 	"os"
+	"regexp"
 	"slices"
 	"strings"
 	"testing"
+	"time"
 
 	gpprof "github.com/google/pprof/profile"
 	profilev1 "github.com/grafana/pyroscope/api/gen/proto/go/google/v1"
@@ -54,6 +56,8 @@ func TestDoDump(t *testing.T) {
 }
 
 var parseInput = &ParseInput{
+	StartTime:  time.Unix(1706241880, 0),
+	EndTime:    time.Unix(1706241890, 0),
 	SampleRate: 100,
 }
 
@@ -79,7 +83,7 @@ func TestParse(t *testing.T) {
 			assert.Equal(t, testfile.expectedCount, len(gprofiles))
 
 			for i, profile := range gprofiles {
-				actual := profile.profile.String()
+				actual := profileToString(t, profile)
 				actualCollapsed := stackCollapseProto(profile.proto, true)
 				expectedFile := fmt.Sprintf("%s%s_%d_%s_expected.txt.gz", testdataDir, testfile.jfr, i, profile.metric)
 				expectedCollapsedFile := fmt.Sprintf("%s%s_%d_%s_expected_collapsed.txt.gz", testdataDir, testfile.jfr, i, profile.metric)
@@ -112,6 +116,17 @@ func TestParse(t *testing.T) {
 	}
 }
 
+func profileToString(t *testing.T, profile gprofile) string {
+	res := profile.profile.String()
+	re := regexp.MustCompile("\nTime: ([^\n]+)\n")
+	matches := re.FindAllStringSubmatch(res, -1)
+	require.Equal(t, 1, len(matches))
+	t2, err := time.Parse("2006-01-02 15:04:05.999999999 -0700 MST", matches[0][1])
+	assert.NoError(t, err)
+	res = re.ReplaceAllString(res, fmt.Sprintf("\nTime: %d\n", t2.UnixNano()))
+	return res
+}
+
 func readLabels(t testing.TB, td testdata) *LabelsSnapshot {
 	ls := new(LabelsSnapshot)
 	if td.labels != "" {