testing changes

Author: sabrenner

packages/dd-trace/test/plugins/externals.json

@@ -8,12 +8,12 @@
     {
       "name": "couchbase",
       "versions": [">=3.0.0 <3.2.0", "3.2.0 - 3.2.1", "3.2.2 - 3.2.4"],
-      "nodeVersions": [">=14.0.0"]
+      "nodeVersions": [">=14.0.0 <18.0.0"]
     },
     {
       "name": "couchbase",
       "versions": [">=4.0.0"],
-      "nodeVersions": [">=14.0.0"],
+      "nodeVersions": [">=14.0.0 <18.0.0"],
       "ignoreMinVersion": true
     }
   ],

packages/dd-trace/test/setup/core.js

@@ -60,16 +60,16 @@ function loadInstFile (file, instrumentations) {
   })
 }
 
-function removeVersions (instrumentations, external) {
-  let idx = 0
-  while (idx < instrumentations.length) {
-    const inst = instrumentations[idx]
-    if (JSON.stringify(inst.versions) === JSON.stringify(external.versions)) {
-      instrumentations.splice(idx, 1)
-    } else {
-      idx++
-    }
-  }
+function removeVersions (instrumentations = [], external) {
+  instrumentations.forEach((instrumentation, index) => {
+    instrumentation.versions.forEach(instVersion => {
+      external.versions.forEach(externalVersion => {
+        if (semver.intersects(instVersion, externalVersion)) {
+          delete instrumentations[index]
+        }
+      })
+    })
+  })
 }
 
 function withVersions (plugin, modules, range, cb) {
@@ -112,6 +112,7 @@ function withVersions (plugin, modules, range, cb) {
     const testVersions = new Map()
 
     instrumentations
+      .filter(Boolean)
       .filter(instrumentation => instrumentation.name === moduleName)
       .forEach(instrumentation => {
         instrumentation.versions