From 069485b2b50c8c397c0095a630932bdcc8cdcfc1 Mon Sep 17 00:00:00 2001 From: Antoine Toulme Date: Sun, 17 Mar 2024 23:15:03 -0700 Subject: [PATCH 1/4] [chore] reuse the timer object when parsing --- pkg/stanza/operator/helper/time.go | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkg/stanza/operator/helper/time.go b/pkg/stanza/operator/helper/time.go index f9326c73dd183..1c9cec3452b04 100644 --- a/pkg/stanza/operator/helper/time.go +++ b/pkg/stanza/operator/helper/time.go @@ -47,12 +47,11 @@ type TimeParser struct { // Unmarshal starting from default settings func (t *TimeParser) Unmarshal(component *confmap.Conf) error { - cfg := NewTimeParser() - err := component.Unmarshal(&cfg, confmap.WithIgnoreUnused()) + *t = NewTimeParser() + err := component.Unmarshal(t, confmap.WithIgnoreUnused()) if err != nil { return err } - *t = cfg return nil } From 1878d83224061e78d3e23da8f695f3e77e20bccb Mon Sep 17 00:00:00 2001 From: Antoine Toulme Date: Tue, 19 Mar 2024 21:51:02 -0700 Subject: [PATCH 2/4] move after err --- pkg/stanza/operator/helper/time.go | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkg/stanza/operator/helper/time.go b/pkg/stanza/operator/helper/time.go index 1c9cec3452b04..1a7e6d1405397 100644 --- a/pkg/stanza/operator/helper/time.go +++ b/pkg/stanza/operator/helper/time.go @@ -31,7 +31,7 @@ const NativeKey = "native" // provided for operator development // NewTimeParser creates a new time parser with default values func NewTimeParser() TimeParser { return TimeParser{ - LayoutType: "strptime", + LayoutType: StrptimeKey, } } @@ -47,11 +47,13 @@ type TimeParser struct { // Unmarshal starting from default settings func (t *TimeParser) Unmarshal(component *confmap.Conf) error { - *t = NewTimeParser() err := component.Unmarshal(t, confmap.WithIgnoreUnused()) if err != nil { return err } + if t.LayoutType == "" { + t.LayoutType = StrptimeKey + } return nil } From 469b41c5f38ccc4f042df95202fe72ecacb9cb0d Mon Sep 17 00:00:00 2001 From: Antoine Toulme Date: Fri, 5 Apr 2024 08:57:40 -0700 Subject: [PATCH 3/4] remove default value, set by builder --- pkg/stanza/operator/helper/time.go | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkg/stanza/operator/helper/time.go b/pkg/stanza/operator/helper/time.go index 1a7e6d1405397..202cb2326f1e7 100644 --- a/pkg/stanza/operator/helper/time.go +++ b/pkg/stanza/operator/helper/time.go @@ -51,9 +51,6 @@ func (t *TimeParser) Unmarshal(component *confmap.Conf) error { if err != nil { return err } - if t.LayoutType == "" { - t.LayoutType = StrptimeKey - } return nil } From bf139d6ce894e1a07f0419990c550308fc7c5533 Mon Sep 17 00:00:00 2001 From: Antoine Toulme Date: Fri, 5 Apr 2024 09:00:07 -0700 Subject: [PATCH 4/4] separate constant reuse change --- pkg/stanza/operator/helper/time.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/stanza/operator/helper/time.go b/pkg/stanza/operator/helper/time.go index 202cb2326f1e7..d31cbca6f72d2 100644 --- a/pkg/stanza/operator/helper/time.go +++ b/pkg/stanza/operator/helper/time.go @@ -31,7 +31,7 @@ const NativeKey = "native" // provided for operator development // NewTimeParser creates a new time parser with default values func NewTimeParser() TimeParser { return TimeParser{ - LayoutType: StrptimeKey, + LayoutType: "strptime", } }