Merge pull request #9 from threadedstream/account_for_labels

Account for labels

Author: threadedstream

.gitignore

@@ -0,0 +1,2 @@
+vendor/
+.idea/

merged_profile.proto api/merged_profile.protomerged_profile.proto renamed to api/merged_profile.proto

@@ -1,8 +1,8 @@
 syntax = "proto3";
 
-package dummymergedprofile;
+package ppmerge;
 
-import "profile.proto";
+import "api/profile.proto";
 
 option go_package = "github.com/threadedstream/ppmerge";
 
@@ -36,6 +36,7 @@ message MergedProfile {
   repeated uint64 num_sample_types = 13;
   repeated uint64 num_mappings = 14;
   repeated uint64 num_samples = 15;
+  map<uint64, Labels> labels = 16;
 }
 
 // ValueType describes the semantics and measurement units of a value.

profile.proto api/profile.protoprofile.proto renamed to api/profile.proto

@@ -1,10 +1,8 @@
 syntax = "proto3";
 
-package dummymergedprofile;
-
-
-option go_package = "github.com/threadedstream/ppmerge";
+package ppmerge;
 
+option go_package = "github.com/threadedstream/ppmerge/profile";
 
 message GoroutineProfile {
   uint64 total = 1;
@@ -117,6 +115,11 @@ message Label {
   int64 num_unit = 4;  // Index into string table
 }
 
+message Labels {
+  repeated Label labels = 1;
+}
+
+
 message Mapping {
   // Unique nonzero id for the mapping.
   uint64 id = 1;

goroutine_merger.go

@@ -5,6 +5,7 @@ import (
 	"compress/gzip"
 	"io"
 
+	"github.com/threadedstream/ppmerge/profile"
 	"google.golang.org/protobuf/proto"
 )
 
@@ -35,7 +36,7 @@ func (gpm *GoroutineProfileMerger) WriteCompressed(w io.Writer) error {
 	return err
 }
 
-func (gpm *GoroutineProfileMerger) Merge(gps ...*GoroutineProfile) *MergedGoroutineProfile {
+func (gpm *GoroutineProfileMerger) Merge(gps ...*profile.GoroutineProfile) *MergedGoroutineProfile {
 	gpm.mergedProfile.Totals = make([]uint64, 0, len(gps))
 	gpm.mergedProfile.NumStacktraces = make([]uint64, 0, len(gps))
 
@@ -45,16 +46,16 @@ func (gpm *GoroutineProfileMerger) Merge(gps ...*GoroutineProfile) *MergedGorout
 	return gpm.mergedProfile
 }
 
-func (gpm *GoroutineProfileMerger) merge(gps ...*GoroutineProfile) {
-	var resultStacktraces []*Stacktrace
+func (gpm *GoroutineProfileMerger) merge(gps ...*profile.GoroutineProfile) {
+	var resultStacktraces []*profile.Stacktrace
 	for _, gp := range gps {
 		gpm.mergedProfile.Totals = append(gpm.mergedProfile.Totals, gp.Total)
 		stacktraces := gp.GetStacktraces()
 
 		gpm.mergedProfile.NumStacktraces = append(gpm.mergedProfile.NumStacktraces, uint64(len(stacktraces)))
 
 		for _, st := range stacktraces {
-			resultStacktrace := new(Stacktrace)
+			resultStacktrace := new(profile.Stacktrace)
 			resultStacktrace.Total = st.Total
 
 			resultStacktrace.PC = make([]uint64, len(st.PC))
@@ -65,7 +66,7 @@ func (gpm *GoroutineProfileMerger) merge(gps ...*GoroutineProfile) {
 				resultStacktraces = append(resultStacktraces, resultStacktrace)
 				continue
 			}
-			resultStacktrace.Frames = make([]*Frame, 0, len(frames))
+			resultStacktrace.Frames = make([]*profile.Frame, 0, len(frames))
 			for _, f := range frames {
 				resultStacktrace.Frames = append(resultStacktrace.Frames, gpm.remapFrame(f, gp.StringTable))
 			}
@@ -76,8 +77,8 @@ func (gpm *GoroutineProfileMerger) merge(gps ...*GoroutineProfile) {
 	gpm.mergedProfile.Stacktraces = resultStacktraces
 }
 
-func (gpm *GoroutineProfileMerger) remapFrame(frame *Frame, gpStringTable []string) *Frame {
-	return &Frame{
+func (gpm *GoroutineProfileMerger) remapFrame(frame *profile.Frame, gpStringTable []string) *profile.Frame {
+	return &profile.Frame{
 		Address:      frame.Address,
 		FunctionName: gpm.putString(gpStringTable[frame.FunctionName]),
 		Offset:       frame.Offset,
@@ -116,7 +117,7 @@ func NewGoroutineProfileUnPacker(mergedProfile *MergedGoroutineProfile) *Gorouti
 	}
 }
 
-func (gpu *GoroutineProfileUnPacker) UnpackRaw(compressedRawProfile []byte, idx uint64) (*GoroutineProfile, error) {
+func (gpu *GoroutineProfileUnPacker) UnpackRaw(compressedRawProfile []byte, idx uint64) (*profile.GoroutineProfile, error) {
 	bb := bytes.NewBuffer(compressedRawProfile)
 
 	gzReader, err := gzip.NewReader(bb)
@@ -140,11 +141,11 @@ func (gpu *GoroutineProfileUnPacker) UnpackRaw(compressedRawProfile []byte, idx
 	return gpu.Unpack(idx)
 }
 
-func (gpu *GoroutineProfileUnPacker) Unpack(idx uint64) (*GoroutineProfile, error) {
+func (gpu *GoroutineProfileUnPacker) Unpack(idx uint64) (*profile.GoroutineProfile, error) {
 	if idx >= uint64(len(gpu.mergedProfile.NumStacktraces)) {
 		return nil, indexOutOfRangeErr
 	}
-	gp := GoroutineProfileFromVTPool()
+	gp := profile.GoroutineProfileFromVTPool()
 
 	gp.Total = gpu.mergedProfile.Totals[idx]
 
@@ -157,7 +158,7 @@ func (gpu *GoroutineProfileUnPacker) Unpack(idx uint64) (*GoroutineProfile, erro
 
 	limit := offset + numStacktraces
 
-	gp.Stacktraces = make([]*Stacktrace, 0, numStacktraces)
+	gp.Stacktraces = make([]*profile.Stacktrace, 0, numStacktraces)
 	for offset < limit {
 		gp.Stacktraces = append(gp.Stacktraces, gpu.remapStacktrace(gpu.mergedProfile.Stacktraces[offset]))
 		offset++
@@ -168,8 +169,8 @@ func (gpu *GoroutineProfileUnPacker) Unpack(idx uint64) (*GoroutineProfile, erro
 	return gp, nil
 }
 
-func (gpu *GoroutineProfileUnPacker) remapStacktrace(st *Stacktrace) *Stacktrace {
-	resultStacktrace := new(Stacktrace)
+func (gpu *GoroutineProfileUnPacker) remapStacktrace(st *profile.Stacktrace) *profile.Stacktrace {
+	resultStacktrace := new(profile.Stacktrace)
 	resultStacktrace.Total = st.Total
 
 	resultStacktrace.PC = make([]uint64, len(st.PC))
@@ -180,16 +181,16 @@ func (gpu *GoroutineProfileUnPacker) remapStacktrace(st *Stacktrace) *Stacktrace
 		return resultStacktrace
 	}
 
-	resultStacktrace.Frames = make([]*Frame, 0, len(st.Frames))
+	resultStacktrace.Frames = make([]*profile.Frame, 0, len(st.Frames))
 	for _, f := range frames {
 		resultStacktrace.Frames = append(resultStacktrace.Frames, gpu.remapFrame(f))
 	}
 
 	return resultStacktrace
 }
 
-func (gpu *GoroutineProfileUnPacker) remapFrame(frame *Frame) *Frame {
-	return &Frame{
+func (gpu *GoroutineProfileUnPacker) remapFrame(frame *profile.Frame) *profile.Frame {
+	return &profile.Frame{
 		Address:      frame.Address,
 		FunctionName: gpu.putString(gpu.mergedProfile.StringTable[frame.FunctionName]),
 		Offset:       frame.Offset,
@@ -198,7 +199,7 @@ func (gpu *GoroutineProfileUnPacker) remapFrame(frame *Frame) *Frame {
 	}
 }
 
-func (gpu *GoroutineProfileUnPacker) finalizeStringTable(gp *GoroutineProfile) {
+func (gpu *GoroutineProfileUnPacker) finalizeStringTable(gp *profile.GoroutineProfile) {
 	gp.StringTable = make([]string, len(gpu.stringTable))
 	for k, v := range gpu.stringTable {
 		gp.StringTable[v] = k