Merge branch 'master' into refactor_potential_races

Author: cosmo0920

.github/workflows/ci.yaml

@@ -14,21 +14,15 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu, macos, windows]
-        golang: ['1.13', '1.16', '1.17']
-        # currently, we cannot run non-x86_64 machines on Github Actions cloud env.
+        golang: ['1.23', '1.24']
+        # currently, we cannot run non-x86_64 machines on GitHub Actions cloud env.
     runs-on: ${{ matrix.os }}-latest
     name: CI golang ${{ matrix.golang }} on ${{ matrix.os }}
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-go@v2
+      - uses: actions/checkout@v4
+      - uses: actions/setup-go@v5
         with:
           go-version: ${{ matrix.golang }}
-      - name: Change GO11MODULES
-        run: go env -w GO111MODULE=auto
-      - name: Install requirements
-        run: |
-          go get github.com/bmizerany/assert
-          go get github.com/philhofer/fwd
-          go get github.com/tinylib/msgp
       - name: Test
         run: go test -v ./fluent
+        shell: bash

fluent/fluent_test.go

@@ -16,7 +16,6 @@ import (
 	"testing"
 	"time"
 
-	"github.com/bmizerany/assert"
 	"github.com/tinylib/msgp/msgp"
 )
 
@@ -165,13 +164,21 @@ func (d *testDialer) waitForNextDialing(accept bool, delayReads bool) *Conn {
 	return 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{}) {
+	t.Helper()
+	if !reflect.DeepEqual(actual, expected) {
+		t.Errorf("got: '%+v', expected: '%+v'", actual, expected)
+	}
+}
+
 // assertReceived is used below by test cases to assert the content written to a *Conn
 // matches an expected string. This is generally used in conjunction with
 // Conn.waitForNextWrite().
 func assertReceived(t *testing.T, rcv []byte, expected string) {
-	if string(rcv) != expected {
-		t.Fatalf("got %s, expect %s", string(rcv), expected)
-	}
+	t.Helper()
+	assertEqual(t, string(rcv), expected)
 }
 
 // Conn extends net.Conn to add channels used to synchronise across goroutines, eg.
@@ -280,13 +287,13 @@ func (c *Conn) Close() error {
 
 func Test_New_itShouldUseDefaultConfigValuesIfNoOtherProvided(t *testing.T) {
 	f, _ := New(Config{})
-	assert.Equal(t, f.Config.FluentPort, defaultPort)
-	assert.Equal(t, f.Config.FluentHost, defaultHost)
-	assert.Equal(t, f.Config.Timeout, defaultTimeout)
-	assert.Equal(t, f.Config.WriteTimeout, defaultWriteTimeout)
-	assert.Equal(t, f.Config.BufferLimit, defaultBufferLimit)
-	assert.Equal(t, f.Config.FluentNetwork, defaultNetwork)
-	assert.Equal(t, f.Config.FluentSocketPath, defaultSocketPath)
+	assertEqual(t, f.Config.FluentPort, defaultPort)
+	assertEqual(t, f.Config.FluentHost, defaultHost)
+	assertEqual(t, f.Config.Timeout, defaultTimeout)
+	assertEqual(t, f.Config.WriteTimeout, defaultWriteTimeout)
+	assertEqual(t, f.Config.BufferLimit, defaultBufferLimit)
+	assertEqual(t, f.Config.FluentNetwork, defaultNetwork)
+	assertEqual(t, f.Config.FluentSocketPath, defaultSocketPath)
 }
 
 func Test_New_itShouldUseUnixDomainSocketIfUnixSocketSpecified(t *testing.T) {
@@ -310,8 +317,8 @@ func Test_New_itShouldUseUnixDomainSocketIfUnixSocketSpecified(t *testing.T) {
 		return
 	}
 	defer f.Close()
-	assert.Equal(t, f.Config.FluentNetwork, network)
-	assert.Equal(t, f.Config.FluentSocketPath, socketFile)
+	assertEqual(t, f.Config.FluentNetwork, network)
+	assertEqual(t, f.Config.FluentSocketPath, socketFile)
 
 	socketFile = "/tmp/fluent-logger-golang-xxx.sock"
 	network = "unixxxx"
@@ -330,13 +337,13 @@ func Test_New_itShouldUseUnixDomainSocketIfUnixSocketSpecified(t *testing.T) {
 
 func Test_New_itShouldUseConfigValuesFromArguments(t *testing.T) {
 	f, _ := New(Config{FluentPort: 6666, FluentHost: "foobarhost"})
-	assert.Equal(t, f.Config.FluentPort, 6666)
-	assert.Equal(t, f.Config.FluentHost, "foobarhost")
+	assertEqual(t, f.Config.FluentPort, 6666)
+	assertEqual(t, f.Config.FluentHost, "foobarhost")
 }
 
 func Test_New_itShouldUseConfigValuesFromMashalAsJSONArgument(t *testing.T) {
 	f, _ := New(Config{MarshalAsJSON: true})
-	assert.Equal(t, f.Config.MarshalAsJSON, true)
+	assertEqual(t, f.Config.MarshalAsJSON, true)
 }
 
 func Test_MarshalAsMsgpack(t *testing.T) {
@@ -439,9 +446,7 @@ func TestJsonConfig(t *testing.T) {
 		t.Error(err)
 	}
 
-	if !reflect.DeepEqual(expect, got) {
-		t.Errorf("got %v, except %v", got, expect)
-	}
+	assertEqual(t, got, expect)
 }
 
 func TestPostWithTime(t *testing.T) {
@@ -654,11 +659,11 @@ func TestNoPanicOnAsyncClose(t *testing.T) {
 			if testcase.shouldError {
 				f.Close()
 			}
-			e := f.EncodeAndPostData("tag_name", time.Unix(1482493046, 0), map[string]string{"foo": "bar"})
+			err = f.EncodeAndPostData("tag_name", time.Unix(1482493046, 0), map[string]string{"foo": "bar"})
 			if testcase.shouldError {
-				assert.Equal(t, fmt.Errorf("fluent#appendBuffer: Logger already closed"), e)
+				assertEqual(t, err, fmt.Errorf("fluent#appendBuffer: Logger already closed"))
 			} else {
-				assert.Equal(t, nil, e)
+				assertEqual(t, err, nil)
 			}
 		})
 	}

go.mod

@@ -0,0 +1,7 @@
+module github.com/fluent/fluent-logger-golang
+
+go 1.23.5
+
+require github.com/tinylib/msgp v1.3.0
+
+require github.com/philhofer/fwd v1.1.3-0.20240916144458-20a13a1f6b7c // indirect

go.sum

@@ -0,0 +1,4 @@
+github.com/philhofer/fwd v1.1.3-0.20240916144458-20a13a1f6b7c h1:dAMKvw0MlJT1GshSTtih8C2gDs04w8dReiOGXrGLNoY=
+github.com/philhofer/fwd v1.1.3-0.20240916144458-20a13a1f6b7c/go.mod h1:RqIHx9QI14HlwKwm98g9Re5prTQ6LdeRQn+gXJFxsJM=
+github.com/tinylib/msgp v1.3.0 h1:ULuf7GPooDaIlbyvgAxBV/FI7ynli6LZ1/nVUNu+0ww=
+github.com/tinylib/msgp v1.3.0/go.mod h1:ykjzy2wzgrlvpDCRc4LA8UXy6D8bzMSuAF3WD57Gok0=