runtime/pprof: include labels in profile dump

prattmic · prattmic · commit 90f47dbba635 · 2021-11-09T17:02:38.000Z
For tests of pprof label support having the sample labels in the output is needed for effective debugging. For golang#48577 Change-Id: Ic7c5bc90cb33e8fb477f7db62d9b56a7a9d6ffa8 Reviewed-on: https://go-review.googlesource.com/c/go/+/362614 Trust: Michael Pratt <mpratt@google.com> Run-TryBot: Michael Pratt <mpratt@google.com> TryBot-Result: Go Bot <gobot@golang.org> Reviewed-by: Cherry Mui <cherryyz@google.com>
diff --git a/src/runtime/pprof/pprof_test.go b/src/runtime/pprof/pprof_test.go
@@ -494,6 +494,7 @@ func profileOk(t *testing.T, matches matchFunc, need []string, avoid []string, p
 	p := parseProfile(t, prof.Bytes(), func(count uintptr, stk []*profile.Location, labels map[string][]string) {
 		fmt.Fprintf(&buf, "%d:", count)
 		fprintStack(&buf, stk)
+		fmt.Fprintf(&buf, " labels: %v\n", labels)
 		samples += count
 		for i, spec := range need {
 			if matches(spec, count, stk, labels) {
@@ -675,7 +676,6 @@ func fprintStack(w io.Writer, stk []*profile.Location) {
 		}
 		fmt.Fprintf(w, ")")
 	}
-	fmt.Fprintf(w, "\n")
 }
 
 // Test that profiling of division operations is okay, especially on ARM. See issue 6681.

Original file line number	Diff line number	Diff line change
`@@ -494,6 +494,7 @@ func profileOk(t *testing.T, matches matchFunc, need []string, avoid []string, p`
`494`	`494`	`p := parseProfile(t, prof.Bytes(), func(count uintptr, stk []*profile.Location, labels map[string][]string) {`
`495`	`495`	`fmt.Fprintf(&buf, "%d:", count)`
`496`	`496`	`fprintStack(&buf, stk)`
	`497`	`+ fmt.Fprintf(&buf, " labels: %v\n", labels)`
`497`	`498`	`samples += count`
`498`	`499`	`for i, spec := range need {`
`499`	`500`	`if matches(spec, count, stk, labels) {`
`@@ -675,7 +676,6 @@ func fprintStack(w io.Writer, stk []*profile.Location) {`
`675`	`676`	`}`
`676`	`677`	`fmt.Fprintf(w, ")")`
`677`	`678`	`}`
`678`		`- fmt.Fprintf(w, "\n")`
`679`	`679`	`}`
`680`	`680`
`681`	`681`	`// Test that profiling of division operations is okay, especially on ARM. See issue 6681.`