WIP

Author: qingyang-hu

internal/integration/sessions_test.go

@@ -526,26 +526,30 @@ func TestSessionsProse(t *testing.T) {
 			SetDirect(true).
 			SetHeartbeatInterval(500 * time.Millisecond).
 			SetMonitor(&event.CommandMonitor{
-				Started: func(ctx context.Context, cse *event.CommandStartedEvent) {
+				Started: func(_ context.Context, cse *event.CommandStartedEvent) {
 					fmt.Println("Command started:", cse.CommandName, cse.Command)
 				},
-				Succeeded: func(ctx context.Context, cse *event.CommandSucceededEvent) {
+				Succeeded: func(_ context.Context, cse *event.CommandSucceededEvent) {
 					fmt.Println("Command succeeded:", cse.CommandName, cse.Reply)
 				},
 			}).
 			SetServerMonitor(serverMonitor)
 
 		client, err := mongo.Connect(opts)
 		require.NoError(mt, err, "expected no error connecting to client, got: %v", err)
-		defer client.Disconnect(context.Background())
+		defer func() {
+			err = client.Disconnect(context.Background())
+			require.NoError(mt, err, "expected no error disconnecting client, got: %v", err)
+		}()
 
 		res, err := client.Database("admin").RunCommand(context.Background(), bson.D{
 			{"ping", 1},
 		}).Raw()
 		require.NoError(mt, err, "expected no error, got: %v", err)
 		mt.Log("result of ping command:", res)
 
-		mt.Client.Database("test").Collection("test").InsertOne(context.Background(), bson.D{{"advance", "$clusterTime"}})
+		_, err = mt.Client.Database("test").Collection("test").InsertOne(context.Background(), bson.D{{"advance", "$clusterTime"}})
+		require.NoError(mt, err, "expected no error inserting document, got: %v", err)
 
 		time.Sleep(3 * time.Second)
 

x/mongo/driver/auth/auth.go

@@ -103,7 +103,6 @@ func (ah *authHandshaker) GetHandshakeInformation(
 		AppName(ah.options.AppName).
 		Compressors(ah.options.Compressors).
 		SASLSupportedMechs(ah.options.DBUser).
-		ClusterClock(ah.options.ClusterClock).
 		ServerAPI(ah.options.ServerAPI).
 		LoadBalanced(ah.options.LoadBalanced).
 		OuterLibraryName(ah.options.OuterLibraryName).

x/mongo/driver/operation/hello.go

@@ -26,7 +26,6 @@ import (
 	"go.mongodb.org/mongo-driver/v2/x/mongo/driver"
 	"go.mongodb.org/mongo-driver/v2/x/mongo/driver/description"
 	"go.mongodb.org/mongo-driver/v2/x/mongo/driver/mnet"
-	"go.mongodb.org/mongo-driver/v2/x/mongo/driver/session"
 )
 
 // maxClientMetadataSize is the maximum size of the client metadata document
@@ -44,7 +43,6 @@ type Hello struct {
 	compressors        []string
 	saslSupportedMechs string
 	d                  driver.Deployment
-	clock              *session.ClusterClock
 	speculativeAuth    bsoncore.Document
 	topologyVersion    *description.TopologyVersion
 	maxAwaitTimeMS     *int64
@@ -71,16 +69,6 @@ func (h *Hello) AppName(appname string) *Hello {
 	return h
 }
 
-// ClusterClock sets the cluster clock for this operation.
-func (h *Hello) ClusterClock(clock *session.ClusterClock) *Hello {
-	if h == nil {
-		h = new(Hello)
-	}
-
-	h.clock = clock
-	return h
-}
-
 // Compressors sets the compressors that can be used.
 func (h *Hello) Compressors(compressors []string) *Hello {
 	h.compressors = compressors
@@ -611,7 +599,6 @@ func (h *Hello) Execute(ctx context.Context) error {
 		return errors.New("a Hello must have a Deployment set before Execute can be called")
 	}
 
-	fmt.Println("Executing Hello operation...")
 	return h.createOperation().Execute(ctx)
 }
 
@@ -630,7 +617,6 @@ func isLegacyHandshake(srvAPI *driver.ServerAPIOptions, loadbalanced bool) bool
 
 func (h *Hello) createOperation() driver.Operation {
 	op := driver.Operation{
-		// Clock:      h.clock,
 		CommandFn:  h.command,
 		Database:   "admin",
 		Deployment: h.d,
@@ -641,10 +627,10 @@ func (h *Hello) createOperation() driver.Operation {
 		ServerAPI:     h.serverAPI,
 		OmitMaxTimeMS: h.omitMaxTimeMS,
 		CommandMonitor: &event.CommandMonitor{
-			Started: func(ctx context.Context, e *event.CommandStartedEvent) {
+			Started: func(_ context.Context, e *event.CommandStartedEvent) {
 				fmt.Println("Hello started:", e.CommandName, e.Command)
 			},
-			Succeeded: func(ctx context.Context, e *event.CommandSucceededEvent) {
+			Succeeded: func(_ context.Context, e *event.CommandSucceededEvent) {
 				fmt.Println("Hello succeeded:", e.CommandName, e.Reply)
 			},
 		},
@@ -663,7 +649,6 @@ func (h *Hello) GetHandshakeInformation(ctx context.Context, _ address.Address,
 	deployment := driver.SingleConnectionDeployment{C: conn}
 
 	op := driver.Operation{
-		// Clock:      h.clock,
 		CommandFn:  h.handshakeCommand,
 		Deployment: deployment,
 		Database:   "admin",

x/mongo/driver/topology/server.go

@@ -842,7 +842,6 @@ func (s *Server) setupHeartbeatConnection(ctx context.Context) error {
 func (s *Server) createBaseOperation(conn *mnet.Connection) *operation.Hello {
 	return operation.
 		NewHello().
-		ClusterClock(s.cfg.clock).
 		Deployment(driver.SingleConnectionDeployment{C: conn}).
 		ServerAPI(s.cfg.serverAPI)
 }

x/mongo/driver/topology/topology_options.go

@@ -290,7 +290,6 @@ func NewConfigFromOptionsWithAuthenticator(opts *options.ClientOptions, clock *s
 			return operation.NewHello().
 				AppName(appName).
 				Compressors(comps).
-				ClusterClock(clock).
 				ServerAPI(serverAPI).
 				LoadBalanced(loadBalanced).
 				OuterLibraryName(outerLibraryName).