dd-trace 2.12.2 → 2.13.0

package/packages/dd-trace/src/telemetry.js

@@ -9,7 +9,6 @@ const os = require('os')
 const request = require('./exporters/common/request')
 
 let config
-let instrumenter
 let pluginManager
 
 let seqId = 0
@@ -20,17 +19,6 @@ const sentIntegrations = new Set()
 
 function getIntegrations () {
   const newIntegrations = []
-  for (const plugin of instrumenter._instrumented.keys()) {
-    if (sentIntegrations.has(plugin.name)) {
-      continue
-    }
-    newIntegrations.push({
-      name: plugin.name,
-      enabled: true,
-      auto_enabled: true
-    })
-    sentIntegrations.add(plugin.name)
-  }
   for (const pluginName in pluginManager._pluginsByName) {
     if (sentIntegrations.has(pluginName)) {
       continue
@@ -146,12 +134,11 @@ function sendData (reqType, payload = {}) {
   })
 }
 
-function start (aConfig, theInstrumenter, thePluginManager) {
+function start (aConfig, thePluginManager) {
   if (!aConfig.telemetryEnabled) {
     return
   }
   config = aConfig
-  instrumenter = theInstrumenter
   pluginManager = thePluginManager
   application = createAppObject()
   host = createHostObject()

package/scripts/install_plugin_modules.js

@@ -7,8 +7,6 @@ const semver = require('semver')
 const proxyquire = require('proxyquire')
 const exec = require('./helpers/exec')
 const childProcess = require('child_process')
-const plugins = require('../packages/dd-trace/src/plugins')
-const Plugin = require('../packages/dd-trace/src/plugins/plugin')
 const externals = require('../packages/dd-trace/test/plugins/externals')
 
 const requirePackageJsonPath = require.resolve('../packages/dd-trace/src/require-package-json')
@@ -16,6 +14,9 @@ const requirePackageJsonPath = require.resolve('../packages/dd-trace/src/require
 const workspaces = new Set()
 const versionLists = {}
 const deps = {}
+const names = []
+const filter = process.env.hasOwnProperty('PLUGINS') && process.env.PLUGINS.split('|')
+
 Object.keys(externals).forEach(external => externals[external].forEach(thing => {
   if (thing.dep) {
     if (!deps[external]) {
@@ -29,7 +30,10 @@ fs.readdirSync(path.join(__dirname, '../packages/datadog-instrumentations/src'))
   .filter(file => file.endsWith('js'))
   .forEach(file => {
     file = file.replace('.js', '')
-    plugins[file] = { name: file, prototype: Object.create(Plugin.prototype) }
+
+    if (!filter || filter.includes(file)) {
+      names.push(file)
+    }
   })
 
 run()
@@ -42,32 +46,19 @@ async function run () {
 }
 
 async function assertVersions () {
-  let filter = []
-  let names = Object.keys(plugins)
-
-  if (process.env.hasOwnProperty('PLUGINS')) {
-    filter = process.env.PLUGINS.split('|')
-    names = names.filter(name => ~filter.indexOf(name))
-  }
-
   const internals = names
     .map(key => {
-      const plugin = plugins[key]
-      if (plugin.prototype instanceof Plugin) {
-        const instrumentations = []
-        const name = plugin.name
-
-        try {
-          loadInstFile(`${name}/server.js`, instrumentations)
-          loadInstFile(`${name}/client.js`, instrumentations)
-        } catch (e) {
-          loadInstFile(`${name}.js`, instrumentations)
-        }
-
-        return instrumentations
-      } else {
-        return plugin
+      const instrumentations = []
+      const name = key
+
+      try {
+        loadInstFile(`${name}/server.js`, instrumentations)
+        loadInstFile(`${name}/client.js`, instrumentations)
+      } catch (e) {
+        loadInstFile(`${name}.js`, instrumentations)
       }
+
+      return instrumentations
     })
     .reduce((prev, next) => prev.concat(next), [])