Merge pull request #631 from getsentry/txiao/test/flakey-flamegraph-test

test(flamegraph): Flakey flamegraph test

Author: Zylphrex

internal/flamegraph/flamegraph_test.go

@@ -340,19 +340,6 @@ func TestFlamegraphAggregation(t *testing.T) {
 					SumSelfTime: 50,
 					Count:       5,
 				},
-				{
-					Name:        "b",
-					Package:     "test.package",
-					Fingerprint: 2430275455,
-					InApp:       true,
-					P75:         40,
-					P95:         40,
-					P99:         40,
-					Avg:         35,
-					Sum:         70,
-					SumSelfTime: 20,
-					Count:       7,
-				},
 				{
 					Name:        "a",
 					Package:     "test.package",
@@ -366,6 +353,19 @@ func TestFlamegraphAggregation(t *testing.T) {
 					SumSelfTime: 20,
 					Count:       9,
 				},
+				{
+					Name:        "b",
+					Package:     "test.package",
+					Fingerprint: 2430275455,
+					InApp:       true,
+					P75:         40,
+					P95:         40,
+					P99:         40,
+					Avg:         35,
+					Sum:         70,
+					SumSelfTime: 20,
+					Count:       7,
+				},
 			},
 		},
 		{

internal/metrics/metrics.go

@@ -100,7 +100,10 @@ func (ma *Aggregator) ToMetrics() []examples.FunctionMetrics {
 		})
 	}
 	sort.Slice(metrics, func(i, j int) bool {
-		return metrics[i].SumSelfTime > metrics[j].SumSelfTime
+		if metrics[i].SumSelfTime != metrics[j].SumSelfTime {
+			return metrics[i].SumSelfTime > metrics[j].SumSelfTime
+		}
+		return metrics[i].Sum > metrics[j].Sum
 	})
 	if len(metrics) > int(ma.MaxUniqueFunctions) {
 		metrics = metrics[:ma.MaxUniqueFunctions]
@@ -172,7 +175,10 @@ func mergeAndSortFunctions(
 
 	// sort the list in descending order, and take the top N results
 	sort.SliceStable(functionsList, func(i, j int) bool {
-		return functionsList[i].SumSelfTimeNS > functionsList[j].SumSelfTimeNS
+		if functionsList[i].SumSelfTimeNS != functionsList[j].SumSelfTimeNS {
+			return functionsList[i].SumSelfTimeNS > functionsList[j].SumSelfTimeNS
+		}
+		return functionsList[i].SumDurationNS > functionsList[j].SumDurationNS
 	})
 
 	return functionsList