Fix ENHANCE_YOUR_CALM too_many_pings error for the proxy agent following https://blog.cloudflare.com/go-and-enhance-your-calm/

EmperorGentoo · EmperorGentoo · commit 785783962149 · 2025-11-12T11:50:31.000Z
diff --git a/agent/utils/utils.go b/agent/utils/utils.go
@@ -241,7 +241,10 @@ func ListPendingRequests(ctx context.Context, client *http.Client, proxyHost, ba
 	if err != nil {
 		return nil, fmt.Errorf("A proxy request failed: %q", err.Error())
 	}
-	defer proxyResp.Body.Close()
+	defer func() {
+		io.Copy(io.Discard, proxyResp.Body)
+		proxyResp.Body.Close()
+	}()
 	return parseRequestIDs(proxyResp, metricHandler)
 }
 
@@ -371,6 +374,7 @@ func postResponseWithRetries(client *http.Client, proxyURL, backendID, requestID
 			}
 			continue
 		}
+		io.Copy(io.Discard, proxyResp.Body)
 		proxyResp.Body.Close()
 		if 500 <= proxyResp.StatusCode && proxyResp.StatusCode < 600 {
 			if _, seekErr := proxyReadSeeker.Seek(0, io.SeekStart); seekErr != nil {

Original file line number	Diff line number	Diff line change
`@@ -241,7 +241,10 @@ func ListPendingRequests(ctx context.Context, client *http.Client, proxyHost, ba`
`241`	`241`	`if err != nil {`
`242`	`242`	`return nil, fmt.Errorf("A proxy request failed: %q", err.Error())`
`243`	`243`	`}`
`244`		`- defer proxyResp.Body.Close()`
	`244`	`+ defer func() {`
	`245`	`+ io.Copy(io.Discard, proxyResp.Body)`
	`246`	`+ proxyResp.Body.Close()`
	`247`	`+ }()`
`245`	`248`	`return parseRequestIDs(proxyResp, metricHandler)`
`246`	`249`	`}`
`247`	`250`
`@@ -371,6 +374,7 @@ func postResponseWithRetries(client *http.Client, proxyURL, backendID, requestID`
`371`	`374`	`}`
`372`	`375`	`continue`
`373`	`376`	`}`
	`377`	`+ io.Copy(io.Discard, proxyResp.Body)`
`374`	`378`	`proxyResp.Body.Close()`
`375`	`379`	`if 500 <= proxyResp.StatusCode && proxyResp.StatusCode < 600 {`
`376`	`380`	`if _, seekErr := proxyReadSeeker.Seek(0, io.SeekStart); seekErr != nil {`