From 5f041d734e74c17c4f8717f70078c388e08a4715 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Fri, 2 Oct 2026 10:54:43 +0200 Subject: [PATCH 1/2] chore: go fix Results of `go fix -mod=readonly -all ./...` Signed-off-by: Sebastiaan van Stijn --- fluent/fluent.go | 19 ++++++++----------- fluent/fluent_test.go | 8 ++++---- fluent/proto.go | 16 ++++++++-------- 3 files changed, 20 insertions(+), 23 deletions(-) diff --git a/fluent/fluent.go b/fluent/fluent.go index 9959d60..5a78159 100644 --- a/fluent/fluent.go +++ b/fluent/fluent.go @@ -226,12 +226,12 @@ func newWithDialer(config Config, d dialer) (f *Fluent, err error) { // "john smith", // } // f.Post("tag_name", structData) -func (f *Fluent) Post(tag string, message interface{}) error { +func (f *Fluent) Post(tag string, message any) error { timeNow := time.Now() return f.PostWithTime(tag, timeNow, message) } -func (f *Fluent) PostWithTime(tag string, tm time.Time, message interface{}) error { +func (f *Fluent) PostWithTime(tag string, tm time.Time, message any) error { if len(f.TagPrefix) > 0 { tag = f.TagPrefix + "." + tag } @@ -245,9 +245,9 @@ func (f *Fluent) PostWithTime(tag string, tm time.Time, message interface{}) err if msgtype.Kind() == reflect.Struct { // message should be tagged by "codec" or "msg" - kv := make(map[string]interface{}) + kv := make(map[string]any) fields := msgtype.NumField() - for i := 0; i < fields; i++ { + for i := range fields { field := msgtype.Field(i) value := msg.FieldByIndex(field.Index) // ignore unexported fields @@ -271,7 +271,7 @@ func (f *Fluent) PostWithTime(tag string, tm time.Time, message interface{}) err return errors.New("fluent#PostWithTime: map keys must be strings") } - kv := make(map[string]interface{}) + kv := make(map[string]any) for _, k := range msg.MapKeys() { kv[k.String()] = msg.MapIndex(k).Interface() } @@ -279,7 +279,7 @@ func (f *Fluent) PostWithTime(tag string, tm time.Time, message interface{}) err return f.EncodeAndPostData(tag, tm, kv) } -func (f *Fluent) EncodeAndPostData(tag string, tm time.Time, message interface{}) error { +func (f *Fluent) EncodeAndPostData(tag string, tm time.Time, message any) error { var msg *msgToSend var err error if msg, err = f.EncodeData(tag, tm, message); err != nil { @@ -346,7 +346,7 @@ func getUniqueID(timeUnix int64) (string, error) { return buf.String(), nil } -func (f *Fluent) EncodeData(tag string, tm time.Time, message interface{}) (msg *msgToSend, err error) { +func (f *Fluent) EncodeData(tag string, tm time.Time, message any) (msg *msgToSend, err error) { option := make(map[string]string) msg = &msgToSend{} timeUnix := tm.Unix() @@ -536,10 +536,7 @@ func (f *Fluent) connectWithRetry(ctx context.Context) error { return errIsClosing } - waitTime := f.Config.RetryWait * e(defaultReconnectWaitIncreRate, float64(i-1)) - if waitTime > f.Config.MaxRetryWait { - waitTime = f.Config.MaxRetryWait - } + waitTime := min(f.Config.RetryWait*e(defaultReconnectWaitIncreRate, float64(i-1)), f.Config.MaxRetryWait) timeout = time.NewTimer(time.Duration(waitTime) * time.Millisecond) case <-ctx.Done(): diff --git a/fluent/fluent_test.go b/fluent/fluent_test.go index ed41dde..0cb8015 100644 --- a/fluent/fluent_test.go +++ b/fluent/fluent_test.go @@ -166,7 +166,7 @@ func (d *testDialer) waitForNextDialing(accept bool, delayReads bool) *Conn { // asserEqual asserts that actual and expected are equivalent, and otherwise // marks the test as failed (t.Error). It uses reflect.DeepEqual internally. -func assertEqual(t *testing.T, actual, expected interface{}) { +func assertEqual(t *testing.T, actual, expected any) { t.Helper() if !reflect.DeepEqual(actual, expected) { t.Errorf("got: '%+v', expected: '%+v'", actual, expected) @@ -704,7 +704,7 @@ func TestNoPanicOnFailingTLSConnect(t *testing.T) { } defer f.Close() - for i := 0; i < 2; i++ { + for range 2 { if err := f.Post("tag", map[string]string{"log": "msg"}); err == nil { t.Error("Expected an error posting to an unreachable TLS endpoint") } @@ -830,10 +830,10 @@ func TestPendingChannelThreadSafety(t *testing.T) { var wg sync.WaitGroup wg.Add(numGoroutines) - for i := 0; i < numGoroutines; i++ { + for i := range numGoroutines { go func(id int) { defer wg.Done() - for j := 0; j < messagesPerGoroutine; j++ { + for j := range messagesPerGoroutine { // Post a message err := f.Post("tag", map[string]string{ "goroutine": strconv.Itoa(id), diff --git a/fluent/proto.go b/fluent/proto.go index 95faa96..e71671a 100644 --- a/fluent/proto.go +++ b/fluent/proto.go @@ -11,8 +11,8 @@ import ( //msgp:tuple Entry type Entry struct { - Time int64 `msg:"time"` - Record interface{} `msg:"record"` + Time int64 `msg:"time"` + Record any `msg:"record"` } //msgp:tuple Forward @@ -24,17 +24,17 @@ type Forward struct { //msgp:tuple Message type Message struct { - Tag string `msg:"tag"` - Time int64 `msg:"time"` - Record interface{} `msg:"record"` + Tag string `msg:"tag"` + Time int64 `msg:"time"` + Record any `msg:"record"` Option map[string]string } //msgp:tuple MessageExt type MessageExt struct { - Tag string `msg:"tag"` - Time EventTime `msg:"time,extension"` - Record interface{} `msg:"record"` + Tag string `msg:"tag"` + Time EventTime `msg:"time,extension"` + Record any `msg:"record"` Option map[string]string } From 948ac71255115e64edde9430123178efdf313d18 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Fri, 2 Oct 2026 11:00:22 +0200 Subject: [PATCH 2/2] remove uses of deprecated io/ioutil and fix error-capitalization Signed-off-by: Sebastiaan van Stijn --- fluent/fluent_test.go | 4 ++-- fluent/proto.go | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/fluent/fluent_test.go b/fluent/fluent_test.go index 0cb8015..7cb33a8 100644 --- a/fluent/fluent_test.go +++ b/fluent/fluent_test.go @@ -6,8 +6,8 @@ import ( "encoding/json" "errors" "fmt" - "io/ioutil" "net" + "os" "reflect" "runtime" "strconv" @@ -421,7 +421,7 @@ func Test_MarshalAsJSON(t *testing.T) { } func TestJsonConfig(t *testing.T) { - b, err := ioutil.ReadFile(`testdata/config.json`) + b, err := os.ReadFile(`testdata/config.json`) if err != nil { t.Error(err) } diff --git a/fluent/proto.go b/fluent/proto.go index e71671a..418061c 100644 --- a/fluent/proto.go +++ b/fluent/proto.go @@ -98,7 +98,7 @@ func (t *EventTime) MarshalBinaryTo(b []byte) error { // UnmarshalBinary is implemented for testing and general completeness. func (t *EventTime) UnmarshalBinary(b []byte) error { if len(b) != length { - return fmt.Errorf("Invalid EventTime byte length: %d", len(b)) + return fmt.Errorf("invalid EventTime byte length: %d", len(b)) } sec := (int32(b[0]) << 24) | (int32(b[1]) << 16)