From 9726c764290231c47aee071f07b277dbd03b7c06 Mon Sep 17 00:00:00 2001 From: Will Browne Date: Fri, 7 May 2021 15:16:21 +0200 Subject: [PATCH] Chore: Swap out use of backend plugin SDK's backend.Logger (#33783) * Remove use of backend SDKs backend.Logger * reorder imports * FIx logger name Co-authored-by: Marcus Efraimsson Co-authored-by: Marcus Efraimsson --- pkg/expr/nodes.go | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkg/expr/nodes.go b/pkg/expr/nodes.go index 59cfa31ffbf..f4ff7716c21 100644 --- a/pkg/expr/nodes.go +++ b/pkg/expr/nodes.go @@ -10,10 +10,15 @@ import ( "github.com/grafana/grafana-plugin-sdk-go/data" "github.com/grafana/grafana/pkg/expr/classic" "github.com/grafana/grafana/pkg/expr/mathexp" + "github.com/grafana/grafana/pkg/infra/log" "gonum.org/v1/gonum/graph/simple" ) +var ( + logger = log.New("expr") +) + // baseNode includes commmon properties used across DPNodes. type baseNode struct { id int64 @@ -241,7 +246,7 @@ func (dn *DSNode) Execute(ctx context.Context, vars mathexp.Vars, s *Service) (m if len(qr.Frames) == 1 { frame := qr.Frames[0] if frame.TimeSeriesSchema().Type == data.TimeSeriesTypeNot && isNumberTable(frame) { - backend.Logger.Debug("expression datasource query (numberSet)", "query", refID) + logger.Debug("expression datasource query (numberSet)", "query", refID) numberSet, err := extractNumberSet(frame) if err != nil { return mathexp.Results{}, err @@ -257,7 +262,7 @@ func (dn *DSNode) Execute(ctx context.Context, vars mathexp.Vars, s *Service) (m } for _, frame := range qr.Frames { - backend.Logger.Debug("expression datasource query (seriesSet)", "query", refID) + logger.Debug("expression datasource query (seriesSet)", "query", refID) series, err := WideToMany(frame) if err != nil { return mathexp.Results{}, err