Skip to content

Preserve operation interrupted in ContextEval error#1303

Merged
TristonianJones merged 1 commit intogoogle:masterfrom
dims:fix-context-eval-backward-compat
Apr 15, 2026
Merged

Preserve operation interrupted in ContextEval error#1303
TristonianJones merged 1 commit intogoogle:masterfrom
dims:fix-context-eval-backward-compat

Conversation

@dims
Copy link
Copy Markdown
Contributor

@dims dims commented Apr 14, 2026

When ContextEval detects an InterruptError, wrap both the original error and the context cause using fmt.Errorf("%w: %w", ...) so that:

  • errors.Is(err, context.Canceled) works (new behavior)
  • errors.Is(err, context.DeadlineExceeded) works (new behavior)
  • errors.Is(err, InterruptError{}) works (preserved)
  • strings.Contains(err.Error(), "operation interrupted") works (backward compat)

Previously, the error was replaced entirely with context.Cause(ctx), which dropped the "operation interrupted" message that downstream consumers (e.g. Kubernetes) rely on for string matching.

Fixes #1195 while maintaining backward compatibility.

Pull Requests Guidelines

See CONTRIBUTING.md for more details about when to create
a GitHub Pull Request and when other kinds of contributions or
consultation might be more desirable.

When creating a new pull request, please fork the repo and work within a
development branch.

Commit Messages

  • Most changes should be accompanied by tests.
  • Commit messages should explain why the changes were made.
Summary of change in 50 characters or less

Background on why the change is being made with additional detail on
consequences of the changes elsewhere in the code or to the general
functionality of the library. Multiple paragraphs may be used, but
please keep lines to 72 characters or less.

Reviews

  • Perform a self-review.
  • Make sure the Travis CI build passes.
  • Assign a reviewer once both the above have been completed.

Merging

  • If a CEL maintaner approves the change, it may be merged by the author if
    they have write access. Otherwise, the change will be merged by a maintainer.
  • Multiple commits should be squashed before merging.
  • Please append the line closes #<issue-num>: description in the merge message,
    if applicable.

When ContextEval detects an InterruptError, wrap both the original
error and the context cause using fmt.Errorf("%w: %w", ...) so that:
- errors.Is(err, context.Canceled) works (new behavior)
- errors.Is(err, context.DeadlineExceeded) works (new behavior)
- errors.Is(err, InterruptError{}) works (preserved)
- strings.Contains(err.Error(), "operation interrupted") works (backward compat)

Previously, the error was replaced entirely with context.Cause(ctx),
which dropped the "operation interrupted" message that downstream
consumers (e.g. Kubernetes) rely on for string matching.

Fixes google#1195 while maintaining backward compatibility.

Signed-off-by: Davanum Srinivas <davanum@gmail.com>
@dims
Copy link
Copy Markdown
Contributor Author

dims commented Apr 14, 2026

xref: kubernetes/kubernetes#138334

@TristonianJones
Copy link
Copy Markdown
Collaborator

/gcbrun

@TristonianJones TristonianJones merged commit 7263793 into google:master Apr 15, 2026
3 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

ContextEval: better error when context is canceled

2 participants