Skip to content

feature(proxy): Adds special handling for client cancellations in proxy error handler#1522

Open
soilSpoon wants to merge 7 commits intorouter-for-me:mainfrom
soilSpoon:feature/canceled
Open

feature(proxy): Adds special handling for client cancellations in proxy error handler#1522
soilSpoon wants to merge 7 commits intorouter-for-me:mainfrom
soilSpoon:feature/canceled

Conversation

@soilSpoon
Copy link
Collaborator

Silences logging for client cancellations during polling to reduce noise in logs.
Client-side cancellations are common during long-running operations and should not be treated as errors.

…xy error handler

Silences logging for client cancellations during polling to reduce noise in logs.
Client-side cancellations are common during long-running operations and should not be treated as errors.
@soilSpoon soilSpoon requested a review from Copilot February 10, 2026 09:04
@gemini-code-assist
Copy link
Contributor

Summary of Changes

Hello @soilSpoon, I'm Gemini Code Assist1! I'm currently reviewing this pull request and will post my feedback shortly. In the meantime, here's a summary to help you and other reviewers quickly get up to speed!

This pull request refines the proxy's error handling mechanism to differentiate between genuine upstream errors and client-initiated cancellations. By explicitly ignoring context.Canceled errors, the system's logs will become cleaner and more focused on actionable issues, improving operational clarity.

Highlights

  • Client Cancellation Handling: The proxy's error handler was updated to specifically detect and handle client-side cancellations (context.Canceled) without logging them as errors.
  • Log Noise Reduction: This change reduces log noise by preventing error messages for expected client cancellations, which commonly occur during long-running polling operations.

🧠 New Feature in Public Preview: You can now enable Memory to help Gemini Code Assist learn from your team's feedback. This makes future code reviews more consistent and personalized to your project's style. Click here to enable Memory in your admin console.

Changelog
  • internal/api/modules/amp/proxy.go
    • Imported the context package to enable detection of cancellation signals.
    • Modified the ErrorHandler function to check if the error is context.Canceled.
    • Added logic to return early from the ErrorHandler when a context.Canceled error is detected, effectively silencing these specific errors.
Activity
  • No specific activity has been recorded for this pull request yet.
Using Gemini Code Assist

The full guide for Gemini Code Assist can be found on our documentation page, here are some quick tips.

Invoking Gemini

You can request assistance from Gemini at any point by creating a comment using either /gemini <command> or @gemini-code-assist <command>. Below is a summary of the supported commands on the current page.

Feature Command Description
Code Review /gemini review Performs a code review for the current pull request in its current state.
Pull Request Summary /gemini summary Provides a summary of the current pull request in its current state.
Comment @gemini-code-assist Responds in comments when explicitly tagged, both in pull request comments and review comments.
Help /gemini help Displays a list of available commands.

Customization

To customize Gemini Code Assist for GitHub experience, repository maintainers can create a configuration file and/or provide a custom code review style guide (such as PEP-8 for Python) by creating and adding files to a .gemini/ folder in the base of the repository. Detailed instructions can be found here.

Limitations & Feedback

Gemini Code Assist may make mistakes. Please leave feedback on any instances where its feedback is incorrect or counter productive. You can react with 👍 and 👎 on @gemini-code-assist comments. If you're interested in giving your feedback about your experience with Gemini Code Assist for Github and other Google products, sign up here.

You can also get AI-powered code generation, chat, as well as code reviews directly in the IDE at no cost with the Gemini Code Assist IDE Extension.

Footnotes

  1. Review the Privacy Notices, Generative AI Prohibited Use Policy, Terms of Service, and learn how to configure Gemini Code Assist in GitHub here. Gemini can make mistakes, so double check it and use code with caution.

Copy link
Contributor

@gemini-code-assist gemini-code-assist bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Code Review

This pull request aims to reduce log noise by silencing errors from client cancellations in the proxy. The change correctly identifies context.Canceled errors but has a flaw: by simply returning from the error handler, the client receives an incorrect 200 OK status. My review provides a correction to use errors.Is for robust error checking and to explicitly send a 499 Client Closed Request status, aligning the code with the comment's intent and preventing incorrect client responses.

Copy link
Contributor

Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

Reduces log noise in the Amp upstream reverse proxy by adding special-case handling in the proxy error handler for client-initiated request cancellations (common during long-polling).

Changes:

  • Adds a cancellation check in proxy.ErrorHandler to skip error logging when the request is canceled.
  • Imports context to enable cancellation detection.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Comment on lines 191 to 195
proxy.ErrorHandler = func(rw http.ResponseWriter, req *http.Request, err error) {
// Client-side cancellations are common during polling; return 499 without logging
if err == context.Canceled {
return
}
Copy link

Copilot AI Feb 10, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This change introduces special-case behavior for canceled requests; there are existing proxy tests in proxy_test.go (including TestReverseProxy_ErrorHandler), but no assertion covering the cancellation path. Adding a focused test for the cancellation case would prevent regressions and clarify the intended status/response behavior.

Copilot uses AI. Check for mistakes.
soilSpoon and others added 2 commits February 10, 2026 19:07
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com>
Adds explicit handling for context.Canceled errors in the reverse proxy error handler to return 499 status code without logging, which is more appropriate for client-side cancellations during polling.

Also adds a test case to verify this behavior.
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.

1 participant