Chore: Use SDK logger for test data source (#71579)

pkg/plugins/backendplugin/coreplugin/registry.go

@@ -52,6 +52,23 @@ func init() {
 	// Non-optimal global solution to replace plugin SDK default loggers for core plugins.
 	sdklog.DefaultLogger = &logWrapper{logger: log.New("plugin.coreplugin")}
 	backend.Logger = sdklog.DefaultLogger
+	backend.NewLoggerWith = func(args ...interface{}) sdklog.Logger {
+		for i, arg := range args {
+			// Obtain logger name from args.
+			if s, ok := arg.(string); ok && s == "logger" {
+				l := &logWrapper{logger: log.New(args[i+1].(string))}
+				// new args slice without logger name and logger name value
+				if len(args) > 2 {
+					newArgs := make([]interface{}, 0, len(args)-2)
+					newArgs = append(newArgs, args[:i]...)
+					newArgs = append(newArgs, args[i+2:]...)
+					return l.With(newArgs...)
+				}
+				return l
+			}
+		}
+		return sdklog.DefaultLogger
+	}
 }
 
 type Registry struct {

pkg/tsdb/testdatasource/resource_handler.go

@@ -9,7 +9,7 @@ import (
 	"strconv"
 	"time"
 
-	"github.com/grafana/grafana/pkg/infra/log"
+	"github.com/grafana/grafana-plugin-sdk-go/backend/log"
 )
 
 func (s *Service) registerRoutes() *http.ServeMux {

pkg/tsdb/testdatasource/sims/engine.go

@@ -10,9 +10,8 @@ import (
 	"sync"
 	"time"
 
-	"github.com/grafana/grafana/pkg/infra/log"
-
 	"github.com/grafana/grafana-plugin-sdk-go/backend"
+	"github.com/grafana/grafana-plugin-sdk-go/backend/log"
 	"github.com/grafana/grafana-plugin-sdk-go/data"
 )
 
@@ -60,7 +59,7 @@ func NewSimulationEngine() (*SimulationEngine, error) {
 	s := &SimulationEngine{
 		registry: make(map[string]simulationInfo),
 		running:  make(map[string]Simulation),
-		logger:   log.New("tsdb.sims"),
+		logger:   backend.NewLoggerWith("logger", "tsdb.sims"),
 	}
 	// Initialize each type
 	initializers := []simulationInitializer{

pkg/tsdb/testdatasource/testdata.go

@@ -6,10 +6,9 @@ import (
 
 	"github.com/grafana/grafana-plugin-sdk-go/backend"
 	"github.com/grafana/grafana-plugin-sdk-go/backend/datasource"
+	"github.com/grafana/grafana-plugin-sdk-go/backend/log"
 	"github.com/grafana/grafana-plugin-sdk-go/backend/resource/httpadapter"
 	"github.com/grafana/grafana-plugin-sdk-go/data"
-
-	"github.com/grafana/grafana/pkg/infra/log"
 	"github.com/grafana/grafana/pkg/tsdb/testdatasource/sims"
 )
 
@@ -28,7 +27,7 @@ func ProvideService() *Service {
 			data.NewField("Time", nil, make([]time.Time, 1)),
 			data.NewField("Value", nil, make([]float64, 1)),
 		),
-		logger: log.New("tsdb.testdata"),
+		logger: backend.NewLoggerWith("logger", "tsdb.testdata"),
 	}
 
 	var err error