Skip to content

Preserve operation interrupted in ContextEval error #1303

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
TristonianJones merged 1 commit into from
Apr 15, 2026
Merged

Preserve operation interrupted in ContextEval error #1303

Show file tree
Hide file tree
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
5 changes: 4 additions & 1 deletion cel/cel_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1160,9 +1160,12 @@ func TestContextEval(t *testing.T) {
if err == nil {
t.Errorf("Got result %v, wanted timeout error", out)
}
if err != nil && err.Error() != "context deadline exceeded" {
if err != nil && !errors.Is(err, context.DeadlineExceeded) {
t.Errorf("Got %v, wanted context deadline exceeded", err)
}
if err != nil && !strings.Contains(err.Error(), "operation interrupted") {
t.Errorf("Got %v, wanted error containing 'operation interrupted'", err)
}
}

func TestContextEvalUnknowns(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion cel/program.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -370,7 +370,7 @@ func (p *prog) ContextEval(ctx context.Context, input any) (ref.Val, *EvalDetail
}
out, det, err := p.Eval(vars)
if err != nil && errors.Is(err, interpreter.InterruptError{}) {
return out, det, context.Cause(ctx)
return out, det, fmt.Errorf("%w: %w", err, context.Cause(ctx))
}
return out, det, err
}
Expand Down