From fdcb1adfb064ea71a33f880f3bc3b1ffad09563e Mon Sep 17 00:00:00 2001 From: Ken Kaizu Date: Tue, 31 Jan 2023 14:55:01 +0900 Subject: [PATCH] feat: suppress log package logging (#3076) To suppress uber-go/tally logs which are not structured logs. --- .../controllers/events/events_controller_e2e_test.go | 1 + server/logging/log.go | 12 ++++++++++++ server/server.go | 1 + 3 files changed, 14 insertions(+) create mode 100644 server/logging/log.go diff --git a/server/controllers/events/events_controller_e2e_test.go b/server/controllers/events/events_controller_e2e_test.go index 19dc70c07..151cf2434 100644 --- a/server/controllers/events/events_controller_e2e_test.go +++ b/server/controllers/events/events_controller_e2e_test.go @@ -1063,6 +1063,7 @@ func setupE2E(t *testing.T, repoDir string, opt setupOption) (events_controllers projectCmdOutputHandler := jobmocks.NewMockProjectCommandOutputHandler() // Real dependencies. + logging.SuppressDefaultLogging() logger := logging.NewNoopLogger(t) eventParser := &events.EventParser{ diff --git a/server/logging/log.go b/server/logging/log.go new file mode 100644 index 000000000..8e63640a1 --- /dev/null +++ b/server/logging/log.go @@ -0,0 +1,12 @@ +package logging + +import ( + "io" + "log" +) + +// SuppressDefaultLogging suppresses the default logging +func SuppressDefaultLogging() { + // Some packages use the default logger, so we need to suppress it. (such as uber-go/tally) + log.SetOutput(io.Discard) +} diff --git a/server/server.go b/server/server.go index 407467820..e1d03c908 100644 --- a/server/server.go +++ b/server/server.go @@ -153,6 +153,7 @@ type WebhookConfig struct { // its dependencies an error will be returned. This is like the main() function // for the server CLI command because it injects all the dependencies. func NewServer(userConfig UserConfig, config Config) (*Server, error) { + logging.SuppressDefaultLogging() logger, err := logging.NewStructuredLoggerFromLevel(userConfig.ToLogLevel()) if err != nil {