test: fix cmap runner

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++;

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

@@ -4,13 +4,11 @@ import { clearTimeout, setTimeout } from 'timers';
 import { inspect } from 'util';
 
 import {
-  addContainerMetadata,
   CMAP_EVENTS,
   type Connection,
   ConnectionPool,
   type ConnectionPoolOptions,
   type HostAddress,
-  makeClientMetadata,
   type MongoClient,
   type Server,
   shuffle,
@@ -324,7 +322,9 @@ export class ThreadContext {
       hostAddress: this.#hostAddress,
       serverApi: process.env.MONGODB_API_VERSION
         ? { version: process.env.MONGODB_API_VERSION }
-        : undefined
+        : undefined,
+
+      extendedMetadata: this.#server.topology.client.options?.extendedMetadata
     });
     this.#originalServerPool = this.#server.pool;
     this.#server.pool = this.pool;
@@ -376,8 +376,8 @@ async function runCmapTest(test: CmapTest, threadContext: ThreadContext) {
     delete poolOptions.backgroundThreadIntervalMS;
   }
 
-  const metadata = makeClientMetadata({ appName: poolOptions.appName, driverInfo: {} });
-  const extendedMetadata = addContainerMetadata(metadata);
+  //const metadata = makeClientMetadata({ appName: poolOptions.appName });
+  //const extendedMetadata = addContainerMetadata(metadata);
   delete poolOptions.appName;
 
   const operations = test.operations;
@@ -391,8 +391,6 @@ async function runCmapTest(test: CmapTest, threadContext: ThreadContext) {
 
   threadContext.createPool({
     ...poolOptions,
-    metadata,
-    extendedMetadata,
     minPoolSizeCheckFrequencyMS
   });
   // yield control back to the event loop so that the ConnectionPoolCreatedEvent
@@ -513,10 +511,15 @@ export function runCmapTestSuite(
           const selectedHostUri = hosts[0];
           hostAddress = serverDescriptionMap.get(selectedHostUri).hostAddress;
 
+          const clientOptions: { appName?: string } = {};
+          if (test.poolOptions?.appName) {
+            clientOptions.appName = test.poolOptions.appName;
+          }
           client = this.configuration.newClient(
             `mongodb://${hostAddress}/${
               this.configuration.isLoadBalanced ? '?loadBalanced=true' : '?directConnection=true'
-            }`
+            }`,
+            clientOptions
           );
           await client.connect();
           if (test.failPoint) {