Merge branch 'main' into type-templates-auto-encryption

Author: addaleax

.evergreen/ci_matrix_constants.js

@@ -2,7 +2,8 @@ const MONGODB_VERSIONS = ['latest', 'rapid', '8.0', '7.0', '6.0', '5.0', '4.4',
 const versions = [
   { codeName: 'gallium', versionNumber: 16, npmVersion: 9 },
   { codeName: 'hydrogen', versionNumber: 18, npmVersion: 'latest' },
-  { codeName: 'iron', versionNumber: 20, npmVersion: 'latest' }
+  { codeName: 'iron', versionNumber: 20, npmVersion: 'latest' },
+  { codeName: 'jod', versionNumber: 22, npmVersion: 'latest' },
 ];
 const NODE_VERSIONS = versions.map(({ versionNumber }) => versionNumber).sort();
 const LOWEST_LTS = NODE_VERSIONS[0];

.evergreen/config.in.yml

@@ -321,6 +321,7 @@ functions:
       params:
         working_dir: src
         script: |
+          source ${DRIVERS_TOOLS}/.evergreen/init-node-and-npm-env.sh
           npm install --force ${PACKAGE}
 
   "run lint checks":
@@ -1221,6 +1222,28 @@ tasks:
       - command: perf.send
         params:
           file: src/results.json
+          
+  - name: run-spec-benchmark-tests-node-server-monitorCommands-true
+    tags:
+      - run-spec-benchmark-tests
+      - performance
+    exec_timeout_secs: 3600
+    commands:
+      - command: expansions.update
+        type: setup
+        params:
+          updates:
+            - { key: NODE_LTS_VERSION, value: v22.11.0 }
+            - { key: VERSION, value: v6.0-perf }
+            - { key: TOPOLOGY, value: server }
+            - { key: AUTH, value: noauth }
+            - { key: MONGODB_CLIENT_OPTIONS, value: '{"monitorCommands": true}' }
+      - func: install dependencies
+      - func: bootstrap mongo-orchestration
+      - func: run spec driver benchmarks
+      - command: perf.send
+        params:
+          file: src/results.json
 
   - name: "test-gcpkms-task"
     commands:
@@ -1793,3 +1816,4 @@ buildvariants:
       - run-spec-benchmark-tests-node-server
       - run-spec-benchmark-tests-node-server-timeoutMS-120000
       - run-spec-benchmark-tests-node-server-timeoutMS-0
+      - run-spec-benchmark-tests-node-server-monitorCommands-true

.evergreen/config.yml

@@ -287,6 +287,7 @@ functions:
       params:
         working_dir: src
         script: |
+          source ${DRIVERS_TOOLS}/.evergreen/init-node-and-npm-env.sh
           npm install --force ${PACKAGE}
   run lint checks:
     - command: subprocess.exec
@@ -1179,6 +1180,27 @@ tasks:
       - command: perf.send
         params:
           file: src/results.json
+  - name: run-spec-benchmark-tests-node-server-monitorCommands-true
+    tags:
+      - run-spec-benchmark-tests
+      - performance
+    exec_timeout_secs: 3600
+    commands:
+      - command: expansions.update
+        type: setup
+        params:
+          updates:
+            - {key: NODE_LTS_VERSION, value: v22.11.0}
+            - {key: VERSION, value: v6.0-perf}
+            - {key: TOPOLOGY, value: server}
+            - {key: AUTH, value: noauth}
+            - {key: MONGODB_CLIENT_OPTIONS, value: '{"monitorCommands": true}'}
+      - func: install dependencies
+      - func: bootstrap mongo-orchestration
+      - func: run spec driver benchmarks
+      - command: perf.send
+        params:
+          file: src/results.json
   - name: test-gcpkms-task
     commands:
       - command: expansions.update
@@ -2105,7 +2127,23 @@ tasks:
       - func: install dependencies
       - func: bootstrap mongo-orchestration
       - func: run socks5 tests
-  - name: test-zstd-compression
+  - name: test-snappy-compression
+    tags:
+      - latest
+      - snappy
+    commands:
+      - command: expansions.update
+        type: setup
+        params:
+          updates:
+            - {key: VERSION, value: latest}
+            - {key: TOPOLOGY, value: replica_set}
+            - {key: AUTH, value: auth}
+            - {key: COMPRESSOR, value: snappy}
+      - func: install dependencies
+      - func: bootstrap mongo-orchestration
+      - func: run-compression-tests
+  - name: test-zstd-1.x-compression
     tags:
       - latest
       - zstd
@@ -2120,11 +2158,14 @@ tasks:
             - {key: COMPRESSOR, value: zstd}
       - func: install dependencies
       - func: bootstrap mongo-orchestration
+      - func: install package
+        vars:
+          PACKAGE: '@mongodb-js/[email protected]'
       - func: run-compression-tests
-  - name: test-snappy-compression
+  - name: test-zstd-2.x-compression
     tags:
       - latest
-      - snappy
+      - zstd
     commands:
       - command: expansions.update
         type: setup
@@ -2133,7 +2174,7 @@ tasks:
             - {key: VERSION, value: latest}
             - {key: TOPOLOGY, value: replica_set}
             - {key: AUTH, value: auth}
-            - {key: COMPRESSOR, value: snappy}
+            - {key: COMPRESSOR, value: zstd}
       - func: install dependencies
       - func: bootstrap mongo-orchestration
       - func: run-compression-tests
@@ -3555,6 +3596,18 @@ tasks:
             - {key: NPM_VERSION, value: latest}
       - func: install dependencies
       - func: run unit tests
+  - name: run-unit-tests-node-22
+    tags:
+      - unit-tests
+    commands:
+      - command: expansions.update
+        type: setup
+        params:
+          updates:
+            - {key: NODE_LTS_VERSION, value: '22'}
+            - {key: NPM_VERSION, value: latest}
+      - func: install dependencies
+      - func: run unit tests
   - name: run-lint-checks
     tags:
       - lint-checks
@@ -4724,6 +4777,7 @@ buildvariants:
       - run-spec-benchmark-tests-node-server
       - run-spec-benchmark-tests-node-server-timeoutMS-120000
       - run-spec-benchmark-tests-node-server-timeoutMS-0
+      - run-spec-benchmark-tests-node-server-monitorCommands-true
   - name: rhel80-large-gallium
     display_name: rhel8 Node16
     run_on: rhel80-large
@@ -4773,6 +4827,9 @@ buildvariants:
       - test-socks5
       - test-socks5-csfle
       - test-socks5-tls
+      - test-snappy-compression
+      - test-zstd-1.x-compression
+      - test-zstd-2.x-compression
       - test-tls-support-latest
       - test-tls-support-8.0
       - test-tls-support-7.0
@@ -4829,6 +4886,9 @@ buildvariants:
       - test-socks5
       - test-socks5-csfle
       - test-socks5-tls
+      - test-snappy-compression
+      - test-zstd-1.x-compression
+      - test-zstd-2.x-compression
       - test-tls-support-latest
       - test-tls-support-8.0
       - test-tls-support-7.0
@@ -4885,6 +4945,68 @@ buildvariants:
       - test-socks5
       - test-socks5-csfle
       - test-socks5-tls
+      - test-snappy-compression
+      - test-zstd-1.x-compression
+      - test-zstd-2.x-compression
+      - test-tls-support-latest
+      - test-tls-support-8.0
+      - test-tls-support-7.0
+      - test-tls-support-6.0
+      - test-tls-support-5.0
+      - test-tls-support-4.4
+      - test-tls-support-4.2
+  - name: rhel80-large-Node22
+    display_name: rhel8 Node22
+    run_on: rhel80-large
+    expansions:
+      NODE_LTS_VERSION: 22
+      NPM_VERSION: latest
+      CLIENT_ENCRYPTION: true
+    tasks:
+      - test-latest-server
+      - test-latest-replica_set
+      - test-latest-sharded_cluster
+      - test-rapid-server
+      - test-rapid-replica_set
+      - test-rapid-sharded_cluster
+      - test-8.0-server
+      - test-8.0-replica_set
+      - test-8.0-sharded_cluster
+      - test-7.0-server
+      - test-7.0-replica_set
+      - test-7.0-sharded_cluster
+      - test-6.0-server
+      - test-6.0-replica_set
+      - test-6.0-sharded_cluster
+      - test-5.0-server
+      - test-5.0-replica_set
+      - test-5.0-sharded_cluster
+      - test-4.4-server
+      - test-4.4-replica_set
+      - test-4.4-sharded_cluster
+      - test-4.2-server
+      - test-4.2-replica_set
+      - test-4.2-sharded_cluster
+      - test-4.0-server
+      - test-4.0-replica_set
+      - test-4.0-sharded_cluster
+      - test-latest-server-v1-api
+      - test-x509-authentication
+      - test-atlas-connectivity
+      - test-5.0-load-balanced
+      - test-6.0-load-balanced
+      - test-7.0-load-balanced
+      - test-8.0-load-balanced
+      - test-rapid-load-balanced
+      - test-latest-load-balanced
+      - test-auth-kerberos
+      - test-auth-ldap
+      - test-socks5
+      - test-socks5-csfle
+      - test-socks5-tls
+      - test-snappy-compression
+      - test-zstd-1.x-compression
+      - test-zstd-2.x-compression
       - test-tls-support-latest
       - test-tls-support-8.0
       - test-tls-support-7.0
@@ -4939,8 +5061,9 @@ buildvariants:
       - test-auth-ldap
       - test-socks5-csfle
       - test-socks5-tls
-      - test-zstd-compression
       - test-snappy-compression
+      - test-zstd-1.x-compression
+      - test-zstd-2.x-compression
       - test-tls-support-latest
       - test-tls-support-8.0
       - test-tls-support-7.0
@@ -4985,6 +5108,9 @@ buildvariants:
       - test-latest-server-v1-api
       - test-socks5
       - test-socks5-tls
+      - test-snappy-compression
+      - test-zstd-1.x-compression
+      - test-zstd-2.x-compression
       - test-tls-support-latest
       - test-tls-support-8.0
       - test-tls-support-7.0
@@ -5029,6 +5155,9 @@ buildvariants:
       - test-latest-server-v1-api
       - test-socks5
       - test-socks5-tls
+      - test-snappy-compression
+      - test-zstd-1.x-compression
+      - test-zstd-2.x-compression
       - test-tls-support-latest
       - test-tls-support-8.0
       - test-tls-support-7.0
@@ -5073,6 +5202,56 @@ buildvariants:
       - test-latest-server-v1-api
       - test-socks5
       - test-socks5-tls
+      - test-snappy-compression
+      - test-zstd-1.x-compression
+      - test-zstd-2.x-compression
+      - test-tls-support-latest
+      - test-tls-support-8.0
+      - test-tls-support-7.0
+      - test-tls-support-6.0
+      - test-tls-support-5.0
+      - test-tls-support-4.4
+      - test-tls-support-4.2
+  - name: windows-vsCurrent-large-Node22
+    display_name: Windows Node22
+    run_on: windows-vsCurrent-large
+    expansions:
+      NODE_LTS_VERSION: 22
+      NPM_VERSION: latest
+    tasks:
+      - test-latest-server
+      - test-latest-replica_set
+      - test-latest-sharded_cluster
+      - test-rapid-server
+      - test-rapid-replica_set
+      - test-rapid-sharded_cluster
+      - test-8.0-server
+      - test-8.0-replica_set
+      - test-8.0-sharded_cluster
+      - test-7.0-server
+      - test-7.0-replica_set
+      - test-7.0-sharded_cluster
+      - test-6.0-server
+      - test-6.0-replica_set
+      - test-6.0-sharded_cluster
+      - test-5.0-server
+      - test-5.0-replica_set
+      - test-5.0-sharded_cluster
+      - test-4.4-server
+      - test-4.4-replica_set
+      - test-4.4-sharded_cluster
+      - test-4.2-server
+      - test-4.2-replica_set
+      - test-4.2-sharded_cluster
+      - test-4.0-server
+      - test-4.0-replica_set
+      - test-4.0-sharded_cluster
+      - test-latest-server-v1-api
+      - test-socks5
+      - test-socks5-tls
+      - test-snappy-compression
+      - test-zstd-1.x-compression
+      - test-zstd-2.x-compression
       - test-tls-support-latest
       - test-tls-support-8.0
       - test-tls-support-7.0
@@ -5097,8 +5276,8 @@ buildvariants:
       - test-5.0-csfle-mongocryptd
       - test-4.4-csfle-mongocryptd
       - test-4.2-csfle-mongocryptd
-  - name: rhel8-node20-test-csfle-mongocryptd
-    display_name: rhel 8 Node20 test mongocryptd
+  - name: rhel8-node22-test-csfle-mongocryptd
+    display_name: rhel 8 Node22 test mongocryptd
     run_on: rhel80-large
     expansions:
       CLIENT_ENCRYPTION: true
@@ -5115,10 +5294,10 @@ buildvariants:
       - test-4.4-csfle-mongocryptd
       - test-4.2-csfle-mongocryptd
   - name: macos-1100
-    display_name: MacOS 11 Node20
+    display_name: MacOS 11 Node22
     run_on: macos-1100
     expansions:
-      NODE_LTS_VERSION: 20
+      NODE_LTS_VERSION: 22
       CLIENT_ENCRYPTION: true
     tasks:
       - test-rapid-server
@@ -5138,7 +5317,7 @@ buildvariants:
     display_name: MONGODB-AWS Auth test
     run_on: ubuntu2004-small
     expansions:
-      NODE_LTS_VERSION: 20
+      NODE_LTS_VERSION: 22
     tasks:
       - aws-latest-auth-test-run-aws-auth-test-with-regular-aws-credentials
       - aws-latest-auth-test-run-aws-auth-test-with-assume-role-credentials
@@ -5228,7 +5407,7 @@ buildvariants:
     display_name: Atlas Data Lake Tests
     run_on: ubuntu2204-large
     expansions:
-      NODE_LTS_VERSION: 20
+      NODE_LTS_VERSION: 22
     tasks:
       - test-atlas-data-lake
   - name: rhel8-custom-dependency-tests
@@ -5264,7 +5443,7 @@ buildvariants:
     display_name: MONGODB-OIDC Auth Tests
     run_on: ubuntu2004-small
     expansions:
-      NODE_LTS_VERSION: 20
+      NODE_LTS_VERSION: 22
     batchtime: 20160
     tasks:
       - testtestoidc_task_group