From 2052f376d388de9de9dc607747f076cfc1179a70 Mon Sep 17 00:00:00 2001 From: Steven Masley Date: Wed, 16 Mar 2022 13:03:39 -0500 Subject: [PATCH 1/2] Replace 'Interface' usage with correct zerolog api Handle structures as documented in zerolog, similar to how zap does in it's test case. --- benchmarks/zerolog_test.go | 38 ++++++++++++++++++++++++++------------ 1 file changed, 26 insertions(+), 12 deletions(-) diff --git a/benchmarks/zerolog_test.go b/benchmarks/zerolog_test.go index b14cd9df3..bcad6d4f5 100644 --- a/benchmarks/zerolog_test.go +++ b/benchmarks/zerolog_test.go @@ -26,38 +26,52 @@ import ( "github.com/rs/zerolog" ) + func newZerolog() zerolog.Logger { return zerolog.New(ioutil.Discard).With().Timestamp().Logger() } + func newDisabledZerolog() zerolog.Logger { return newZerolog().Level(zerolog.Disabled) } +func (u *user) MarshalZerologObject(e *zerolog.Event) { + e.Str("name", u.Name). + Str("email", u.Email). + Int64("createdAt", u.CreatedAt.UnixNano()) +} + +func (uu users) MarshalZerologArray(a *zerolog.Array) { + for _, u := range uu { + a.Object(u) + } +} + func fakeZerologFields(e *zerolog.Event) *zerolog.Event { return e. Int("int", _tenInts[0]). - Interface("ints", _tenInts). + Ints("ints", _tenInts). Str("string", _tenStrings[0]). - Interface("strings", _tenStrings). + Strs("strings", _tenStrings). Time("time", _tenTimes[0]). - Interface("times", _tenTimes). - Interface("user1", _oneUser). - Interface("user2", _oneUser). - Interface("users", _tenUsers). + Times("times", _tenTimes). + Object("user1", _oneUser). + Object("user2", _oneUser). + Array("users", _tenUsers). Err(errExample) } func fakeZerologContext(c zerolog.Context) zerolog.Context { return c. Int("int", _tenInts[0]). - Interface("ints", _tenInts). + Ints("ints", _tenInts). Str("string", _tenStrings[0]). - Interface("strings", _tenStrings). + Strs("strings", _tenStrings). Time("time", _tenTimes[0]). - Interface("times", _tenTimes). - Interface("user1", _oneUser). - Interface("user2", _oneUser). - Interface("users", _tenUsers). + Times("times", _tenTimes). + Object("user1", _oneUser). + Object("user2", _oneUser). + Array("users", _tenUsers). Err(errExample) } From 6aae3e6b28147be17d3678cb5aaf4816110a26c9 Mon Sep 17 00:00:00 2001 From: Abhinav Gupta Date: Wed, 16 Mar 2022 15:42:57 -0700 Subject: [PATCH 2/2] Apply suggestions from code review --- benchmarks/zerolog_test.go | 2 -- 1 file changed, 2 deletions(-) diff --git a/benchmarks/zerolog_test.go b/benchmarks/zerolog_test.go index bcad6d4f5..5edb502a8 100644 --- a/benchmarks/zerolog_test.go +++ b/benchmarks/zerolog_test.go @@ -26,12 +26,10 @@ import ( "github.com/rs/zerolog" ) - func newZerolog() zerolog.Logger { return zerolog.New(ioutil.Discard).With().Timestamp().Logger() } - func newDisabledZerolog() zerolog.Logger { return newZerolog().Level(zerolog.Disabled) }