From fbaa847a3ceda1dca9461a675efdcbfe07cb3b3d Mon Sep 17 00:00:00 2001
From: Steve Simpson <steve.simpson@grafana.com>
Date: Mon, 29 Apr 2024 12:10:23 +0200
Subject: [PATCH] Alerting: Pass logger into NewRemoteLokiBackend. (#87029)

Tiny refactor to allow a logger to be passed into NewRemoteLokiBackend.
---
 pkg/services/ngalert/ngalert.go                   | 3 ++-
 pkg/services/ngalert/state/historian/loki.go      | 3 +--
 pkg/services/ngalert/state/historian/loki_test.go | 3 ++-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkg/services/ngalert/ngalert.go b/pkg/services/ngalert/ngalert.go
index 3b5d4b51ad5..6410c4be22d 100644
--- a/pkg/services/ngalert/ngalert.go
+++ b/pkg/services/ngalert/ngalert.go
@@ -480,7 +480,8 @@ func configureHistorianBackend(ctx context.Context, cfg setting.UnifiedAlertingS
 			return nil, fmt.Errorf("invalid remote loki configuration: %w", err)
 		}
 		req := historian.NewRequester()
-		backend := historian.NewRemoteLokiBackend(lcfg, req, met)
+		lokiBackendLogger := log.New("ngalert.state.historian", "backend", "loki")
+		backend := historian.NewRemoteLokiBackend(lokiBackendLogger, lcfg, req, met)
 
 		testConnCtx, cancelFunc := context.WithTimeout(ctx, 10*time.Second)
 		defer cancelFunc()
diff --git a/pkg/services/ngalert/state/historian/loki.go b/pkg/services/ngalert/state/historian/loki.go
index 1c4c8b071bb..72add63518d 100644
--- a/pkg/services/ngalert/state/historian/loki.go
+++ b/pkg/services/ngalert/state/historian/loki.go
@@ -55,8 +55,7 @@ type RemoteLokiBackend struct {
 	log            log.Logger
 }
 
-func NewRemoteLokiBackend(cfg LokiConfig, req client.Requester, metrics *metrics.Historian) *RemoteLokiBackend {
-	logger := log.New("ngalert.state.historian", "backend", "loki")
+func NewRemoteLokiBackend(logger log.Logger, cfg LokiConfig, req client.Requester, metrics *metrics.Historian) *RemoteLokiBackend {
 	return &RemoteLokiBackend{
 		client:         NewLokiClient(cfg, req, metrics, logger),
 		externalLabels: cfg.ExternalLabels,
diff --git a/pkg/services/ngalert/state/historian/loki_test.go b/pkg/services/ngalert/state/historian/loki_test.go
index caa0db0aa4d..dbdefd0c51c 100644
--- a/pkg/services/ngalert/state/historian/loki_test.go
+++ b/pkg/services/ngalert/state/historian/loki_test.go
@@ -513,7 +513,8 @@ func createTestLokiBackend(req client.Requester, met *metrics.Historian) *Remote
 		Encoder:        JsonEncoder{},
 		ExternalLabels: map[string]string{"externalLabelKey": "externalLabelValue"},
 	}
-	return NewRemoteLokiBackend(cfg, req, met)
+	lokiBackendLogger := log.New("ngalert.state.historian", "backend", "loki")
+	return NewRemoteLokiBackend(lokiBackendLogger, cfg, req, met)
 }
 
 func singleFromNormal(st *state.State) []state.StateTransition {