feat(logging): Capture imported library logs and redirect to zerolog

Signed-off-by: spbsoluble <[email protected]>

Author: spbsoluble

cmd/helpers.go

@@ -31,8 +31,7 @@ import (
 	"github.com/rs/zerolog"
 	"github.com/rs/zerolog/log"
 	"github.com/spf13/cobra"
-
-	stdlog "log"
+	//stdlog "log"
 )
 
 func boolToPointer(b bool) *bool {
@@ -191,12 +190,23 @@ func informDebug(debugFlag bool) {
 }
 
 func initLogger() {
-	stdlog.SetOutput(io.Discard)
-	zerolog.TimeFieldFormat = zerolog.TimeFormatUnix
-	zerolog.SetGlobalLevel(zerolog.Disabled) // default to disabled
-	log.Logger = log.With().Caller().Logger()
+	// Configure zerolog to include caller information
+	log.Logger = log.With().Caller().Logger().Output(
+		zerolog.ConsoleWriter{
+			Out:        os.Stdout,
+			TimeFormat: time.RFC3339,
+			FormatCaller: func(caller interface{}) string {
+				if c, ok := caller.(string); ok {
+					return c // This will include the full file path and line number
+				}
+				return ""
+			},
+		},
+	)
 	log.Logger = log.Output(zerolog.ConsoleWriter{Out: os.Stdout, TimeFormat: time.RFC3339})
 
+	initStdLogger()
+
 }
 
 func intToPointer(i int) *int {

cmd/logging.go

@@ -0,0 +1,45 @@
+package cmd
+
+import (
+	"strings"
+
+	"github.com/rs/zerolog/log"
+)
+
+// zerologWriter implements io.Writer and forwards standard log output to zerolog
+type zerologWriter struct{}
+
+func (w zerologWriter) Write(p []byte) (n int, err error) {
+	// Clean up the log message (remove timestamp, etc.)
+	msg := string(p)
+	msg = strings.TrimSpace(msg)
+
+	// Check if it's a debug message
+	if strings.Contains(msg, "[DEBUG]") {
+		msg = strings.Replace(msg, "[DEBUG]", "", 1)
+		log.Debug().Msg(strings.TrimSpace(msg))
+	} else if strings.Contains(msg, "[ERROR]") {
+		msg = strings.Replace(msg, "[ERROR]", "", 1)
+		log.Error().Msg(strings.TrimSpace(msg))
+	} else if strings.Contains(msg, "[INFO]") {
+		msg = strings.Replace(msg, "[INFO]", "", 1)
+		log.Info().Msg(strings.TrimSpace(msg))
+
+	} else if strings.Contains(msg, "[WARN]") {
+		msg = strings.Replace(msg, "[WARN]", "", 1)
+		log.Warn().Msg(strings.TrimSpace(msg))
+
+	} else if strings.Contains(msg, "[FATAL]") {
+		msg = strings.Replace(msg, "[FATAL]", "", 1)
+		log.Fatal().Msg(strings.TrimSpace(msg))
+
+	} else if strings.Contains(msg, "[TRACE]") {
+		msg = strings.Replace(msg, "[TRACE]", "", 1)
+		log.Debug().Msg(strings.TrimSpace(msg)) // Converting TRACE to DEBUG for zerolog
+	} else {
+		// Default to info level
+		log.Info().Msg(msg)
+	}
+
+	return len(p), nil
+}

cmd/login.go

@@ -17,8 +17,6 @@ package cmd
 import (
 	"bufio"
 	"fmt"
-	"io"
-	stdlog "log"
 	"os"
 	"path"
 	"strings"
@@ -70,7 +68,7 @@ WARNING: This will write the environmental credentials to disk and will be store
 		if debugErr != nil {
 			return debugErr
 		}
-		stdlog.SetOutput(io.Discard)
+		//stdlog.SetOutput(io.Discard)
 		informDebug(debugFlag)
 		logGlobals()
 

cmd/logout.go

@@ -16,8 +16,6 @@ package cmd
 
 import (
 	"fmt"
-	"io"
-	stdlog "log"
 	"os"
 
 	"github.com/Keyfactor/keyfactor-auth-client-go/auth_providers"
@@ -39,7 +37,7 @@ var logoutCmd = &cobra.Command{
 		if debugErr != nil {
 			return debugErr
 		}
-		stdlog.SetOutput(io.Discard)
+		//stdlog.SetOutput(io.Discard)
 		informDebug(debugFlag)
 
 		logGlobals()

cmd/root.go

@@ -17,7 +17,6 @@ package cmd
 import (
 	_ "embed"
 	"fmt"
-	"io"
 	stdlog "log"
 	"os"
 	"strings"
@@ -738,7 +737,7 @@ var RootCmd = &cobra.Command{
 // Execute adds all child commands to the root command and sets flags appropriately.
 // This is called by main.main(). It only needs to happen once to the rootCmd.
 func Execute() {
-	stdlog.SetOutput(io.Discard)
+	//stdlog.SetOutput(io.Discard)
 	err := RootCmd.Execute()
 	if err != nil {
 		os.Exit(1)
@@ -881,3 +880,9 @@ func init() {
 
 	RootCmd.AddCommand(makeDocsCmd)
 }
+
+func initStdLogger() {
+	// Redirect standard library's log to zerolog
+	stdlog.SetOutput(zerologWriter{})
+	stdlog.SetFlags(0) // Remove timestamp from standard logger
+}

cmd/rot.go

@@ -631,7 +631,7 @@ kfutil stores rot reconcile --import-csv <audit-file>
 			if debugErr != nil {
 				return debugErr
 			}
-			stdlog.SetOutput(io.Discard)
+			//stdlog.SetOutput(io.Discard)
 			informDebug(debugFlag)
 
 			var lookupFailures []string
@@ -880,7 +880,7 @@ the utility will first generate an audit report and then execute the add/remove
 			if debugErr != nil {
 				return debugErr
 			}
-			stdlog.SetOutput(io.Discard)
+			//stdlog.SetOutput(io.Discard)
 			informDebug(debugFlag)
 
 			var lookupFailures []string
@@ -1415,7 +1415,7 @@ the utility will first generate an audit report and then execute the add/remove
 			if debugErr != nil {
 				return debugErr
 			}
-			stdlog.SetOutput(io.Discard)
+			//stdlog.SetOutput(io.Discard)
 			informDebug(debugFlag)
 
 			// Authenticate

cmd/storeTypes.go

@@ -55,7 +55,7 @@ var storesTypesListCmd = &cobra.Command{
 		if debugErr != nil {
 			return debugErr
 		}
-		stdlog.SetOutput(io.Discard)
+		//stdlog.SetOutput(io.Discard)
 		informDebug(debugFlag)
 
 		// Authenticate