Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[otel-agent] log level: case insensitivity to set the log level #32619

Merged
merged 5 commits into from
Jan 6, 2025
+36 −3
Merged

[otel-agent] log level: case insensitivity to set the log level #32619

Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1cc0ab3
[otel-agent] log level: case insensitivity to set the log level
truthbk Dec 31, 2024
cd8b0b3
Merge branch 'main' into jaime/otelloglevel
truthbk Jan 3, 2025
1379763
[otel-agent] log level: add test case
truthbk Jan 3, 2025
edc24d5
Merge branch 'jaime/otelloglevel' of github.com:DataDog/datadog-agent…
truthbk Jan 3, 2025
1143f63
[otel-agent] log level: add test case
truthbk Jan 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions cmd/otel-agent/config/agent_config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,15 +117,15 @@ func NewConfigComponent(ctx context.Context, ddCfg string, uris []string) (confi
return nil, err
}
var ok bool
activeLogLevel, ok = logLevelMap[pkgconfig.GetString("log_level")]
activeLogLevel, ok = logLevelMap[strings.ToLower(pkgconfig.GetString("log_level"))]
if !ok {
return nil, fmt.Errorf("invalid log level (%v) set in the Datadog Agent configuration", pkgconfig.GetString("log_level"))
}
}

// Set the right log level. The most verbose setting takes precedence.
telemetryLogLevel := sc.Telemetry.Logs.Level
telemetryLogMapping, ok := logLevelMap[telemetryLogLevel.String()]
telemetryLogMapping, ok := logLevelMap[strings.ToLower(telemetryLogLevel.String())]
if !ok {
return nil, fmt.Errorf("invalid log level (%v) set in the OTel Telemetry configuration", telemetryLogLevel.String())
}
Expand Down
Loading