Use named loggers everywhere

kafka/service.go

@@ -21,13 +21,14 @@ type Service struct {
 func NewService(cfg Config, logger *zap.Logger) *Service {
 	return &Service{
 		cfg:    cfg,
-		logger: logger.Named("kafka-service"),
+		logger: logger.Named("kafka_service"),
 	}
 }
 
 // CreateAndTestClient creates a client with the services default settings
 // logger: will be used to log connections, errors, warnings about tls config, ...
-func (s *Service) CreateAndTestClient(ctx context.Context, logger *zap.Logger, opts []kgo.Opt) (*kgo.Client, error) {
+func (s *Service) CreateAndTestClient(ctx context.Context, l *zap.Logger, opts []kgo.Opt) (*kgo.Client, error) {
+	logger := l.Named("kgo_client")
 	// Config with default options
 	kgoOpts, err := NewKgoConfig(s.cfg, logger)
 	if err != nil {

main.go

@@ -30,7 +30,7 @@ func main() {
 		startupLogger.Fatal("failed to parse config", zap.Error(err))
 	}
 
-	logger := logging.NewLogger(cfg.Logger, cfg.Exporter.Namespace)
+	logger := logging.NewLogger(cfg.Logger, cfg.Exporter.Namespace).Named("main")
 	if err != nil {
 		startupLogger.Fatal("failed to create new logger", zap.Error(err))
 	}

minion/service.go

@@ -42,8 +42,7 @@ func NewService(cfg Config, logger *zap.Logger, kafkaSvc *kafka.Service, metrics
 	}
 
 	// Kafka client
-	hooksChildLogger := logger.With(zap.String("source", "minion_kafka_client"))
-	minionHooks := newMinionClientHooks(hooksChildLogger, metricsNamespace)
+	minionHooks := newMinionClientHooks(logger.Named("kafka_hooks"), metricsNamespace)
 	kgoOpts := []kgo.Opt{
 		kgo.WithHooks(minionHooks),
 		kgo.ConsumeTopics("__consumer_offsets"),
@@ -63,7 +62,7 @@ func NewService(cfg Config, logger *zap.Logger, kafkaSvc *kafka.Service, metrics
 
 	service := &Service{
 		Cfg:    cfg,
-		logger: logger,
+		logger: logger.Named("minion_service"),
 
 		requestGroup: &singleflight.Group{},
 		cache:        make(map[string]interface{}),

minion/storage.go

@@ -44,7 +44,7 @@ type OffsetCommit struct {
 
 func newStorage(logger *zap.Logger) (*Storage, error) {
 	return &Storage{
-		logger:          logger,
+		logger:          logger.Named("storage"),
 		offsetCommits:   cmap.New(),
 		progressTracker: cmap.New(),
 		isReadyBool:     atomic.NewBool(false),

prometheus/exporter.go

@@ -47,7 +47,7 @@ type Exporter struct {
 }
 
 func NewExporter(cfg Config, logger *zap.Logger, minionSvc *minion.Service) (*Exporter, error) {
-	return &Exporter{cfg: cfg, logger: logger, minionSvc: minionSvc}, nil
+	return &Exporter{cfg: cfg, logger: logger.Named("prometheus"), minionSvc: minionSvc}, nil
 }
 
 func (e *Exporter) InitializeMetrics() {