Drop Testing for Segfault Couchbase Versions

.github/workflows/plugins.yml

@@ -172,24 +172,26 @@ jobs:
       - run: yarn test:plugins:ci
       - uses: codecov/codecov-action@v2
 
-  # couchbase:
-  #   runs-on: ubuntu-latest
-  #   services:
-  #     couchbase:
-  #       image: sabrenner/couchbase-server-sandbox:latest
-  #       ports:
-  #         - 8091-8095:8091-8095
-  #         - 11210:11210
-  #   env:
-  #     PLUGINS: couchbase
-  #     SERVICES: couchbase
-  #   steps:
-  #     - uses: actions/checkout@v2
-  #     - uses: ./.github/actions/node/setup
-  #     - run: yarn install
-  #     - uses: ./.github/actions/node/oldest
-  #     - run: yarn test:plugins:ci
-  #     - uses: codecov/codecov-action@v2
+  couchbase:
+    runs-on: ubuntu-latest
+    services:
+      couchbase:
+        image: sabrenner/couchbase-server-sandbox:sandbox
+        ports:
+          - 8091-8095:8091-8095
+          - 11210:11210
+    env:
+      PLUGINS: couchbase
+      SERVICES: couchbase
+    steps:
+      - uses: actions/checkout@v2
+      - uses: ./.github/actions/node/setup
+      - run: yarn install
+      - uses: ./.github/actions/node/14
+      - run: yarn test:plugins:ci
+      - uses: ./.github/actions/node/16
+      - run: yarn test:plugins:ci
+      - uses: codecov/codecov-action@v2
 
   connect:
     runs-on: ubuntu-latest

docker-compose.yml

@@ -1,7 +1,7 @@
 version: "2"
 services:
   couchbase:
-    image: sabrenner/couchbase-server-sandbox:latest
+    image: sabrenner/couchbase-server-sandbox:sandbox
     ports:
       - "127.0.0.1:8091-8095:8091-8095"
       - "127.0.0.1:11210:11210"

packages/datadog-instrumentations/src/couchbase.js

@@ -232,7 +232,10 @@ addHook({ name: 'couchbase', file: 'lib/cluster.js', versions: ['>=3.0.0 <3.2.0'
 
 // semver >=3.2.0
 
-addHook({ name: 'couchbase', file: 'dist/collection.js', versions: ['>=3.2.0'] }, collection => {
+addHook({
+  name: 'couchbase',
+  file: 'dist/collection.js',
+  versions: ['>=3.2.0'] }, collection => {
   const Collection = collection.Collection
 
   wrapAllNames(['upsert', 'insert', 'replace'], name => {
@@ -242,7 +245,10 @@ addHook({ name: 'couchbase', file: 'dist/collection.js', versions: ['>=3.2.0'] }
   return collection
 })
 
-addHook({ name: 'couchbase', file: 'dist/cluster.js', versions: ['3.2.0 - 3.2.1', '>=3.2.2'] }, cluster => {
+addHook({
+  name: 'couchbase',
+  file: 'dist/cluster.js',
+  versions: ['>=3.2.0'] }, cluster => {
   const Cluster = cluster.Cluster
 
   shimmer.wrap(Cluster.prototype, 'query', wrapV3Query)

packages/datadog-plugin-couchbase/test/index.spec.js

@@ -12,7 +12,6 @@ describe('Plugin', () => {
     let cluster
     let bucket
     let tracer
-    let collection
 
     before(() => {
       tracer = global.tracer = require('../../dd-trace')
@@ -150,9 +149,7 @@ describe('Plugin', () => {
     })
 
     withVersions('couchbase', 'couchbase', '>=3.0.0', version => {
-      beforeEach(() => {
-        tracer = global.tracer = require('../../dd-trace')
-      })
+      let collection
 
       describe('without configuration', () => {
         beforeEach(done => {

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

@@ -1,4 +1,22 @@
 {
+  "couchbase": [
+    {
+      "name": "couchbase",
+      "versions": ["^2.6.5"],
+      "nodeVersions": ["<14.0.0"]
+    },
+    {
+      "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"]
+    },
+    {
+      "name": "couchbase",
+      "versions": [">=4.0.0"],
+      "nodeVersions": [">=14.0.0"],
+      "ignoreMinVersion": true
+    }
+  ],
   "cypress": [
     {
       "name": "cypress",

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

@@ -61,15 +61,34 @@ function loadInstFile (file, instrumentations) {
 }
 
 function withVersions (plugin, modules, range, cb) {
-  const instrumentations = typeof plugin === 'string' ? loadInst(plugin) : [].concat(plugin)
+  let instrumentations = typeof plugin === 'string' ? loadInst(plugin) : [].concat(plugin)
   const names = instrumentations.map(instrumentation => instrumentation.name)
 
   modules = [].concat(modules)
 
   names.forEach(name => {
     if (externals[name]) {
       [].concat(externals[name]).forEach(external => {
-        instrumentations.push(external)
+        const { nodeVersions } = external
+        const satisfies = nodeVersions
+          ? nodeVersions
+            .reduce((satisfies, version) => satisfies || semver.satisfies(process.version, version), false)
+          : true
+
+        if (satisfies) {
+          // use external in instrumentation
+          instrumentations.push(external)
+        } else {
+          // don't add this external, and remove all other instrumentations from testing with overlapping versions
+          instrumentations = instrumentations.filter(instrumentation => {
+            return instrumentation.versions.reduce((matches, instVersion) => {
+              external.versions.forEach(extVersion => {
+                matches = matches && !semver.intersects(instVersion, extVersion)
+              })
+              return matches
+            }, true)
+          })
+        }
       })
     }
   })
@@ -89,8 +108,8 @@ function withVersions (plugin, modules, range, cb) {
           .forEach(version => {
             const min = semver.coerce(version).version
             const max = require(`../../../../versions/${moduleName}@${version}`).version()
-
-            testVersions.set(min, { range: version, test: min })
+            // temporary work-around for issues with testing multiple versions within a range
+            if (!instrumentation.ignoreMinVersion) testVersions.set(min, { range: version, test: min })
             testVersions.set(max, { range: version, test: version })
           })
       })