From 5c21a324a789c186aae63c4ed3cd84c02a5fe18f Mon Sep 17 00:00:00 2001 From: Bryan Aguilar Date: Wed, 11 May 2022 15:48:53 -0700 Subject: [PATCH 1/3] Remove conditional check from logging wrapper --- cmd/awscollector/main.go | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/cmd/awscollector/main.go b/cmd/awscollector/main.go index f4b1f48e9f..9bb66ad844 100644 --- a/cmd/awscollector/main.go +++ b/cmd/awscollector/main.go @@ -71,9 +71,10 @@ func main() { Factories: factories, BuildInfo: info, } - if lumberOpt := logger.WrapCoreOpt(); lumberOpt != nil { - params.LoggingOptions = []zap.Option{lumberOpt} - } + + lumberOpt := logger.WrapCoreOpt() + params.LoggingOptions = []zap.Option{lumberOpt} + if err = run(params); err != nil { logFatal(err) } From c5e79d684924b2f0721cae8e881f307a23ef6ecc Mon Sep 17 00:00:00 2001 From: bryan-aguilar <46550959+bryan-aguilar@users.noreply.github.com> Date: Wed, 11 May 2022 16:07:37 -0700 Subject: [PATCH 2/3] Update cmd/awscollector/main.go Co-authored-by: Anthony Mirabella --- cmd/awscollector/main.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/cmd/awscollector/main.go b/cmd/awscollector/main.go index 9bb66ad844..6e250441db 100644 --- a/cmd/awscollector/main.go +++ b/cmd/awscollector/main.go @@ -72,8 +72,7 @@ func main() { BuildInfo: info, } - lumberOpt := logger.WrapCoreOpt() - params.LoggingOptions = []zap.Option{lumberOpt} + params.LoggingOptions = []zap.Option{logger.WrapCoreOpt()} if err = run(params); err != nil { logFatal(err) From f148e82952973351f0757e2c27a9603a530f1373 Mon Sep 17 00:00:00 2001 From: Bryan Aguilar Date: Wed, 11 May 2022 16:10:31 -0700 Subject: [PATCH 3/3] Add logging option to struct literal --- cmd/awscollector/main.go | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/cmd/awscollector/main.go b/cmd/awscollector/main.go index 6e250441db..333d9fd56e 100644 --- a/cmd/awscollector/main.go +++ b/cmd/awscollector/main.go @@ -68,12 +68,11 @@ func main() { } params := service.CollectorSettings{ - Factories: factories, - BuildInfo: info, + Factories: factories, + BuildInfo: info, + LoggingOptions: []zap.Option{logger.WrapCoreOpt()}, } - params.LoggingOptions = []zap.Option{logger.WrapCoreOpt()} - if err = run(params); err != nil { logFatal(err) }