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

Revert "Prometheus: Check both error and http status for source of error " (#96396)

Browse Source
This commit is contained in:
Brendan O'Handley 2024-11-13 20:19:30 -06:00 committed by GitHub
parent 7038bbe318
commit ad3fc95755
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 10 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
pkg/promlib/querydata/request.go
View File

@ -234,13 +234,9 @@ func (s *QueryData) fetch(traceCtx context.Context, client *client.Client, q *mo
func (s *QueryData) rangeQuery(ctx context.Context, c *client.Client, q *models.Query, enablePrometheusDataplaneFlag bool) backend.DataResponse { func (s *QueryData) rangeQuery(ctx context.Context, c *client.Client, q *models.Query, enablePrometheusDataplaneFlag bool) backend.DataResponse {
res, err := c.QueryRange(ctx, q) res, err := c.QueryRange(ctx, q)
if err != nil { if err != nil {
return addErrorSourceToDataResponse(err)
}
if res.StatusCode/100 != 2 {
// for differentiating the source of http errors by status code
return backend.DataResponse{ return backend.DataResponse{
ErrorSource: backend.ErrorSourceFromHTTPStatus(res.StatusCode), Error: err,
Status: backend.StatusBadGateway,
} }
} }
@ -257,22 +253,16 @@ func (s *QueryData) rangeQuery(ctx context.Context, c *client.Client, q *models.
func (s *QueryData) instantQuery(ctx context.Context, c *client.Client, q *models.Query, enablePrometheusDataplaneFlag bool) backend.DataResponse { func (s *QueryData) instantQuery(ctx context.Context, c *client.Client, q *models.Query, enablePrometheusDataplaneFlag bool) backend.DataResponse {
res, err := c.QueryInstant(ctx, q) res, err := c.QueryInstant(ctx, q)
if err != nil { if err != nil {
// confirm that it is a downstream error return backend.DataResponse{
return addErrorSourceToDataResponse(err) Error: err,
Status: backend.StatusBadGateway,
}
} }
if res.StatusCode/100 != 2 {
// This is only for health check fall back scenario // This is only for health check fall back scenario
// add more details to the health check error if res.StatusCode != 200 && q.RefId == "__healthcheck__" {
if q.RefId == "__healthcheck__" {
return backend.DataResponse{ return backend.DataResponse{
Error: errors.New(res.Status), Error: errors.New(res.Status),
ErrorSource: backend.ErrorSourceFromHTTPStatus(res.StatusCode),
}
}
// for differentiating the source of http errors by status code
return backend.DataResponse{
ErrorSource: backend.ErrorSourceFromHTTPStatus(res.StatusCode),
} }
} }
@ -289,13 +279,8 @@ func (s *QueryData) instantQuery(ctx context.Context, c *client.Client, q *model
func (s *QueryData) exemplarQuery(ctx context.Context, c *client.Client, q *models.Query, enablePrometheusDataplaneFlag bool) backend.DataResponse { func (s *QueryData) exemplarQuery(ctx context.Context, c *client.Client, q *models.Query, enablePrometheusDataplaneFlag bool) backend.DataResponse {
res, err := c.QueryExemplars(ctx, q) res, err := c.QueryExemplars(ctx, q)
if err != nil { if err != nil {
return addErrorSourceToDataResponse(err)
}
if res.StatusCode/100 != 2 {
// for differentiating the source of http errors by status code
return backend.DataResponse{ return backend.DataResponse{
ErrorSource: backend.ErrorSourceFromHTTPStatus(res.StatusCode), Error: err,
} }
} }
@ -319,15 +304,3 @@ func addDataResponse(res *backend.DataResponse, dr *backend.DataResponse) {
} }
dr.Frames = append(dr.Frames, res.Frames...) dr.Frames = append(dr.Frames, res.Frames...)
} }
func addErrorSourceToDataResponse(err error) backend.DataResponse {
response := backend.DataResponse{
Error: err,
Status: backend.StatusBadGateway,
}
if backend.IsDownstreamHTTPError(err) {
response.ErrorSource = backend.ErrorSourceDownstream
}
return response
}