dd-trace 2.41.0 → 2.42.1

package/packages/dd-trace/src/lambda/handler.js

@@ -86,6 +86,13 @@ exports.datadog = function datadog (lambdaHandler) {
     const context = extractContext(args)
 
     checkTimeout(context)
-    return lambdaHandler.apply(this, args).then((res) => { clearTimeout(__lambdaTimeout); return res })
+    const result = lambdaHandler.apply(this, args)
+    if (result && typeof result.then === 'function') {
+      return result.then((res) => {
+        clearTimeout(__lambdaTimeout)
+        return res
+      })
+    }
+    return result
   }
 }

package/packages/dd-trace/src/opentelemetry/span.js

@@ -10,6 +10,7 @@ const { timeInputToHrTime } = require('@opentelemetry/core')
 const tracer = require('../../')
 const DatadogSpan = require('../opentracing/span')
 const { ERROR_MESSAGE, ERROR_TYPE, ERROR_STACK } = require('../constants')
+const { SERVICE_NAME, RESOURCE_NAME } = require('../../../../ext/tags')
 
 const SpanContext = require('./span_context')
 
@@ -40,7 +41,8 @@ class Span {
       hostname: _tracer._hostname,
       integrationName: 'otel',
       tags: {
-        'service.name': _tracer._service
+        [SERVICE_NAME]: _tracer._service,
+        [RESOURCE_NAME]: spanName
       }
     }, _tracer._debug)
 

package/packages/dd-trace/src/opentracing/span_context.js

@@ -12,7 +12,8 @@ class DatadogSpanContext {
     this._name = props.name
     this._isFinished = props.isFinished || false
     this._tags = props.tags || {}
-    this._sampling = Object.assign({}, props.sampling)
+    this._sampling = props.sampling || {}
+    this._spanSampling = undefined
     this._baggageItems = props.baggageItems || {}
     this._traceparent = props.traceparent
     this._tracestate = props.tracestate

package/packages/dd-trace/src/plugins/index.js

@@ -10,6 +10,7 @@ module.exports = {
   get '@grpc/grpc-js' () { return require('../../../datadog-plugin-grpc/src') },
   get '@hapi/hapi' () { return require('../../../datadog-plugin-hapi/src') },
   get '@jest/core' () { return require('../../../datadog-plugin-jest/src') },
+  get '@jest/transform' () { return require('../../../datadog-plugin-jest/src') },
   get '@koa/router' () { return require('../../../datadog-plugin-koa/src') },
   get '@node-redis/client' () { return require('../../../datadog-plugin-redis/src') },
   get '@opensearch-project/opensearch' () { return require('../../../datadog-plugin-opensearch/src') },

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

@@ -399,6 +399,7 @@ module.exports = {
         BITBUCKET_BRANCH,
         BITBUCKET_COMMIT,
         BITBUCKET_GIT_SSH_ORIGIN,
+        BITBUCKET_GIT_HTTP_ORIGIN,
         BITBUCKET_TAG,
         BITBUCKET_PIPELINE_UUID,
         BITBUCKET_CLONE_DIR
@@ -416,7 +417,7 @@ module.exports = {
         [CI_PIPELINE_URL]: url,
         [GIT_BRANCH]: BITBUCKET_BRANCH,
         [GIT_TAG]: BITBUCKET_TAG,
-        [GIT_REPOSITORY_URL]: BITBUCKET_GIT_SSH_ORIGIN,
+        [GIT_REPOSITORY_URL]: BITBUCKET_GIT_SSH_ORIGIN || BITBUCKET_GIT_HTTP_ORIGIN,
         [CI_WORKSPACE_PATH]: BITBUCKET_CLONE_DIR,
         [CI_PIPELINE_ID]: BITBUCKET_PIPELINE_UUID && BITBUCKET_PIPELINE_UUID.replace(/{|}/gm, '')
       }

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

@@ -103,6 +103,7 @@ const web = {
     context.res = res
 
     this.setConfig(req, config)
+    addRequestTags(context)
 
     return span
   },

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

@@ -18,7 +18,6 @@ class Config {
     const {
       DD_PROFILING_ENABLED,
       DD_PROFILING_PROFILERS,
-      DD_PROFILING_ENDPOINT_COLLECTION_ENABLED,
       DD_ENV,
       DD_TAGS,
       DD_SERVICE,
@@ -36,7 +35,9 @@ class Config {
       DD_PROFILING_EXPERIMENTAL_OOM_MONITORING_ENABLED,
       DD_PROFILING_EXPERIMENTAL_OOM_HEAP_LIMIT_EXTENSION_SIZE,
       DD_PROFILING_EXPERIMENTAL_OOM_MAX_HEAP_EXTENSION_COUNT,
-      DD_PROFILING_EXPERIMENTAL_OOM_EXPORT_STRATEGIES
+      DD_PROFILING_EXPERIMENTAL_OOM_EXPORT_STRATEGIES,
+      DD_PROFILING_EXPERIMENTAL_CODEHOTSPOTS_ENABLED,
+      DD_PROFILING_EXPERIMENTAL_ENDPOINT_COLLECTION_ENABLED
     } = process.env
 
     const enabled = isTrue(coalesce(options.enabled, DD_PROFILING_ENABLED, true))
@@ -51,8 +52,8 @@ class Config {
       Number(DD_PROFILING_UPLOAD_TIMEOUT), 60 * 1000)
     const sourceMap = coalesce(options.sourceMap,
       DD_PROFILING_SOURCE_MAP, true)
-    const endpointCollection = coalesce(options.endpointCollection,
-      DD_PROFILING_ENDPOINT_COLLECTION_ENABLED, false)
+    const endpointCollectionEnabled = coalesce(options.endpointCollection,
+      DD_PROFILING_EXPERIMENTAL_ENDPOINT_COLLECTION_ENABLED, false)
     const pprofPrefix = coalesce(options.pprofPrefix,
       DD_PROFILING_PPROF_PREFIX, '')
 
@@ -73,7 +74,7 @@ class Config {
     this.uploadTimeout = uploadTimeout
     this.sourceMap = sourceMap
     this.debugSourceMaps = isTrue(coalesce(options.debugSourceMaps, DD_PROFILING_DEBUG_SOURCE_MAPS, false))
-    this.endpointCollection = endpointCollection
+    this.endpointCollectionEnabled = endpointCollectionEnabled
     this.pprofPrefix = pprofPrefix
 
     const hostname = coalesce(options.hostname, DD_AGENT_HOST) || 'localhost'
@@ -110,6 +111,8 @@ class Config {
     const profilers = options.profilers
       ? options.profilers
       : getProfilers({ DD_PROFILING_HEAP_ENABLED, DD_PROFILING_WALLTIME_ENABLED, DD_PROFILING_PROFILERS })
+    this.codeHotspotsEnabled = isTrue(coalesce(options.codeHotspotsEnabled,
+      DD_PROFILING_EXPERIMENTAL_CODEHOTSPOTS_ENABLED, false))
 
     this.profilers = ensureProfilers(profilers, this)
   }

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

@@ -1,7 +1,8 @@
 'use strict'
 
 const retry = require('retry')
-const { request } = require('http')
+const { request: httpRequest } = require('http')
+const { request: httpsRequest } = require('https')
 
 // TODO: avoid using dd-trace internals. Make this a separate module?
 const docker = require('../../exporters/common/docker')
@@ -12,6 +13,8 @@ const version = require('../../../../../package.json').version
 const containerId = docker.id()
 
 function sendRequest (options, form, callback) {
+  const request = options.protocol === 'https:' ? httpsRequest : httpRequest
+
   const store = storage.getStore()
   storage.enterWith({ noop: true })
   const req = request(options, res => {

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

@@ -23,7 +23,7 @@ class Profiler extends EventEmitter {
   }
 
   start (options) {
-    this._start(options).catch(() => {})
+    this._start(options).catch((err) => { if (options.logger) options.logger.error(err) })
     return this
   }
 

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

@@ -1,23 +1,111 @@
 'use strict'
 
+const { storage } = require('../../../../datadog-core')
+
+const dc = require('../../../../diagnostics_channel')
+
+const beforeCh = dc.channel('dd-trace:storage:before')
+const enterCh = dc.channel('dd-trace:storage:enter')
+
+let kSampleCount
+
+function getActiveSpan () {
+  const store = storage.getStore()
+  return store && store.span
+}
+
+function getStartedSpans (context) {
+  return context._trace.started
+}
+
+function generateLabels ({ spanId, rootSpanId, webTags, endpoint }) {
+  const labels = {}
+  if (spanId) {
+    labels['span id'] = spanId
+  }
+  if (rootSpanId) {
+    labels['local root span id'] = rootSpanId
+  }
+  if (webTags && Object.keys(webTags).length !== 0) {
+    labels['trace endpoint'] = endpointNameFromTags(webTags)
+  } else if (endpoint) {
+    // fallback to endpoint computed when sample was taken
+    labels['trace endpoint'] = endpoint
+  }
+
+  return labels
+}
+
+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(' ')
+}
+
+function updateContext (context, span, startedSpans, endpointCollectionEnabled) {
+  context.spanId = span.context().toSpanId()
+  const rootSpan = startedSpans[0]
+  if (rootSpan) {
+    context.rootSpanId = rootSpan.context().toSpanId()
+    if (endpointCollectionEnabled) {
+      // Find the first webspan starting from the end:
+      // There might be several webspans, for example with next.js, http plugin creates a first span
+      // and then next.js plugin creates a child span, and this child span haves the correct endpoint information.
+      for (let i = startedSpans.length - 1; i >= 0; i--) {
+        const tags = getSpanContextTags(startedSpans[i])
+        if (isWebServerSpan(tags)) {
+          context.webTags = tags
+          // endpoint may not be determined yet, but keep it as fallback
+          // if tags are not available anymore during serialization
+          context.endpoint = endpointNameFromTags(tags)
+          break
+        }
+      }
+    }
+  }
+}
+
 class NativeWallProfiler {
   constructor (options = {}) {
     this.type = 'wall'
     this._samplingIntervalMicros = options.samplingInterval || 1e6 / 99 // 99hz
     this._flushIntervalMillis = options.flushInterval || 60 * 1e3 // 60 seconds
     this._codeHotspotsEnabled = !!options.codeHotspotsEnabled
+    this._endpointCollectionEnabled = !!options.endpointCollectionEnabled
     this._mapper = undefined
     this._pprof = undefined
 
+    // Bind to this so the same value can be used to unsubscribe later
+    this._enter = this._enter.bind(this)
     this._logger = options.logger
     this._started = false
   }
 
+  codeHotspotsEnabled () {
+    return this._codeHotspotsEnabled
+  }
+
   start ({ mapper } = {}) {
     if (this._started) return
 
+    if (this._codeHotspotsEnabled && !this._emittedFFMessage && this._logger) {
+      this._logger.debug(
+        `Wall profiler: Enable config_trace_show_breakdown_profiling_for_node feature flag to see code hotspots.`)
+      this._emittedFFMessage = true
+    }
+
     this._mapper = mapper
     this._pprof = require('@datadog/pprof')
+    kSampleCount = this._pprof.time.constants.kSampleCount
 
     // pprof otherwise crashes in worker threads
     if (!process._startProfilerIdleNotifier) {
@@ -31,16 +119,62 @@ class NativeWallProfiler {
       intervalMicros: this._samplingIntervalMicros,
       durationMillis: this._flushIntervalMillis,
       sourceMapper: this._mapper,
-      customLabels: this._codeHotspotsEnabled,
+      withContexts: this._codeHotspotsEnabled,
       lineNumbers: false
     })
 
+    if (this._codeHotspotsEnabled) {
+      this._profilerState = this._pprof.time.getState()
+      this._currentContext = {}
+      this._pprof.time.setContext(this._currentContext)
+      this._lastSpan = undefined
+      this._lastStartedSpans = undefined
+      this._lastSampleCount = 0
+
+      beforeCh.subscribe(this._enter)
+      enterCh.subscribe(this._enter)
+    }
+
     this._started = true
   }
 
-  profile () {
+  _enter () {
     if (!this._started) return
-    return this._pprof.time.stop(true)
+
+    const sampleCount = this._profilerState[kSampleCount]
+    if (sampleCount !== this._lastSampleCount) {
+      this._lastSampleCount = sampleCount
+      const context = this._currentContext
+      this._currentContext = {}
+      this._pprof.time.setContext(this._currentContext)
+
+      if (this._lastSpan) {
+        updateContext(context, this._lastSpan, this._lastStartedSpans, this._endpointCollectionEnabled)
+      }
+    }
+
+    const span = getActiveSpan()
+    if (span) {
+      this._lastSpan = span
+      this._lastStartedSpans = getStartedSpans(span.context())
+    } else {
+      this._lastStartedSpans = undefined
+      this._lastSpan = undefined
+    }
+  }
+
+  _stop (restart) {
+    if (!this._started) return
+    if (this._codeHotspotsEnabled) {
+      // update last sample context if needed
+      this._enter()
+      this._lastSampleCount = 0
+    }
+    return this._pprof.time.stop(restart, this._codeHotspotsEnabled ? generateLabels : undefined)
+  }
+
+  profile () {
+    return this._stop(true)
   }
 
   encode (profile) {
@@ -50,7 +184,13 @@ class NativeWallProfiler {
   stop () {
     if (!this._started) return
 
-    const profile = this._pprof.time.stop()
+    const profile = this._stop(false)
+    if (this._codeHotspotsEnabled) {
+      beforeCh.unsubscribe(this._enter)
+      enterCh.subscribe(this._enter)
+      this._profilerState = undefined
+    }
+
     this._started = false
     return profile
   }

package/packages/dd-trace/src/service-naming/index.js

@@ -3,7 +3,7 @@ const { schemaDefinitions } = require('./schemas')
 class SchemaManager {
   constructor () {
     this.schemas = schemaDefinitions
-    this.config = { spanAttributeSchema: 'v0', traceRemoveIntegrationServiceNamesEnabled: false }
+    this.config = { spanAttributeSchema: 'v0', spanRemoveIntegrationFromService: false }
   }
 
   get schema () {
@@ -15,7 +15,7 @@ class SchemaManager {
   }
 
   get shouldUseConsistentServiceNaming () {
-    return this.config.traceRemoveIntegrationServiceNamesEnabled && this.version === 'v0'
+    return this.config.spanRemoveIntegrationFromService && this.version === 'v0'
   }
 
   opName (type, kind, plugin, ...opNameArgs) {

package/packages/dd-trace/src/service-naming/schemas/v0/graphql.js

@@ -0,0 +1,12 @@
+const { identityService } = require('../util')
+
+const graphql = {
+  server: {
+    graphql: {
+      opName: () => 'graphql.execute',
+      serviceName: identityService
+    }
+  }
+}
+
+module.exports = graphql

package/packages/dd-trace/src/service-naming/schemas/v0/index.js

@@ -1,6 +1,7 @@
 const SchemaDefinition = require('../definition')
 const messaging = require('./messaging')
 const storage = require('./storage')
+const graphql = require('./graphql')
 const web = require('./web')
 
-module.exports = new SchemaDefinition({ messaging, storage, web })
+module.exports = new SchemaDefinition({ messaging, storage, web, graphql })

package/packages/dd-trace/src/service-naming/schemas/v1/graphql.js

@@ -0,0 +1,12 @@
+const { identityService } = require('../util')
+
+const graphql = {
+  server: {
+    graphql: {
+      opName: () => 'graphql.server.request',
+      serviceName: identityService
+    }
+  }
+}
+
+module.exports = graphql

package/packages/dd-trace/src/service-naming/schemas/v1/index.js

@@ -1,6 +1,7 @@
 const SchemaDefinition = require('../definition')
 const messaging = require('./messaging')
 const storage = require('./storage')
+const graphql = require('./graphql')
 const web = require('./web')
 
-module.exports = new SchemaDefinition({ messaging, storage, web })
+module.exports = new SchemaDefinition({ messaging, storage, web, graphql })

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

@@ -138,10 +138,6 @@ class SpanProcessor {
       }
     }
 
-    for (const span of trace.finished) {
-      span.context()._tags = {}
-    }
-
     trace.started = active
     trace.finished = []
   }

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

@@ -82,7 +82,7 @@ class SpanSampler {
 
       const rule = this.findRule(service, name)
       if (rule && rule.sample()) {
-        span.context()._sampling.spanSampling = {
+        span.context()._spanSampling = {
           sampleRate: rule.sampleRate,
           maxPerSecond: rule.maxPerSecond
         }

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

@@ -7,8 +7,10 @@ const { sendData } = require('./send-data')
 const dc = require('../../../diagnostics_channel')
 const { fileURLToPath } = require('url')
 
-const savedDependencies = new Set()
-const detectedDependencyNames = new Set()
+const savedDependenciesToSend = new Set()
+const detectedDependencyKeys = new Set()
+const detectedDependencyVersions = new Set()
+
 const FILE_URI_START = `file://`
 const moduleLoadStartChannel = dc.channel('dd-trace:moduleLoadStart')
 
@@ -18,14 +20,14 @@ function waitAndSend (config, application, host) {
   if (!immediate) {
     immediate = setImmediate(() => {
       immediate = null
-      if (savedDependencies.size > 0) {
-        const dependencies = Array.from(savedDependencies.values()).splice(0, 1000).map(pair => {
-          savedDependencies.delete(pair)
+      if (savedDependenciesToSend.size > 0) {
+        const dependencies = Array.from(savedDependenciesToSend.values()).splice(0, 1000).map(pair => {
+          savedDependenciesToSend.delete(pair)
           const [name, version] = pair.split(' ')
           return { name, version }
         })
         sendData(config, application, host, 'app-dependencies-loaded', { dependencies })
-        if (savedDependencies.size > 0) {
+        if (savedDependenciesToSend.size > 0) {
           waitAndSend(config, application, host)
         }
       }
@@ -46,15 +48,24 @@ function onModuleLoad (data) {
     }
     const parseResult = filename && parse(filename)
     const request = data.request || (parseResult && parseResult.name)
-    if (filename && request && isDependency(filename, request) && !detectedDependencyNames.has(request)) {
-      detectedDependencyNames.add(request)
+    const dependencyKey = parseResult && parseResult.basedir ? parseResult.basedir : request
+
+    if (filename && request && isDependency(filename, request) && !detectedDependencyKeys.has(dependencyKey)) {
+      detectedDependencyKeys.add(dependencyKey)
+
       if (parseResult) {
         const { name, basedir } = parseResult
         if (basedir) {
           try {
             const { version } = requirePackageJson(basedir, module)
-            savedDependencies.add(`${name} ${version}`)
-            waitAndSend(config, application, host)
+            const dependencyAndVersion = `${name} ${version}`
+
+            if (!detectedDependencyVersions.has(dependencyAndVersion)) {
+              savedDependenciesToSend.add(dependencyAndVersion)
+              detectedDependencyVersions.add(dependencyAndVersion)
+
+              waitAndSend(config, application, host)
+            }
           } catch (e) {
             // can not read the package.json, do nothing
           }
@@ -88,8 +99,9 @@ function stop () {
   config = null
   application = null
   host = null
-  detectedDependencyNames.clear()
-  savedDependencies.clear()
+  detectedDependencyKeys.clear()
+  savedDependenciesToSend.clear()
+  detectedDependencyVersions.clear()
   if (moduleLoadStartChannel.hasSubscribers) {
     moduleLoadStartChannel.unsubscribe(onModuleLoad)
   }

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

@@ -64,7 +64,7 @@ if (!Channel.prototype.runStores) {
     this._stores.set(store, transform)
   }
 
-  Channel.prototype.unbindStore = ActiveChannelPrototype.runStores = function (store) {
+  Channel.prototype.unbindStore = ActiveChannelPrototype.unbindStore = function (store) {
     if (!this._stores) return
     this._stores.delete(store)
   }

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)}`)
-}