PR feedback

Author: aphralG

internal/config/config.go

@@ -789,8 +789,16 @@ func normalizeFunc(f *flag.FlagSet, name string) flag.NormalizedName {
 }
 
 func resolveLog() *Log {
+	logLevel := strings.ToLower(viperInstance.GetString(LogLevelKey))
+	validLevels := []string{"debug", "info", "warn", "error"}
+
+	if !slices.Contains(validLevels, logLevel) {
+		slog.Warn("Invalid log level set, defaulting to 'info'", "log_level", logLevel)
+		logLevel = "info"
+	}
+
 	return &Log{
-		Level: viperInstance.GetString(LogLevelKey),
+		Level: logLevel,
 		Path:  viperInstance.GetString(LogPathKey),
 	}
 }
@@ -1173,7 +1181,7 @@ func resolveCollectorLog() *Log {
 		Path:  viperInstance.GetString(CollectorLogPathKey),
 	}
 
-	if !viperInstance.IsSet(CollectorLogLevelKey) {
+	if !viperInstance.IsSet(CollectorLogLevelKey) && strings.ToLower(viperInstance.GetString(LogLevelKey)) != "warn" {
 		log.Level = viperInstance.GetString(LogLevelKey)
 	}
 

internal/config/config_test.go

@@ -243,12 +243,54 @@ func TestResolveAllowedDirectories(t *testing.T) {
 
 func TestResolveLog(t *testing.T) {
 	viperInstance = viper.NewWithOptions(viper.KeyDelimiter(KeyDelimiter))
-	viperInstance.Set(LogLevelKey, "error")
-	viperInstance.Set(LogPathKey, "/var/log/test/test.log")
 
-	result := resolveLog()
-	assert.Equal(t, "error", result.Level)
-	assert.Equal(t, "/var/log/test/test.log", result.Path)
+	tests := []struct {
+		name             string
+		logLevel         string
+		logPath          string
+		expectedLogPath  string
+		expectedLogLevel string
+	}{
+		{
+			name:             "Test 1: Log level set to info",
+			logLevel:         "info",
+			logPath:          "/var/log/test/test.log",
+			expectedLogPath:  "/var/log/test/test.log",
+			expectedLogLevel: "info",
+		},
+		{
+			name:             "Test 2: Invalid log level set",
+			logLevel:         "trace",
+			logPath:          "/var/log/test/test.log",
+			expectedLogPath:  "/var/log/test/test.log",
+			expectedLogLevel: "info",
+		},
+		{
+			name:             "Test 3: Log level set to debug",
+			logLevel:         "debug",
+			logPath:          "/var/log/test/test.log",
+			expectedLogPath:  "/var/log/test/test.log",
+			expectedLogLevel: "debug",
+		},
+		{
+			name:             "Test 4: Log level set with capitalization",
+			logLevel:         "DEBUG",
+			logPath:          "./logs/nginx.log",
+			expectedLogPath:  "./logs/nginx.log",
+			expectedLogLevel: "debug",
+		},
+	}
+
+	for _, test := range tests {
+		t.Run(test.name, func(t *testing.T) {
+			viperInstance.Set(LogLevelKey, test.logLevel)
+			viperInstance.Set(LogPathKey, test.logPath)
+
+			result := resolveLog()
+			assert.Equal(t, test.expectedLogLevel, result.Level)
+			assert.Equal(t, test.expectedLogPath, result.Path)
+		})
+	}
 }
 
 func TestResolveClient(t *testing.T) {
@@ -299,29 +341,57 @@ func TestResolveCollector(t *testing.T) {
 }
 
 func TestResolveCollectorLog(t *testing.T) {
-	t.Run("Test 1: OTel Log Level Set In Config", func(t *testing.T) {
-		viperInstance = viper.NewWithOptions(viper.KeyDelimiter(KeyDelimiter))
-
-		viperInstance.Set(CollectorLogLevelKey, "info")
-		viperInstance.Set(CollectorLogPathKey, "/tmp/collector.log")
-		viperInstance.Set(LogLevelKey, "debug")
+	viperInstance = viper.NewWithOptions(viper.KeyDelimiter(KeyDelimiter))
+	viperInstance.SetDefault(CollectorLogLevelKey, DefCollectorLogLevel)
+	tests := []struct {
+		name             string
+		logLevel         string
+		logPath          string
+		agentLogLevel    string
+		expectedLogPath  string
+		expectedLogLevel string
+	}{
+		{
+			name:             "Test 1: OTel Log Level Set In Config",
+			logLevel:         "",
+			logPath:          "/tmp/collector.log",
+			agentLogLevel:    "debug",
+			expectedLogPath:  "/tmp/collector.log",
+			expectedLogLevel: "debug",
+		},
+		{
+			name:             "Test 2: Agent Log Level is Warn",
+			logLevel:         "",
+			logPath:          "/tmp/collector.log",
+			agentLogLevel:    "warn",
+			expectedLogPath:  "/tmp/collector.log",
+			expectedLogLevel: "INFO",
+		},
+		{
+			name:             "Test 3: OTel Log Level Set In Config",
+			logLevel:         "INFO",
+			logPath:          "/tmp/collector.log",
+			agentLogLevel:    "debug",
+			expectedLogPath:  "/tmp/collector.log",
+			expectedLogLevel: "INFO",
+		},
+	}
 
-		log := resolveCollectorLog()
+	for _, test := range tests {
+		t.Run(test.name, func(t *testing.T) {
+			viperInstance.Set(CollectorLogPathKey, test.logPath)
+			viperInstance.Set(LogLevelKey, test.agentLogLevel)
 
-		// Check
-		assert.Equal(t, "info", log.Level)
-		assert.Equal(t, "/tmp/collector.log", log.Path)
-	})
+			if test.logLevel != "" {
+				viperInstance.Set(CollectorLogLevelKey, test.logLevel)
+			}
 
-	t.Run("Test 2: OTel Log Level Not Set In Config", func(t *testing.T) {
-		viperInstance = viper.NewWithOptions(viper.KeyDelimiter(KeyDelimiter))
-		viperInstance.Set(LogLevelKey, "debug")
-		viperInstance.Set(CollectorLogPathKey, "/tmp/collector.log")
+			log := resolveCollectorLog()
 
-		log := resolveCollectorLog()
-		assert.Equal(t, "debug", log.Level)
-		assert.Equal(t, "/tmp/collector.log", log.Path)
-	})
+			assert.Equal(t, test.expectedLogLevel, log.Level)
+			assert.Equal(t, test.expectedLogPath, log.Path)
+		})
+	}
 }
 
 func TestCommand(t *testing.T) {