use an empty registry when setting up the logger for the push server (#…

…5761)

Signed-off-by: Ed Welch <edward.welch@grafana.com>

clients/pkg/promtail/targets/lokipush/pushtarget.go

@@ -37,15 +37,13 @@ type PushTarget struct {
 	relabelConfig []*relabel.Config
 	jobName       string
 	server        *server.Server
-	registerer    prometheus.Registerer
 }
 
 func NewPushTarget(logger log.Logger,
 	handler api.EntryHandler,
 	relabel []*relabel.Config,
 	jobName string,
 	config *scrapeconfig.PushTargetConfig,
-	reg prometheus.Registerer,
 ) (*PushTarget, error) {
 
 	pt := &PushTarget{
@@ -54,7 +52,6 @@ func NewPushTarget(logger log.Logger,
 		relabelConfig: relabel,
 		jobName:       jobName,
 		config:        config,
-		registerer:    reg,
 	}
 
 	// Bit of a chicken and egg problem trying to register the defaults and apply overrides from the loaded config.
@@ -92,7 +89,9 @@ func (t *PushTarget) run() error {
 	// We don't want the /debug and /metrics endpoints running
 	t.config.Server.RegisterInstrumentation = false
 
-	util_log.InitLogger(&t.config.Server, t.registerer)
+	// The logger registers a metric which will cause a duplicate registry panic unless we provide an empty registry
+	// The metric created is for counting log lines and isn't likely to be missed.
+	util_log.InitLogger(&t.config.Server, prometheus.NewRegistry())
 
 	srv, err := server.New(t.config.Server)
 	if err != nil {

clients/pkg/promtail/targets/lokipush/pushtarget_test.go

@@ -70,7 +70,7 @@ func TestLokiPushTarget(t *testing.T) {
 		},
 	}
 
-	pt, err := NewPushTarget(logger, eh, rlbl, "job1", config, nil)
+	pt, err := NewPushTarget(logger, eh, rlbl, "job1", config)
 	require.NoError(t, err)
 
 	// Build a client to send logs
@@ -163,7 +163,7 @@ func TestPlaintextPushTarget(t *testing.T) {
 		KeepTimestamp: true,
 	}
 
-	pt, err := NewPushTarget(logger, eh, []*relabel.Config{}, "job2", config, nil)
+	pt, err := NewPushTarget(logger, eh, []*relabel.Config{}, "job2", config)
 	require.NoError(t, err)
 
 	// Send some logs

clients/pkg/promtail/targets/lokipush/pushtargetmanager.go

@@ -44,7 +44,7 @@ func NewPushTargetManager(
 			return nil, err
 		}
 
-		t, err := NewPushTarget(logger, pipeline.Wrap(client), cfg.RelabelConfigs, cfg.JobName, cfg.PushConfig, reg)
+		t, err := NewPushTarget(logger, pipeline.Wrap(client), cfg.RelabelConfigs, cfg.JobName, cfg.PushConfig)
 		if err != nil {
 			return nil, err
 		}