Avoid returning 500 when for TRACE_TOO_LARGE

grafana · Oct 4, 2024 · a62bf71 · a62bf71
1 parent 6afedd9
commit a62bf71
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/modules/frontend/pipeline/sync_handler_adjust_response_code.go b/modules/frontend/pipeline/sync_handler_adjust_response_code.go
@@ -44,8 +44,9 @@ func (c statusCodeAdjustWare) RoundTrip(req Request) (*http.Response, error) {
 	// if the frontend issues a bad request then externally we need to represent that as an
 	// internal error
 	// exceptions
+	//   413 - request entity too large
 	//   429 - too many requests
-	if resp.StatusCode >= 400 && resp.StatusCode < 500 && resp.StatusCode != 429 {
+	if resp.StatusCode >= 400 && resp.StatusCode < 500 && resp.StatusCode != 429 && resp.StatusCode != 413 {
 		resp.StatusCode = http.StatusInternalServerError
 		resp.Status = http.StatusText(http.StatusInternalServerError)
 		// leave the body alone. it will preserve the original error message

diff --git a/modules/querier/http.go b/modules/querier/http.go
@@ -427,7 +427,7 @@ func handleError(w http.ResponseWriter, err error) {
 
 	// todo: better understand all errors returned from queriers and categorize more as 4XX
 	if errors.Is(err, trace.ErrTraceTooLarge) {
-		http.Error(w, err.Error(), http.StatusBadRequest)
+		http.Error(w, err.Error(), http.StatusRequestEntityTooLarge)
 		return
 	}