update ci config

Author: W-A-James

.evergreen/config.yml

@@ -44,19 +44,10 @@ functions:
       - command: subprocess.exec
         params:
           working_dir: src
-          binary: node 
-          env:
-            project: ${project}
-            revision_order_id: ${order}
-            execution: ${execution}
-            requester: ${requester}
-            task_id: ${task_id}
-            task_name: ${task_name}
-            build_variant: ${build_variant}
-            version_id: ${version_id}
+          binary: bash
+          add_expansions_to_env: true
           args:
-            - .evergreen/perfSend.mjs
-            - ./test/bench/etc/resultsCollectedMeans.json
+            - .evergreen/perf-send.sh
 
   run tests:
     - command: subprocess.exec
@@ -273,24 +264,11 @@ tasks:
           NPM_VERSION: 9
       - func: run granular benchmarks
         vars:
-          WARMUP: 1
-          ITERATIONS: 1
-      - command: subprocess.exec
-        params:
-          working_dir: src
-          binary: node 
-          env:
-            project: ${project}
-            revision_order_id: ${order}
-            execution: ${execution}
-            requester: ${requester}
-            task_id: ${task_id}
-            task_name: ${task_name}
-            build_variant: ${build_variant}
-            version_id: ${version_id}
-          args:
-            - .evergreen/perfSend.mjs
-            - ./test/bench/etc/resultsCollectedMeans.json
+          WARMUP: 1000
+          ITERATIONS: 1000
+      - func: perf send
+        vars:
+          TARGET_FILE: ./test/bench/etc/resultsCollectedMeans.json
   - name: run-custom-benchmarks
     commands:
       - func: fetch source
@@ -302,21 +280,9 @@ tasks:
         vars:
           NPM_VERSION: 9
       - func: run custom benchmarks
-      - command: subprocess.exec
-        working_dir: src
-        binary: bash
-        env:
-          project: ${project}
-          revision_order_id: ${order}
-          execution: ${execution}
-          requester: ${requester}
-          task_id: ${task_id}
-          task_name: ${task_name}
-          build_variant: ${build_variant}
-          version_id: ${version_id}
-          TARGET_FILE: ../customBenchmarkResults.json
-        args:
-          - .evergreen/perf-send.sh
+      - func: perf send
+        vars:
+          TARGET_FILE: ./customBenchmarkResults.json
   - name: run-spec-benchmarks
     commands:
       - func: fetch source
@@ -328,9 +294,9 @@ tasks:
         vars:
           NPM_VERSION: 9
       - func: run spec benchmarks
-      - command: perf.send
-        params:
-          file: src/bsonBench.json
+      - func: perf send
+        vars:
+          TARGET_FILE: ./bsonBench.json
   - name: check-eslint-plugin
     commands:
       - func: fetch source

.evergreen/perf-send.sh

@@ -4,4 +4,4 @@ source $DRIVERS_TOOLS/.evergreen/init-node-and-npm-env.sh
 set -o xtrace
 TARGET_FILE=$TARGET_FILE
 
-node ./.evergreen/perfSend.mjs $TARGET_FILE
+node ./.evergreen/perf_send.mjs $TARGET_FILE

.evergreen/perfSend.mjs renamed to .evergreen/perf_send.mjs

@@ -3,8 +3,7 @@
 
 import * as fs from 'fs/promises';
 console.log(process.versions);
-// STAGING
-const API_PATH = "https://performance-monitoring-service-rest.server-tig.staging.corp.mongodb.com/raw_perf_results"
+const API_PATH = "https://performance-monitoring-service-rest.server-tig.prod.corp.mongodb.com/raw_perf_results"
 
 const resultFile = process.argv[2];
 if (resultFile == undefined) {
@@ -40,6 +39,8 @@ fs.readFile(resultFile, { encoding: 'utf8' })
         },
         results: JSON.parse(results)
       };
+
+      console.log(body);
       return fetch(API_PATH, {
         method: "POST",
         headers: {
@@ -49,9 +50,14 @@ fs.readFile(resultFile, { encoding: 'utf8' })
       })
     }
   )
-  .then(resp => {
+  .then(async resp => {
     console.log(resp);
     if (resp.status !== 200) {
-      throw new Error('Got non 200 status code')
+      throw new Error(`Got status code: ${resp.status}\nResponse body: ${await resp.json()}`);
     }
+    console.log("Successfully posted results");
+  })
+  .catch(e => {
+    console.error(e);
+    process.exit(1);
   });