From a2868fdb143a4fdb279a0d553c416c7694564b99 Mon Sep 17 00:00:00 2001 From: Will Browne Date: Thu, 24 Oct 2024 12:00:40 +0100 Subject: [PATCH] Plugins: Replace references of plugin SDK `backend.Logger` with Grafana logger (#95235) replace references --- pkg/services/grpcserver/service.go | 5 ++--- pkg/tsdb/azuremonitor/loganalytics/traces_test.go | 3 ++- .../resourcegraph/azure-resource-graph-datasource.go | 2 +- pkg/tsdb/cloud-monitoring/utils.go | 2 +- pkg/tsdb/prometheus/azureauth/azure_test.go | 2 +- pkg/tsdb/prometheus/prometheus_test.go | 5 +++-- 6 files changed, 10 insertions(+), 9 deletions(-) diff --git a/pkg/services/grpcserver/service.go b/pkg/services/grpcserver/service.go index d94ad836874..543d3488ecb 100644 --- a/pkg/services/grpcserver/service.go +++ b/pkg/services/grpcserver/service.go @@ -8,7 +8,6 @@ import ( "github.com/grafana/dskit/instrument" "github.com/grafana/dskit/middleware" - "github.com/grafana/grafana-plugin-sdk-go/backend" grpcAuth "github.com/grpc-ecosystem/go-grpc-middleware/v2/interceptors/auth" "github.com/prometheus/client_golang/prometheus" "go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc" @@ -118,14 +117,14 @@ func (s *gPRCServerService) Run(ctx context.Context) error { s.logger.Info("GRPC server: starting") err := s.server.Serve(listener) if err != nil { - backend.Logger.Error("GRPC server: failed to serve", "err", err) + s.logger.Error("GRPC server: failed to serve", "err", err) serveErr <- err } }() select { case err := <-serveErr: - backend.Logger.Error("GRPC server: failed to serve", "err", err) + s.logger.Error("GRPC server: failed to serve", "err", err) return err case <-ctx.Done(): } diff --git a/pkg/tsdb/azuremonitor/loganalytics/traces_test.go b/pkg/tsdb/azuremonitor/loganalytics/traces_test.go index 3e365061c6d..c93bcc26703 100644 --- a/pkg/tsdb/azuremonitor/loganalytics/traces_test.go +++ b/pkg/tsdb/azuremonitor/loganalytics/traces_test.go @@ -14,6 +14,7 @@ import ( "github.com/google/go-cmp/cmp" "github.com/grafana/grafana-plugin-sdk-go/backend" "github.com/grafana/grafana-plugin-sdk-go/backend/httpclient" + "github.com/grafana/grafana-plugin-sdk-go/backend/log" "github.com/grafana/grafana/pkg/tsdb/azuremonitor/kinds/dataquery" "github.com/grafana/grafana/pkg/tsdb/azuremonitor/types" "github.com/stretchr/testify/require" @@ -1150,7 +1151,7 @@ func TestBuildAppInsightsQuery(t *testing.T) { for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { - query, err := buildAppInsightsQuery(ctx, tt.queryModel, dsInfo, appInsightsRegExp, backend.Logger) + query, err := buildAppInsightsQuery(ctx, tt.queryModel, dsInfo, appInsightsRegExp, log.NewNullLogger()) tt.Err(t, err) if diff := cmp.Diff(&tt.azureLogAnalyticsQuery, query); diff != "" { t.Errorf("Result mismatch (-want +got): \n%s", diff) diff --git a/pkg/tsdb/azuremonitor/resourcegraph/azure-resource-graph-datasource.go b/pkg/tsdb/azuremonitor/resourcegraph/azure-resource-graph-datasource.go index 22667b74968..dfa1f70537d 100644 --- a/pkg/tsdb/azuremonitor/resourcegraph/azure-resource-graph-datasource.go +++ b/pkg/tsdb/azuremonitor/resourcegraph/azure-resource-graph-datasource.go @@ -163,7 +163,7 @@ func (e *AzureResourceGraphDatasource) executeQuery(ctx context.Context, query * defer func() { if err := res.Body.Close(); err != nil { - backend.Logger.Warn("Failed to close response body", "err", err) + e.Logger.Warn("Failed to close response body", "err", err) } }() diff --git a/pkg/tsdb/cloud-monitoring/utils.go b/pkg/tsdb/cloud-monitoring/utils.go index e95e66c681a..c4e32d1e179 100644 --- a/pkg/tsdb/cloud-monitoring/utils.go +++ b/pkg/tsdb/cloud-monitoring/utils.go @@ -90,7 +90,7 @@ func doRequestPage(_ context.Context, r *http.Request, dsInfo datasourceInfo, pa defer func() { if err = res.Body.Close(); err != nil { - backend.Logger.Warn("Failed to close response body", "error", err) + logger.Warn("Failed to close response body", "error", err) } }() diff --git a/pkg/tsdb/prometheus/azureauth/azure_test.go b/pkg/tsdb/prometheus/azureauth/azure_test.go index a8d66667b47..9ab86f9dbcb 100644 --- a/pkg/tsdb/prometheus/azureauth/azure_test.go +++ b/pkg/tsdb/prometheus/azureauth/azure_test.go @@ -33,7 +33,7 @@ func (l fakeLogger) With(args ...interface{}) log.Logger { func TestConfigureAzureAuthentication(t *testing.T) { azureSettings := &azsettings.AzureSettings{} - testLogger := backend.Logger + testLogger := log.NewNullLogger() t.Run("should set Azure middleware when JsonData contains valid credentials", func(t *testing.T) { settings := backend.DataSourceInstanceSettings{ diff --git a/pkg/tsdb/prometheus/prometheus_test.go b/pkg/tsdb/prometheus/prometheus_test.go index 7bf2db10fec..a06253a0e52 100644 --- a/pkg/tsdb/prometheus/prometheus_test.go +++ b/pkg/tsdb/prometheus/prometheus_test.go @@ -7,6 +7,7 @@ import ( "github.com/grafana/grafana-azure-sdk-go/v2/azsettings" "github.com/grafana/grafana-plugin-sdk-go/backend" sdkhttpclient "github.com/grafana/grafana-plugin-sdk-go/backend/httpclient" + "github.com/grafana/grafana-plugin-sdk-go/backend/log" "github.com/stretchr/testify/require" ) @@ -28,7 +29,7 @@ func TestExtendClientOpts(t *testing.T) { } ctx := backend.WithGrafanaConfig(context.Background(), cfg) opts := &sdkhttpclient.Options{} - err := extendClientOpts(ctx, settings, opts, backend.Logger) + err := extendClientOpts(ctx, settings, opts, log.NewNullLogger()) require.NoError(t, err) require.Equal(t, 1, len(opts.Middlewares)) }) @@ -47,7 +48,7 @@ func TestExtendClientOpts(t *testing.T) { SecretKey: "secretkey", }, } - err := extendClientOpts(context.Background(), settings, opts, backend.Logger) + err := extendClientOpts(context.Background(), settings, opts, log.NewNullLogger()) require.NoError(t, err) require.Equal(t, "aps", opts.SigV4.Service) })