Fix pprof merge (#2379)

grafana · Sep 8, 2023 · cb13865 · cb13865
1 parent 301751c
commit cb13865
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 1 deletion.
diff --git a/pkg/phlaredb/symdb/resolver.go b/pkg/phlaredb/symdb/resolver.go
@@ -279,7 +279,8 @@ func (r *pprofSymbols) init(symbols *Symbols, samples schemav1.Samples) {
 	r.symbols = symbols
 	r.samples = &samples
 	r.profile = &profile.Profile{
-		Sample: make([]*profile.Sample, len(samples.StacktraceIDs)),
+		Sample:     make([]*profile.Sample, len(samples.StacktraceIDs)),
+		PeriodType: new(profile.ValueType),
 	}
 	r.locations = grow(r.locations, len(r.symbols.Locations))
 	r.mappings = grow(r.mappings, len(r.symbols.Mappings))

diff --git a/pkg/phlaredb/symdb/resolver_test.go b/pkg/phlaredb/symdb/resolver_test.go
@@ -18,6 +18,24 @@ func Test_memory_Resolver_ResolveProfile(t *testing.T) {
 	require.Equal(t, expectedFingerprint, profileFingerprint(resolved, 0))
 }
 
+func Test_memory_Resolver_ResolveProfile_multiple_partitions(t *testing.T) {
+	s := newMemSuite(t, [][]string{
+		{"testdata/profile.pb.gz"},
+		{"testdata/profile.pb.gz"},
+	})
+	expectedFingerprint := pprofFingerprint(s.profiles[0].Profile, 0)
+	for i := range expectedFingerprint {
+		expectedFingerprint[i][1] *= 2
+	}
+	r := NewResolver(context.Background(), s.db)
+	defer r.Release()
+	r.AddSamples(0, s.indexed[0][0].Samples)
+	r.AddSamples(1, s.indexed[1][0].Samples)
+	resolved, err := r.Profile()
+	require.NoError(t, err)
+	require.Equal(t, expectedFingerprint, profileFingerprint(resolved, 0))
+}
+
 func Test_memory_Resolver_ResolveTree(t *testing.T) {
 	s := newMemSuite(t, [][]string{{"testdata/profile.pb.gz"}})
 	expectedFingerprint := pprofFingerprint(s.profiles[0].Profile, 0)