dd-trace 2.40.0 → 2.42.0

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

@@ -25,6 +25,10 @@ function mapToJsonArray (map) {
   return Array.from(map.values()).map(v => v.toJSON())
 }
 
+function hasPoints (metric) {
+  return metric.points.length > 0
+}
+
 class Metric {
   constructor (namespace, metric, common, tags) {
     this.namespace = namespace.toString()
@@ -172,10 +176,16 @@ class MetricsCollection extends Map {
 
   toJSON () {
     if (!this.size) return
+
+    const series = mapToJsonArray(this)
+      .filter(hasPoints)
+
+    if (!series.length) return
+
     const { namespace } = this
     return {
       namespace,
-      series: mapToJsonArray(this)
+      series
     }
   }
 }

package/packages/diagnostics_channel/src/index.js

@@ -54,4 +54,68 @@ if (major === '19' && minor === '9') {
   }
 }
 
+if (!Channel.prototype.runStores) {
+  const ActiveChannelPrototype = getActiveChannelPrototype()
+
+  Channel.prototype.bindStore = ActiveChannelPrototype.bindStore = function (store, transform) {
+    if (!this._stores) {
+      this._stores = new Map()
+    }
+    this._stores.set(store, transform)
+  }
+
+  Channel.prototype.unbindStore = ActiveChannelPrototype.runStores = function (store) {
+    if (!this._stores) return
+    this._stores.delete(store)
+  }
+
+  Channel.prototype.runStores = ActiveChannelPrototype.runStores = function (data, fn, thisArg, ...args) {
+    if (!this._stores) return Reflect.apply(fn, thisArg, args)
+
+    let run = () => {
+      this.publish(data)
+      return Reflect.apply(fn, thisArg, args)
+    }
+
+    for (const entry of this._stores.entries()) {
+      const store = entry[0]
+      const transform = entry[1]
+      run = wrapStoreRun(store, data, run, transform)
+    }
+
+    return run()
+  }
+}
+
+function defaultTransform (data) {
+  return data
+}
+
+function wrapStoreRun (store, data, next, transform = defaultTransform) {
+  return () => {
+    let context
+    try {
+      context = transform(data)
+    } catch (err) {
+      process.nextTick(() => {
+        throw err
+      })
+      return next()
+    }
+
+    return store.run(context, next)
+  }
+}
+
+function getActiveChannelPrototype () {
+  const dummyChannel = channel('foo')
+  const listener = () => {}
+
+  dummyChannel.subscribe(listener)
+  const ActiveChannelPrototype = Object.getPrototypeOf(dummyChannel)
+  dummyChannel.unsubscribe(listener)
+
+  return ActiveChannelPrototype
+}
+
 module.exports = dc

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

@@ -1,126 +0,0 @@
-'use strict'
-
-const { storage } = require('../../../../datadog-core')
-
-const dc = require('../../../../diagnostics_channel')
-
-const beforeCh = dc.channel('dd-trace:storage:before')
-const afterCh = dc.channel('dd-trace:storage:after')
-
-function getActiveSpan () {
-  const store = storage.getStore()
-  if (!store) return
-  return store.span
-}
-
-function getStartedSpans (activeSpan) {
-  const context = activeSpan.context()
-  if (!context) return
-  return context._trace.started
-}
-
-function getSpanContextTags (span) {
-  return span.context()._tags
-}
-
-function isWebServerSpan (tags) {
-  return tags['span.type'] === 'web'
-}
-
-function endpointNameFromTags (tags) {
-  return tags['resource.name'] || [
-    tags['http.method'],
-    tags['http.route']
-  ].filter(v => v).join(' ')
-}
-
-class NativeCpuProfiler {
-  constructor (options = {}) {
-    this.type = 'cpu'
-    this._frequency = options.frequency || 99
-    this._mapper = undefined
-    this._pprof = undefined
-    this._started = false
-    this._cpuProfiler = undefined
-    this._endpointCollection = options.endpointCollection
-
-    // Bind to this so the same value can be used to unsubscribe later
-    this._enter = this._enter.bind(this)
-    this._exit = this._exit.bind(this)
-  }
-
-  _enter () {
-    if (!this._cpuProfiler) return
-
-    const active = getActiveSpan()
-    if (!active) return
-
-    const activeCtx = active.context()
-    if (!activeCtx) return
-
-    const spans = getStartedSpans(active)
-    if (!spans || !spans.length) return
-
-    const firstCtx = spans[0].context()
-    if (!firstCtx) return
-
-    const labels = {
-      'local root span id': firstCtx.toSpanId(),
-      'span id': activeCtx.toSpanId()
-    }
-
-    if (this._endpointCollection) {
-      const webServerTags = spans
-        .map(getSpanContextTags)
-        .filter(isWebServerSpan)[0]
-
-      if (webServerTags) {
-        labels['trace endpoint'] = endpointNameFromTags(webServerTags)
-      }
-    }
-
-    this._cpuProfiler.labels = labels
-  }
-
-  _exit () {
-    if (!this._cpuProfiler) return
-    this._cpuProfiler.labels = {}
-  }
-
-  start ({ mapper } = {}) {
-    if (this._started) return
-    this._started = true
-
-    this._mapper = mapper
-    if (!this._pprof) {
-      this._pprof = require('@datadog/pprof')
-      this._cpuProfiler = new this._pprof.CpuProfiler()
-    }
-
-    this._cpuProfiler.start(this._frequency)
-
-    this._enter()
-    beforeCh.subscribe(this._enter)
-    afterCh.subscribe(this._exit)
-  }
-
-  profile () {
-    if (!this._started) return
-    return this._cpuProfiler.profile()
-  }
-
-  encode (profile) {
-    return this._pprof.encode(profile)
-  }
-
-  stop () {
-    if (!this._started) return
-    this._started = false
-
-    this._cpuProfiler.stop()
-    beforeCh.unsubscribe(this._enter)
-    afterCh.unsubscribe(this._exit)
-  }
-}
-
-module.exports = NativeCpuProfiler

package/scripts/version.js

@@ -1,66 +0,0 @@
-'use strict'
-
-const path = require('path')
-const fs = require('fs')
-const semver = require('semver')
-const exec = require('./helpers/exec')
-const title = require('./helpers/title')
-
-const pkg = require('../package.json')
-const increment = getIncrement()
-const version = semver.inc(pkg.version, increment, 'pre')
-
-title(`Bumping version to v${version}.`)
-
-const currentBranch = exec.pipe(`git branch --show-current`)
-
-if (currentBranch === 'master') {
-  const major = semver.major(pkg.version)
-  const nextMajor = semver.major(pkg.version) + 1
-
-  exec(`git checkout -b v${major}.x`)
-  exec(`git push -u origin HEAD`)
-
-  bump(`${nextMajor}.0.0-pre`)
-
-  exec(`git checkout v${major}.x`)
-}
-
-bump(version)
-
-exec(`git checkout ${currentBranch}`)
-
-function bump (newVersion) {
-  pkg.version = newVersion
-
-  exec(`git checkout -b v${newVersion}-bump`)
-  write('package.json', JSON.stringify(pkg, null, 2) + '\n')
-  write('packages/dd-trace/lib/version.js', `module.exports = '${newVersion}'\n`)
-  add('package.json')
-  add('packages/dd-trace/lib/version.js')
-  exec(`git commit -m "v${newVersion}"`)
-  exec(`git push -u origin HEAD`)
-}
-
-function getIncrement () {
-  const increments = ['major', 'premajor', 'minor', 'preminor', 'patch', 'prepatch', 'prerelease']
-  const index = increments.indexOf(process.argv[2])
-
-  if (index === -1) {
-    throw new Error(`increment must be one of ${increments.join(', ')}`)
-  }
-
-  return increments[index]
-}
-
-function filename (relativePath) {
-  return path.normalize(path.join(__dirname, '..', relativePath))
-}
-
-function write (file, data) {
-  fs.writeFileSync(filename(file), data)
-}
-
-function add (file) {
-  exec(`git add ${filename(file)}`)
-}