Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion context.go
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,9 @@ func (c Context) Object(key string, obj LogObjectMarshaler) Context {
func (c Context) EmbedObject(obj LogObjectMarshaler) Context {
e := newEvent(LevelWriterAdapter{io.Discard}, 0)
e.EmbedObject(obj)
c.l.context = enc.AppendObjectData(c.l.context, e.buf)
if len(e.buf) > 1 {
c.l.context = enc.AppendObjectData(c.l.context, e.buf)
}
putEvent(e)
return c
}
Expand Down
43 changes: 43 additions & 0 deletions ctx_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -99,3 +99,46 @@ func Test_InterfaceLogObjectMarshaler(t *testing.T) {
t.Errorf("got %q, want %q", got, want)
}
}

type emptyObjectMarshaler struct {
name string
}

func (t *emptyObjectMarshaler) MarshalZerologObject(e *Event) {
if t.name != "" {
e.Str("name", t.name)
}
}

func TestContext_EmbedObject(t *testing.T) {
tests := []struct {
name string
obj *emptyObjectMarshaler
want string
}{
{
name: "empty object",
obj: &emptyObjectMarshaler{name: ""},
want: `{"level":"info","parent_field":"parent_value","message":"test"}` + "\n",
},
{
name: "non-empty object",
obj: &emptyObjectMarshaler{name: "Alice"},
want: `{"level":"info","parent_field":"parent_value","name":"Alice","message":"test"}` + "\n",
},
}

for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
var buf bytes.Buffer
parentCtx := New(&buf).With().Str("parent_field", "parent_value")
logger := parentCtx.EmbedObject(tt.obj).Logger()
logger.Info().Msg("test")

got := cbor.DecodeIfBinaryToString(buf.Bytes())
if got != tt.want {
t.Errorf("got %q, want %q", got, tt.want)
}
})
}
}