update bluebird instrumentation to account for getNewLibraryCopy

packages/datadog-plugin-bluebird/src/index.js

@@ -2,7 +2,58 @@
 
 const tx = require('../../dd-trace/src/plugins/util/promise')
 
+const DD_LIB_COPIES = '_datadog_library_copies'
+
+function createGetNewLibraryCopyWrap (tracer, config, originalLib, shim) {
+  return function wrapGetNewLibraryCopy (getNewLibraryCopy) {
+    return function getNewLibraryCopyWithTrace () {
+      const libraryCopy = getNewLibraryCopy.apply(this, arguments)
+      shim.wrap(libraryCopy.prototype, '_then', tx.createWrapThen(tracer, config))
+      addToLibraryCopies(originalLib.prototype, libraryCopy)
+      return libraryCopy
+    }
+  }
+}
+
+function addToLibraryCopies (originalLibPrototype, libraryCopy) {
+  let libraryCopies = originalLibPrototype[DD_LIB_COPIES]
+
+  if (!libraryCopies) {
+    libraryCopies = new Set()
+
+    Object.defineProperty(originalLibPrototype, DD_LIB_COPIES, {
+      enumerable: false,
+      writable: true
+    })
+
+    originalLibPrototype[DD_LIB_COPIES] = libraryCopies
+  }
+
+  libraryCopies.add(libraryCopy)
+}
+
+function unwrapLibraryCopies (originalLibPrototype, shim) {
+  const libraryCopies = originalLibPrototype[DD_LIB_COPIES]
+
+  if (libraryCopies) {
+    libraryCopies.forEach(libraryCopy => shim.unwrap(libraryCopy.prototype, '_then'))
+    libraryCopies.clear()
+    delete originalLibPrototype[DD_LIB_COPIES]
+  }
+}
+
 module.exports = [
+  {
+    name: 'bluebird',
+    versions: ['^2.11.0', '^3.4.1'],
+    patch (Promise, tracer, config) {
+      this.wrap(Promise, 'getNewLibraryCopy', createGetNewLibraryCopyWrap(tracer, config, Promise, this))
+    },
+    unpatch (Promise) {
+      this.unwrap(Promise, 'getNewLibraryCopy')
+      unwrapLibraryCopies(Promise.prototype, this)
+    }
+  },
   {
     name: 'bluebird',
     versions: ['>=2.0.2'], // 2.0.0 and 2.0.1 were removed from npm

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

@@ -3,3 +3,14 @@
 const assertPromise = require('../../dd-trace/test/plugins/promise')
 
 assertPromise('bluebird')
+
+assertPromise('bluebird', bluebird => {
+  // TODO: remove if statement when running tests only for versions ^2.11.0 and ^3.4.1
+  // https://github.com/petkaantonov/bluebird/releases/tag/v2.11.0
+  // https://github.com/petkaantonov/bluebird/releases/tag/v3.4.1
+  if (!bluebird.getNewLibraryCopy) {
+    return bluebird
+  }
+
+  return bluebird.getNewLibraryCopy()
+})