From a7c62f2122ccd31b719a0c6d2f1256127b590d28 Mon Sep 17 00:00:00 2001
From: Adam0Brien <aobrien@redhat.com>
Date: Mon, 23 Sep 2024 13:02:27 +0100
Subject: [PATCH] RHCLOUD-35286: Ensure log verbosity can be adjusted

---
 cmd/root.go                | 67 +++++++++++++++++++++++++++++++-------
 inventory-api-compose.yaml |  2 ++
 2 files changed, 58 insertions(+), 11 deletions(-)

diff --git a/cmd/root.go b/cmd/root.go
index 5266f086..e2f9bdf1 100644
--- a/cmd/root.go
+++ b/cmd/root.go
@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"os"
 	"path/filepath"
+	"strings"
 
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
@@ -27,16 +28,9 @@ var (
 	Name    = "inventory-api"
 	cfgFile string
 
-	rootLog = log.With(log.NewStdLogger(os.Stdout),
-		"ts", log.DefaultTimestamp,
-		"caller", log.DefaultCaller,
-		"service.name", Name,
-		"service.version", Version,
-		"trace.id", tracing.TraceID(),
-		"span.id", tracing.SpanID(),
-	)
+	logger *log.Helper
 
-	logger = log.NewHelper(log.NewFilter(rootLog, log.FilterLevel(log.LevelInfo)))
+	baseLogger log.Logger
 
 	rootCmd = &cobra.Command{
 		Use:     Name,
@@ -88,13 +82,17 @@ func init() {
 	if err != nil {
 		panic(err)
 	}
-	migrateCmd := migrate.NewCommand(options.Storage, log.With(rootLog, "group", "storage"))
+
+	logLevel := getLogLevel()
+	logger, baseLogger = initLogger(logLevel)
+
+	migrateCmd := migrate.NewCommand(options.Storage, baseLogger)
 	rootCmd.AddCommand(migrateCmd)
 	err = viper.BindPFlags(migrateCmd.Flags())
 	if err != nil {
 		panic(err)
 	}
-	serveCmd := serve.NewCommand(options.Server, options.Storage, options.Authn, options.Authz, options.Eventing, log.With(rootLog, "group", "server"))
+	serveCmd := serve.NewCommand(options.Server, options.Storage, options.Authn, options.Authz, options.Eventing, baseLogger)
 	rootCmd.AddCommand(serveCmd)
 	err = viper.BindPFlags(serveCmd.Flags())
 	if err != nil {
@@ -143,3 +141,50 @@ func initConfig() {
 		panic(err)
 	}
 }
+
+func getLogLevel() string {
+	viper.SetConfigFile("./inventory-api-compose.yaml")
+
+	if err := viper.ReadInConfig(); err != nil {
+		fmt.Printf("Error reading config file: %v. Using default log level 'info'.\n", err)
+		return "info" // Default log level in case of error
+	}
+
+	logLevel := viper.GetString("log.level")
+	fmt.Printf("Log Level is set to: %s\n", logLevel)
+	return logLevel
+}
+
+// initLogger initializes the logger based on the provided log level
+func initLogger(logLevel string) (*log.Helper, log.Logger) {
+	// Convert logLevel string to log.Level type
+	var level log.Level
+	switch strings.ToLower(logLevel) {
+	case "debug":
+		level = log.LevelDebug
+	case "info":
+		level = log.LevelInfo
+	case "warn":
+		level = log.LevelWarn
+	case "error":
+		level = log.LevelError
+	case "fatal":
+		level = log.LevelFatal
+	default:
+		fmt.Printf("Invalid log level '%s' provided. Defaulting to 'info' level.\n", logLevel)
+		level = log.LevelInfo
+	}
+
+	rootLogger := log.With(log.NewStdLogger(os.Stdout),
+		"ts", log.DefaultTimestamp,
+		"caller", log.DefaultCaller,
+		"service.name", Name,
+		"service.version", Version,
+		"trace.id", tracing.TraceID(),
+		"span.id", tracing.SpanID(),
+	)
+	filteredLogger := log.NewFilter(rootLogger, log.FilterLevel(level))
+	helperLogger := log.NewHelper(filteredLogger)
+
+	return helperLogger, filteredLogger
+}
diff --git a/inventory-api-compose.yaml b/inventory-api-compose.yaml
index 6184e4f5..87ef0284 100644
--- a/inventory-api-compose.yaml
+++ b/inventory-api-compose.yaml
@@ -25,3 +25,5 @@ storage:
     user: "postgres"
     password: "yPsw5e6ab4bvAGe5H"
     dbname: "spicedb"
+log:
+  level: "info"