sql: use logging functionality from plugin-sdk (#79294)

pkg/tsdb/mssql/mssql.go

@@ -20,7 +20,7 @@ import (
 	mssql "github.com/microsoft/go-mssqldb"
 	_ "github.com/microsoft/go-mssqldb/azuread"
 
-	"github.com/grafana/grafana/pkg/infra/log"
+	"github.com/grafana/grafana-plugin-sdk-go/backend/log"
 	"github.com/grafana/grafana/pkg/setting"
 	"github.com/grafana/grafana/pkg/tsdb/mssql/utils"
 	"github.com/grafana/grafana/pkg/tsdb/sqleng"
@@ -40,7 +40,7 @@ const (
 )
 
 func ProvideService(cfg *setting.Cfg) *Service {
-	logger := log.New("tsdb.mssql")
+	logger := backend.NewLoggerWith("logger", "tsdb.mssql")
 	return &Service{
 		im:     datasource.NewInstanceManager(newInstanceSettings(cfg, logger)),
 		logger: logger,
@@ -140,8 +140,16 @@ func newInstanceSettings(cfg *setting.Cfg, logger log.Logger) datasource.Instanc
 	}
 }
 
+// ParseURL is called also from pkg/api/datasource/validation.go,
+// which uses a different logging interface,
+// so we have a special minimal interface that is fulfilled by
+// both places.
+type DebugOnlyLogger interface {
+	Debug(msg string, args ...interface{})
+}
+
 // ParseURL tries to parse an MSSQL URL string into a URL object.
-func ParseURL(u string, logger log.Logger) (*url.URL, error) {
+func ParseURL(u string, logger DebugOnlyLogger) (*url.URL, error) {
 	logger.Debug("Parsing MSSQL URL", "url", u)
 
 	// Recognize ODBC connection strings like host\instance:1234

pkg/tsdb/mssql/mssql_test.go

@@ -15,7 +15,6 @@ import (
 	"github.com/stretchr/testify/require"
 
 	"github.com/grafana/grafana/pkg/infra/db"
-	"github.com/grafana/grafana/pkg/infra/log"
 	"github.com/grafana/grafana/pkg/services/sqlstore/sqlutil"
 	"github.com/grafana/grafana/pkg/setting"
 	"github.com/grafana/grafana/pkg/tsdb/sqleng"
@@ -60,7 +59,7 @@ func TestMSSQL(t *testing.T) {
 		RowLimit:          1000000,
 	}
 
-	logger := log.New("mssql.test")
+	logger := backend.NewLoggerWith("logger", "mssql.test")
 
 	endpoint, err := sqleng.NewQueryDataHandler(setting.NewCfg(), config, &queryResultTransformer, newMssqlMacroEngine(), logger)
 	require.NoError(t, err)
@@ -1340,7 +1339,7 @@ func TestTransformQueryError(t *testing.T) {
 		{err: randomErr, expectedErr: randomErr},
 	}
 
-	logger := log.New("mssql.test")
+	logger := backend.NewLoggerWith("logger", "mssql.test")
 
 	for _, tc := range tests {
 		resultErr := transformer.TransformQueryError(logger, tc.err)
@@ -1477,7 +1476,7 @@ func TestGenerateConnectionString(t *testing.T) {
 		},
 	}
 
-	logger := log.New("mssql.test")
+	logger := backend.NewLoggerWith("logger", "mssql.test")
 
 	for _, tc := range testCases {
 		t.Run(tc.desc, func(t *testing.T) {