From 6638dd9a836c5e00c1d962b6ab994eb97fea47f8 Mon Sep 17 00:00:00 2001 From: Brendan O'Handley Date: Thu, 7 Nov 2024 10:52:42 -0600 Subject: [PATCH] Revert "Prometheus: Add error source to differentiate errors for api server work" (#96043) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Revert "Prometheus: Add error source to differentiate errors for api server w…" This reverts commit b9b5445090a9de0181611419028d52dd2271f00c. --- pkg/promlib/querydata/request.go | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/pkg/promlib/querydata/request.go b/pkg/promlib/querydata/request.go index 5ed665ea4e2..625113a69c9 100644 --- a/pkg/promlib/querydata/request.go +++ b/pkg/promlib/querydata/request.go @@ -235,9 +235,8 @@ func (s *QueryData) rangeQuery(ctx context.Context, c *client.Client, q *models. res, err := c.QueryRange(ctx, q) if err != nil { return backend.DataResponse{ - Error: err, - Status: backend.StatusBadGateway, - ErrorSource: backend.ErrorSourceDownstream, + Error: err, + Status: backend.StatusBadGateway, } } @@ -255,17 +254,15 @@ func (s *QueryData) instantQuery(ctx context.Context, c *client.Client, q *model res, err := c.QueryInstant(ctx, q) if err != nil { return backend.DataResponse{ - Error: err, - Status: backend.StatusBadGateway, - ErrorSource: backend.ErrorSourceDownstream, + Error: err, + Status: backend.StatusBadGateway, } } // This is only for health check fall back scenario if res.StatusCode != 200 && q.RefId == "__healthcheck__" { return backend.DataResponse{ - Error: errors.New(res.Status), - ErrorSource: backend.ErrorSourceDownstream, + Error: errors.New(res.Status), } } @@ -283,8 +280,7 @@ func (s *QueryData) exemplarQuery(ctx context.Context, c *client.Client, q *mode res, err := c.QueryExemplars(ctx, q) if err != nil { return backend.DataResponse{ - Error: err, - ErrorSource: backend.ErrorSourceDownstream, + Error: err, } }