Skip to content

fix(proxy): distinguish upstream failures from routing failures in proxy ErrorHandler #3692

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
AdaAibaby wants to merge 1 commit into
base: main
Choose a base branch
from
+20 −9
Open

fix(proxy): distinguish upstream failures from routing failures in proxy ErrorHandler #3692

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
29 changes: 20 additions & 9 deletions packages/shared/pkg/proxy/pool/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,13 @@ import (
"context"
"crypto/tls"
"errors"
"io"
"log"
"net"
"net/http"
"net/http/httputil"
"sync/atomic"
"syscall"
"time"

"go.uber.org/zap"
Expand Down Expand Up @@ -153,14 +155,20 @@ func newProxyClient(
}

if err != nil {
if t.SandboxPort == uint64(consts.DefaultEnvdServerPort) {
if errors.Is(err, context.Canceled) {
t.RequestLogger.Warn(ctx, "sandbox request canceled by client", zap.Error(err))
} else {
t.RequestLogger.Error(ctx, "sandbox error handler called", zap.Error(err))
}
} else {
t.RequestLogger.Warn(ctx, "sandbox error handler called", zap.Error(err))
// Client-caused disconnects (cancel, connection reset, EOF) are not
// server faults: an SDK/browser that gives up mid-request, or a weak
// (CGNAT/mobile) link that drops a large upload, surfaces here. Log
// them at Warn so they do not drown real upstream faults in ERROR.
clientGone := errors.Is(err, context.Canceled) ||
errors.Is(err, syscall.ECONNRESET) ||
errors.Is(err, io.EOF)
switch {
case clientGone:
t.RequestLogger.Warn(ctx, "sandbox request aborted by client", zap.Error(err))
case t.SandboxPort == uint64(consts.DefaultEnvdServerPort):
t.RequestLogger.Error(ctx, "sandbox upstream error", zap.Error(err))
default:
t.RequestLogger.Warn(ctx, "sandbox upstream error", zap.Error(err))
}
}

Expand All @@ -179,7 +187,10 @@ func newProxyClient(
return
}

cors.Error(w, "Failed to route request to sandbox", http.StatusBadGateway)
// Destination resolved; this is an upstream/transport failure reaching
// the sandbox, not a routing failure. A distinct message and 502 let
// logs and clients tell it apart from the 500 routing failures above.
cors.Error(w, "Failed to reach sandbox (upstream connection error)", http.StatusBadGateway)
},
ModifyResponse: func(r *http.Response) error {
ctx := r.Request.Context()
Expand Down