dd-trace 3.0.0-pre.1 → 3.1.0

package/packages/dd-trace/src/plugins/util/web.js

@@ -2,7 +2,7 @@
 
 const uniq = require('lodash.uniq')
 const analyticsSampler = require('../../analytics_sampler')
-const FORMAT_HTTP_HEADERS = require('opentracing').FORMAT_HTTP_HEADERS
+const FORMAT_HTTP_HEADERS = 'http_headers'
 const log = require('../../log')
 const tags = require('../../../../../ext/tags')
 const types = require('../../../../../ext/types')

package/packages/dd-trace/src/profiling/exporters/agent.js

@@ -2,10 +2,10 @@
 
 const retry = require('retry')
 const { request } = require('http')
-const FormData = require('./form-data')
 
 // TODO: avoid using dd-trace internals. Make this a separate module?
 const docker = require('../../exporters/common/docker')
+const FormData = require('../../exporters/common/form-data')
 const version = require('../../../../../package.json').version
 
 const containerId = docker.id()

package/packages/dd-trace/src/profiling/profilers/cpu.js

@@ -20,7 +20,7 @@ function getStartedSpans (activeSpan) {
 }
 
 function getSpanContextTags (span) {
-  return span._context()._tags
+  return span.context()._tags
 }
 
 function isWebServerSpan (tags) {
@@ -55,13 +55,13 @@ class NativeCpuProfiler {
     const active = getActiveSpan()
     if (!active) return
 
-    const activeCtx = active._context()
+    const activeCtx = active.context()
     if (!activeCtx) return
 
     const spans = getStartedSpans(active)
     if (!spans || !spans.length) return
 
-    const firstCtx = spans[0]._context()
+    const firstCtx = spans[0].context()
     if (!firstCtx) return
 
     const labels = {

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

@@ -1,31 +1,25 @@
 'use strict'
 
-const BaseTracer = require('opentracing').Tracer
-const NoopTracer = require('./noop/tracer')
+const NoopProxy = require('./noop/proxy')
 const DatadogTracer = require('./tracer')
 const Config = require('./config')
-const Instrumenter = require('./instrumenter')
-const PluginManager = require('./plugin_manager')
 const metrics = require('./metrics')
 const log = require('./log')
-const { isFalse } = require('./util')
-const { setStartupLogInstrumenter } = require('./startup-log')
+const { setStartupLogPluginManager } = require('./startup-log')
 const telemetry = require('./telemetry')
+const PluginManager = require('./plugin_manager')
+const { sendGitMetadata } = require('./ci-visibility/exporters/git/git_metadata')
 
-const noop = new NoopTracer()
-
-class Tracer extends BaseTracer {
+class Tracer extends NoopProxy {
   constructor () {
     super()
 
     this._initialized = false
-    this._tracer = noop
-    this._instrumenter = new Instrumenter(this)
     this._pluginManager = new PluginManager(this)
   }
 
   init (options) {
-    if (isFalse(process.env.DD_TRACE_ENABLED) || this._initialized) return this
+    if (this._initialized) return this
 
     this._initialized = true
 
@@ -56,10 +50,19 @@ class Tracer extends BaseTracer {
         }
 
         this._tracer = new DatadogTracer(config)
-        this._instrumenter.enable(config)
         this._pluginManager.configure(config)
-        setStartupLogInstrumenter(this._instrumenter)
-        telemetry.start(config, this._instrumenter, this._pluginManager)
+        setStartupLogPluginManager(this._pluginManager)
+        telemetry.start(config, this._pluginManager)
+      }
+
+      if (config.isGitUploadEnabled) {
+        sendGitMetadata(config.site, (err) => {
+          if (err) {
+            log.error(`Error uploading git metadata: ${err}`)
+          } else {
+            log.debug('Successfully uploaded git metadata')
+          }
+        })
       }
     } catch (e) {
       log.error(e)
@@ -69,65 +72,9 @@ class Tracer extends BaseTracer {
   }
 
   use () {
-    this._instrumenter.use(...arguments)
     this._pluginManager.configurePlugin(...arguments)
     return this
   }
-
-  trace (name, options, fn) {
-    if (!fn) {
-      fn = options
-      options = {}
-    }
-
-    if (typeof fn !== 'function') return
-
-    options = options || {}
-
-    return this._tracer.trace(name, options, fn)
-  }
-
-  wrap (name, options, fn) {
-    if (!fn) {
-      fn = options
-      options = {}
-    }
-
-    if (typeof fn !== 'function') return fn
-
-    options = options || {}
-
-    return this._tracer.wrap(name, options, fn)
-  }
-
-  setUrl () {
-    this._tracer.setUrl.apply(this._tracer, arguments)
-    return this
-  }
-
-  startSpan () {
-    return this._tracer.startSpan.apply(this._tracer, arguments)
-  }
-
-  inject () {
-    return this._tracer.inject.apply(this._tracer, arguments)
-  }
-
-  extract () {
-    return this._tracer.extract.apply(this._tracer, arguments)
-  }
-
-  scope () {
-    return this._tracer.scope.apply(this._tracer, arguments)
-  }
-
-  getRumData () {
-    return this._tracer.getRumData.apply(this._tracer, arguments)
-  }
-
-  setUser () {
-    return this._tracer.setUser.apply(this.tracer, arguments)
-  }
 }
 
 module.exports = Tracer

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

@@ -34,21 +34,7 @@ class Scope {
     }
   }
 
-  bind (target, span) {
-    target = this._bindPromise(target, span)
-    target = this._bindFn(target, span)
-
-    return target
-  }
-
-  unbind (target) {
-    target = this._unbindFn(target)
-    target = this._unbindPromise(target)
-
-    return target
-  }
-
-  _bindFn (fn, span) {
+  bind (fn, span) {
     if (typeof fn !== 'function') return fn
 
     const scope = this
@@ -65,28 +51,6 @@ class Scope {
     return bound
   }
 
-  _unbindFn (fn) {
-    if (typeof fn !== 'function') return fn
-
-    return originals.get(fn) || fn
-  }
-
-  _bindPromise (promise, span) {
-    if (!this._isPromise(promise)) return promise
-
-    wrapMethod(promise, 'then', wrapThen, this, span)
-
-    return promise
-  }
-
-  _unbindPromise (promise) {
-    if (!this._isPromise(promise)) return promise
-
-    promise.then = originals.get(promise.then) || promise.then
-
-    return promise
-  }
-
   _spanOrActive (span) {
     return span !== undefined ? span : this.active()
   }
@@ -96,25 +60,4 @@ class Scope {
   }
 }
 
-function wrapThen (then, scope, span) {
-  return function thenWithTrace (onFulfilled, onRejected) {
-    const args = new Array(arguments.length)
-
-    for (let i = 0, l = args.length; i < l; i++) {
-      args[i] = scope.bind(arguments[i], span)
-    }
-
-    return then.apply(this, args)
-  }
-}
-
-function wrapMethod (target, name, wrapper, ...args) {
-  if (!target[name] || originals.has(target[name])) return
-
-  const original = target[name]
-
-  target[name] = wrapper(target[name], ...args)
-  originals.set(target[name], original)
-}
-
 module.exports = Scope

package/packages/dd-trace/src/startup-log.js

@@ -5,38 +5,27 @@ const mainLogger = require('./log')
 const os = require('os')
 const { inspect } = require('util')
 const tracerVersion = require('../../../package.json').version
-const requirePackageJson = require('./require-package-json')
 
 const logger = Object.create(mainLogger)
 logger._enabled = true
 
 let config
-let instrumenter
+let pluginManager
 let samplingRules = []
-
 let alreadyRan = false
 
 function getIntegrationsAndAnalytics () {
   const integrations = new Set()
   const extras = {}
-  for (const plugin of instrumenter._instrumented.keys()) {
-    if (plugin.versions) {
-      try {
-        const version = requirePackageJson(plugin.name, module).version
-        integrations.add(`${plugin.name}@${version}`)
-      } catch (e) {
-        integrations.add(plugin.name)
-      }
-    } else {
-      integrations.add(plugin.name)
-    }
+  for (const pluginName in pluginManager._pluginsByName) {
+    integrations.add(pluginName)
   }
   extras.integrations_loaded = Array.from(integrations)
   return extras
 }
 
 function startupLog ({ agentError } = {}) {
-  if (!config || !instrumenter) {
+  if (!config || !pluginManager) {
     return
   }
 
@@ -106,7 +95,7 @@ function startupLog ({ agentError } = {}) {
   }
 
   config = undefined
-  instrumenter = undefined
+  pluginManager = undefined
   samplingRules = undefined
 }
 
@@ -114,8 +103,8 @@ function setStartupLogConfig (aConfig) {
   config = aConfig
 }
 
-function setStartupLogInstrumenter (theInstrumenter) {
-  instrumenter = theInstrumenter
+function setStartupLogPluginManager (thePluginManager) {
+  pluginManager = thePluginManager
 }
 
 function setSamplingRules (theRules) {
@@ -125,6 +114,6 @@ function setSamplingRules (theRules) {
 module.exports = {
   startupLog,
   setStartupLogConfig,
-  setStartupLogInstrumenter,
+  setStartupLogPluginManager,
   setSamplingRules
 }

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
@@ -141,17 +129,16 @@ function sendData (reqType, payload = {}) {
     host
   })
 
-  request(data, options, true, () => {
+  request(data, options, () => {
     // ignore errors
   })
 }
 
-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), [])
 

package/ci/jest/env.js

@@ -1,38 +0,0 @@
-/* eslint-disable no-console */
-
-const tracer = require('../../packages/dd-trace')
-const { ORIGIN_KEY } = require('../../packages/dd-trace/src/constants')
-const { isTrue } = require('../../packages/dd-trace/src/util')
-
-const options = {
-  startupLogs: false,
-  tags: {
-    [ORIGIN_KEY]: 'ciapp-test'
-  }
-}
-
-const isAgentlessEnabled = isTrue(process.env.DD_CIVISIBILITY_AGENTLESS_ENABLED)
-
-if (isAgentlessEnabled) {
-  if (process.env.DATADOG_API_KEY || process.env.DD_API_KEY) {
-    tracer.init({
-      ...options,
-      experimental: {
-        exporter: 'datadog'
-      }
-    })
-  } else {
-    console.error(`DD_CIVISIBILITY_AGENTLESS_ENABLED is set, \
-but neither DD_API_KEY nor DATADOG_API_KEY are set in your environment, \
-so dd-trace will not be initialized.`)
-  }
-} else {
-  tracer.init({
-    ...options,
-    flushInterval: 400000
-  })
-}
-
-tracer.use('fs', false)
-
-module.exports = tracer