Merge branch 'master' into godriver3574

qingyang-hu · web-flow · commit b57049bd18e7 · 2025-06-03T16:15:51.000-04:00
diff --git a/.github/workflows/merge-up.yml b/.github/workflows/merge-up.yml
@@ -27,10 +27,11 @@ jobs:
 
       - name: Create pull request
         id: create-pull-request
-        uses: alcaeus/automatic-merge-up-action@main
+        uses: alcaeus/automatic-merge-up-action@1.0.0
         with:
           ref: ${{ github.ref_name }}
           branchNamePattern: 'release/<major>.<minor>'
           devBranchNamePattern: 'v<major>'
           fallbackBranch: 'master'
+          ignoredBranches: ${{ vars.IGNORED_MERGE_UP_BRANCHES }}
           enableAutoMerge: true
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -49,6 +49,7 @@ jobs:
         with:
           version: ${{ inputs.version }}
           push_changes: ${{ inputs.push_changes }}
+          ignored_branches: ${{ vars.IGNORED_MERGE_UP_BRANCHES }}
 
   static-scan:
     needs: [pre-publish]
diff --git a/README.md b/README.md
@@ -19,7 +19,7 @@ The MongoDB Go driver follows [semantic versioning](https://semver.org/) for its
 
 ## Requirements
 
-- Go 1.18 or higher. We aim to support the latest versions of Go.
+- Go 1.19 or higher. We aim to support the latest versions of Go.
 - Go 1.23 or higher is required to run the driver test suite.
 - MongoDB 4.0 and higher.
 
diff --git a/docs/CONTRIBUTING.md b/docs/CONTRIBUTING.md
@@ -17,7 +17,7 @@ Before starting to write code, look for existing [tickets](https://jira.mongodb.
 The Go Driver team uses GitHub to manage and review all code changes. Patches should generally be made against the master (default) branch and include relevant tests, if
 applicable.
 
-Code should compile and tests should pass under all Go versions which the driver currently supports. Currently the Go Driver supports a minimum version of Go 1.18 and requires Go 1.23 for development. Please run the following `Taskfile` targets to validate your changes:
+Code should compile and tests should pass under all Go versions which the driver currently supports. Currently the Go Driver supports a minimum version of Go 1.19 and requires Go 1.23 for development. Please run the following `Taskfile` targets to validate your changes:
 
 - `task fmt`
 - `task lint`
diff --git a/docs/migration-2.0.md b/docs/migration-2.0.md
@@ -1,7 +1,5 @@
 # Migrating from 1.x to 2.0
 
-The minimum supported version of Go for v2 is 1.18.
-
 To upgrade imports of the Go Driver from v1 to v2, we recommend using [marwan-at-work/mod
 ](https://github.com/marwan-at-work/mod):
 
diff --git a/etc/compile_check.sh b/etc/compile_check.sh
@@ -2,7 +2,7 @@
 set -e # exit when any command fails
 set -x # show all commands being run
 
-: ${GC:=go${GO_VERSION="1.18"}}
+: ${GC:=go${GO_VERSION="1.19"}}
 
 COMPILE_CHECK_DIR="internal/cmd/compilecheck"
 ARCHITECTURES=("386" "arm" "arm64" "ppc64le" "s390x")
diff --git a/examples/_logger/logrus/go.mod b/examples/_logger/logrus/go.mod
@@ -1,4 +1,4 @@
-module go.mongodb.go/mongo-driver/examples/logger/logrus
+module go.mongodb.go/mongo-driver/v2/examples/logger/logrus
 
 go 1.23
 
diff --git a/examples/_logger/zap/go.mod b/examples/_logger/zap/go.mod
@@ -1,4 +1,4 @@
-module go.mongodb.go/mongo-driver/examples/logger/zap
+module go.mongodb.go/mongo-driver/v2/examples/logger/zap
 
 go 1.23
 
diff --git a/examples/_logger/zerolog/go.mod b/examples/_logger/zerolog/go.mod
@@ -1,4 +1,4 @@
-module go.mongodb.go/mongo-driver/examples/logger/zerolog
+module go.mongodb.go/mongo-driver/v2/examples/logger/zerolog
 
 go 1.23
 
diff --git a/go.mod b/go.mod
@@ -1,6 +1,6 @@
 module go.mongodb.org/mongo-driver/v2
 
-go 1.18
+go 1.19
 
 require (
 	github.com/davecgh/go-spew v1.1.1
diff --git a/internal/cmd/benchmark/go.mod b/internal/cmd/benchmark/go.mod
@@ -1,6 +1,6 @@
-module go.mongodb.go/mongo-driver/internal/cmd/benchmark
+module go.mongodb.go/mongo-driver/v2/internal/cmd/benchmark
 
-go 1.18
+go 1.19
 
 replace go.mongodb.org/mongo-driver/v2 => ../../../
 
diff --git a/internal/cmd/compilecheck/go.mod b/internal/cmd/compilecheck/go.mod
@@ -1,6 +1,6 @@
-module go.mongodb.go/mongo-driver/internal/cmd/compilecheck
+module go.mongodb.go/mongo-driver/v2/internal/cmd/compilecheck
 
-go 1.18
+go 1.19
 
 replace go.mongodb.org/mongo-driver/v2 => ../../../
 
diff --git a/internal/cmd/faas/awslambda/mongodb/go.mod b/internal/cmd/faas/awslambda/mongodb/go.mod
@@ -1,4 +1,4 @@
-module go.mongodb.go/mongo-driver/internal/test/mongodb
+module go.mongodb.go/mongo-driver/v2/internal/cmd/faas/awslambda/mongodb
 
 go 1.23
 
diff --git a/internal/test/compilecheck/compile_check_test.go b/internal/test/compilecheck/compile_check_test.go
@@ -27,7 +27,7 @@ import (
 // requires a version of klauspost/compress that is not compatible with the Go
 // Driver. Must use GOWORK=off to run this test.
 
-const minSupportedVersion = "1.18"
+const minSupportedVersion = "1.19"
 
 func TestCompileCheck(t *testing.T) {
 	cwd, err := os.Getwd()
diff --git a/internal/test/compilecheck/go.mod b/internal/test/compilecheck/go.mod
@@ -1,4 +1,4 @@
-module go.mongodb.go/mongo-driver/internal/test/compilecheck
+module go.mongodb.go/mongo-driver/v2/internal/test/compilecheck
 
 go 1.23.0
 
diff --git a/internal/test/goleak/go.mod b/internal/test/goleak/go.mod
@@ -1,4 +1,4 @@
-module go.mongodb.go/mongo-driver/internal/test/goleak
+module go.mongodb.go/mongo-driver/v2/internal/test/goleak
 
 go 1.22
 
diff --git a/testdata/specifications b/testdata/specifications
@@ -1 +1 @@
-Subproject commit 9d0d3f0042a8cf5faeb47ae7765716151bfca9ef
+Subproject commit f4c0bbdbf8a8560580c947ca2c331794431a0c78
diff --git a/x/mongo/driver/topology/connection.go b/x/mongo/driver/topology/connection.go
@@ -14,7 +14,6 @@ import (
 	"fmt"
 	"io"
 	"net"
-	"os"
 	"strings"
 	"sync"
 	"sync/atomic"
@@ -526,48 +525,6 @@ func (c *connection) closed() bool {
 	return atomic.LoadInt64(&c.state) == connDisconnected
 }
 
-// isAlive returns true if the connection is alive and ready to be used for an
-// operation.
-//
-// Note that the liveness check can be slow (at least 1ms), so isAlive only
-// checks the liveness of the connection if it's been idle for at least 10
-// seconds. For frequently in-use connections, a network error during an
-// operation will be the first indication of a dead connection.
-func (c *connection) isAlive() bool {
-	if c.nc == nil {
-		return false
-	}
-
-	// If the connection has been idle for less than 10 seconds, skip the
-	// liveness check.
-	//
-	// The 10-seconds idle bypass is based on the liveness check implementation
-	// in the Python Driver. That implementation uses 1 second as the idle
-	// threshold, but we chose to be more conservative in the Go Driver because
-	// this is new behavior with unknown side-effects. See
-	// https://github.com/mongodb/mongo-python-driver/blob/e6b95f65953e01e435004af069a6976473eaf841/pymongo/synchronous/pool.py#L983-L985
-	idleStart, ok := c.idleStart.Load().(time.Time)
-	if !ok || idleStart.Add(10*time.Second).After(time.Now()) {
-		return true
-	}
-
-	// Set a 1ms read deadline and attempt to read 1 byte from the connection.
-	// Expect it to block for 1ms then return a deadline exceeded error. If it
-	// returns any other error, the connection is not usable, so return false.
-	// If it doesn't return an error and actually reads data, the connection is
-	// also not usable, so return false.
-	//
-	// Note that we don't need to un-set the read deadline because the "read"
-	// and "write" methods always reset the deadlines.
-	err := c.nc.SetReadDeadline(time.Now().Add(1 * time.Millisecond))
-	if err != nil {
-		return false
-	}
-	var b [1]byte
-	_, err = c.nc.Read(b[:])
-	return errors.Is(err, os.ErrDeadlineExceeded)
-}
-
 func (c *connection) idleTimeoutExpired() bool {
 	if c.idleTimeout == 0 {
 		return false
diff --git a/x/mongo/driver/topology/connection_test.go b/x/mongo/driver/topology/connection_test.go
@@ -1161,85 +1161,3 @@ func TestConnectionError(t *testing.T) {
 		assert.ErrorContains(t, err, "client timed out waiting for server response")
 	})
 }
-
-func TestConnection_IsAlive(t *testing.T) {
-	t.Parallel()
-
-	t.Run("uninitialized", func(t *testing.T) {
-		t.Parallel()
-
-		conn := newConnection("")
-		assert.False(t,
-			conn.isAlive(),
-			"expected isAlive for an uninitialized connection to always return false")
-	})
-
-	t.Run("connection open", func(t *testing.T) {
-		t.Parallel()
-
-		cleanup := make(chan struct{})
-		defer close(cleanup)
-		addr := bootstrapConnections(t, 1, func(nc net.Conn) {
-			// Keep the connection open until the end of the test.
-			<-cleanup
-			_ = nc.Close()
-		})
-
-		conn := newConnection(address.Address(addr.String()))
-		err := conn.connect(context.Background())
-		require.NoError(t, err)
-
-		conn.idleStart.Store(time.Now().Add(-11 * time.Second))
-		assert.True(t,
-			conn.isAlive(),
-			"expected isAlive for an open connection to return true")
-	})
-
-	t.Run("connection closed", func(t *testing.T) {
-		t.Parallel()
-
-		conns := make(chan net.Conn)
-		addr := bootstrapConnections(t, 1, func(nc net.Conn) {
-			conns <- nc
-		})
-
-		conn := newConnection(address.Address(addr.String()))
-		err := conn.connect(context.Background())
-		require.NoError(t, err)
-
-		// Close the connection before calling isAlive.
-		nc := <-conns
-		err = nc.Close()
-		require.NoError(t, err)
-
-		conn.idleStart.Store(time.Now().Add(-11 * time.Second))
-		assert.False(t,
-			conn.isAlive(),
-			"expected isAlive for a closed connection to return false")
-	})
-
-	t.Run("connection reads data", func(t *testing.T) {
-		t.Parallel()
-
-		cleanup := make(chan struct{})
-		defer close(cleanup)
-		addr := bootstrapConnections(t, 1, func(nc net.Conn) {
-			// Write some data to the connection before calling isAlive.
-			_, err := nc.Write([]byte{5, 0, 0, 0, 0})
-			require.NoError(t, err)
-
-			// Keep the connection open until the end of the test.
-			<-cleanup
-			_ = nc.Close()
-		})
-
-		conn := newConnection(address.Address(addr.String()))
-		err := conn.connect(context.Background())
-		require.NoError(t, err)
-
-		conn.idleStart.Store(time.Now().Add(-11 * time.Second))
-		assert.False(t,
-			conn.isAlive(),
-			"expected isAlive for an open connection that reads data to return false")
-	})
-}
diff --git a/x/mongo/driver/topology/pool.go b/x/mongo/driver/topology/pool.go
@@ -169,11 +169,9 @@ type reason struct {
 // connectionPerished checks if a given connection is perished and should be removed from the pool.
 func connectionPerished(conn *connection) (reason, bool) {
 	switch {
-	case conn.closed() || !conn.isAlive():
+	case conn.closed():
 		// A connection would only be closed if it encountered a network error
-		// during an operation and closed itself. If a connection is not alive
-		// (e.g. the connection was closed by the server-side), it's also
-		// considered a network error.
+		// during an operation and closed itself.
 		return reason{
 			loggerConn: logger.ReasonConnClosedError,
 			event:      event.ReasonError,
diff --git a/x/mongo/driver/topology/pool_test.go b/x/mongo/driver/topology/pool_test.go
@@ -843,79 +843,6 @@ func TestPool_checkOut(t *testing.T) {
 			assert.Containsf(t, err.Error(), "canceled", `expected error message to contain "canceled"`)
 		}
 
-		p.close(context.Background())
-	})
-	t.Run("discards connections closed by the server side", func(t *testing.T) {
-		t.Parallel()
-
-		cleanup := make(chan struct{})
-		defer close(cleanup)
-
-		ncs := make(chan net.Conn, 2)
-		addr := bootstrapConnections(t, 2, func(nc net.Conn) {
-			// Send all "server-side" connections to a channel so we can
-			// interact with them during the test.
-			ncs <- nc
-
-			<-cleanup
-			_ = nc.Close()
-		})
-
-		d := newdialer(&net.Dialer{})
-		p := newPool(poolConfig{
-			Address: address.Address(addr.String()),
-		}, WithDialer(func(Dialer) Dialer { return d }))
-		err := p.ready()
-		require.NoError(t, err)
-
-		// Add 1 idle connection to the pool by checking-out and checking-in
-		// a connection.
-		conn, err := p.checkOut(context.Background())
-		require.NoError(t, err)
-		err = p.checkIn(conn)
-		require.NoError(t, err)
-		assertConnectionsOpened(t, d, 1)
-		assert.Equalf(t, 1, p.availableConnectionCount(), "should be 1 idle connections in pool")
-		assert.Equalf(t, 1, p.totalConnectionCount(), "should be 1 total connection in pool")
-
-		// Make that connection appear as if it's been idle for a minute.
-		conn.idleStart.Store(time.Now().Add(-1 * time.Minute))
-
-		// Close the "server-side" of the connection we just created. The idle
-		// connection in the pool is now unusable because the "server-side"
-		// closed it.
-		nc := <-ncs
-		err = nc.Close()
-		require.NoError(t, err)
-
-		// In a separate goroutine, write a valid wire message to the 2nd
-		// connection that's about to be created. Stop waiting for a 2nd
-		// connection after 100ms to prevent leaking a goroutine.
-		go func() {
-			select {
-			case nc := <-ncs:
-				_, err := nc.Write([]byte{5, 0, 0, 0, 0})
-				require.NoError(t, err, "Write error")
-			case <-time.After(100 * time.Millisecond):
-			}
-		}()
-
-		// Check out a connection and try to read from it. Expect the pool to
-		// discard the connection that was closed by the "server-side" and
-		// return a newly created connection instead.
-		conn, err = p.checkOut(context.Background())
-		require.NoError(t, err)
-		msg, err := conn.readWireMessage(context.Background())
-		require.NoError(t, err)
-		assert.Equal(t, []byte{5, 0, 0, 0, 0}, msg)
-
-		err = p.checkIn(conn)
-		require.NoError(t, err)
-
-		assertConnectionsOpened(t, d, 2)
-		assert.Equalf(t, 1, p.availableConnectionCount(), "should be 1 idle connections in pool")
-		assert.Equalf(t, 1, p.totalConnectionCount(), "should be 1 total connection in pool")
-
 		p.close(context.Background())
 	})
 }

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-module go.mongodb.go/mongo-driver/examples/logger/logrus`
	`1`	`+module go.mongodb.go/mongo-driver/v2/examples/logger/logrus`
`2`	`2`
`3`	`3`	`go 1.23`
`4`	`4`