dd-trace 2.0.0-beta.0 → 2.1.1

package/packages/dd-trace/src/appsec/reporter.js

@@ -1,6 +1,10 @@
 'use strict'
 
 const addresses = require('./addresses')
+const Limiter = require('../rate_limiter')
+
+// default limiter, configurable with setRateLimit()
+let limiter = new Limiter(100)
 
 const REQUEST_HEADERS_PASSLIST = [
   'accept',
@@ -85,8 +89,11 @@ function reportAttack (attackData, store) {
   const currentTags = topSpan.context()._tags
 
   const newTags = {
-    'appsec.event': true,
-    'manual.keep': true // TODO: figure out how to keep appsec traces with sampling revamp
+    'appsec.event': 'true'
+  }
+
+  if (limiter.isAllowed()) {
+    newTags['manual.keep'] = 'true' // TODO: figure out how to keep appsec traces with sampling revamp
   }
 
   // TODO: maybe add this to format.js later (to take decision as late as possible)
@@ -136,11 +143,16 @@ function finishAttacks (req, context) {
   topSpan.addTags(newTags)
 }
 
+function setRateLimit (rateLimit) {
+  limiter = new Limiter(rateLimit)
+}
+
 module.exports = {
   resolveHTTPRequest,
   resolveHTTPResponse,
   filterHeaders,
   formatHeaderName,
   reportAttack,
-  finishAttacks
+  finishAttacks,
+  setRateLimit
 }

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

@@ -134,6 +134,11 @@ class Config {
       process.env.DD_APPSEC_RULES,
       path.join(__dirname, 'appsec', 'recommended.json')
     )
+    const DD_APPSEC_TRACE_RATE_LIMIT = coalesce(
+      appsec.rateLimit,
+      process.env.DD_APPSEC_TRACE_RATE_LIMIT,
+      100
+    )
 
     const sampler = (options.experimental && options.experimental.sampler) || {}
     const ingestion = options.ingestion || {}
@@ -198,7 +203,8 @@ class Config {
     this.protocolVersion = DD_TRACE_AGENT_PROTOCOL_VERSION
     this.appsec = {
       enabled: isTrue(DD_APPSEC_ENABLED),
-      rules: DD_APPSEC_RULES
+      rules: DD_APPSEC_RULES,
+      rateLimit: DD_APPSEC_TRACE_RATE_LIMIT
     }
 
     tagger.add(this.tags, {

package/packages/dd-trace/src/profiling/config.js

@@ -20,7 +20,8 @@ const {
   DD_TRACE_AGENT_URL,
   DD_AGENT_HOST,
   DD_TRACE_AGENT_PORT,
-  DD_PROFILING_UPLOAD_TIMEOUT
+  DD_PROFILING_UPLOAD_TIMEOUT,
+  DD_PROFILING_SOURCE_MAP
 } = process.env
 
 class Config {
@@ -34,6 +35,8 @@ class Config {
     const flushInterval = coalesce(options.interval, 65 * 1000)
     const uploadTimeout = coalesce(options.uploadTimeout,
       DD_PROFILING_UPLOAD_TIMEOUT, 60 * 1000)
+    const sourceMap = coalesce(options.sourceMap,
+      DD_PROFILING_SOURCE_MAP, true)
 
     this.enabled = String(enabled) !== 'false'
     this.service = service
@@ -49,6 +52,7 @@ class Config {
     this.logger = ensureLogger(options.logger)
     this.flushInterval = flushInterval
     this.uploadTimeout = uploadTimeout
+    this.sourceMap = sourceMap
 
     const hostname = coalesce(options.hostname, DD_AGENT_HOST, 'localhost')
     const port = coalesce(options.port, DD_TRACE_AGENT_PORT, 8126)

package/packages/dd-trace/src/profiling/profiler.js

@@ -2,7 +2,15 @@
 
 const { EventEmitter } = require('events')
 const { Config } = require('./config')
-const { SourceMapper } = require('./mapper')
+
+function maybeSourceMap (sourceMap) {
+  if (!sourceMap) return
+
+  const { SourceMapper } = require('@datadog/pprof')
+  return SourceMapper.create([
+    process.cwd()
+  ])
+}
 
 class Profiler extends EventEmitter {
   constructor () {
@@ -15,18 +23,21 @@ class Profiler extends EventEmitter {
   }
 
   start (options) {
+    this._start(options).catch(() => {})
+    return this
+  }
+
+  async _start (options) {
     if (this._enabled) return
 
     const config = this._config = new Config(options)
-
     if (!config.enabled) return
 
     this._logger = config.logger
-
     this._enabled = true
 
     try {
-      const mapper = config.sourceMap ? new SourceMapper() : null
+      const mapper = await maybeSourceMap(config.sourceMap)
 
       for (const profiler of config.profilers) {
         // TODO: move this out of Profiler when restoring sourcemap support
@@ -39,8 +50,6 @@ class Profiler extends EventEmitter {
       this._logger.error(e)
       this.stop()
     }
-
-    return this
   }
 
   stop () {

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

@@ -39,7 +39,7 @@ class NativeCpuProfiler {
 
   _record () {
     this._stop = this._pprof.time.start(this._samplingInterval, null,
-      this._mapper)
+      this._mapper, false)
   }
 }
 

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

@@ -8,13 +8,14 @@ class NativeHeapProfiler {
     this._pprof = undefined
   }
 
-  start () {
+  start ({ mapper } = {}) {
+    this._mapper = mapper
     this._pprof = require('@datadog/pprof')
     this._pprof.heap.start(this._samplingInterval, this._stackDepth)
   }
 
   profile () {
-    return this._pprof.heap.profile()
+    return this._pprof.heap.profile(undefined, this._mapper)
   }
 
   encode (profile) {

package/scripts/publish_docs.js

@@ -18,4 +18,4 @@ exec('git init', { cwd: './docs/out' }) // cloning would overwrite generated doc
 exec('git remote add origin git@github.com:DataDog/dd-trace-js.git', { cwd: './docs/out' })
 exec('git add -A', { cwd: './docs/out' })
 exec(`git commit -m "${msg}"`, { cwd: './docs/out' })
-exec('git push -f origin master:gh-pages', { cwd: './docs/out' })
+exec('git push -f origin main:gh-pages', { cwd: './docs/out' })

package/scripts/tracer-runner.js

@@ -0,0 +1,13 @@
+'use strict'
+
+const spawnWrap = require('spawn-wrap')
+const path = require('path')
+
+spawnWrap(['--require', path.join(__dirname, '..', 'init.js')])
+
+const { spawn } = require('child_process')
+
+const [command, ...argv] = process.argv.slice(2)
+spawn(command, argv, {
+  stdio: 'inherit'
+})

package/packages/dd-trace/src/profiling/mapper.js

@@ -1,91 +0,0 @@
-'use strict'
-
-// TODO: use sourceRoot when set, possibly from source-map-resolve
-
-const fs = require('fs')
-const { SourceMapConsumer } = require('source-map')
-const sourceMapResolve = require('source-map-resolve')
-const { fileURLToPath, pathToFileURL } = require('url')
-
-class SourceMapper {
-  constructor () {
-    this._consumers = Object.create(null)
-    this._sources = Object.create(null)
-  }
-
-  async getSource (callFrame) {
-    const { url, lineNumber, columnNumber, functionName } = callFrame
-    const key = `${url}:${functionName}:${lineNumber}:${columnNumber}`
-
-    if (!this._sources[key]) {
-      this._sources[key] = await this._getMapping(callFrame)
-    }
-
-    return this._sources[key]
-  }
-
-  async _getConsumer (url) {
-    if (this._consumers[url] === undefined) {
-      this._consumers[url] = this._createConsumer(url)
-    }
-
-    return this._consumers[url]
-  }
-
-  async _createConsumer (url) {
-    try {
-      const map = await this._resolve(url)
-
-      return map ? new SourceMapConsumer(map) : null
-    } catch (e) {
-      return null
-    }
-  }
-
-  async _getMapping (callFrame) {
-    const { url, functionName, lineNumber, columnNumber } = callFrame
-
-    // Runtime.CallFrame is 0-based for both line and column numbers.
-    // When the line or column number is not known the value is -1.
-    // https://chromedevtools.github.io/devtools-protocol/v8/Runtime/#type-CallFrame
-    if (lineNumber < 0 || columnNumber < 0) return callFrame
-
-    const consumer = await this._getConsumer(url)
-
-    if (!consumer) return callFrame
-
-    // SourceMapConsumer is 1-based for lines and 0-based for columns
-    // https://github.com/mozilla/source-map/blob/0.7.3/lib/source-map-consumer.js#L464-L487
-    const map = consumer.originalPositionFor({
-      line: lineNumber + 1,
-      column: columnNumber
-    })
-
-    if (!map || !map.source || !map.line) return callFrame
-
-    return {
-      url: pathToFileURL(map.source).href,
-      lineNumber: map.line - 1, // reset to 0-based from 1-based
-      columnNumber: map.column !== null ? map.column : -1,
-      functionName: map.name || functionName
-    }
-  }
-
-  async _resolve (url) {
-    const filename = fileURLToPath(url)
-    const code = (await fs.promises.readFile(filename)).toString()
-
-    return new Promise((resolve, reject) => {
-      sourceMapResolve.resolve(code, filename, fs.readFile, (error, result) => {
-        if (!result || error) return resolve(null)
-
-        result.map.sourcesContent = result.sourcesContent
-        result.map.sources = result.sourcesResolved
-
-        resolve(result.map)
-      })
-    })
-  }
-}
-
-module.exports = { SourceMapper }