wip

Author: nbbeeken

src/cmap/connect.ts

@@ -387,10 +387,18 @@ export async function makeSocket(options: MakeConnectionOptions): Promise<Stream
     resolve(socket);
   } else {
     const connectEvent = useTLS ? 'secureConnect' : 'connect';
+    const start = performance.now();
     socket
       .once(connectEvent, () => resolve(socket))
       .once('error', error => reject(connectionFailureError('error', error)))
-      .once('timeout', () => reject(connectionFailureError('timeout')))
+      .once('timeout', () => {
+        const end = performance.now();
+        return reject(
+          new MongoNetworkTimeoutError(
+            `socket.connect() timed out! connectTimeoutMS=${connectTimeoutMS}ms, socket.setTimeout fired after ${end - start}ms.`
+          )
+        );
+      })
       .once('close', () => reject(connectionFailureError('close')));
 
     if (options.cancellationToken != null) {

test/benchmarks/driverBench/index.js

@@ -59,10 +59,6 @@ benchmarkRunner
     ]);
     const multiBench = average(Object.values(microBench.multiBench));
 
-    // ldjsonMultiFileUpload and ldjsonMultiFileExport cause connection errors.
-    // While we investigate, we will use the last known good values:
-    // https://spruce.mongodb.com/task/mongo_node_driver_next_performance_tests_run_spec_benchmark_tests_node_server_4bc3e500b6f0e8ab01f052c4a1bfb782d6a29b4e_f168e1328f821bbda265e024cc91ae54_24_11_18_15_37_24/logs?execution=0
-
     const parallelBench = average([
       microBench.parallel.ldjsonMultiFileUpload,
       microBench.parallel.ldjsonMultiFileExport,