Skip to content

Commit e42f59b

Browse files
committed
fix setting of level
1 parent 2bf90cc commit e42f59b

File tree

2 files changed

+11
-14
lines changed

2 files changed

+11
-14
lines changed

internal/config/config.go

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -794,11 +794,11 @@ func resolveLog() *Log {
794794

795795
if !slices.Contains(validLevels, logLevel) {
796796
slog.Warn("Invalid log level set, defaulting to 'info'", "log_level", logLevel)
797-
logLevel = "info"
797+
viperInstance.Set(LogLevelKey, "info")
798798
}
799799

800800
return &Log{
801-
Level: logLevel,
801+
Level: viperInstance.GetString(LogLevelKey),
802802
Path: viperInstance.GetString(LogPathKey),
803803
}
804804
}
@@ -1176,16 +1176,14 @@ func isHealthExtensionSet() bool {
11761176
}
11771177

11781178
func resolveCollectorLog() *Log {
1179-
log := &Log{
1180-
Level: viperInstance.GetString(CollectorLogLevelKey),
1181-
Path: viperInstance.GetString(CollectorLogPathKey),
1179+
if !viperInstance.IsSet(CollectorLogLevelKey) {
1180+
viperInstance.Set(CollectorLogLevelKey, strings.ToUpper(viperInstance.GetString(LogLevelKey)))
11821181
}
11831182

1184-
if !viperInstance.IsSet(CollectorLogLevelKey) && strings.ToLower(viperInstance.GetString(LogLevelKey)) != "warn" {
1185-
log.Level = viperInstance.GetString(LogLevelKey)
1183+
return &Log{
1184+
Level: viperInstance.GetString(CollectorLogLevelKey),
1185+
Path: viperInstance.GetString(CollectorLogPathKey),
11861186
}
1187-
1188-
return log
11891187
}
11901188

11911189
func resolveCommand() *Command {

internal/config/config_test.go

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -277,7 +277,7 @@ func TestResolveLog(t *testing.T) {
277277
logLevel: "DEBUG",
278278
logPath: "./logs/nginx.log",
279279
expectedLogPath: "./logs/nginx.log",
280-
expectedLogLevel: "debug",
280+
expectedLogLevel: "DEBUG",
281281
},
282282
}
283283

@@ -341,8 +341,6 @@ func TestResolveCollector(t *testing.T) {
341341
}
342342

343343
func TestResolveCollectorLog(t *testing.T) {
344-
viperInstance = viper.NewWithOptions(viper.KeyDelimiter(KeyDelimiter))
345-
viperInstance.SetDefault(CollectorLogLevelKey, DefCollectorLogLevel)
346344
tests := []struct {
347345
name string
348346
logLevel string
@@ -357,15 +355,15 @@ func TestResolveCollectorLog(t *testing.T) {
357355
logPath: "/tmp/collector.log",
358356
agentLogLevel: "debug",
359357
expectedLogPath: "/tmp/collector.log",
360-
expectedLogLevel: "debug",
358+
expectedLogLevel: "DEBUG",
361359
},
362360
{
363361
name: "Test 2: Agent Log Level is Warn",
364362
logLevel: "",
365363
logPath: "/tmp/collector.log",
366364
agentLogLevel: "warn",
367365
expectedLogPath: "/tmp/collector.log",
368-
expectedLogLevel: "INFO",
366+
expectedLogLevel: "WARN",
369367
},
370368
{
371369
name: "Test 3: OTel Log Level Set In Config",
@@ -379,6 +377,7 @@ func TestResolveCollectorLog(t *testing.T) {
379377

380378
for _, test := range tests {
381379
t.Run(test.name, func(t *testing.T) {
380+
viperInstance = viper.NewWithOptions(viper.KeyDelimiter(KeyDelimiter))
382381
viperInstance.Set(CollectorLogPathKey, test.logPath)
383382
viperInstance.Set(LogLevelKey, test.agentLogLevel)
384383

0 commit comments

Comments
 (0)