diff --git a/pkg/expr/converter.go b/pkg/expr/converter.go index 2ecd6c42b7f..4681aab8b72 100644 --- a/pkg/expr/converter.go +++ b/pkg/expr/converter.go @@ -8,6 +8,7 @@ import ( "github.com/grafana/grafana-plugin-sdk-go/data" "github.com/grafana/grafana/pkg/expr/mathexp" + "github.com/grafana/grafana/pkg/infra/log" "github.com/grafana/grafana/pkg/infra/tracing" "github.com/grafana/grafana/pkg/services/datasources" "github.com/grafana/grafana/pkg/services/featuremgmt" @@ -119,7 +120,7 @@ func (c *ResultConverter) Convert(ctx context.Context, }, nil } -func getResponseFrame(resp *backend.QueryDataResponse, refID string) (data.Frames, error) { +func getResponseFrame(logger *log.ConcreteLogger, resp *backend.QueryDataResponse, refID string) (data.Frames, error) { response, ok := resp.Responses[refID] if !ok { // This indicates that the RefID of the request was not included to the response, i.e. some problem in the data source plugin diff --git a/pkg/expr/ml.go b/pkg/expr/ml.go index affdad77a95..e7bde5487f2 100644 --- a/pkg/expr/ml.go +++ b/pkg/expr/ml.go @@ -124,7 +124,7 @@ func (m *MLNode) Execute(ctx context.Context, now time.Time, _ mathexp.Vars, s * data = &backend.QueryDataResponse{Responses: map[string]backend.DataResponse{}} } - dataFrames, err := getResponseFrame(data, m.refID) + dataFrames, err := getResponseFrame(logger, data, m.refID) if err != nil { return mathexp.Results{}, MakeQueryError(m.refID, "ml", err) } diff --git a/pkg/expr/nodes.go b/pkg/expr/nodes.go index 2d0bbbf0d2b..80de28e9883 100644 --- a/pkg/expr/nodes.go +++ b/pkg/expr/nodes.go @@ -325,7 +325,7 @@ func executeDSNodesGrouped(ctx context.Context, now time.Time, vars mathexp.Vars } for _, dn := range nodeGroup { - dataFrames, err := getResponseFrame(resp, dn.refID) + dataFrames, err := getResponseFrame(logger, resp, dn.refID) if err != nil { vars[dn.refID] = mathexp.Results{Error: MakeQueryError(dn.refID, dn.datasource.UID, err)} instrument(err, "") @@ -395,7 +395,7 @@ func (dn *DSNode) Execute(ctx context.Context, now time.Time, _ mathexp.Vars, s return mathexp.Results{}, MakeQueryError(dn.refID, dn.datasource.UID, err) } - dataFrames, err := getResponseFrame(resp, dn.refID) + dataFrames, err := getResponseFrame(logger, resp, dn.refID) if err != nil { return mathexp.Results{}, MakeQueryError(dn.refID, dn.datasource.UID, err) }