dd-trace 2.0.0 → 2.2.0

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/packages/dd-trace/src/tagger.js

@@ -5,32 +5,25 @@ const log = require('./log')
 function add (carrier, keyValuePairs) {
   if (!carrier || !keyValuePairs) return
 
-  if (typeof keyValuePairs === 'string') {
-    return add(
-      carrier,
-      keyValuePairs
-        .split(',')
-        .filter(tag => tag.indexOf(':') !== -1)
-        .reduce((prev, next) => {
-          const tag = next.split(':')
-          const key = tag[0].trim()
-          const value = tag.slice(1).join(':').trim()
-
-          prev[key] = value
-
-          return prev
-        }, {})
-    )
-  }
-
   if (Array.isArray(keyValuePairs)) {
     return keyValuePairs.forEach(tags => add(carrier, tags))
   }
 
   try {
-    Object.keys(keyValuePairs).forEach(key => {
-      carrier[key] = keyValuePairs[key]
-    })
+    if (typeof keyValuePairs === 'string') {
+      const segments = keyValuePairs.split(',')
+      for (const segment of segments) {
+        const separatorIndex = segment.indexOf(':')
+        if (separatorIndex === -1) continue
+
+        const key = segment.slice(0, separatorIndex)
+        const value = segment.slice(separatorIndex + 1)
+
+        carrier[key.trim()] = value.trim()
+      }
+    } else {
+      Object.assign(carrier, keyValuePairs)
+    }
   } catch (e) {
     log.error(e)
   }

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

@@ -21,7 +21,7 @@ class DatadogTracer extends Tracer {
   }
 
   trace (name, options, fn) {
-    options = Object.assign({}, {
+    options = Object.assign({
       childOf: this.scope().active()
     }, options)
 

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/NOTICE

@@ -1,4 +0,0 @@
-Datadog dd-trace-js
-Copyright 2016-Present Datadog, Inc.
-
-This product includes software developed at Datadog, Inc. (https://www.datadoghq.com/).

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 }