lazy load dd-trace-api integration

Author: rochdev

packages/datadog-instrumentations/src/dd-trace-api.js

@@ -0,0 +1,6 @@
+'use strict'
+
+const { addHook } = require('./helpers/instrument')
+
+// Empty hook just to make the plugin load.
+addHook({ name: 'dd-trace-api' }, api => api)

packages/datadog-instrumentations/src/helpers/hooks.js

@@ -42,6 +42,7 @@ module.exports = {
   couchbase: () => require('../couchbase'),
   crypto: () => require('../crypto'),
   cypress: () => require('../cypress'),
+  'dd-trace-api': () => require('../dd-trace-api'),
   dns: () => require('../dns'),
   elasticsearch: () => require('../elasticsearch'),
   express: () => require('../express'),

packages/datadog-instrumentations/src/helpers/register.js

@@ -155,7 +155,7 @@ for (const packageName of names) {
 }
 
 function matchVersion (version, ranges) {
-  return !version || (ranges && ranges.some(range => satisfies(version, range)))
+  return !version || !ranges || ranges.some(range => satisfies(version, range))
 }
 
 function getVersion (moduleBaseDir) {

packages/datadog-plugin-dd-trace-api/test/index.spec.js

@@ -22,6 +22,9 @@ describe('Plugin', () => {
 
       tracer = require('../../dd-trace')
 
+      // TODO: Use the real module when it's released.
+      dc.channel('dd-trace:instrumentation:load').publish({ name: 'dd-trace-api' })
+
       sinon.spy(tracer)
       sinon.spy(tracer.appsec)
       sinon.spy(tracer.dogstatsd)

packages/dd-trace/src/plugin_manager.js

@@ -28,9 +28,6 @@ loadChannel.subscribe(({ name }) => {
   maybeEnable(plugins[name])
 })
 
-// Always enabled
-maybeEnable(require('../../datadog-plugin-dd-trace-api/src'))
-
 function maybeEnable (Plugin) {
   if (!Plugin || typeof Plugin !== 'function') return
   if (!pluginClasses[Plugin.id]) {