Merge branch 'master' into feat/slog-stacktrace

exp/zapslog/handler.go

@@ -154,6 +154,10 @@ func (h *Handler) Handle(ctx context.Context, record slog.Record) error {
 
 	fields := make([]zapcore.Field, 0, record.NumAttrs())
 	record.Attrs(func(attr slog.Attr) bool {
+		if attr.Equal(slog.Attr{}) {
+			return true // ignore empty attributes
+		}
+
 		fields = append(fields, convertAttrToField(attr))
 		return true
 	})
@@ -164,9 +168,12 @@ func (h *Handler) Handle(ctx context.Context, record slog.Record) error {
 // WithAttrs returns a new Handler whose attributes consist of
 // both the receiver's attributes and the arguments.
 func (h *Handler) WithAttrs(attrs []slog.Attr) slog.Handler {
-	fields := make([]zapcore.Field, len(attrs))
-	for i, attr := range attrs {
-		fields[i] = convertAttrToField(attr)
+	fields := make([]zapcore.Field, 0, len(attrs))
+	for _, attr := range attrs {
+		if attr.Equal(slog.Attr{}) {
+			continue // ignore empty attributes
+		}
+		fields = append(fields, convertAttrToField(attr))
 	}
 	return h.withFields(fields...)
 }

exp/zapslog/handler_test.go

@@ -33,6 +33,8 @@ import (
 )
 
 func TestAddCaller(t *testing.T) {
+	t.Parallel()
+
 	fac, logs := observer.New(zapcore.DebugLevel)
 	sl := slog.New(NewHandler(fac, WithCaller(true)))
 	sl.Info("msg")
@@ -66,3 +68,34 @@ func TestAddStack(t *testing.T) {
 		"Unexpected stack trace annotation.",
 	)
 }
+
+func TestEmptyAttr(t *testing.T) {
+	t.Parallel()
+
+	fac, observedLogs := observer.New(zapcore.DebugLevel)
+	sl := slog.New(NewHandler(fac))
+
+	t.Run("Handle", func(t *testing.T) {
+		sl.Info(
+			"msg",
+			slog.String("foo", "bar"),
+			slog.Attr{},
+		)
+
+		logs := observedLogs.TakeAll()
+		require.Len(t, logs, 1, "Expected exactly one entry to be logged")
+		assert.Equal(t, map[string]any{
+			"foo": "bar",
+		}, logs[0].ContextMap(), "Unexpected context")
+	})
+
+	t.Run("WithAttrs", func(t *testing.T) {
+		sl.With(slog.String("foo", "bar"), slog.Attr{}).Info("msg")
+
+		logs := observedLogs.TakeAll()
+		require.Len(t, logs, 1, "Expected exactly one entry to be logged")
+		assert.Equal(t, map[string]any{
+			"foo": "bar",
+		}, logs[0].ContextMap(), "Unexpected context")
+	})
+}