Skip to content

Commit 065dd0a

Browse files
feat: update log level retrieval to support CLEF-format logs ( '@l' key) (#4236)
1 parent b1cbd7c commit 065dd0a

File tree

2 files changed

+26
-2
lines changed

2 files changed

+26
-2
lines changed

internal/container/level_guesser.go

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,11 @@ func guessLogLevel(logEvent *LogEvent) string {
8181
return "unknown"
8282
}
8383

84-
if level, ok := value.Get("level"); ok {
84+
if level, ok := value.Get("@l"); ok {
85+
if level, ok := level.(string); ok {
86+
return normalizeLogLevel(level)
87+
}
88+
} else if level, ok := value.Get("level"); ok {
8589
if level, ok := level.(string); ok {
8690
return normalizeLogLevel(level)
8791
}
@@ -95,7 +99,9 @@ func guessLogLevel(logEvent *LogEvent) string {
9599
if value == nil {
96100
return "unknown"
97101
}
98-
if level, ok := value.Get("level"); ok {
102+
if level, ok := value.Get("@l"); ok {
103+
return normalizeLogLevel(level)
104+
} else if level, ok := value.Get("level"); ok {
99105
return normalizeLogLevel(level)
100106
} else if severity, ok := value.Get("severity"); ok {
101107
return normalizeLogLevel(severity)

internal/container/level_guesser_test.go

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,24 @@ func TestGuessLogLevel(t *testing.T) {
6565
orderedmap.Pair[string, any]{Key: "severity", Value: "info"},
6666
),
6767
), "info"},
68+
{orderedmap.New[string, string](
69+
orderedmap.WithInitialData(
70+
orderedmap.Pair[string, string]{Key: "key", Value: "value"},
71+
orderedmap.Pair[string, string]{Key: "@l", Value: "info"},
72+
),
73+
), "info"},
74+
{orderedmap.New[string, any](
75+
orderedmap.WithInitialData(
76+
orderedmap.Pair[string, any]{Key: "key", Value: "value"},
77+
orderedmap.Pair[string, any]{Key: "@l", Value: "debug"},
78+
),
79+
), "debug"},
80+
{orderedmap.New[string, string](
81+
orderedmap.WithInitialData(
82+
orderedmap.Pair[string, string]{Key: "@l", Value: "error"},
83+
orderedmap.Pair[string, string]{Key: "@t", Value: "2024-01-01T00:00:00Z"},
84+
),
85+
), "error"},
6886
{nilOrderedMap, "unknown"},
6987
{nil, "unknown"},
7088
}

0 commit comments

Comments
 (0)