From e31dd929e8083e2d7492fd0db3b0278bbd9f52fa Mon Sep 17 00:00:00 2001 From: teddy-wahle <87345799+teddy-wahle@users.noreply.github.com> Date: Thu, 23 Jan 2025 18:05:23 -0800 Subject: [PATCH 1/2] Switch default logging to JSON Signed-off-by: teddy-wahle <87345799+teddy-wahle@users.noreply.github.com> --- util/log/logrus.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/util/log/logrus.go b/util/log/logrus.go index 6a51cd344ee0a..01ebc27993eb9 100644 --- a/util/log/logrus.go +++ b/util/log/logrus.go @@ -46,8 +46,7 @@ func CreateFormatter(logFormat string) logrus.Formatter { TimestampFormat: checkTimestampFormat(), } default: - formatType = &logrus.TextFormatter{ - FullTimestamp: checkEnableFullTimestamp(), + formatType = &logrus.JSONFormatter{ TimestampFormat: checkTimestampFormat(), } } From caf0f5d8d79a2a08ad2ae5e22c1751a7a511c8c2 Mon Sep 17 00:00:00 2001 From: teddy-wahle <87345799+teddy-wahle@users.noreply.github.com> Date: Thu, 23 Jan 2025 18:12:24 -0800 Subject: [PATCH 2/2] Update logrus_test.go Signed-off-by: teddy-wahle <87345799+teddy-wahle@users.noreply.github.com> --- util/log/logrus_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/util/log/logrus_test.go b/util/log/logrus_test.go index 66c8dcfb7512b..f25ab4ca7b526 100644 --- a/util/log/logrus_test.go +++ b/util/log/logrus_test.go @@ -48,6 +48,6 @@ func TestCreateFormatter(t *testing.T) { }) t.Run("log format is not json or text", func(t *testing.T) { result := CreateFormatter("xml") - assert.Equal(t, &logrus.TextFormatter{}, result) + assert.Equal(t, &logrus.JSONFormatter{}, result) }) }