Skip to content

Commit aed69c8

Browse files
committed
convert logrus severity levels properly
1 parent 8fdb732 commit aed69c8

File tree

2 files changed

+22
-6
lines changed

2 files changed

+22
-6
lines changed

bridges/otellogrus/hook.go

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -165,8 +165,24 @@ func (h *Hook) convertEntry(e *logrus.Entry) log.Record {
165165
record.SetTimestamp(e.Time)
166166
record.SetBody(log.StringValue(e.Message))
167167

168-
const sevOffset = logrus.Level(log.SeverityDebug) - logrus.DebugLevel
169-
record.SetSeverity(log.Severity(e.Level + sevOffset))
168+
var severity log.Severity
169+
switch e.Level {
170+
case logrus.PanicLevel:
171+
severity = log.SeverityFatal4
172+
case logrus.FatalLevel:
173+
severity = log.SeverityFatal
174+
case logrus.ErrorLevel:
175+
severity = log.SeverityError
176+
case logrus.WarnLevel:
177+
severity = log.SeverityWarn
178+
case logrus.InfoLevel:
179+
severity = log.SeverityInfo
180+
case logrus.DebugLevel:
181+
severity = log.SeverityDebug
182+
case logrus.TraceLevel:
183+
severity = log.SeverityTrace
184+
}
185+
record.SetSeverity(severity)
170186
record.AddAttributes(convertFields(e.Data)...)
171187

172188
return record

bridges/otellogrus/hook_test.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ func TestHookFire(t *testing.T) {
162162

163163
wantRecords: map[string][]log.Record{
164164
name: {
165-
buildRecord(log.StringValue(""), time.Time{}, 0, nil),
165+
buildRecord(log.StringValue(""), time.Time{}, log.SeverityFatal4, nil),
166166
},
167167
},
168168
},
@@ -173,7 +173,7 @@ func TestHookFire(t *testing.T) {
173173
},
174174
wantRecords: map[string][]log.Record{
175175
name: {
176-
buildRecord(log.StringValue(""), now, 0, nil),
176+
buildRecord(log.StringValue(""), now, log.SeverityFatal4, nil),
177177
},
178178
},
179179
},
@@ -184,7 +184,7 @@ func TestHookFire(t *testing.T) {
184184
},
185185
wantRecords: map[string][]log.Record{
186186
name: {
187-
buildRecord(log.StringValue(""), time.Time{}, log.SeverityTrace1, nil),
187+
buildRecord(log.StringValue(""), time.Time{}, log.SeverityFatal, nil),
188188
},
189189
},
190190
},
@@ -197,7 +197,7 @@ func TestHookFire(t *testing.T) {
197197
},
198198
wantRecords: map[string][]log.Record{
199199
name: {
200-
buildRecord(log.StringValue(""), time.Time{}, 0, []log.KeyValue{
200+
buildRecord(log.StringValue(""), time.Time{}, log.SeverityFatal4, []log.KeyValue{
201201
log.String("hello", "world"),
202202
}),
203203
},

0 commit comments

Comments
 (0)