otelzap: Add caller and stacktrace to attributes if present

CHANGELOG.md

@@ -13,6 +13,7 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
 - Transform raw (`slog.KindAny`) attribute values to matching `log.Value` types.
   For example, `[]string{"foo", "bar"}` attribute value is now transformed to `log.SliceValue(log.StringValue("foo"), log.StringValue("bar"))` instead of `log.String("[foo bar"])`. (#6254)
 - Add the `WithSource` option to the `go.opentelemetry.io/contrib/bridges/otelslog` log bridge to set the `code.*` attributes in the log record that includes the source location where the record was emitted. (#6253)
+- Set the `code.*` attributes in `go.opentelemetry.io/contrib/bridges/otelzap` if the `zap.Logger` was created with the `AddCaller` and/or `AddStacktrace(level)` option. (#6268)
 
 ### Fixed
 

bridges/otelzap/core.go

@@ -41,6 +41,7 @@ import (
 
 	"go.opentelemetry.io/otel/log"
 	"go.opentelemetry.io/otel/log/global"
+	semconv "go.opentelemetry.io/otel/semconv/v1.26.0"
 )
 
 type config struct {
@@ -200,6 +201,16 @@ func (o *Core) Write(ent zapcore.Entry, fields []zapcore.Field) error {
 	r.SetSeverityText(ent.Level.String())
 
 	r.AddAttributes(o.attr...)
+	if ent.Caller.Defined {
+		r.AddAttributes(
+			log.String(string(semconv.CodeFilepathKey), ent.Caller.File),
+			log.Int(string(semconv.CodeLineNumberKey), ent.Caller.Line),
+			log.String(string(semconv.CodeFunctionKey), ent.Caller.Function),
+		)
+	}
+	if ent.Stack != "" {
+		r.AddAttributes(log.String(string(semconv.CodeStacktraceKey), ent.Stack))
+	}
 	if len(fields) > 0 {
 		ctx, attrbuf := convertField(fields)
 		if ctx != nil {

bridges/otelzap/core_test.go

@@ -17,6 +17,7 @@ import (
 	"go.opentelemetry.io/otel/log"
 	"go.opentelemetry.io/otel/log/global"
 	"go.opentelemetry.io/otel/log/logtest"
+	semconv "go.opentelemetry.io/otel/semconv/v1.26.0"
 )
 
 var (
@@ -164,6 +165,77 @@ func TestCoreEnabled(t *testing.T) {
 	assert.Equal(t, zap.InfoLevel.String(), got.SeverityText())
 }
 
+func TestCoreWithCaller(t *testing.T) {
+	rec := logtest.NewRecorder()
+	zc := NewCore(loggerName, WithLoggerProvider(rec))
+
+	t.Run("WithAddCaller", func(t *testing.T) {
+		logger := zap.New(zc, zap.AddCaller())
+		logger.Info(testMessage)
+		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())
+		got.WalkAttributes(func(kv log.KeyValue) bool {
+			switch kv.Key {
+			case string(semconv.CodeFilepathKey):
+				assert.Contains(t, kv.Value.AsString(), "core_test.go")
+			case string(semconv.CodeLineNumberKey):
+				assert.Positive(t, kv.Value.AsInt64())
+			case string(semconv.CodeFunctionKey):
+				assert.Contains(t, kv.Value.AsString(), "TestCoreWithCaller")
+			default:
+				assert.Fail(t, "unexpected attribute key", kv.Key)
+			}
+			return true
+		})
+	})
+
+	rec.Reset()
+
+	t.Run("Default", func(t *testing.T) {
+		logger := zap.New(zc)
+		logger.Info(testMessage)
+		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, 0, got.AttributesLen())
+	})
+}
+
+func TestCoreWithStacktrace(t *testing.T) {
+	rec := logtest.NewRecorder()
+	zc := NewCore(loggerName, WithLoggerProvider(rec))
+	logger := zap.New(zc, zap.AddStacktrace(zapcore.ErrorLevel))
+
+	t.Run("Error", func(t *testing.T) {
+		logger.Error(testMessage)
+		got := rec.Result()[0].Records[0]
+		assert.Equal(t, testMessage, got.Body().AsString())
+		assert.Equal(t, log.SeverityError, got.Severity())
+		assert.Equal(t, zap.ErrorLevel.String(), got.SeverityText())
+		assert.Equal(t, 1, got.AttributesLen())
+		got.WalkAttributes(func(kv log.KeyValue) bool {
+			assert.Equal(t, string(semconv.CodeStacktraceKey), kv.Key)
+			assert.NotEmpty(t, kv.Value.AsString())
+			return true
+		})
+	})
+
+	rec.Reset()
+
+	t.Run("Warn", func(t *testing.T) {
+		logger.Warn(testMessage)
+		got := rec.Result()[0].Records[0]
+		assert.Equal(t, testMessage, got.Body().AsString())
+		assert.Equal(t, log.SeverityWarn, got.Severity())
+		assert.Equal(t, zap.WarnLevel.String(), got.SeverityText())
+		assert.Equal(t, 0, got.AttributesLen())
+	})
+}
+
 func TestNewCoreConfiguration(t *testing.T) {
 	t.Run("Default", func(t *testing.T) {
 		r := logtest.NewRecorder()