diff --git a/console_test.go b/console_test.go index d90da79..2aebe65 100644 --- a/console_test.go +++ b/console_test.go @@ -378,7 +378,7 @@ func TestConsoleWriterConfiguration(t *testing.T) { t.Run("Sets FormatExtra", func(t *testing.T) { buf := &bytes.Buffer{} - w := zerolog.ConsoleWriter{ + w := zlog.ConsoleWriter{ Out: buf, NoColor: true, PartsOrder: []string{"level", "message"}, FormatExtra: func(evt map[string]interface{}, buf *bytes.Buffer) error { buf.WriteString("\nAdditional stacktrace") @@ -406,14 +406,14 @@ func TestConsoleWriterConfiguration(t *testing.T) { expectedOutput := "2022-10-20 20:24:50 INF Foobar\n" evt := `{"time": "2022-10-20 20:24:50", "level": "info", "message": "Foobar"}` - of := zerolog.TimeFieldFormat + of := zlog.TimeFieldFormat defer func() { - zerolog.TimeFieldFormat = of + zlog.TimeFieldFormat = of }() - zerolog.TimeFieldFormat = timeFormat + zlog.TimeFieldFormat = timeFormat buf := &bytes.Buffer{} - w := zerolog.ConsoleWriter{Out: buf, NoColor: true, TimeFormat: timeFormat} + w := zlog.ConsoleWriter{Out: buf, NoColor: true, TimeFormat: timeFormat} _, err := w.Write([]byte(evt)) if err != nil { t.Errorf("Unexpected error when writing output: %s", err) diff --git a/diode/diode_test.go b/diode/diode_test.go index 3ffb6f8..a8382a8 100644 --- a/diode/diode_test.go +++ b/diode/diode_test.go @@ -33,7 +33,7 @@ func TestNewWriter(t *testing.T) { func TestClose(t *testing.T) { buf := bytes.Buffer{} w := diode.NewWriter(&buf, 1000, 0, func(missed int) {}) - log := zerolog.New(w) + log := zlog.New(w) log.Print("test") w.Close() } diff --git a/hlog/hlog.go b/hlog/hlog.go index 9cbc028..85d68d5 100644 --- a/hlog/hlog.go +++ b/hlog/hlog.go @@ -126,8 +126,8 @@ func RefererHandler(fieldKey string) func(next http.Handler) http.Handler { func ProtoHandler(fieldKey string) func(next http.Handler) http.Handler { return func(next http.Handler) http.Handler { return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { - log := zerolog.Ctx(r.Context()) - log.UpdateContext(func(c zerolog.Context) zerolog.Context { + log := zlog.Ctx(r.Context()) + log.UpdateContext(func(c zlog.Context) zlog.Context { return c.Str(fieldKey, r.Proto) }) next.ServeHTTP(w, r) diff --git a/hlog/hlog_test.go b/hlog/hlog_test.go index 06da6b6..f94e8ce 100644 --- a/hlog/hlog_test.go +++ b/hlog/hlog_test.go @@ -210,7 +210,7 @@ func TestProtoHandler(t *testing.T) { l := FromRequest(r) l.Log().Msg("") })) - h = NewHandler(zerolog.New(out))(h) + h = NewHandler(zlog.New(out))(h) h.ServeHTTP(nil, r) if want, got := `{"proto":"test"}`+"\n", decodeIfBinary(out); want != got { t.Errorf("Invalid log output, got: %s, want: %s", got, want) diff --git a/journald/journald.go b/journald/journald.go index 3a14399..903b30b 100644 --- a/journald/journald.go +++ b/journald/journald.go @@ -102,7 +102,7 @@ func (w journalWriter) Write(p []byte) (n int, err error) { case json.Number: args[jKey] = fmt.Sprint(value) default: - b, err := zerolog.InterfaceMarshalFunc(value) + b, err := zlog.InterfaceMarshalFunc(value) if err != nil { args[jKey] = fmt.Sprintf("[error: %v]", err) } else {