fix(instr-mongodb): fix instr to no longer break mongodb >=6.4.0

.tav.yml

@@ -131,7 +131,7 @@ mongodb:
     node: '>=14.20.1'
     commands: node test/instrumentation/modules/mongodb/mongodb.test.js
   - versions: '>=6 <7'
-    node: '>=15.0.0'
+    node: '>=16.20.1'
     commands: node test/instrumentation/modules/mongodb/mongodb.test.js
 
 # Bluebird is effectively deprecated (https://github.com/petkaantonov/bluebird#%EF%B8%8Fnote%EF%B8%8F).

CHANGELOG.asciidoc

@@ -44,6 +44,10 @@ See the <<upgrade-to-v4>> guide.
 [float]
 ===== Bug fixes
 
+* Fix instrumentation of mongodb to not break mongodb@6.4.0. Mongodb v6.4.0
+  included changes that resulted in the APM agent's instrumentation breaking it.
+  ({pull}3897[#3897])
+
 [float]
 ===== Chores
 

lib/instrumentation/modules/mongodb/lib/cmap/connection_pool.js

@@ -12,13 +12,14 @@ const semver = require('semver');
 
 module.exports = (mod, agent, { version, enabled }) => {
   if (!enabled) return mod;
-  if (!semver.satisfies(version, '>=3.3 <7.0')) {
-    agent.logger.debug(
-      'mongodb version %s not instrumented (mongodb <3.3 is instrumented via mongodb-core)',
-      version,
-    );
+  if (!semver.satisfies(version, '>=3.3 <6.4.0')) {
+    // - mongodb <3.3 is instrumented via mongodb-core
+    // - mongodb >=6.4.0 now longer requires ConnectionPool#checkOut to be
+    //   patched to fix async context tracking. See discussion at
+    //   https://github.com/elastic/apm-agent-nodejs/pull/3897
     return mod;
   }
+  agent.logger.debug('instrumenting mongodb ConnectionPool#checkOut');
 
   if (mod.ConnectionPool) {
     class ConnectionPoolTraced extends mod.ConnectionPool {

test/_is_mongodb_incompat.js

@@ -39,7 +39,7 @@ function isMongodbIncompat() {
       return msg;
     }
   } else if (semver.satisfies(mongodbVer, '>=6.0.0')) {
-    if (!semver.satisfies(nodeVer, '>=15.0.0')) {
+    if (!semver.satisfies(nodeVer, '>=16.20.1')) {
       return msg;
     }
   }