IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

DataProxy: Fix issue overriding response body when response status is 101 (#41364)

Browse Source 
When a request going through Grafana data source proxy responds with a websocket 
upgrade response we cannot override the response body since it produces an error. 
This problem seems to have been introduced in Grafana v8.0 by #38962. 
In addition #40303 added same problem.

Fixes #41292
This commit is contained in:
Marcus Efraimsson 2021-11-09 14:33:54 +01:00 committed by GitHub
parent cd5d84b0f3
commit 3be452f995
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/infra/httpclient/httpclientprovider/datasource_metrics_middleware.go
View File

@ -96,7 +96,7 @@ func executeMiddleware(next http.RoundTripper, datasourceLabel prometheus.Labels
return nil, err return nil, err
} }
if res != nil { if res != nil && res.StatusCode != http.StatusSwitchingProtocols {
res.Body = httpclient.CountBytesReader(res.Body, func(bytesRead int64) { res.Body = httpclient.CountBytesReader(res.Body, func(bytesRead int64) {
responseSizeSummary.Observe(float64(bytesRead)) responseSizeSummary.Observe(float64(bytesRead))
}) })

5
pkg/infra/httpclient/httpclientprovider/response_limit_middleware.go
View File

@ -21,7 +21,10 @@ func ResponseLimitMiddleware(limit int64) sdkhttpclient.Middleware {
return nil, err return nil, err
} }
res.Body = httpclient.MaxBytesReader(res.Body, limit) if res != nil && res.StatusCode != http.StatusSwitchingProtocols {
res.Body = httpclient.MaxBytesReader(res.Body, limit)
}
return res, nil return res, nil
}) })
}) })