Skip to content

cli/daemon/engine/trace2: report trace2.ErrNotFound #2097

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

cli/daemon/engine/trace2: report trace2.ErrNotFound #2097

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion cli/daemon/engine/trace2/sqlite/read.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,9 @@ func (s *Store) Get(ctx context.Context, appID, traceID string, iter trace2.Even
}

defer fns.CloseIgnore(rows)
hasRows := false
for rows.Next() {
hasRows = true
var data []byte
err := rows.Scan(&data)
if err != nil {
Expand All @@ -143,5 +145,10 @@ func (s *Store) Get(ctx context.Context, appID, traceID string, iter trace2.Even
}
}

return errors.Wrap(rows.Err(), "iterate events")
if err := rows.Err(); err != nil {
return errors.Wrap(err, "iterate events")
} else if !hasRows {
return trace2.ErrNotFound
}
return nil
}