Skip to content

Commit

Permalink
[mq] working branch - merge d878c2a on top of main at fa33a49
Browse files Browse the repository at this point in the history
{"baseBranch":"main","baseCommit":"fa33a498f7c4a3850a38d111837282323e9affa9","createdAt":"2025-02-07T19:36:08.366187Z","headSha":"d878c2a1e659a1cdaefff4cec5d5bf5331cc5f49","id":"40cddc33-257f-4380-bcb2-015bf0b71e68","priority":"200","pullRequestNumber":"33786","queuedAt":"2025-02-07T19:36:08.365612Z","status":"STATUS_QUEUED"}
  • Loading branch information
dd-mergequeue[bot] authored Feb 7, 2025
2 parents d088859 + d878c2a commit 0e2e499
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions pkg/dynamicinstrumentation/uploader/stack_trace.go
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,10 @@ func parseStackTrace(procInfo *ditypes.ProcessInfo, rawProgramCounters []uint64)
}

funcInfo, err := pcToLine(procInfo, rawProgramCounters[i])
if err != nil {
return stackTrace, fmt.Errorf("could not resolve pc to function info: %w", err)
if err != nil && len(stackTrace) == 0 {
return stackTrace, fmt.Errorf("no stack trace: %w", err)
} else if err != nil {
return stackTrace, nil
}
stackFrame := ditypes.StackFrame{Function: funcInfo.fn, FileName: funcInfo.file, Line: int(funcInfo.line)}
stackTrace = append(stackTrace, stackFrame)
Expand Down

0 comments on commit 0e2e499

Please sign in to comment.