WIP

Author: qingyang-hu

internal/integration/sessions_test.go

@@ -17,7 +17,6 @@ import (
 	"time"
 
 	"go.mongodb.org/mongo-driver/v2/bson"
-	"go.mongodb.org/mongo-driver/v2/event"
 	"go.mongodb.org/mongo-driver/v2/internal/assert"
 	"go.mongodb.org/mongo-driver/v2/internal/integration/mtest"
 	"go.mongodb.org/mongo-driver/v2/internal/mongoutil"
@@ -599,42 +598,13 @@ func TestSessionsProse(t *testing.T) {
 
 	pingOpts := mtest.NewOptions().
 		CreateCollection(false).
-		Topologies(mtest.ReplicaSet, mtest.LoadBalanced)
-	mt.RunOpts("ping test", pingOpts, func(mt *mtest.T) {
-		serverMonitor := &event.ServerMonitor{
-			ServerHeartbeatStarted: func(e *event.ServerHeartbeatStartedEvent) {
-				fmt.Println("Server heartbeat started:", e.ConnectionID)
-			},
-			ServerHeartbeatSucceeded: func(e *event.ServerHeartbeatSucceededEvent) {
-				fmt.Println("Server heartbeat succeeded:", e.ConnectionID, e.Duration, e.Reply)
-			},
-		}
-
-		commandMonitor := &event.CommandMonitor{
-			Started: func(_ context.Context, cse *event.CommandStartedEvent) {
-				fmt.Println("Command started:", cse.CommandName, cse.Command)
-			},
-			Succeeded: func(_ context.Context, cse *event.CommandSucceededEvent) {
-				fmt.Println("Command succeeded:", cse.CommandName, cse.Reply)
-			},
-		}
-
-		opts := options.Client().
+		ClientOptions(options.Client().
 			ApplyURI(mtest.ClusterURI()).
-			SetHosts([]string{mtest.ClusterConnString().Hosts[0]}).
-			SetDirect(true).
 			SetHeartbeatInterval(500 * time.Millisecond). // Minimum interval
-			SetServerMonitor(serverMonitor).
-			SetMonitor(commandMonitor)
-
-		client, err := mongo.Connect(opts)
-		require.NoError(mt, err, "expected no error connecting to client, got: %v", err)
-		defer func() {
-			err = client.Disconnect(context.Background())
-			require.NoError(mt, err, "expected no error disconnecting client, got: %v", err)
-		}()
-
-		err = client.Ping(context.Background(), readpref.Primary())
+			SetHosts([]string{mtest.ClusterConnString().Hosts[0]}).
+			SetDirect(true))
+	mt.RunOpts("ping test", pingOpts, func(mt *mtest.T) {
+		err := mt.Client.Ping(context.Background(), readpref.Primary())
 		assert.NoError(mt, err, "expected no error, got: %v", err)
 		// mt.Fatal(mtest.ClusterURI(), mtest.ClusterConnString().Hosts, mtest.GlobalTopology().Description().Servers)
 	})