fix: move FixSamplesTime call to speedscope and calltrees methods (#339)

* Move FixSamplesTime call to speedscope and calltrees methods
getsentry · Oct 18, 2023 · 5a29391 · 5a29391
1 parent 6a50fe9
commit 5a29391
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -10,6 +10,8 @@
 
 **Internal**
 
+- Move FixSamplesTime call to speedscope and calltrees methods([#339](https://github.com/getsentry/vroom/pull/339))
+
 
 ## 23.10.0
 

diff --git a/internal/profile/android.go b/internal/profile/android.go
@@ -232,6 +232,9 @@ func (p *Android) FixSamplesTime() {
 
 // CallTrees generates call trees for a given profile.
 func (p Android) CallTrees() map[uint64][]*nodetree.Node {
+	// in case wall-clock.secs is not monotonic, "fix" it
+	p.FixSamplesTime()
+
 	var activeThreadID uint64
 	for _, thread := range p.Threads {
 		if thread.Name == mainThread {
@@ -370,6 +373,9 @@ func (p *Android) NormalizeMethods(pi profileInterface) {
 }
 
 func (p Android) Speedscope() (speedscope.Output, error) {
+	// in case wall-clock.secs is not monotonic, "fix" it
+	p.FixSamplesTime()
+
 	frames := make([]speedscope.Frame, 0)
 	methodIDToFrameIndex := make(map[uint64][]int)
 	for _, method := range p.Methods {

diff --git a/internal/profile/legacy.go b/internal/profile/legacy.go
@@ -239,8 +239,6 @@ func (p *LegacyProfile) Normalize() {
 		t.ReplaceIdleStacks()
 	case *Android:
 		t.NormalizeMethods(p)
-		// in case wall-clock.secs is not monotonic, "fix" it
-		t.FixSamplesTime()
 	}
 
 	if p.BuildID != "" {
Original file line number	Diff line number	Diff line change
Expand Up		@@ -10,6 +10,8 @@

		Internal

		- Move FixSamplesTime call to speedscope and calltrees methods([#339](https://github.com/getsentry/vroom/pull/339))


		## 23.10.0

Expand Down