Fixed operation names and remainingTimeMS function, altered replica-set spec test temporarily

Author: aditi-khare-mongoDB

src/change_stream.ts

@@ -934,10 +934,14 @@ export class ChangeStream<
       this.cursor.close().catch(() => null);
 
       const topology = getTopology(this.parent);
-      topology.selectServer(this.cursor.readPreference, {}, serverSelectionError => {
-        if (serverSelectionError) return this._closeEmitterModeWithError(changeStreamError);
-        this.cursor = this._createChangeStreamCursor(this.cursor.resumeOptions);
-      });
+      topology.selectServer(
+        this.cursor.readPreference,
+        { operationName: 'reconnect topology' },
+        serverSelectionError => {
+          if (serverSelectionError) return this._closeEmitterModeWithError(changeStreamError);
+          this.cursor = this._createChangeStreamCursor(this.cursor.resumeOptions);
+        }
+      );
     } else {
       this._closeEmitterModeWithError(changeStreamError);
     }
@@ -962,7 +966,9 @@ export class ChangeStream<
     await this.cursor.close().catch(() => null);
     const topology = getTopology(this.parent);
     try {
-      await topology.selectServerAsync(this.cursor.readPreference, {});
+      await topology.selectServerAsync(this.cursor.readPreference, {
+        operationName: 'reconnect topology'
+      });
       this.cursor = this._createChangeStreamCursor(this.cursor.resumeOptions);
     } catch {
       // if the topology can't reconnect, close the stream

src/sdam/server_selection_events.ts

@@ -5,7 +5,6 @@ import {
   WAITING_FOR_SUITABLE_SERVER
 } from '../constants';
 import { type ReadPreference } from '../read_preference';
-import { HostAddress } from '../utils';
 import { type ServerSelector } from './server_selection';
 import type { TopologyDescription } from './topology_description';
 

src/sdam/topology.ts

@@ -455,6 +455,7 @@ export class Topology extends TypedEventEmitter<TopologyEvents> {
       callback ? callback(error) : this.emit(Topology.ERROR, error);
 
     const readPreference = options.readPreference ?? ReadPreference.primary;
+    options = Object.assign({ operationName: 'ping' }, options);
     this.selectServer(readPreferenceServerSelector(readPreference), options, (err, server) => {
       if (err) {
         return this.close({ force: false }, () => exitWithError(err));

src/utils.ts

@@ -1290,8 +1290,9 @@ export class TimeoutController extends AbortController {
     this.timeoutId = null;
   }
 
+  /** May only be called for non-infinite timeouts */
   getRemainingTimeMS() {
-    return Math.max(this.timeoutTimeMS - (Date.now() - this.startTime) / 1000, 0);
+    return Math.round(Math.max(this.timeoutTimeMS - (Date.now() - this.startTime) / 1000, 0));
   }
 }
 

test/integration/server-selection/server_selection.spec.test.ts

@@ -3,7 +3,7 @@ import * as path from 'path';
 import { loadSpecTests } from '../../spec';
 import { runUnifiedSuite } from '../../tools/unified-spec-runner/runner';
 
-describe.only('Server Selection Tests - Unified', function () {
+describe('Server Selection Tests - Unified', function () {
   const tests = loadSpecTests(path.join('server-selection', 'logging'));
   runUnifiedSuite(tests, test => {
     if (

test/spec/server-selection/logging/replica-set.json

@@ -52,7 +52,7 @@
         "collectionName": "unsatisfiableRPColl",
         "collectionOptions": {
           "readPreference": {
-            "mode": "Secondary",
+            "mode": "secondary",
             "tagSets": [
               {
                 "nonexistenttag": "a"

test/spec/server-selection/logging/replica-set.yml

@@ -34,7 +34,7 @@ createEntities:
       collectionName: &unsatisfiableRPColl unsatisfiableRPColl
       collectionOptions:
         readPreference:
-          mode: Secondary
+          mode: secondary
           tagSets:
             - { nonexistenttag : a }
 

test/tools/unified-spec-runner/match.ts

@@ -604,7 +604,6 @@ export function compareLogs(
   actual: ExpectedLogMessage[],
   entities: EntitiesMap
 ): void {
-
   expect(actual).to.have.lengthOf(expected.length);
 
   for (const [index, actualLog] of actual.entries()) {

test/tools/unified-spec-runner/runner.ts

@@ -237,7 +237,7 @@ async function runUnifiedTest(
         const filteredLogs = testClient!.collectedLogs.filter(
           log =>
             testClient!.mongoLogger.componentSeverities.serverSelection === 'off' ||
-            log?.data?.operation !== 'n/a'
+            (log?.data?.operation !== 'reconnect topology' && log?.data?.operation !== 'ping')
         );
         compareLogs(expectedLogsForClient.messages, filteredLogs, entities);
       }