improvements in the logging package

Author: j-rafique

pkg/logtrace/log.go

@@ -18,10 +18,22 @@ type ContextKey string
 const CorrelationIDKey ContextKey = "correlation_id"
 
 // Setup initializes the logger with a specified log level
-func Setup(serviceName, env string, level slog.Level) {
+func Setup(serviceName, env string, level string) {
+	var slogLevel slog.Level
+	switch level {
+	case "warn":
+		slogLevel = slog.LevelWarn
+	case "error":
+		slogLevel = slog.LevelError
+	case "debug":
+		slogLevel = slog.LevelDebug
+	default:
+		slogLevel = slog.LevelInfo
+	}
+
 	opts := &slog.HandlerOptions{
-		AddSource: true,
-		Level:     level,
+		AddSource: false,
+		Level:     slogLevel,
 	}
 
 	hostname, _ := os.Hostname()
@@ -35,20 +47,38 @@ func Setup(serviceName, env string, level slog.Level) {
 func log(logFunc LogLevel, message string, fields Fields) {
 	fieldArgs := make([]interface{}, 0, len(fields)*2+1)
 
-	pc, file, line, ok := runtime.Caller(2)
-	if ok {
-		details := runtime.FuncForPC(pc)
-		fieldArgs = append(fieldArgs, slog.Group(
-			"source",
-			slog.Attr{Key: "filename", Value: slog.StringValue(file)},
-			slog.Attr{Key: "lineno", Value: slog.IntValue(line)},
-			slog.Attr{Key: "function", Value: slog.StringValue(details.Name())},
-		))
+	// Determine the current level
+	var currentLevel slog.Level
+	switch logFunc {
+	case slog.Debug:
+		currentLevel = slog.LevelDebug
+	case slog.Info:
+		currentLevel = slog.LevelInfo
+	case slog.Warn:
+		currentLevel = slog.LevelWarn
+	case slog.Error:
+		currentLevel = slog.LevelError
+	default:
+		currentLevel = slog.LevelInfo
+	}
+
+	// Only attach source info for TRACE/DEBUG level
+	if currentLevel <= slog.LevelDebug {
+		if pc, file, line, ok := runtime.Caller(2); ok {
+			details := runtime.FuncForPC(pc)
+			fieldArgs = append(fieldArgs, slog.Group(
+				"source",
+				slog.String("filename", file),
+				slog.Int("lineno", line),
+				slog.String("function", details.Name()),
+			))
+		}
 	}
 
 	for key, value := range fields {
 		fieldArgs = append(fieldArgs, slog.Any(key, value))
 	}
+
 	logFunc(message, fieldArgs...)
 }
 

supernode/cmd/start.go

@@ -3,7 +3,6 @@ package cmd
 import (
 	"context"
 	"fmt"
-	"log/slog"
 	"os"
 	"os/signal"
 	"syscall"
@@ -35,8 +34,7 @@ var startCmd = &cobra.Command{
 The supernode will connect to the Lumera network and begin participating in the network.`,
 	RunE: func(cmd *cobra.Command, args []string) error {
 		// Initialize logging
-		logLevel := slog.LevelInfo
-		logtrace.Setup("supernode", "dev", logLevel)
+		logtrace.Setup("supernode", "dev", appConfig.LogConfig.Level)
 
 		// Create context with correlation ID for tracing
 		ctx := logtrace.CtxWithCorrelationID(context.Background(), "supernode-start")

supernode/config.yml

@@ -27,3 +27,7 @@ lumera:
 # RaptorQ Configuration
 raptorq:
   files_dir: "raptorq_files"
+
+#Logging Configuration
+log:
+  level: "info" #debug, info, warn, error

supernode/config/config.go

@@ -39,12 +39,17 @@ type RaptorQConfig struct {
 	FilesDir string `yaml:"files_dir"`
 }
 
+type LogConfig struct {
+	Level string `yaml:"level"`
+}
+
 type Config struct {
 	SupernodeConfig    `yaml:"supernode"`
 	KeyringConfig      `yaml:"keyring"`
 	P2PConfig          `yaml:"p2p"`
 	LumeraClientConfig `yaml:"lumera"`
 	RaptorQConfig      `yaml:"raptorq"`
+	LogConfig          `yaml:"log"`
 
 	// Store base directory (not from YAML)
 	BaseDir string `yaml:"-"`
@@ -135,11 +140,12 @@ func LoadConfig(filename string, baseDir string) (*Config, error) {
 		return nil, err
 	}
 
-	logtrace.Info(ctx, "Configuration loaded successfully", logtrace.Fields{
+	logtrace.Debug(ctx, "Configuration loaded successfully", logtrace.Fields{
 		"baseDir":         baseDir,
 		"keyringDir":      config.GetKeyringDir(),
 		"p2pDataDir":      config.GetP2PDataDir(),
 		"raptorqFilesDir": config.GetRaptorQFilesDir(),
+		"logLevel":        config.LogConfig.Level,
 	})
 
 	return &config, nil