dd-trace 4.11.1 → 4.13.0

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

@@ -2,7 +2,7 @@
 
 const request = require('../common/request')
 const { startupLog } = require('../../startup-log')
-const metrics = require('../../metrics')
+const runtimeMetrics = require('../../runtime_metrics')
 const log = require('../../log')
 const tracerVersion = require('../../../../../package.json').version
 const BaseWriter = require('../common/writer')
@@ -22,19 +22,19 @@ class Writer extends BaseWriter {
   }
 
   _sendPayload (data, count, done) {
-    metrics.increment(`${METRIC_PREFIX}.requests`, true)
+    runtimeMetrics.increment(`${METRIC_PREFIX}.requests`, true)
 
     const { _headers, _lookup, _protocolVersion, _url } = this
     makeRequest(_protocolVersion, data, count, _url, _headers, _lookup, true, (err, res, status) => {
       if (status) {
-        metrics.increment(`${METRIC_PREFIX}.responses`, true)
-        metrics.increment(`${METRIC_PREFIX}.responses.by.status`, `status:${status}`, true)
+        runtimeMetrics.increment(`${METRIC_PREFIX}.responses`, true)
+        runtimeMetrics.increment(`${METRIC_PREFIX}.responses.by.status`, `status:${status}`, true)
       } else if (err) {
-        metrics.increment(`${METRIC_PREFIX}.errors`, true)
-        metrics.increment(`${METRIC_PREFIX}.errors.by.name`, `name:${err.name}`, true)
+        runtimeMetrics.increment(`${METRIC_PREFIX}.errors`, true)
+        runtimeMetrics.increment(`${METRIC_PREFIX}.errors.by.name`, `name:${err.name}`, true)
 
         if (err.code) {
-          metrics.increment(`${METRIC_PREFIX}.errors.by.code`, `code:${err.code}`, true)
+          runtimeMetrics.increment(`${METRIC_PREFIX}.errors.by.code`, `code:${err.code}`, true)
         }
       }
 
@@ -53,8 +53,8 @@ class Writer extends BaseWriter {
       } catch (e) {
         log.error(e)
 
-        metrics.increment(`${METRIC_PREFIX}.errors`, true)
-        metrics.increment(`${METRIC_PREFIX}.errors.by.name`, `name:${e.name}`, true)
+        runtimeMetrics.increment(`${METRIC_PREFIX}.errors`, true)
+        runtimeMetrics.increment(`${METRIC_PREFIX}.errors.by.name`, `name:${e.name}`, true)
       }
       done()
     })

package/packages/dd-trace/src/exporters/common/request.js

@@ -42,10 +42,19 @@ function urlToOptions (url) {
   return options
 }
 
-function fromUrlString (url) {
-  return typeof urlToHttpOptions === 'function'
-    ? urlToOptions(new URL(url))
-    : urlParse(url)
+function fromUrlString (urlString) {
+  const url = typeof urlToHttpOptions === 'function'
+    ? urlToOptions(new URL(urlString))
+    : urlParse(urlString)
+
+  // Add the 'hostname' back if we're using named pipes
+  if (url.protocol === 'unix:' && url.host === '.') {
+    const udsPath = urlString.replace(/^unix:/, '')
+    url.path = udsPath
+    url.pathname = udsPath
+  }
+
+  return url
 }
 
 function request (data, options, callback) {

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

@@ -8,7 +8,7 @@ const semver = require('semver')
 const SpanContext = require('./span_context')
 const id = require('../id')
 const tagger = require('../tagger')
-const metrics = require('../metrics')
+const runtimeMetrics = require('../runtime_metrics')
 const log = require('../log')
 const { storage } = require('../../../datadog-core')
 const telemetryMetrics = require('../telemetry/metrics')
@@ -79,11 +79,11 @@ class DatadogSpan {
     this._startTime = fields.startTime || this._getTime()
 
     if (DD_TRACE_EXPERIMENTAL_SPAN_COUNTS && finishedRegistry) {
-      metrics.increment('runtime.node.spans.unfinished')
-      metrics.increment('runtime.node.spans.unfinished.by.name', `span_name:${operationName}`)
+      runtimeMetrics.increment('runtime.node.spans.unfinished')
+      runtimeMetrics.increment('runtime.node.spans.unfinished.by.name', `span_name:${operationName}`)
 
-      metrics.increment('runtime.node.spans.open') // unfinished for real
-      metrics.increment('runtime.node.spans.open.by.name', `span_name:${operationName}`)
+      runtimeMetrics.increment('runtime.node.spans.open') // unfinished for real
+      runtimeMetrics.increment('runtime.node.spans.open.by.name', `span_name:${operationName}`)
 
       unfinishedRegistry.register(this, operationName, this)
     }
@@ -159,13 +159,13 @@ class DatadogSpan {
     getIntegrationCounter('span_finished', this._integrationName).inc()
 
     if (DD_TRACE_EXPERIMENTAL_SPAN_COUNTS && finishedRegistry) {
-      metrics.decrement('runtime.node.spans.unfinished')
-      metrics.decrement('runtime.node.spans.unfinished.by.name', `span_name:${this._name}`)
-      metrics.increment('runtime.node.spans.finished')
-      metrics.increment('runtime.node.spans.finished.by.name', `span_name:${this._name}`)
+      runtimeMetrics.decrement('runtime.node.spans.unfinished')
+      runtimeMetrics.decrement('runtime.node.spans.unfinished.by.name', `span_name:${this._name}`)
+      runtimeMetrics.increment('runtime.node.spans.finished')
+      runtimeMetrics.increment('runtime.node.spans.finished.by.name', `span_name:${this._name}`)
 
-      metrics.decrement('runtime.node.spans.open') // unfinished for real
-      metrics.decrement('runtime.node.spans.open.by.name', `span_name:${this._name}`)
+      runtimeMetrics.decrement('runtime.node.spans.open') // unfinished for real
+      runtimeMetrics.decrement('runtime.node.spans.open.by.name', `span_name:${this._name}`)
 
       unfinishedRegistry.unregister(this)
       finishedRegistry.register(this, this._name)
@@ -243,8 +243,8 @@ function createRegistry (type) {
   if (!semver.satisfies(process.version, '>=14.6')) return
 
   return new global.FinalizationRegistry(name => {
-    metrics.decrement(`runtime.node.spans.${type}`)
-    metrics.decrement(`runtime.node.spans.${type}.by.name`, [`span_name:${name}`])
+    runtimeMetrics.decrement(`runtime.node.spans.${type}`)
+    runtimeMetrics.decrement(`runtime.node.spans.${type}.by.name`, [`span_name:${name}`])
   })
 }
 

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

@@ -11,7 +11,7 @@ const LogPropagator = require('./propagation/log')
 const formats = require('../../../../ext/formats')
 
 const log = require('../log')
-const metrics = require('../metrics')
+const runtimeMetrics = require('../runtime_metrics')
 const getExporter = require('../exporter')
 const SpanContext = require('./span_context')
 
@@ -82,7 +82,7 @@ class DatadogTracer {
       this._propagators[format].inject(spanContext, carrier)
     } catch (e) {
       log.error(e)
-      metrics.increment('datadog.tracer.node.inject.errors', true)
+      runtimeMetrics.increment('datadog.tracer.node.inject.errors', true)
     }
   }
 
@@ -91,7 +91,7 @@ class DatadogTracer {
       return this._propagators[format].extract(carrier)
     } catch (e) {
       log.error(e)
-      metrics.increment('datadog.tracer.node.extract.errors', true)
+      runtimeMetrics.increment('datadog.tracer.node.extract.errors', true)
       return null
     }
   }

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

@@ -12,7 +12,10 @@ const {
   TEST_MODULE_ID,
   TEST_SESSION_ID,
   TEST_COMMAND,
-  TEST_MODULE
+  TEST_MODULE,
+  getTestSuiteCommonTags,
+  TEST_STATUS,
+  TEST_SKIPPED_BY_ITR
 } = require('./util/test')
 const Plugin = require('./plugin')
 const { COMPONENT } = require('../constants')
@@ -77,6 +80,24 @@ module.exports = class CiPlugin extends Plugin {
         }
       })
     })
+
+    this.addSub(`ci:${this.constructor.id}:itr:skipped-suites`, ({ skippedSuites, frameworkVersion }) => {
+      const testCommand = this.testSessionSpan.context()._tags[TEST_COMMAND]
+      skippedSuites.forEach((testSuite) => {
+        const testSuiteMetadata = getTestSuiteCommonTags(testCommand, frameworkVersion, testSuite, this.constructor.id)
+
+        this.tracer.startSpan(`${this.constructor.id}.test_suite`, {
+          childOf: this.testModuleSpan,
+          tags: {
+            [COMPONENT]: this.constructor.id,
+            ...this.testEnvironmentMetadata,
+            ...testSuiteMetadata,
+            [TEST_STATUS]: 'skip',
+            [TEST_SKIPPED_BY_ITR]: 'true'
+          }
+        }).finish()
+      })
+    })
   }
 
   configure (config) {

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

@@ -47,6 +47,7 @@ const TEST_SESSION_ID = 'test_session_id'
 const TEST_MODULE_ID = 'test_module_id'
 const TEST_SUITE_ID = 'test_suite_id'
 const TEST_TOOLCHAIN = 'test.toolchain'
+const TEST_SKIPPED_BY_ITR = 'test.skipped_by_itr'
 
 const CI_APP_ORIGIN = 'ciapp-test'
 
@@ -54,6 +55,8 @@ const JEST_TEST_RUNNER = 'test.jest.test_runner'
 
 const TEST_ITR_TESTS_SKIPPED = '_dd.ci.itr.tests_skipped'
 const TEST_ITR_SKIPPING_ENABLED = 'test.itr.tests_skipping.enabled'
+const TEST_ITR_SKIPPING_TYPE = 'test.itr.tests_skipping.type'
+const TEST_ITR_SKIPPING_COUNT = 'test.itr.tests_skipping.count'
 const TEST_CODE_COVERAGE_ENABLED = 'test.code_coverage.enabled'
 
 const TEST_CODE_COVERAGE_LINES_PCT = 'test.code_coverage.lines_pct'
@@ -80,6 +83,7 @@ module.exports = {
   JEST_WORKER_TRACE_PAYLOAD_CODE,
   JEST_WORKER_COVERAGE_PAYLOAD_CODE,
   TEST_SOURCE_START,
+  TEST_SKIPPED_BY_ITR,
   getTestEnvironmentMetadata,
   getTestParametersString,
   finishAllTraceSpans,
@@ -99,6 +103,8 @@ module.exports = {
   TEST_ITR_TESTS_SKIPPED,
   TEST_MODULE,
   TEST_ITR_SKIPPING_ENABLED,
+  TEST_ITR_SKIPPING_TYPE,
+  TEST_ITR_SKIPPING_COUNT,
   TEST_CODE_COVERAGE_ENABLED,
   TEST_CODE_COVERAGE_LINES_PCT,
   addIntelligentTestRunnerSpanTags,
@@ -354,14 +360,25 @@ function getTestSuiteCommonTags (command, testFrameworkVersion, testSuite, testF
 function addIntelligentTestRunnerSpanTags (
   testSessionSpan,
   testModuleSpan,
-  { isSuitesSkipped, isSuitesSkippingEnabled, isCodeCoverageEnabled, testCodeCoverageLinesTotal }
+  {
+    isSuitesSkipped,
+    isSuitesSkippingEnabled,
+    isCodeCoverageEnabled,
+    testCodeCoverageLinesTotal,
+    skippingCount,
+    skippingType = 'suite'
+  }
 ) {
   testSessionSpan.setTag(TEST_ITR_TESTS_SKIPPED, isSuitesSkipped ? 'true' : 'false')
   testSessionSpan.setTag(TEST_ITR_SKIPPING_ENABLED, isSuitesSkippingEnabled ? 'true' : 'false')
+  testSessionSpan.setTag(TEST_ITR_SKIPPING_TYPE, skippingType)
+  testSessionSpan.setTag(TEST_ITR_SKIPPING_COUNT, skippingCount)
   testSessionSpan.setTag(TEST_CODE_COVERAGE_ENABLED, isCodeCoverageEnabled ? 'true' : 'false')
 
   testModuleSpan.setTag(TEST_ITR_TESTS_SKIPPED, isSuitesSkipped ? 'true' : 'false')
   testModuleSpan.setTag(TEST_ITR_SKIPPING_ENABLED, isSuitesSkippingEnabled ? 'true' : 'false')
+  testModuleSpan.setTag(TEST_ITR_SKIPPING_TYPE, skippingType)
+  testModuleSpan.setTag(TEST_ITR_SKIPPING_COUNT, skippingCount)
   testModuleSpan.setTag(TEST_CODE_COVERAGE_ENABLED, isCodeCoverageEnabled ? 'true' : 'false')
 
   // If suites have been skipped we don't want to report the total coverage, as it will be wrong

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

@@ -31,6 +31,7 @@ class Config {
       DD_PROFILING_UPLOAD_PERIOD,
       DD_PROFILING_PPROF_PREFIX,
       DD_PROFILING_HEAP_ENABLED,
+      DD_PROFILING_V8_PROFILER_BUG_WORKAROUND,
       DD_PROFILING_WALLTIME_ENABLED,
       DD_PROFILING_EXPERIMENTAL_OOM_MONITORING_ENABLED,
       DD_PROFILING_EXPERIMENTAL_OOM_HEAP_LIMIT_EXTENSION_SIZE,
@@ -76,7 +77,8 @@ class Config {
     this.debugSourceMaps = isTrue(coalesce(options.debugSourceMaps, DD_PROFILING_DEBUG_SOURCE_MAPS, false))
     this.endpointCollectionEnabled = endpointCollectionEnabled
     this.pprofPrefix = pprofPrefix
-
+    this.v8ProfilerBugWorkaroundEnabled = isTrue(coalesce(options.v8ProfilerBugWorkaround,
+      DD_PROFILING_V8_PROFILER_BUG_WORKAROUND, true))
     const hostname = coalesce(options.hostname, DD_AGENT_HOST) || 'localhost'
     const port = coalesce(options.port, DD_TRACE_AGENT_PORT) || 8126
     this.url = new URL(coalesce(options.url, DD_TRACE_AGENT_URL, format({

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

@@ -3,6 +3,9 @@
 const { storage } = require('../../../../datadog-core')
 
 const dc = require('../../../../diagnostics_channel')
+const { HTTP_METHOD, HTTP_ROUTE, RESOURCE_NAME, SPAN_TYPE } = require('../../../../../ext/tags')
+const { WEB } = require('../../../../../ext/types')
+const runtimeMetrics = require('../../runtime_metrics')
 
 const beforeCh = dc.channel('dd-trace:storage:before')
 const enterCh = dc.channel('dd-trace:storage:enter')
@@ -41,13 +44,13 @@ function getSpanContextTags (span) {
 }
 
 function isWebServerSpan (tags) {
-  return tags['span.type'] === 'web'
+  return tags[SPAN_TYPE] === WEB
 }
 
 function endpointNameFromTags (tags) {
-  return tags['resource.name'] || [
-    tags['http.method'],
-    tags['http.route']
+  return tags[RESOURCE_NAME] || [
+    tags[HTTP_METHOD],
+    tags[HTTP_ROUTE]
   ].filter(v => v).join(' ')
 }
 
@@ -81,6 +84,7 @@ class NativeWallProfiler {
     this._flushIntervalMillis = options.flushInterval || 60 * 1e3 // 60 seconds
     this._codeHotspotsEnabled = !!options.codeHotspotsEnabled
     this._endpointCollectionEnabled = !!options.endpointCollectionEnabled
+    this._v8ProfilerBugWorkaroundEnabled = !!options.v8ProfilerBugWorkaroundEnabled
     this._mapper = undefined
     this._pprof = undefined
 
@@ -99,7 +103,7 @@ class NativeWallProfiler {
 
     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.`)
+        `Wall profiler: Enable trace_show_breakdown_profiling_for_node feature flag to see code hotspots.`)
       this._emittedFFMessage = true
     }
 
@@ -120,7 +124,8 @@ class NativeWallProfiler {
       durationMillis: this._flushIntervalMillis,
       sourceMapper: this._mapper,
       withContexts: this._codeHotspotsEnabled,
-      lineNumbers: false
+      lineNumbers: false,
+      workaroundV8Bug: this._v8ProfilerBugWorkaroundEnabled
     })
 
     if (this._codeHotspotsEnabled) {
@@ -170,7 +175,18 @@ class NativeWallProfiler {
       this._enter()
       this._lastSampleCount = 0
     }
-    return this._pprof.time.stop(restart, this._codeHotspotsEnabled ? generateLabels : undefined)
+    const profile = this._pprof.time.stop(restart, this._codeHotspotsEnabled ? generateLabels : undefined)
+    if (restart) {
+      const v8BugDetected = this._pprof.time.v8ProfilerStuckEventLoopDetected()
+      if (v8BugDetected === 1) {
+        this._logger?.warn('Wall profiler: possible v8 profiler stuck event loop detected.')
+        runtimeMetrics.increment('runtime.node.profiler.v8_cpu_profiler_maybe_stuck_event_loop', undefined, true)
+      } else if (v8BugDetected === 2) {
+        this._logger?.warn('Wall profiler: v8 profiler stuck event loop detected.')
+        runtimeMetrics.increment('runtime.node.profiler.v8_cpu_profiler_stuck_event_loop', undefined, true)
+      }
+    }
+    return profile
   }
 
   profile () {

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

@@ -2,13 +2,14 @@
 const NoopProxy = require('./noop/proxy')
 const DatadogTracer = require('./tracer')
 const Config = require('./config')
-const metrics = require('./metrics')
+const runtimeMetrics = require('./runtime_metrics')
 const log = require('./log')
 const { setStartupLogPluginManager } = require('./startup-log')
 const telemetry = require('./telemetry')
 const PluginManager = require('./plugin_manager')
 const remoteConfig = require('./appsec/remote_config')
 const AppsecSdk = require('./appsec/sdk')
+const dogstatsd = require('./dogstatsd')
 
 class Tracer extends NoopProxy {
   constructor () {
@@ -16,6 +17,7 @@ class Tracer extends NoopProxy {
 
     this._initialized = false
     this._pluginManager = new PluginManager(this)
+    this.dogstatsd = new dogstatsd.NoopDogStatsDClient()
   }
 
   init (options) {
@@ -26,6 +28,25 @@ class Tracer extends NoopProxy {
     try {
       const config = new Config(options) // TODO: support dynamic code config
 
+      if (config.dogstatsd) {
+        // Custom Metrics
+        this.dogstatsd = new dogstatsd.CustomMetrics({
+          host: config.dogstatsd.hostname,
+          port: config.dogstatsd.port,
+          tags: [
+            // these are the Runtime Metrics default tags
+            // Python also uses these as default Custom Metrics tags
+            `service:${config.tags.service}`,
+            `env:${config.tags.env}`,
+            `version:${config.tags.version}`
+          ]
+        })
+
+        setInterval(() => {
+          this.dogstatsd.flush()
+        }, 10 * 1000).unref()
+      }
+
       if (config.remoteConfig.enabled && !config.isCiVisibility) {
         const rc = remoteConfig.enable(config)
 
@@ -58,7 +79,7 @@ class Tracer extends NoopProxy {
       }
 
       if (config.runtimeMetrics) {
-        metrics.start(config)
+        runtimeMetrics.start(config)
       }
 
       if (config.tracing) {

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

@@ -117,8 +117,16 @@ function Hook (modules, options, onrequire) {
         // abort if _resolveLookupPaths return null
         return exports
       }
-      const res = Module._findPath(name, [basedir, ...paths])
-      if (res !== filename) {
+
+      let res
+      try {
+        res = Module._findPath(name, [basedir, ...paths])
+      } catch (e) {
+        // case where the file specified in package.json "main" doesn't exist
+        // in this case, the file is treated as module-internal
+      }
+
+      if (!res || res !== filename) {
         // this is a module-internal file
         // use the module-relative path to the file, prefixed by original module name
         name = name + path.sep + path.relative(basedir, filename)