Merge pull request #542 from getsentry/txiao/fix/pass-readjob-result-…

…as-pointer fix(readjob): Pass readjob result as pointer
getsentry · Dec 6, 2024 · 4a38d5a · 4a38d5a
2 parents dc73a44 + 13f6269
commit 4a38d5a
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 9 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -124,6 +124,7 @@
 - Lower number of concurrent reads ([#537](https://github.com/getsentry/vroom/pull/537))
 - Remove unused metrics summary kafka writer ([#538](https://github.com/getsentry/vroom/pull/538))
 - Remove unused chunks flamegraph endpoint ([#541](https://github.com/getsentry/vroom/pull/541))
+- Pass readjob result as pointer ([#542](https://github.com/getsentry/vroom/pull/542))
 
 ## 23.12.0
 

diff --git a/cmd/vroom/chunk.go b/cmd/vroom/chunk.go
@@ -281,7 +281,7 @@ func (env *environment) postProfileFromChunkIDs(w http.ResponseWriter, r *http.R
 			// sense to have a final profile with missing chunks
 			continue
 		}
-		chunks = append(chunks, result.Chunk)
+		chunks = append(chunks, *result.Chunk)
 	}
 	s.Finish()
 	if err != nil {

diff --git a/internal/chunk/sample_readjob.go b/internal/chunk/sample_readjob.go
@@ -25,7 +25,7 @@ type (
 
 	ReadJobResult struct {
 		Err           error
-		Chunk         Chunk
+		Chunk         *Chunk
 		TransactionID string
 		ThreadID      *string
 		Start         uint64
@@ -45,7 +45,7 @@ func (job ReadJob) Read() {
 
 	job.Result <- ReadJobResult{
 		Err:           err,
-		Chunk:         chunk,
+		Chunk:         &chunk,
 		TransactionID: job.TransactionID,
 		ThreadID:      job.ThreadID,
 		Start:         job.Start,
@@ -63,7 +63,7 @@ type (
 	CallTreesReadJobResult struct {
 		Err           error
 		CallTrees     map[string][]*nodetree.Node
-		Chunk         SampleChunk
+		Chunk         *SampleChunk
 		TransactionID string
 		ThreadID      *string
 		Start         uint64
@@ -90,7 +90,7 @@ func (job CallTreesReadJob) Read() {
 	job.Result <- CallTreesReadJobResult{
 		Err:           err,
 		CallTrees:     callTrees,
-		Chunk:         chunk,
+		Chunk:         &chunk,
 		TransactionID: job.TransactionID,
 		ThreadID:      job.ThreadID,
 		Start:         job.Start,

diff --git a/internal/profile/readjob.go b/internal/profile/readjob.go
@@ -20,7 +20,7 @@ type (
 
 	ReadJobResult struct {
 		Err     error
-		Profile Profile
+		Profile *Profile
 	}
 )
 
@@ -34,7 +34,7 @@ func (job ReadJob) Read() {
 		&profile,
 	)
 
-	job.Result <- ReadJobResult{Profile: profile, Err: err}
+	job.Result <- ReadJobResult{Profile: &profile, Err: err}
 }
 
 func (result ReadJobResult) Error() error {
@@ -47,7 +47,7 @@ type (
 	CallTreesReadJobResult struct {
 		Err       error
 		CallTrees map[uint64][]*nodetree.Node
-		Profile   Profile
+		Profile   *Profile
 	}
 )
 
@@ -70,7 +70,7 @@ func (job CallTreesReadJob) Read() {
 
 	job.Result <- CallTreesReadJobResult{
 		CallTrees: callTrees,
-		Profile:   profile,
+		Profile:   &profile,
 		Err:       err,
 	}
 }