From 834a9106069480ef980aed280362dae668d06b4d Mon Sep 17 00:00:00 2001 From: "grafana-delivery-bot[bot]" <132647405+grafana-delivery-bot[bot]@users.noreply.github.com> Date: Tue, 28 Nov 2023 13:01:55 +0200 Subject: [PATCH] [v10.2.x] Loki: Fix nil pointer in api.go (#78729) Loki: Fix nil pointer in api.go (#78727) (cherry picked from commit 777d119a803e00232ecb16cbcc99f22653630b2f) Co-authored-by: Sven Grossmann --- pkg/tsdb/loki/api.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/tsdb/loki/api.go b/pkg/tsdb/loki/api.go index b1a9dfd404c..dad8e410c27 100644 --- a/pkg/tsdb/loki/api.go +++ b/pkg/tsdb/loki/api.go @@ -208,7 +208,7 @@ func (api *LokiAPI) DataQuery(ctx context.Context, query lokiQuery, responseOpts if res.Error != nil { span.RecordError(res.Error) - span.SetStatus(codes.Error, err.Error()) + span.SetStatus(codes.Error, res.Error.Error()) instrumentation.UpdatePluginParsingResponseDurationSeconds(ctx, time.Since(start), "error") api.log.Error("Error parsing response from loki", "error", res.Error, "metricDataplane", responseOpts.metricDataplane, "duration", time.Since(start), "stage", stageParseResponse) return nil, res.Error