Skip to content

Commit 1b77587

Browse files
ZylphrexZylphrex
authored
Merge pull request #634 from getsentry/txiao/chore/remove-unused-self-times-array
chore(flamegraph): Remove unused self times array
2 parents 2e2e155 + 8f62c8d commit 1b77587

File tree

4 files changed

+0
-25
lines changed

4 files changed

+0
-25
lines changed

‎internal/metrics/metrics.go‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@ func (ma *Aggregator) AddFunctions(functions []nodetree.CallTreeFunction, result
4444
fn.SampleCount += f.SampleCount
4545
fn.DurationsNS = append(fn.DurationsNS, f.DurationsNS...)
4646
fn.SumDurationNS += f.SumDurationNS
47-
fn.SelfTimesNS = append(fn.SelfTimesNS, f.SelfTimesNS...)
4847
fn.SumSelfTimeNS += f.SumSelfTimeNS
4948
funcMetadata := ma.FunctionsMetadata[f.Fingerprint]
5049
if f.SumSelfTimeNS > funcMetadata.MaxVal {

‎internal/metrics/metrics_test.go‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,13 @@ func TestAggregatorAddFunctions(t *testing.T) {
2121
{
2222
Function: "a",
2323
Fingerprint: 0,
24-
SelfTimesNS: []uint64{10, 5, 25},
2524
SumSelfTimeNS: 40,
2625
DurationsNS: []uint64{10, 5, 25},
2726
SumDurationNS: 40,
2827
},
2928
{
3029
Function: "b",
3130
Fingerprint: 1,
32-
SelfTimesNS: []uint64{45, 60},
3331
SumSelfTimeNS: 105,
3432
DurationsNS: []uint64{45, 60},
3533
SumDurationNS: 105,
@@ -42,15 +40,13 @@ func TestAggregatorAddFunctions(t *testing.T) {
4240
0: {
4341
Function: "a",
4442
Fingerprint: 0,
45-
SelfTimesNS: []uint64{10, 5, 25, 10, 5, 25},
4643
SumSelfTimeNS: 80,
4744
DurationsNS: []uint64{10, 5, 25, 10, 5, 25},
4845
SumDurationNS: 80,
4946
},
5047
1: {
5148
Function: "b",
5249
Fingerprint: 1,
53-
SelfTimesNS: []uint64{45, 60, 45, 60},
5450
SumSelfTimeNS: 210,
5551
DurationsNS: []uint64{45, 60, 45, 60},
5652
SumDurationNS: 210,
@@ -100,7 +96,6 @@ func TestAggregatorToMetrics(t *testing.T) {
10096
Fingerprint: 0,
10197
DurationsNS: []uint64{1, 2, 3, 4, 10, 8, 7, 11, 20},
10298
SumDurationNS: 66,
103-
SelfTimesNS: []uint64{1, 2, 3, 4, 10, 8, 7, 11, 20},
10499
SumSelfTimeNS: 66,
105100
SampleCount: 2,
106101
},
@@ -109,7 +104,6 @@ func TestAggregatorToMetrics(t *testing.T) {
109104
Fingerprint: 1,
110105
DurationsNS: []uint64{1, 2, 3, 4, 10, 8, 7, 11, 20},
111106
SumDurationNS: 66,
112-
SelfTimesNS: []uint64{1, 2, 3, 4, 10, 8, 7, 11, 20},
113107
SumSelfTimeNS: 66,
114108
SampleCount: 2,
115109
},

‎internal/nodetree/nodetree.go‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,6 @@ type CallTreeFunction struct {
124124
InApp bool `json:"in_app"`
125125
DurationsNS []uint64 `json:"durations_ns"`
126126
SumDurationNS uint64 `json:"-"`
127-
SelfTimesNS []uint64 `json:"self_times_ns"`
128127
SumSelfTimeNS uint64 `json:"-"`
129128
SampleCount int `json:"-"`
130129
ThreadID string `json:"thread_id"`
@@ -210,7 +209,6 @@ func (n *Node) CollectFunctions(
210209
InApp: n.IsApplication,
211210
DurationsNS: []uint64{n.DurationNS},
212211
SumDurationNS: n.DurationNS,
213-
SelfTimesNS: []uint64{},
214212
SumSelfTimeNS: 0,
215213
SampleCount: n.SampleCount,
216214
ThreadID: threadID,
@@ -229,7 +227,6 @@ func (n *Node) CollectFunctions(
229227
}
230228

231229
if selfTimeNS > 0 {
232-
function.SelfTimesNS = append(function.SelfTimesNS, selfTimeNS)
233230
function.SumSelfTimeNS += selfTimeNS
234231
}
235232

‎internal/nodetree/nodetree_test.go‎

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@ func TestNodeTreeCollectFunctions(t *testing.T) {
4343
Package: "foo",
4444
DurationsNS: []uint64{10},
4545
SumDurationNS: 10,
46-
SelfTimesNS: []uint64{10},
4746
SumSelfTimeNS: 10,
4847
MaxDuration: 10,
4948
},
@@ -68,7 +67,6 @@ func TestNodeTreeCollectFunctions(t *testing.T) {
6867
Package: "foo",
6968
DurationsNS: []uint64{10},
7069
SumDurationNS: 10,
71-
SelfTimesNS: []uint64{10},
7270
SumSelfTimeNS: 10,
7371
MaxDuration: 10,
7472
},
@@ -103,7 +101,6 @@ func TestNodeTreeCollectFunctions(t *testing.T) {
103101
Package: "foo",
104102
DurationsNS: []uint64{20},
105103
SumDurationNS: 20,
106-
SelfTimesNS: []uint64{10},
107104
SumSelfTimeNS: 10,
108105
MaxDuration: 10,
109106
},
@@ -114,7 +111,6 @@ func TestNodeTreeCollectFunctions(t *testing.T) {
114111
Package: "bar",
115112
DurationsNS: []uint64{10},
116113
SumDurationNS: 10,
117-
SelfTimesNS: []uint64{10},
118114
SumSelfTimeNS: 10,
119115
MaxDuration: 10,
120116
},
@@ -167,7 +163,6 @@ func TestNodeTreeCollectFunctions(t *testing.T) {
167163
Function: "bar",
168164
Package: "bar",
169165
DurationsNS: []uint64{10},
170-
SelfTimesNS: []uint64{},
171166
SumDurationNS: 10,
172167
MaxDuration: 0,
173168
},
@@ -178,7 +173,6 @@ func TestNodeTreeCollectFunctions(t *testing.T) {
178173
Package: "foo",
179174
DurationsNS: []uint64{10},
180175
SumDurationNS: 10,
181-
SelfTimesNS: []uint64{10},
182176
SumSelfTimeNS: 10,
183177
MaxDuration: 10,
184178
},
@@ -189,7 +183,6 @@ func TestNodeTreeCollectFunctions(t *testing.T) {
189183
Package: "baz",
190184
DurationsNS: []uint64{10},
191185
SumDurationNS: 10,
192-
SelfTimesNS: []uint64{10},
193186
SumSelfTimeNS: 10,
194187
MaxDuration: 10,
195188
},
@@ -200,7 +193,6 @@ func TestNodeTreeCollectFunctions(t *testing.T) {
200193
Package: "main",
201194
DurationsNS: []uint64{10},
202195
SumDurationNS: 10,
203-
SelfTimesNS: []uint64{},
204196
SumSelfTimeNS: 0,
205197
MaxDuration: 0,
206198
},
@@ -297,7 +289,6 @@ func TestNodeTreeCollectFunctions(t *testing.T) {
297289
Function: "bar",
298290
Package: "bar",
299291
DurationsNS: []uint64{10, 20},
300-
SelfTimesNS: []uint64{},
301292
SumDurationNS: 30,
302293
MaxDuration: 0,
303294
},
@@ -308,7 +299,6 @@ func TestNodeTreeCollectFunctions(t *testing.T) {
308299
Package: "foo",
309300
DurationsNS: []uint64{10, 20},
310301
SumDurationNS: 30,
311-
SelfTimesNS: []uint64{10, 20},
312302
SumSelfTimeNS: 30,
313303
MaxDuration: 20,
314304
},
@@ -319,7 +309,6 @@ func TestNodeTreeCollectFunctions(t *testing.T) {
319309
Package: "baz",
320310
DurationsNS: []uint64{10, 20},
321311
SumDurationNS: 30,
322-
SelfTimesNS: []uint64{10, 20},
323312
SumSelfTimeNS: 30,
324313
MaxDuration: 20,
325314
},
@@ -330,7 +319,6 @@ func TestNodeTreeCollectFunctions(t *testing.T) {
330319
Package: "qux",
331320
DurationsNS: []uint64{10},
332321
SumDurationNS: 10,
333-
SelfTimesNS: []uint64{10},
334322
SumSelfTimeNS: 10,
335323
MaxDuration: 10,
336324
},
@@ -341,7 +329,6 @@ func TestNodeTreeCollectFunctions(t *testing.T) {
341329
Package: "main",
342330
DurationsNS: []uint64{40},
343331
SumDurationNS: 40,
344-
SelfTimesNS: []uint64{10},
345332
SumSelfTimeNS: 10,
346333
MaxDuration: 10,
347334
},
@@ -396,7 +383,6 @@ func TestNodeTreeCollectFunctions(t *testing.T) {
396383
InApp: true,
397384
DurationsNS: []uint64{10},
398385
SumDurationNS: 10,
399-
SelfTimesNS: []uint64{10},
400386
SumSelfTimeNS: 10,
401387
MaxDuration: 10,
402388
},
@@ -433,7 +419,6 @@ func TestNodeTreeCollectFunctions(t *testing.T) {
433419
InApp: true,
434420
DurationsNS: []uint64{10},
435421
SumDurationNS: 10,
436-
SelfTimesNS: []uint64{10},
437422
SumSelfTimeNS: 10,
438423
MaxDuration: 10,
439424
},

0 commit comments

Comments
 (0)