PR requested changes 0

Author: aditi-khare-mongoDB

src/mongo_logger.ts

@@ -379,7 +379,8 @@ function defaultLogTransform(
       return log;
     case SERVER_SELECTION_SUCCEEDED:
       log = attachServerSelectionFields(log, logObject, maxDocumentLength);
-      log = attachConnectionFields(log, logObject);
+      log.serverHost = logObject.serverHost;
+      log.serverPort = logObject.serverPort;
       return log;
     case WAITING_FOR_SUITABLE_SERVER:
       log = attachServerSelectionFields(log, logObject, maxDocumentLength);

src/sdam/server_selection_events.ts

@@ -1,3 +1,4 @@
+import { HostAddress } from '.././utils';
 import {
   SERVER_SELECTION_FAILED,
   SERVER_SELECTION_STARTED,
@@ -36,10 +37,10 @@ export abstract class ServerSelectionEvent {
   constructor(
     selector: string | ReadPreference | ServerSelector,
     topologyDescription: TopologyDescription,
-    operation?: string
+    operation: string
   ) {
     this.selector = selector;
-    this.operation = operation ?? 'n/a';
+    this.operation = operation;
     this.topologyDescription = topologyDescription;
   }
 }
@@ -58,7 +59,7 @@ export class ServerSelectionStartedEvent extends ServerSelectionEvent {
   constructor(
     selector: string | ReadPreference | ServerSelector,
     topologyDescription: TopologyDescription,
-    operation?: string
+    operation: string
   ) {
     super(selector, topologyDescription, operation);
   }
@@ -81,7 +82,7 @@ export class ServerSelectionFailedEvent extends ServerSelectionEvent {
     selector: string | ReadPreference | ServerSelector,
     topologyDescription: TopologyDescription,
     error: Error,
-    operation?: string
+    operation: string
   ) {
     super(selector, topologyDescription, operation);
     this.failure = error;
@@ -97,18 +98,22 @@ export class ServerSelectionSucceededEvent extends ServerSelectionEvent {
   /** @internal */
   name = SERVER_SELECTION_SUCCEEDED;
   message = 'Server selection succeeded';
-  /** The address (host/port pair) of the pool */
-  address: string;
+  /** 	The hostname, IP address, or Unix domain socket path for the selected server. */
+  serverHost: string;
+  /** The port for the selected server. Optional; not present for Unix domain sockets. When the user does not specify a port and the default (27017) is used, the driver SHOULD include it here. */
+  serverPort: number | undefined;
 
   /** @internal */
   constructor(
     selector: string | ReadPreference | ServerSelector,
     topologyDescription: TopologyDescription,
     address: string,
-    operation?: string
+    operation: string
   ) {
     super(selector, topologyDescription, operation);
-    this.address = address;
+    const { host, port } = HostAddress.fromString(address).toHostPort();
+    this.serverHost = host;
+    this.serverPort = port;
   }
 }
 
@@ -129,7 +134,7 @@ export class WaitingForSuitableServerEvent extends ServerSelectionEvent {
     selector: string | ReadPreference | ServerSelector,
     topologyDescription: TopologyDescription,
     remainingTimeMS: number,
-    operation?: string
+    operation: string
   ) {
     super(selector, topologyDescription, operation);
     this.remainingTimeMS = remainingTimeMS;

src/sdam/topology.ts

@@ -106,7 +106,7 @@ export interface ServerSelectionRequest {
   callback: ServerSelectionCallback;
   [kCancelled]?: boolean;
   timeoutController: TimeoutController;
-  operationName?: string;
+  operationName: string;
   waitingLogged: boolean;
 }
 
@@ -172,7 +172,7 @@ export interface SelectServerOptions {
   /** How long to block for server selection before throwing an error */
   serverSelectionTimeoutMS?: number;
   session?: ClientSession;
-  operationName?: string;
+  operationName: string;
 }
 
 /** @public */
@@ -455,36 +455,40 @@ 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));
-      }
+    const selectServerOptions = { operationName: 'ping', ...options };
+    this.selectServer(
+      readPreferenceServerSelector(readPreference),
+      selectServerOptions,
+      (err, server) => {
+        if (err) {
+          return this.close({ force: false }, () => exitWithError(err));
+        }
 
-      // TODO: NODE-2471
-      const skipPingOnConnect = this.s.options[Symbol.for('@@mdb.skipPingOnConnect')] === true;
-      if (!skipPingOnConnect && server && this.s.credentials) {
-        server.command(ns('admin.$cmd'), { ping: 1 }, {}, err => {
-          if (err) {
-            return exitWithError(err);
-          }
+        // TODO: NODE-2471
+        const skipPingOnConnect = this.s.options[Symbol.for('@@mdb.skipPingOnConnect')] === true;
+        if (!skipPingOnConnect && server && this.s.credentials) {
+          server.command(ns('admin.$cmd'), { ping: 1 }, {}, err => {
+            if (err) {
+              return exitWithError(err);
+            }
 
-          stateTransition(this, STATE_CONNECTED);
-          this.emit(Topology.OPEN, this);
-          this.emit(Topology.CONNECT, this);
+            stateTransition(this, STATE_CONNECTED);
+            this.emit(Topology.OPEN, this);
+            this.emit(Topology.CONNECT, this);
 
-          callback?.(undefined, this);
-        });
+            callback?.(undefined, this);
+          });
 
-        return;
-      }
+          return;
+        }
 
-      stateTransition(this, STATE_CONNECTED);
-      this.emit(Topology.OPEN, this);
-      this.emit(Topology.CONNECT, this);
+        stateTransition(this, STATE_CONNECTED);
+        this.emit(Topology.OPEN, this);
+        this.emit(Topology.CONNECT, this);
 
-      callback?.(undefined, this);
-    });
+        callback?.(undefined, this);
+      }
+    );
   }
 
   /** Close this topology */
@@ -559,7 +563,7 @@ export class Topology extends TypedEventEmitter<TopologyEvents> {
 
     this.client.mongoLogger.debug(
       MongoLoggableComponent.SERVER_SELECTION,
-      new ServerSelectionStartedEvent(selector, this.description, options?.operationName)
+      new ServerSelectionStartedEvent(selector, this.description, options.operationName)
     );
 
     options = Object.assign(
@@ -579,7 +583,7 @@ export class Topology extends TypedEventEmitter<TopologyEvents> {
           selector,
           this.description,
           transaction.server.pool.address,
-          options?.operationName
+          options.operationName
         )
       );
       callback(undefined, transaction.server);
@@ -593,7 +597,7 @@ export class Topology extends TypedEventEmitter<TopologyEvents> {
       transaction,
       callback,
       timeoutController: new TimeoutController(options.serverSelectionTimeoutMS),
-      operationName: options?.operationName,
+      operationName: options.operationName,
       waitingLogged: false
     };
 
@@ -610,7 +614,7 @@ export class Topology extends TypedEventEmitter<TopologyEvents> {
           selector,
           this.description,
           timeoutError,
-          options?.operationName
+          options.operationName
         )
       );
       waitQueueMember.callback(timeoutError);
@@ -895,7 +899,7 @@ function drainWaitQueue(queue: List<ServerSelectionRequest>, err?: MongoDriverEr
             waitQueueMember.serverSelector,
             waitQueueMember.topologyDescription,
             err,
-            waitQueueMember?.operationName
+            waitQueueMember.operationName
           )
         );
       }
@@ -937,7 +941,7 @@ function processWaitQueue(topology: Topology) {
           waitQueueMember.serverSelector,
           topology.description,
           e,
-          waitQueueMember?.operationName
+          waitQueueMember.operationName
         )
       );
       waitQueueMember.callback(e);
@@ -953,7 +957,7 @@ function processWaitQueue(topology: Topology) {
             waitQueueMember.serverSelector,
             topology.description,
             waitQueueMember.timeoutController.getRemainingTimeMS(),
-            waitQueueMember?.operationName
+            waitQueueMember.operationName
           )
         );
         waitQueueMember.waitingLogged = true;
@@ -984,7 +988,7 @@ function processWaitQueue(topology: Topology) {
           waitQueueMember.serverSelector,
           topology.description,
           error,
-          waitQueueMember?.operationName
+          waitQueueMember.operationName
         )
       );
       waitQueueMember.callback(error);
@@ -1003,7 +1007,7 @@ function processWaitQueue(topology: Topology) {
         waitQueueMember.serverSelector,
         waitQueueMember.topologyDescription,
         selectedServer.pool.address,
-        waitQueueMember?.operationName
+        waitQueueMember.operationName
       )
     );
     waitQueueMember.callback(undefined, selectedServer);

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

@@ -1,7 +1,7 @@
 import { loadSpecTests } from '../../spec';
 import { runUnifiedSuite } from '../../tools/unified-spec-runner/runner';
 
-describe.only('Server Selection Unified Tests (Node Driver)', function () {
+describe('Server Selection Unified Tests (Node Driver)', function () {
   /* TODO(NODE-2471) ping on connect
    * TODO(NODE-5774) duplicate server selection for bulkWrite and other wrapper operations
    * Remove once the actual unified tests (test/spec/server-selection/logging) are passing