wip

Signed-off-by: Armando Ruocco <armando.ruocco@enterprisedb.com>

Author: armru

pkg/log/flags.go

@@ -21,7 +21,6 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/go-logr/logr"
 	"github.com/spf13/pflag"
 	"go.uber.org/zap/zapcore"
 	"k8s.io/klog/v2"
@@ -81,43 +80,30 @@ func GetFieldsRemapFlags() (res []string) {
 	return res
 }
 
-func (l *Flags) BuildLogger() logr.Logger {
-	if l.zapOptions.TimeEncoder == nil {
-		l.zapOptions.TimeEncoder = zapcore.RFC3339NanoTimeEncoder
-	}
-
-	lgr := zap.New(zap.UseFlagOptions(&l.zapOptions), customLevel, customDestination, remapKeys)
-	switch logLevel {
-	case ErrorLevelString,
-		WarningLevelString,
-		InfoLevelString,
-		DebugLevelString,
-		TraceLevelString:
-		break
-	default:
-		lgr.Info("Invalid log level, defaulting", "level", logLevel, "default", DefaultLevel)
-	}
-
-	return lgr
+// GetOptions returns the zap options
+func (l *Flags) GetOptions() zap.Options {
+	return l.zapOptions
 }
 
 // ConfigureLogging configure the logging honoring the flags
 // passed from the user
 // This is executed after args were already parsed.
+// Deprecated: use NewLogger and SetGlobalLogger instead
 func (l *Flags) ConfigureLogging() {
-	lgr := l.BuildLogger()
+	lgr := NewLogger(l.zapOptions)
 	SetGlobalLogger(lgr)
 }
 
 // SetGlobalLogger configure the underlying loggers
-func SetGlobalLogger(lgr logr.Logger) {
-	redirectStdLog(lgr)
-	controllerruntime.SetLogger(lgr)
-	klog.SetLogger(lgr)
-	SetLogger(lgr)
+func SetGlobalLogger(lgr Logger) {
+	redirectStdLog(lgr.GetLogger())
+	controllerruntime.SetLogger(lgr.GetLogger())
+	klog.SetLogger(lgr.GetLogger())
+	SetLogger(lgr.GetLogger())
 }
 
-func getLogLevel(l string) zapcore.Level {
+// GetLogLevel returns the zap log level from a string
+func GetLogLevel(l string) zapcore.Level {
 	switch l {
 	case ErrorLevelString:
 		return ErrorLevel
@@ -163,7 +149,7 @@ func remapKeys(in *zap.Options) {
 }
 
 func customLevel(in *zap.Options) {
-	in.Level = getLogLevel(logLevel)
+	in.Level = GetLogLevel(logLevel)
 	in.EncoderConfigOptions = append(in.EncoderConfigOptions, func(c *zapcore.EncoderConfig) {
 		c.EncodeLevel = func(l zapcore.Level, enc zapcore.PrimitiveArrayEncoder) {
 			enc.AppendString(getLogLevelString(l))

pkg/log/log.go

@@ -23,6 +23,7 @@ import (
 	stdLog "log"
 	"os"
 	"runtime"
+	"sigs.k8s.io/controller-runtime/pkg/log/zap"
 
 	"github.com/go-logr/logr"
 	"go.uber.org/zap/zapcore"
@@ -69,6 +70,26 @@ type logger struct {
 	printCaller bool
 }
 
+func NewLogger(options zap.Options) Logger {
+	if options.TimeEncoder == nil {
+		options.TimeEncoder = zapcore.RFC3339NanoTimeEncoder
+	}
+
+	lgr := zap.New(zap.UseFlagOptions(&options), customLevel, customDestination, remapKeys)
+	switch logLevel {
+	case ErrorLevelString,
+		WarningLevelString,
+		InfoLevelString,
+		DebugLevelString,
+		TraceLevelString:
+		break
+	default:
+		lgr.Info("Invalid log level, defaulting", "level", logLevel, "default", DefaultLevel)
+	}
+
+	return &logger{Logger: lgr}
+}
+
 // Log is the logger that will be used in this package
 var log = &logger{Logger: ctrl.Log}