chore: remove logging.Lgr interface

Replace everything that used logging.Lgr with *logging.LoggingWithLevelI
This way people can use any logger that implements a few methods
instead of being forced to implement legacy Errorf, Infof, Debugf methods.

This allows users to directly use slog.Logger or other structured loggers
without having to write adapter code.

Author: ccoVeille

internal/pool/pool.go

@@ -122,7 +122,7 @@ type Options struct {
 	DialerRetryTimeout time.Duration
 
 	// Optional logger for connection pool operations.
-	Logger logging.Lgr
+	Logger logging.LoggerWithLevelI
 }
 
 type lastDialErrorWrap struct {
@@ -1058,9 +1058,9 @@ func (p *ConnPool) isHealthyConn(cn *Conn, nowNs int64) bool {
 	return true
 }
 
-func (p *ConnPool) logger() logging.Lgr {
+func (p *ConnPool) logger() *logging.LoggerWrapper {
 	if p.cfg != nil && p.cfg.Logger != nil {
-		return p.cfg.Logger
+		return logging.NewLoggerWrapper(p.cfg.Logger)
 	}
 	return logging.LoggerWithLevel()
 }

logging/custom_go121_test.go

@@ -0,0 +1,10 @@
+//go:build go1.21
+
+package logging
+
+import "log/slog"
+
+// validation that [slog.Logger] implements [LoggerWithLevelI]
+var _ LoggerWithLevelI = &slog.Logger{}
+
+var _ *LoggerWrapper = NewLoggerWrapper(&slog.Logger{})

logging/legacy.go

@@ -93,6 +93,6 @@ func (l *legacyLoggerAdapter) Enabled(ctx context.Context, level LogLevelT) bool
 
 var legacyLoggerWithLevel = &legacyLoggerAdapter{}
 
-func LoggerWithLevel() Lgr {
-	return legacyLoggerWithLevel
+func LoggerWithLevel() *LoggerWrapper {
+	return NewLoggerWrapper(legacyLoggerWithLevel)
 }

logging/logging.go

@@ -89,22 +89,3 @@ func (l *filterLogger) Printf(ctx context.Context, format string, v ...interface
 		return
 	}
 }
-
-// Lgr is a logger interface with leveled logging methods.
-// It is implemented by LoggerWrapper and legacyLoggerAdapter.
-// If you would like to use `slog.Logger` from the standard library, you can use LoggerWrapper.
-//
-//		logger := slog.New(slog.NewTextHandler(os.Stderr))
-//	    db := redis.NewClient(&redis.Options{
-//			Logger: logging.NewLoggerWrapper(logger),
-//		})
-//
-// This will NOT handle all logging at the moment, singe there is still a global logger in use.
-// that will be deprecated in the future.
-type Lgr interface {
-	Errorf(ctx context.Context, format string, v ...any)
-	Warnf(ctx context.Context, format string, v ...any)
-	Infof(ctx context.Context, format string, v ...any)
-	Debugf(ctx context.Context, format string, v ...any)
-	Enabled(ctx context.Context, level LogLevelT) bool
-}

maintnotifications/circuit_breaker.go

@@ -194,9 +194,9 @@ func (cb *CircuitBreaker) GetStats() CircuitBreakerStats {
 	}
 }
 
-func (cb *CircuitBreaker) logger() logging.Lgr {
+func (cb *CircuitBreaker) logger() *logging.LoggerWrapper {
 	if cb.config != nil && cb.config.Logger != nil {
-		return cb.config.Logger
+		return logging.NewLoggerWrapper(cb.config.Logger)
 	}
 	return logging.LoggerWithLevel()
 }
@@ -351,9 +351,9 @@ func (cbm *CircuitBreakerManager) Reset() {
 	})
 }
 
-func (cbm *CircuitBreakerManager) logger() logging.Lgr {
+func (cbm *CircuitBreakerManager) logger() *logging.LoggerWrapper {
 	if cbm.config != nil && cbm.config.Logger != nil {
-		return cbm.config.Logger
+		return logging.NewLoggerWrapper(cbm.config.Logger)
 	}
 	return logging.LoggerWithLevel()
 }

maintnotifications/config.go

@@ -130,7 +130,7 @@ type Config struct {
 	MaxHandoffRetries int
 
 	// Logger is an optional custom logger for maintenance notifications.
-	Logger logging.Lgr
+	Logger logging.LoggerWithLevelI
 }
 
 func (c *Config) IsEnabled() bool {
@@ -369,9 +369,9 @@ func (c *Config) applyWorkerDefaults(poolSize int) {
 	}
 }
 
-func (c *Config) logger() logging.Lgr {
+func (c *Config) logger() *logging.LoggerWrapper {
 	if c.Logger != nil {
-		return c.Logger
+		return logging.NewLoggerWrapper(c.Logger)
 	}
 	return logging.LoggerWithLevel()
 }

maintnotifications/handoff_worker.go

@@ -494,9 +494,9 @@ func (hwm *handoffWorkerManager) closeConnFromRequest(ctx context.Context, reque
 	}
 }
 
-func (hwm *handoffWorkerManager) logger() logging.Lgr {
+func (hwm *handoffWorkerManager) logger() *logging.LoggerWrapper {
 	if hwm.config != nil && hwm.config.Logger != nil {
-		return hwm.config.Logger
+		return logging.NewLoggerWrapper(hwm.config.Logger)
 	}
 	return logging.LoggerWithLevel()
 }

maintnotifications/manager.go

@@ -311,9 +311,9 @@ func (hm *Manager) AddNotificationHook(notificationHook NotificationHook) {
 	hm.hooks = append(hm.hooks, notificationHook)
 }
 
-func (hm *Manager) logger() logging.Lgr {
+func (hm *Manager) logger() *logging.LoggerWrapper {
 	if hm.config != nil && hm.config.Logger != nil {
-		return hm.config.Logger
+		return logging.NewLoggerWrapper(hm.config.Logger)
 	}
 	return logging.LoggerWithLevel()
 }

maintnotifications/pool_hook.go

@@ -181,9 +181,9 @@ func (ph *PoolHook) Shutdown(ctx context.Context) error {
 	return ph.workerManager.shutdownWorkers(ctx)
 }
 
-func (ph *PoolHook) logger() logging.Lgr {
+func (ph *PoolHook) logger() *logging.LoggerWrapper {
 	if ph.config != nil && ph.config.Logger != nil {
-		return ph.config.Logger
+		return logging.NewLoggerWrapper(ph.config.Logger)
 	}
 	return logging.LoggerWithLevel()
 }

maintnotifications/push_notification_handler.go

@@ -274,7 +274,7 @@ func (snh *NotificationHandler) handleFailedOver(ctx context.Context, handlerCtx
 	return nil
 }
 
-func (snh *NotificationHandler) logger() logging.Lgr {
+func (snh *NotificationHandler) logger() *logging.LoggerWrapper {
 	if snh.manager != nil {
 		return snh.manager.logger()
 	}