Merge branch 'main' into zapbench

open-telemetry · Jun 25, 2024 · 2a5db7b · 2a5db7b
2 parents f7ff9d0 + 669ca60
commit 2a5db7b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/bridges/otelzap/core.go b/bridges/otelzap/core.go
@@ -154,6 +154,7 @@ func (o *Core) Write(ent zapcore.Entry, fields []zapcore.Field) error {
 	r.SetTimestamp(ent.Time)
 	r.SetBody(log.StringValue(ent.Message))
 	r.SetSeverity(convertLevel(ent.Level))
+	r.SetSeverityText(ent.Level.String())
 
 	// TODO: Handle ent.LoggerName.
 

diff --git a/bridges/otelzap/core_test.go b/bridges/otelzap/core_test.go
@@ -40,6 +40,7 @@ func TestCore(t *testing.T) {
 		got := rec.Result()[0].Records[0]
 		assert.Equal(t, testMessage, got.Body().AsString())
 		assert.Equal(t, log.SeverityInfo, got.Severity())
+		assert.Equal(t, zap.InfoLevel.String(), got.SeverityText())
 		assert.Equal(t, 1, got.AttributesLen())
 		got.WalkAttributes(func(kv log.KeyValue) bool {
 			assert.Equal(t, testKey, string(kv.Key))
@@ -62,6 +63,7 @@ func TestCore(t *testing.T) {
 		got := rec.Result()[0].Records[0]
 		assert.Equal(t, testMessage, got.Body().AsString())
 		assert.Equal(t, log.SeverityInfo, got.Severity())
+		assert.Equal(t, zap.InfoLevel.String(), got.SeverityText())
 		assert.Equal(t, 2, got.AttributesLen())
 
 		index := 0
@@ -84,6 +86,7 @@ func TestCore(t *testing.T) {
 		got := rec.Result()[0].Records[0]
 		assert.Equal(t, testMessage, got.Body().AsString())
 		assert.Equal(t, log.SeverityInfo, got.Severity())
+		assert.Equal(t, zap.InfoLevel.String(), got.SeverityText())
 		assert.Equal(t, 3, got.AttributesLen())
 
 		index := 0
@@ -119,6 +122,7 @@ func TestCoreEnabled(t *testing.T) {
 	got := r.Result()[0].Records[0]
 	assert.Equal(t, testMessage, got.Body().AsString())
 	assert.Equal(t, log.SeverityInfo, got.Severity())
+	assert.Equal(t, zap.InfoLevel.String(), got.SeverityText())
 }
 
 func TestNewCoreConfiguration(t *testing.T) {