TUN-6427: Differentiate between upstream request closed/canceled and failed origin requests

DevinCarr · DevinCarr · commit f4667c6345b6 · 2022-06-20T14:29:53.000Z
diff --git a/proxy/proxy.go b/proxy/proxy.go
@@ -196,6 +196,9 @@ func (p *Proxy) proxyHTTPRequest(
 	resp, err := httpService.RoundTrip(roundTripReq)
 	if err != nil {
 		tracing.EndWithErrorStatus(ttfbSpan, err)
+		if err := roundTripReq.Context().Err(); err != nil {
+			return errors.Wrap(err, "Incoming request ended abruptly")
+		}
 		return errors.Wrap(err, "Unable to reach the origin service. The service may be down or it may not be responding to traffic from cloudflared")
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -196,6 +196,9 @@ func (p *Proxy) proxyHTTPRequest(`
`196`	`196`	`resp, err := httpService.RoundTrip(roundTripReq)`
`197`	`197`	`if err != nil {`
`198`	`198`	`tracing.EndWithErrorStatus(ttfbSpan, err)`
	`199`	`+ if err := roundTripReq.Context().Err(); err != nil {`
	`200`	`+ return errors.Wrap(err, "Incoming request ended abruptly")`
	`201`	`+ }`
`199`	`202`	`return errors.Wrap(err, "Unable to reach the origin service. The service may be down or it may not be responding to traffic from cloudflared")`
`200`	`203`	`}`
`201`	`204`