diff --git a/internal/metrics/metrics.go b/internal/metrics/metrics.go index d7579697..aa17955e 100644 --- a/internal/metrics/metrics.go +++ b/internal/metrics/metrics.go @@ -44,7 +44,6 @@ func (ma *Aggregator) AddFunctions(functions []nodetree.CallTreeFunction, result fn.SampleCount += f.SampleCount fn.DurationsNS = append(fn.DurationsNS, f.DurationsNS...) fn.SumDurationNS += f.SumDurationNS - fn.SelfTimesNS = append(fn.SelfTimesNS, f.SelfTimesNS...) fn.SumSelfTimeNS += f.SumSelfTimeNS funcMetadata := ma.FunctionsMetadata[f.Fingerprint] if f.SumSelfTimeNS > funcMetadata.MaxVal { diff --git a/internal/metrics/metrics_test.go b/internal/metrics/metrics_test.go index f2547a4f..02651c62 100644 --- a/internal/metrics/metrics_test.go +++ b/internal/metrics/metrics_test.go @@ -21,7 +21,6 @@ func TestAggregatorAddFunctions(t *testing.T) { { Function: "a", Fingerprint: 0, - SelfTimesNS: []uint64{10, 5, 25}, SumSelfTimeNS: 40, DurationsNS: []uint64{10, 5, 25}, SumDurationNS: 40, @@ -29,7 +28,6 @@ func TestAggregatorAddFunctions(t *testing.T) { { Function: "b", Fingerprint: 1, - SelfTimesNS: []uint64{45, 60}, SumSelfTimeNS: 105, DurationsNS: []uint64{45, 60}, SumDurationNS: 105, @@ -42,7 +40,6 @@ func TestAggregatorAddFunctions(t *testing.T) { 0: { Function: "a", Fingerprint: 0, - SelfTimesNS: []uint64{10, 5, 25, 10, 5, 25}, SumSelfTimeNS: 80, DurationsNS: []uint64{10, 5, 25, 10, 5, 25}, SumDurationNS: 80, @@ -50,7 +47,6 @@ func TestAggregatorAddFunctions(t *testing.T) { 1: { Function: "b", Fingerprint: 1, - SelfTimesNS: []uint64{45, 60, 45, 60}, SumSelfTimeNS: 210, DurationsNS: []uint64{45, 60, 45, 60}, SumDurationNS: 210, @@ -100,7 +96,6 @@ func TestAggregatorToMetrics(t *testing.T) { Fingerprint: 0, DurationsNS: []uint64{1, 2, 3, 4, 10, 8, 7, 11, 20}, SumDurationNS: 66, - SelfTimesNS: []uint64{1, 2, 3, 4, 10, 8, 7, 11, 20}, SumSelfTimeNS: 66, SampleCount: 2, }, @@ -109,7 +104,6 @@ func TestAggregatorToMetrics(t *testing.T) { Fingerprint: 1, DurationsNS: []uint64{1, 2, 3, 4, 10, 8, 7, 11, 20}, SumDurationNS: 66, - SelfTimesNS: []uint64{1, 2, 3, 4, 10, 8, 7, 11, 20}, SumSelfTimeNS: 66, SampleCount: 2, }, diff --git a/internal/nodetree/nodetree.go b/internal/nodetree/nodetree.go index 1f8c59a4..f7184f98 100644 --- a/internal/nodetree/nodetree.go +++ b/internal/nodetree/nodetree.go @@ -124,7 +124,6 @@ type CallTreeFunction struct { InApp bool `json:"in_app"` DurationsNS []uint64 `json:"durations_ns"` SumDurationNS uint64 `json:"-"` - SelfTimesNS []uint64 `json:"self_times_ns"` SumSelfTimeNS uint64 `json:"-"` SampleCount int `json:"-"` ThreadID string `json:"thread_id"` @@ -210,7 +209,6 @@ func (n *Node) CollectFunctions( InApp: n.IsApplication, DurationsNS: []uint64{n.DurationNS}, SumDurationNS: n.DurationNS, - SelfTimesNS: []uint64{}, SumSelfTimeNS: 0, SampleCount: n.SampleCount, ThreadID: threadID, @@ -229,7 +227,6 @@ func (n *Node) CollectFunctions( } if selfTimeNS > 0 { - function.SelfTimesNS = append(function.SelfTimesNS, selfTimeNS) function.SumSelfTimeNS += selfTimeNS } diff --git a/internal/nodetree/nodetree_test.go b/internal/nodetree/nodetree_test.go index 21973be3..41028952 100644 --- a/internal/nodetree/nodetree_test.go +++ b/internal/nodetree/nodetree_test.go @@ -43,7 +43,6 @@ func TestNodeTreeCollectFunctions(t *testing.T) { Package: "foo", DurationsNS: []uint64{10}, SumDurationNS: 10, - SelfTimesNS: []uint64{10}, SumSelfTimeNS: 10, MaxDuration: 10, }, @@ -68,7 +67,6 @@ func TestNodeTreeCollectFunctions(t *testing.T) { Package: "foo", DurationsNS: []uint64{10}, SumDurationNS: 10, - SelfTimesNS: []uint64{10}, SumSelfTimeNS: 10, MaxDuration: 10, }, @@ -103,7 +101,6 @@ func TestNodeTreeCollectFunctions(t *testing.T) { Package: "foo", DurationsNS: []uint64{20}, SumDurationNS: 20, - SelfTimesNS: []uint64{10}, SumSelfTimeNS: 10, MaxDuration: 10, }, @@ -114,7 +111,6 @@ func TestNodeTreeCollectFunctions(t *testing.T) { Package: "bar", DurationsNS: []uint64{10}, SumDurationNS: 10, - SelfTimesNS: []uint64{10}, SumSelfTimeNS: 10, MaxDuration: 10, }, @@ -167,7 +163,6 @@ func TestNodeTreeCollectFunctions(t *testing.T) { Function: "bar", Package: "bar", DurationsNS: []uint64{10}, - SelfTimesNS: []uint64{}, SumDurationNS: 10, MaxDuration: 0, }, @@ -178,7 +173,6 @@ func TestNodeTreeCollectFunctions(t *testing.T) { Package: "foo", DurationsNS: []uint64{10}, SumDurationNS: 10, - SelfTimesNS: []uint64{10}, SumSelfTimeNS: 10, MaxDuration: 10, }, @@ -189,7 +183,6 @@ func TestNodeTreeCollectFunctions(t *testing.T) { Package: "baz", DurationsNS: []uint64{10}, SumDurationNS: 10, - SelfTimesNS: []uint64{10}, SumSelfTimeNS: 10, MaxDuration: 10, }, @@ -200,7 +193,6 @@ func TestNodeTreeCollectFunctions(t *testing.T) { Package: "main", DurationsNS: []uint64{10}, SumDurationNS: 10, - SelfTimesNS: []uint64{}, SumSelfTimeNS: 0, MaxDuration: 0, }, @@ -297,7 +289,6 @@ func TestNodeTreeCollectFunctions(t *testing.T) { Function: "bar", Package: "bar", DurationsNS: []uint64{10, 20}, - SelfTimesNS: []uint64{}, SumDurationNS: 30, MaxDuration: 0, }, @@ -308,7 +299,6 @@ func TestNodeTreeCollectFunctions(t *testing.T) { Package: "foo", DurationsNS: []uint64{10, 20}, SumDurationNS: 30, - SelfTimesNS: []uint64{10, 20}, SumSelfTimeNS: 30, MaxDuration: 20, }, @@ -319,7 +309,6 @@ func TestNodeTreeCollectFunctions(t *testing.T) { Package: "baz", DurationsNS: []uint64{10, 20}, SumDurationNS: 30, - SelfTimesNS: []uint64{10, 20}, SumSelfTimeNS: 30, MaxDuration: 20, }, @@ -330,7 +319,6 @@ func TestNodeTreeCollectFunctions(t *testing.T) { Package: "qux", DurationsNS: []uint64{10}, SumDurationNS: 10, - SelfTimesNS: []uint64{10}, SumSelfTimeNS: 10, MaxDuration: 10, }, @@ -341,7 +329,6 @@ func TestNodeTreeCollectFunctions(t *testing.T) { Package: "main", DurationsNS: []uint64{40}, SumDurationNS: 40, - SelfTimesNS: []uint64{10}, SumSelfTimeNS: 10, MaxDuration: 10, }, @@ -396,7 +383,6 @@ func TestNodeTreeCollectFunctions(t *testing.T) { InApp: true, DurationsNS: []uint64{10}, SumDurationNS: 10, - SelfTimesNS: []uint64{10}, SumSelfTimeNS: 10, MaxDuration: 10, }, @@ -433,7 +419,6 @@ func TestNodeTreeCollectFunctions(t *testing.T) { InApp: true, DurationsNS: []uint64{10}, SumDurationNS: 10, - SelfTimesNS: []uint64{10}, SumSelfTimeNS: 10, MaxDuration: 10, },