public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Prometheus: Fix handling errors in streaming client (#61643)

Browse Source 
* Return errors from data parsing

* Better error handling

* Fix the tests

* When there is no frame add empty frame to get metadata attached to it

* Fix tests

* Update testdata
This commit is contained in:
ismail simsek
2023-01-18 22:30:15 +01:00
committed by GitHub
parent 2c46f46d37
commit 29c8ce12a0
5 changed files with 56 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/tsdb/prometheus/querydata/request.go
+3 -9
View File
@@ -125,23 +125,17 @@ func (s *QueryData) fetch(ctx context.Context, client *client.Client, q *models.
if q.InstantQuery {
res, err := s.instantQuery(traceCtx, client, q, headers)
if err != nil {
return nil, err
}
response.Error = res.Error
response.Error = err
response.Frames = res.Frames
}
if q.RangeQuery {
res, err := s.rangeQuery(traceCtx, client, q, headers)
if err != nil {
return nil, err
}
if res.Error != nil {
if response.Error == nil {
response.Error = res.Error
response.Error = err
} else {
response.Error = fmt.Errorf("%v %w", response.Error, res.Error) // lovely
response.Error = fmt.Errorf("%v %w", response.Error, err)
}
}
response.Frames = append(response.Frames, res.Frames...)