WIP

Author: qingyang-hu

internal/integration/sessions_test.go

@@ -511,28 +511,39 @@ func TestSessionsProse(t *testing.T) {
 	})
 
 	mt.Run("20 Drivers do not gossip $clusterTime on SDAM commands", func(mt *mtest.T) {
+		heartbeatStarted := make(chan struct{})
+		heartbeatSucceeded := make(chan struct{})
+		clusterTimeAdvanced := make(chan struct{})
 		serverMonitor := &event.ServerMonitor{
 			ServerHeartbeatStarted: func(e *event.ServerHeartbeatStartedEvent) {
 				fmt.Println("Server heartbeat started:", e.ConnectionID)
+				select {
+				case _, ok := <-clusterTimeAdvanced:
+					if !ok {
+						heartbeatStarted <- struct{}{}
+					}
+				default:
+					// NOOP
+				}
 			},
 			ServerHeartbeatSucceeded: func(e *event.ServerHeartbeatSucceededEvent) {
 				fmt.Println("Server heartbeat succeeded:", e.ConnectionID, e.Duration, e.Reply)
+				select {
+				case _, ok := <-clusterTimeAdvanced:
+					if !ok {
+						heartbeatSucceeded <- struct{}{}
+					}
+				default:
+					// NOOP
+				}
 			},
 		}
 
 		opts := options.Client().
 			ApplyURI(mtest.ClusterURI()).
 			SetHosts([]string{mtest.ClusterConnString().Hosts[0]}).
 			SetDirect(true).
-			SetHeartbeatInterval(500 * time.Millisecond).
-			SetMonitor(&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)
-				},
-			}).
+			SetHeartbeatInterval(500 * time.Millisecond). // Minimum interval
 			SetServerMonitor(serverMonitor)
 
 		client, err := mongo.Connect(opts)
@@ -546,21 +557,23 @@ func TestSessionsProse(t *testing.T) {
 			{"ping", 1},
 		}).Raw()
 		require.NoError(mt, err, "expected no error, got: %v", err)
-		mt.Log("result of ping command:", res)
+		replyClusterTime, err := res.LookupErr("$clusterTime")
+		require.NoError(mt, err, "$clusterTime not found in response")
 
 		_, 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)
+		close(clusterTimeAdvanced)
+		<-heartbeatStarted
+		<-heartbeatSucceeded
 
 		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)
-		replyClusterTimeVal, err := res.LookupErr("$clusterTime")
+		replyClusterTimeNew, err := res.LookupErr("$clusterTime")
 		require.NoError(mt, err, "$clusterTime not found in response")
-		mt.Fatalf("$clusterTime: %v", replyClusterTimeVal)
+		mt.Fatalf("$clusterTime: %v %v", replyClusterTime, replyClusterTimeNew)
 	})
 }