From 083fd11005c9c46bf4d6cc188b18bb8fe51123b8 Mon Sep 17 00:00:00 2001 From: Mingyang Zheng Date: Mon, 2 Dec 2024 16:27:13 -0800 Subject: [PATCH 1/2] fix(logging): Clean up extra empty spaces when redirectLogger is used --- logger/handler.go | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/logger/handler.go b/logger/handler.go index 6bc066658d183..31b286f64408e 100644 --- a/logger/handler.go +++ b/logger/handler.go @@ -119,10 +119,15 @@ func (l *redirectLogger) Print(level telegraf.LogLevel, ts time.Time, prefix str for k, v := range attr { parts = append(parts, fmt.Sprintf("%s=%v", k, v)) } - attrMsg = " (" + strings.Join(parts, ",") + ")" + attrMsg = "(" + strings.Join(parts, ",") + ")" } - msg := append([]interface{}{ts.In(time.UTC).Format(time.RFC3339), " ", level.Indicator(), " ", prefix + attrMsg}, args...) + msg := []interface{}{ts.In(time.UTC).Format(time.RFC3339), level.Indicator(), prefix + attrMsg} + if prefix+attrMsg != "" { + msg = append(msg, prefix+attrMsg) + } + msg = append(msg, args) + fmt.Fprintln(l.writer, msg...) } From 20625575107ac03e76d3e2f14f8f0dfd15827eb7 Mon Sep 17 00:00:00 2001 From: Mingyang Zheng Date: Mon, 2 Dec 2024 18:00:17 -0800 Subject: [PATCH 2/2] fix lint --- logger/handler.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/logger/handler.go b/logger/handler.go index 31b286f64408e..76bf64a9c32d8 100644 --- a/logger/handler.go +++ b/logger/handler.go @@ -126,7 +126,7 @@ func (l *redirectLogger) Print(level telegraf.LogLevel, ts time.Time, prefix str if prefix+attrMsg != "" { msg = append(msg, prefix+attrMsg) } - msg = append(msg, args) + msg = append(msg, args...) fmt.Fprintln(l.writer, msg...) }