Skip to content
Closed
Changes from all commits
Commits
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
38 changes: 38 additions & 0 deletions crates/datadog-agent-config/src/deserializers/log_level.rs
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,13 @@ impl<'de> Deserialize<'de> for LogLevel {
if let Value::String(s) = value {
match LogLevel::from_str(&s) {
Ok(level) => Ok(level),
// A `RUST_LOG`-style directive list, such as `info,cold_start_duration=debug`.
// Its level is the last entry with no target, or warn if it has none, the same as
// for an invalid value.
Err(_) if s.contains(['=', ',']) => Ok(s
.rsplit(',')
.find_map(|entry| LogLevel::from_str(entry.trim()).ok())
.unwrap_or(LogLevel::Warn)),
Err(e) => {
error!("{}", e);
Ok(LogLevel::Warn)
Expand All @@ -83,3 +90,34 @@ impl<'de> Deserialize<'de> for LogLevel {
}
}
}

#[cfg(test)]
mod tests {
use super::LogLevel;
use serde_json::json;

fn parse(value: &str) -> LogLevel {
serde_json::from_value(json!(value)).expect("log level always deserializes")
}

#[test]
fn parses_plain_level() {
assert_eq!(parse("DEBUG"), LogLevel::Debug);
}

#[test]
fn takes_level_from_directives() {
assert_eq!(parse("debug,cold_start_duration=off"), LogLevel::Debug);
assert_eq!(parse("cold_start_duration=debug, warn"), LogLevel::Warn);
}

#[test]
fn defaults_directives_without_level_to_warn() {
assert_eq!(parse("cold_start_duration=debug"), LogLevel::Warn);
}

#[test]
fn falls_back_to_warn_for_invalid_level() {
assert_eq!(parse("verbose"), LogLevel::Warn);
}
}
Loading