mirrors/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2025-08-06 14:17:12 +02:00
Code Issues Projects Releases Wiki Activity

Strip newline in error when reading from remote client (#16487)

Browse Source 
Signed-off-by: Jeanette Tan <jeanette.tan@grafana.com>
This commit is contained in:
zenador 2025-04-27 21:59:33 +08:00 committed by GitHub
parent 5630a3906a
commit d73b0f34e3
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
storage/remote/client.go
View File

@ -384,7 +384,8 @@ func (c *Client) Read(ctx context.Context, query *prompb.Query, sortSeries bool)
_ = httpResp.Body.Close() _ = httpResp.Body.Close()
cancel() cancel()
err := errors.New(string(body)) errStr := strings.Trim(string(body), "\n")
err := errors.New(errStr)
return nil, fmt.Errorf("remote server %s returned http status %s: %w", c.urlString, httpResp.Status, err) return nil, fmt.Errorf("remote server %s returned http status %s: %w", c.urlString, httpResp.Status, err)
} }

2
storage/remote/client_test.go
View File

@ -342,7 +342,7 @@ func TestReadClient(t *testing.T) {
httpHandler: http.HandlerFunc(func(w http.ResponseWriter, _ *http.Request) { httpHandler: http.HandlerFunc(func(w http.ResponseWriter, _ *http.Request) {
http.Error(w, "test error", http.StatusBadRequest) http.Error(w, "test error", http.StatusBadRequest)
}), }),
expectedErrorContains: "test error\n", expectedErrorContains: "test error",
unwrap: true, unwrap: true,
}, },
} }