chore: address comments

Author: durran

src/cmap/connection_pool.ts

@@ -620,7 +620,7 @@ export class ConnectionPool extends TypedEventEmitter<ConnectionPoolEvents> {
       cancellationToken: this.cancellationToken,
       mongoLogger: this.mongoLogger,
       authProviders: this.server.topology.client.s.authProviders,
-      extendedMetadata: this.server.topology.client.options?.extendedMetadata
+      extendedMetadata: this.server.topology.client.options.extendedMetadata
     };
 
     this.pending++;

src/cmap/handshake/client_metadata.ts

@@ -2,7 +2,7 @@ import * as os from 'os';
 import * as process from 'process';
 
 import { BSON, type Document, Int32 } from '../../bson';
-import { MongoInvalidArgumentError } from '../../error';
+import { MongoInvalidArgumentError, MongoRuntimeError } from '../../error';
 import type { MongoOptions } from '../../mongo_client';
 import { fileIsAccessible } from '../../utils';
 
@@ -122,15 +122,19 @@ export function makeClientMetadata(options: MakeClientMetadataOptions): ClientMe
     version: version.length > 0 ? `${NODE_DRIVER_VERSION}|${version}` : NODE_DRIVER_VERSION
   };
 
+  if (options.additionalDriverInfo == null) {
+    throw new MongoRuntimeError(
+      'Client options `additionalDriverInfo` must always default to an empty array'
+    );
+  }
+
   // This is where we handle additional driver info added after client construction.
-  if (options.additionalDriverInfo?.length > 0) {
-    for (const { name: n = '', version: v = '' } of options.additionalDriverInfo) {
-      if (n.length > 0) {
-        driverInfo.name = `${driverInfo.name}|${n}`;
-      }
-      if (v.length > 0) {
-        driverInfo.version = `${driverInfo.version}|${v}`;
-      }
+  for (const { name: n = '', version: v = '' } of options.additionalDriverInfo) {
+    if (n.length > 0) {
+      driverInfo.name = `${driverInfo.name}|${n}`;
+    }
+    if (v.length > 0) {
+      driverInfo.version = `${driverInfo.version}|${v}`;
     }
   }
 
@@ -145,11 +149,9 @@ export function makeClientMetadata(options: MakeClientMetadataOptions): ClientMe
     runtimeInfo = `${runtimeInfo}|${platform}`;
   }
 
-  if (options.additionalDriverInfo?.length > 0) {
-    for (const { platform: p = '' } of options.additionalDriverInfo) {
-      if (p.length > 0) {
-        runtimeInfo = `${runtimeInfo}|${p}`;
-      }
+  for (const { platform: p = '' } of options.additionalDriverInfo) {
+    if (p.length > 0) {
+      runtimeInfo = `${runtimeInfo}|${p}`;
     }
   }
 

test/integration/mongodb-handshake/mongodb-handshake.prose.test.ts

@@ -204,7 +204,7 @@ describe('Client Metadata Update Prose Tests', function () {
     sinon.restore();
   });
 
-  describe('Test 2: Multiple Successive Metadata Updates', function () {
+  describe('Test 1: Test that the driver updates metadata', function () {
     let initialClientMetadata;
     let updatedClientMetadata;
 
@@ -279,13 +279,15 @@ describe('Client Metadata Update Prose Tests', function () {
               ? `${initialClientMetadata.platform}|${platform}`
               : initialClientMetadata.platform
           );
+          // - All other subfields in the client document remain unchanged from initialClientMetadata.
+          // (Note os is the only one getting set in these tests)
           expect(updatedClientMetadata.os).to.deep.equal(initialClientMetadata.os);
         });
       });
     }
   });
 
-  describe('Test 1: Test that the driver updates metadata', function () {
+  describe('Test 2: Multiple Successive Metadata Updates', function () {
     let initialClientMetadata;
     let updatedClientMetadata;
 
@@ -355,6 +357,8 @@ describe('Client Metadata Update Prose Tests', function () {
               ? `${initialClientMetadata.platform}|${platform}`
               : initialClientMetadata.platform
           );
+          // - All other subfields in the client document remain unchanged from initialClientMetadata.
+          // (Note os is the only one getting set in these tests)
           expect(updatedClientMetadata.os).to.deep.equal(initialClientMetadata.os);
         });
       });

test/spec/connection-monitoring-and-pooling/cmap-format/pool-create-min-size-error.json

@@ -14,7 +14,7 @@
     },
     "data": {
       "failCommands": [
-        "ismaster",
+        "isMaster",
         "hello"
       ],
       "closeConnection": true,

test/tools/cmap_spec_runner.ts

@@ -376,8 +376,6 @@ async function runCmapTest(test: CmapTest, threadContext: ThreadContext) {
     delete poolOptions.backgroundThreadIntervalMS;
   }
 
-  //const metadata = makeClientMetadata({ appName: poolOptions.appName });
-  //const extendedMetadata = addContainerMetadata(metadata);
   delete poolOptions.appName;
 
   const operations = test.operations;