mirror of
https://github.com/rs/zerolog
synced 2026-06-08 17:13:30 +00:00
Marc Brooks
0cf9361666
Copies over event settings for ctx, hooks, and stack
- Fix missing context for Event.appendObjects passes event's stack, ctx, and hooks (ch).
- Add Array.Errs support.
- Context.Errs, Event.Errs, use new Array.Errs()
- Array.Err handles nil correctly.
- Fix Event.Err code ignoring modified event in ErrorStackMarshaler handling.
- Fix Fields.appendFieldList when ErrorMarshalFunc returns a nil.
- Fields.appendFieldList does no longer adds the ErrorStackFieldName field when ErrorStackMarshaler returns nil.
- Don't call the ErrorMarshalFunc on nil errors.
- Removed unreachable code NOP in Context.Array
- Rewrite ErrorMarshalFunc testing.
- Made diode tests more stable.
- Log copy error in test.
- Address review comments
- Added CreateArray() and CreateDict() for both Context and Event and deprecate the Arr() and Dict().
Array now carries then stack/context/hooks so they are available to LogObjectMarshal of Array elements.
Added unit tests for error marshal that returns an interface{}
103 lines
2.3 KiB
Go
103 lines
2.3 KiB
Go
package zerolog
|
|
|
|
import (
|
|
"bytes"
|
|
"context"
|
|
"io"
|
|
"reflect"
|
|
"strings"
|
|
"testing"
|
|
|
|
"github.com/rs/zerolog/internal/cbor"
|
|
)
|
|
|
|
func TestCtx(t *testing.T) {
|
|
log := New(io.Discard)
|
|
ctx := log.WithContext(context.Background())
|
|
log2 := Ctx(ctx)
|
|
if !reflect.DeepEqual(log, *log2) {
|
|
t.Error("Ctx did not return the expected logger")
|
|
}
|
|
|
|
// update
|
|
log = log.Level(InfoLevel)
|
|
ctx = log.WithContext(ctx)
|
|
log2 = Ctx(ctx)
|
|
if !reflect.DeepEqual(log, *log2) {
|
|
t.Error("Ctx did not return the expected logger")
|
|
}
|
|
|
|
log2 = Ctx(context.Background())
|
|
if log2 != disabledLogger {
|
|
t.Error("Ctx did not return the expected logger")
|
|
}
|
|
|
|
DefaultContextLogger = &log
|
|
t.Cleanup(func() { DefaultContextLogger = nil })
|
|
log2 = Ctx(context.Background())
|
|
if log2 != &log {
|
|
t.Error("Ctx did not return the expected logger")
|
|
}
|
|
}
|
|
|
|
func TestCtxDisabled(t *testing.T) {
|
|
dl := New(io.Discard).Level(Disabled)
|
|
ctx := dl.WithContext(context.Background())
|
|
if ctx != context.Background() {
|
|
t.Error("WithContext stored a disabled logger")
|
|
}
|
|
|
|
l := New(io.Discard).With().Str("foo", "bar").Logger()
|
|
ctx = l.WithContext(ctx)
|
|
if !reflect.DeepEqual(Ctx(ctx), &l) {
|
|
t.Error("WithContext did not store logger")
|
|
}
|
|
|
|
l.UpdateContext(func(c Context) Context {
|
|
return c.Str("bar", "baz")
|
|
})
|
|
ctx = l.WithContext(ctx)
|
|
if !reflect.DeepEqual(Ctx(ctx), &l) {
|
|
t.Error("WithContext did not store updated logger")
|
|
}
|
|
|
|
l = l.Level(DebugLevel)
|
|
ctx = l.WithContext(ctx)
|
|
if !reflect.DeepEqual(Ctx(ctx), &l) {
|
|
t.Error("WithContext did not store copied logger")
|
|
}
|
|
|
|
ctx = dl.WithContext(ctx)
|
|
if !reflect.DeepEqual(Ctx(ctx), &dl) {
|
|
t.Error("WithContext did not override logger with a disabled logger")
|
|
}
|
|
}
|
|
|
|
type logObjectMarshalerImpl struct {
|
|
name string
|
|
age int
|
|
}
|
|
|
|
func (t logObjectMarshalerImpl) MarshalZerologObject(e *Event) {
|
|
e.Str("name", strings.ToLower(t.name)).Int("age", -t.age)
|
|
}
|
|
|
|
func Test_InterfaceLogObjectMarshaler(t *testing.T) {
|
|
var buf bytes.Buffer
|
|
log := New(&buf)
|
|
ctx := log.WithContext(context.Background())
|
|
|
|
log2 := Ctx(ctx)
|
|
|
|
withLog := log2.With().Interface("obj", &logObjectMarshalerImpl{
|
|
name: "FOO",
|
|
age: 29,
|
|
}).Logger()
|
|
|
|
withLog.Info().Msg("test")
|
|
|
|
if got, want := cbor.DecodeIfBinaryToString(buf.Bytes()), `{"level":"info","obj":{"name":"foo","age":-29},"message":"test"}`+"\n"; got != want {
|
|
t.Errorf("got %q, want %q", got, want)
|
|
}
|
|
}
|