From f4a9aa11711ddaaf697889b2ea80cc7a3f2a4001 Mon Sep 17 00:00:00 2001 From: "grafana-delivery-bot[bot]" <132647405+grafana-delivery-bot[bot]@users.noreply.github.com> Date: Wed, 13 Mar 2024 19:31:12 +0200 Subject: [PATCH] [v10.4.x] Loki: Fix null pointer exception in case request returned an error (#84401) Loki: Fix null pointer exception in case request returned an error (#84398) Loki: Fix nullpointer in case query returned an error (cherry picked from commit 34f9bff9e031cde4e7817611c373dcd9e19b4d75) Co-authored-by: Sven Grossmann --- pkg/tsdb/loki/loki.go | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkg/tsdb/loki/loki.go b/pkg/tsdb/loki/loki.go index 68e1466623b..df2302d7727 100644 --- a/pkg/tsdb/loki/loki.go +++ b/pkg/tsdb/loki/loki.go @@ -240,6 +240,11 @@ func executeQuery(ctx context.Context, query *lokiQuery, req *backend.QueryDataR defer span.End() queryRes, err := runQuery(ctx, api, query, responseOpts, plog) + if queryRes == nil { + // we always want to return a backend.DataResponse object, even if we received just an error + queryRes = &backend.DataResponse{} + } + if err != nil { span.RecordError(err) span.SetStatus(codes.Error, err.Error())