asdf

Author: baileympearson

.evergreen/config.in.yml

@@ -141,20 +141,6 @@ functions:
         add_expansions_to_env: true
         args:
           - .evergreen/run-serverless-tests.sh
-    - command: s3.put
-      params:
-        aws_key: ${aws_key}
-        aws_secret: ${aws_secret}
-        local_file: src/connection-logs.txt
-        optional: true
-        # Upload the coverage report for all tasks in a single build to the same directory.
-        # TODO NODE-4707 - change upload directory to ${UPLOAD_BUCKET}
-        # This change will require changing the `download and merge coverage` func as well
-        remote_file: mongo-node-driver/${revision}/${version_id}/${build_variant}/${task_name}/connection-logs.txt
-        bucket: mciuploads
-        permissions: public-read
-        content_type: text/plain
-        display_name: "Connection Logs"
 
   "start-load-balancer":
     - command: shell.exec
@@ -1016,6 +1002,20 @@ task_groups:
             - .evergreen/setup-serverless.sh
 
     teardown_group:
+      - command: s3.put
+        params:
+          aws_key: ${aws_key}
+          aws_secret: ${aws_secret}
+          local_file: src/connection-logs.txt
+          optional: true
+          # Upload the coverage report for all tasks in a single build to the same directory.
+          # TODO NODE-4707 - change upload directory to ${UPLOAD_BUCKET}
+          # This change will require changing the `download and merge coverage` func as well
+          remote_file: mongo-node-driver/${revision}/${version_id}/${build_variant}/${task_name}/connection-logs.txt
+          bucket: mciuploads
+          permissions: public-read
+          content_type: text/plain
+          display_name: "Connection Logs"
       - func: "upload test results"
       - command: subprocess.exec
         params:

.evergreen/config.yml

@@ -110,17 +110,6 @@ functions:
         add_expansions_to_env: true
         args:
           - .evergreen/run-serverless-tests.sh
-    - command: s3.put
-      params:
-        aws_key: ${aws_key}
-        aws_secret: ${aws_secret}
-        local_file: src/connection-logs.txt
-        optional: true
-        remote_file: mongo-node-driver/${revision}/${version_id}/${build_variant}/${task_name}/connection-logs.txt
-        bucket: mciuploads
-        permissions: public-read
-        content_type: text/plain
-        display_name: Connection Logs
   start-load-balancer:
     - command: shell.exec
       params:
@@ -2896,6 +2885,17 @@ task_groups:
           args:
             - .evergreen/setup-serverless.sh
     teardown_group:
+      - command: s3.put
+        params:
+          aws_key: ${aws_key}
+          aws_secret: ${aws_secret}
+          local_file: src/connection-logs.txt
+          optional: true
+          remote_file: mongo-node-driver/${revision}/${version_id}/${build_variant}/${task_name}/connection-logs.txt
+          bucket: mciuploads
+          permissions: public-read
+          content_type: text/plain
+          display_name: Connection Logs
       - func: upload test results
       - command: subprocess.exec
         params:

src/cmap/connect.ts

@@ -391,7 +391,12 @@ export async function makeSocket(options: MakeConnectionOptions): Promise<Stream
     socket
       .once(connectEvent, () => resolve(socket))
       .once('error', cause =>
-        reject(new MongoNetworkError(MongoError.buildErrorMessage(cause), { cause }))
+        reject(
+          new MongoNetworkError(
+            MongoError.buildErrorMessage(cause) + '- error encountered while establishing socket',
+            { cause }
+          )
+        )
       )
       .once('timeout', () => {
         reject(
@@ -489,7 +494,10 @@ async function makeSocks5Connection(options: MakeConnectionOptions): Promise<Str
     });
     existingSocket = connection.socket;
   } catch (cause) {
-    throw new MongoNetworkError(MongoError.buildErrorMessage(cause), { cause });
+    throw new MongoNetworkError(
+      MongoError.buildErrorMessage(cause) + '- during socks5 proxy establishment',
+      { cause }
+    );
   }
 
   // Finally, now treat the resulting duplex stream as the

src/error.ts

@@ -1,4 +1,5 @@
 import type { Document } from './bson';
+import { write } from './cmap/connection';
 import {
   type ClientBulkWriteError,
   type ClientBulkWriteResult
@@ -1045,8 +1046,15 @@ export class MongoNetworkError extends MongoError {
    * @public
    **/
   constructor(message: string, options?: MongoNetworkErrorOptions) {
+    message = message + `(timestamp = ${new Date().toISOString()})`;
     super(message, { cause: options?.cause });
     this.beforeHandshake = !!options?.beforeHandshake;
+
+    write({
+      event: 'network error',
+      message,
+      error: options?.cause
+    });
   }
 
   override get name(): string {

test/tools/runner/hooks/configuration.ts

@@ -48,7 +48,7 @@ const filters: Filter[] = [];
 
 let initializedFilters = false;
 
-process.env.IP = spawnSync('curl ifconfig.me', { encoding: 'utf-8' }).stdout;
+process.env.IP = spawnSync('curl', ['ifconfig.me'], { encoding: 'utf-8' }).stdout;
 
 async function initializeFilters(client): Promise<Record<string, any>> {
   if (initializedFilters) {