From 8222e019d4df7bf9fa329feac5b285486dcec63e Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Wed, 3 Jan 2024 08:03:23 +0000 Subject: [PATCH] fix: always try to remap both span and error stacktraces (#12221) (#12331) When an event contains both a span and an error, the error is ignored by the sourcemap processor leading to stacktraces not being remapped. (cherry picked from commit 8f1008427981a7bca6ad420e3edce964c170242d) Co-authored-by: kruskall <99559985+kruskall@users.noreply.github.com> --- internal/sourcemap/processor.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/internal/sourcemap/processor.go b/internal/sourcemap/processor.go index 6b2174da390..003ce3f30d1 100644 --- a/internal/sourcemap/processor.go +++ b/internal/sourcemap/processor.go @@ -57,10 +57,10 @@ func (p BatchProcessor) ProcessBatch(ctx context.Context, batch *modelpb.Batch) if event.GetService().GetName() == "" || event.GetService().GetVersion() == "" { continue } - switch { - case event.Span != nil: + if event.Span != nil { p.processStacktraceFrames(ctx, event.Service, event.Span.Stacktrace...) - case event.Error != nil: + } + if event.Error != nil { if event.Error.Log != nil { p.processStacktraceFrames(ctx, event.Service, event.Error.Log.Stacktrace...) }