Skip to content

Only log instance shutdown error if it's not nil or ctx cancel #2371

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

Merged
RebeccaMahany merged 2 commits into from
Jul 22, 2025
Merged

Only log instance shutdown error if it's not nil or ctx cancel #2371

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9fa93d4
Only log instance shutdown error if it's not nil or ctx cancel
RebeccaMahany Jul 22, 2025
db5eacf
Merge remote-tracking branch 'upstream/main' into becca/unexpected-in…
RebeccaMahany Jul 22, 2025
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
11 changes: 6 additions & 5 deletions pkg/osquery/runtime/runner.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,11 +130,12 @@ func (r *Runner) runInstance(registrationId string) error {

// The osquery instance either exited on its own, or we called `Restart`.
// Either way, we wait for exit to complete, and then restart the instance.
err := instance.WaitShutdown(ctx)
slogger.Log(context.TODO(), slog.LevelError,
"unexpected restart of instance",
"err", err,
)
if err := instance.WaitShutdown(ctx); err != nil && !errors.Is(err, context.Canceled) {
slogger.Log(context.TODO(), slog.LevelError,
"received error on instance shutdown after instance exit or instance restart",
"err", err,
)
}

var launchErr error
instance, launchErr = r.launchInstanceWithRetries(ctx, registrationId)
Expand Down