[add] Added flamegraph support

Author: filipecosta90

Makefile

@@ -25,7 +25,8 @@ build:
 	$(GOCMD) build .
 
 fmt:
-	$(GOFMT) ./...
+	$(GOFMT) ./*.go
+	$(GOFMT) ./cmd/*.go
 
 lint:
 	$(GOGET) github.com/golangci/golangci-lint/cmd/golangci-lint

cmd/export.go

@@ -54,7 +54,6 @@ func exportLogic() func(cmd *cobra.Command, args []string) {
 				if err == nil {
 					var w io.Writer
 					// open output file
-					fmt.Println()
 					localExportLogic(w, report)
 				} else {
 					log.Fatal(err)
@@ -64,7 +63,6 @@ func exportLogic() func(cmd *cobra.Command, args []string) {
 			for _, granularity := range granularityOptions {
 				err, report := generateTextReports(granularity, args[0])
 				if err == nil {
-					fmt.Println()
 					remoteExportLogic(report, granularity)
 				} else {
 					log.Fatal(err)
@@ -75,9 +73,9 @@ func exportLogic() func(cmd *cobra.Command, args []string) {
 				log.Fatalf("An Error Occured %v", err)
 			}
 			remoteFlameGraphExport(finalTree)
-			log.Printf("Successfully published profile data. Check it at: %s/gh/%s/%s/commit/%s/bench/%s/cpu", codeperfUrl, gitOrg, gitRepo, gitCommit, bench)
+			log.Printf("Successfully published profile data")
+			log.Printf("Check it at: %s/gh/%s/%s/commit/%s/bench/%s/cpu", codeperfUrl, gitOrg, gitRepo, gitCommit, bench)
 		}
-
 	}
 }
 

cmd/flagset.go

@@ -2,7 +2,7 @@ package cmd
 
 import (
 	"bufio"
-	"fmt"
+	"log"
 	"os"
 )
 
@@ -88,11 +88,11 @@ func (ui *UI) ReadLine(prompt string) (string, error) {
 }
 
 func (ui *UI) Print(args ...interface{}) {
-	fmt.Fprint(os.Stderr, args...)
+	log.Print(args...)
 }
 
 func (ui *UI) PrintErr(args ...interface{}) {
-	fmt.Fprint(os.Stderr, args...)
+	log.Print(args...)
 }
 
 func (ui *UI) IsTerminal() bool {

cmd/folded.go

@@ -1,36 +1,74 @@
 package cmd
 
 import (
-	"fmt"
 	"github.com/google/pprof/profile"
 	"log"
+	"regexp"
 	"sort"
 	"strings"
 )
 
 type treeNode struct {
 	Name     string               `json:"n"`
+	FullName string               `json:"f"`
 	Cum      int64                `json:"v"`
 	Children map[string]*treeNode `json:"c"`
 }
 
 type treeNodeSlice struct {
 	Name     string          `json:"n"`
+	FullName string          `json:"f"`
 	Cum      int64           `json:"v"`
 	Children []treeNodeSlice `json:"c"`
 }
 
+var (
+	// Removes package name and method arguments for Java method names.
+	// See tests for examples.
+	javaRegExp = regexp.MustCompile(`^(?:[a-z]\w*\.)*([A-Z][\w\$]*\.(?:<init>|[a-z][\w\$]*(?:\$\d+)?))(?:(?:\()|$)`)
+	// Removes package name and method arguments for Go function names.
+	// See tests for examples.
+	goRegExp = regexp.MustCompile(`^(?:[\w\-\.]+\/)+(.+)`)
+	// Removes potential module versions in a package path.
+	goVerRegExp = regexp.MustCompile(`^(.*?)/v(?:[2-9]|[1-9][0-9]+)([./].*)$`)
+	// Strips C++ namespace prefix from a C++ function / method name.
+	// NOTE: Make sure to keep the template parameters in the name. Normally,
+	// template parameters are stripped from the C++ names but when
+	// -symbolize=demangle=templates flag is used, they will not be.
+	// See tests for examples.
+	cppRegExp                = regexp.MustCompile(`^(?:[_a-zA-Z]\w*::)+(_*[A-Z]\w*::~?[_a-zA-Z]\w*(?:<.*>)?)`)
+	cppAnonymousPrefixRegExp = regexp.MustCompile(`^\(anonymous namespace\)::`)
+)
+
+// ShortenFunctionName returns a shortened version of a function's name.
+func ShortenFunctionName(f string) string {
+	f = cppAnonymousPrefixRegExp.ReplaceAllString(f, "")
+	f = goVerRegExp.ReplaceAllString(f, `${1}${2}`)
+	for _, re := range []*regexp.Regexp{goRegExp, javaRegExp, cppRegExp} {
+		if matches := re.FindStringSubmatch(f); len(matches) >= 2 {
+			return strings.Join(matches[1:], "")
+		}
+	}
+	return f
+}
+
 // Convert marshals the given protobuf profile into folded text format.
 func profileToFolded(protobuf *profile.Profile) treeNodeSlice {
-	rootNode := treeNode{"root", 0, make(map[string]*treeNode, 0)}
+	rootNode := treeNode{"root", "root", 0, make(map[string]*treeNode, 0)}
 	if err := protobuf.Aggregate(true, true, false, false, false); err != nil {
 		log.Fatal(err)
 	}
 	protobuf = protobuf.Compact()
 	sort.Slice(protobuf.Sample, func(i, j int) bool {
 		return protobuf.Sample[i].Value[0] > protobuf.Sample[j].Value[0]
 	})
+
 	for _, sample := range protobuf.Sample {
+		var cum int64 = 0
+		for _, val := range sample.Value {
+			cum = cum + val
+			break
+		}
 		var frames []string
 		var currentNode *treeNode
 		var currentMap map[string]*treeNode = rootNode.Children
@@ -39,37 +77,27 @@ func profileToFolded(protobuf *profile.Profile) treeNodeSlice {
 			loc := sample.Location[len(sample.Location)-i-1]
 			for j := range loc.Line {
 				line := loc.Line[len(loc.Line)-j-1]
-				fname := line.Function.Name
-				currentNode, ok = currentMap[fname]
+				fname := ShortenFunctionName(line.Function.Name)
+				shortName := fname[strings.LastIndex(fname, ".")+1:]
+				currentNode, ok = currentMap[shortName]
 				if !ok {
-					currentNode = &treeNode{fname, 0, make(map[string]*treeNode, 0)}
-					currentMap[fname] = currentNode
+					currentNode = &treeNode{shortName, fname, 0, make(map[string]*treeNode, 0)}
+					currentMap[shortName] = currentNode
 				}
+				currentNode.Cum += cum
 				currentMap = currentNode.Children
-				frames = append(frames, fname)
+				frames = append(frames, shortName)
 			}
 		}
-
-		var values []string
-		for _, val := range sample.Value {
-			values = append(values, fmt.Sprintf("%d", val))
-			currentNode.Cum = currentNode.Cum + val
-			break
-		}
-		fmt.Printf(
-			"%s %s\n",
-			strings.Join(frames, ";"),
-			strings.Join(values, " "),
-		)
 	}
-	finalTree := treeNodeSlice{rootNode.Name, rootNode.Cum, collapse(rootNode.Children)}
+	finalTree := treeNodeSlice{rootNode.Name, rootNode.FullName, rootNode.Cum, collapse(rootNode.Children)}
 	return finalTree
 }
 
 func collapse(children map[string]*treeNode) (tree []treeNodeSlice) {
 	tree = make([]treeNodeSlice, 0)
 	for _, k := range children {
-		nS := treeNodeSlice{k.Name, k.Cum, collapse(k.Children)}
+		nS := treeNodeSlice{k.Name, k.FullName, k.Cum, collapse(k.Children)}
 		tree = append(tree, nS)
 	}
 	return

cmd/root.go

@@ -78,7 +78,7 @@ func init() {
 		repoStartPos := strings.LastIndex(remoteUsed, "/") + 1
 		defaultGitRepo = remoteUsed[repoStartPos : len(remoteUsed)-4]
 		defaultGitCommit = refHash
-		fmt.Printf("Detected the following git vars org=%s repo=%s hash=%s", defaultGitOrg, defaultGitRepo, defaultGitCommit)
+		log.Printf("Detected the following git vars org=%s repo=%s hash=%s\n", defaultGitOrg, defaultGitRepo, defaultGitCommit)
 	}
 
 	// Here you will define your flags and configuration settings.