dd-trace 2.30.1 → 2.32.0

package/packages/dd-trace/src/appsec/waf/waf_context_wrapper.js

@@ -0,0 +1,57 @@
+'use strict'
+
+const log = require('../../log')
+const Reporter = require('../reporter')
+
+class WAFContextWrapper {
+  constructor (ddwafContext, requiredAddresses, wafTimeout, rulesInfo) {
+    this.ddwafContext = ddwafContext
+    this.requiredAddresses = requiredAddresses
+    this.wafTimeout = wafTimeout
+    this.rulesInfo = rulesInfo
+  }
+
+  run (params) {
+    const inputs = {}
+    let someInputAdded = false
+
+    // TODO: possible optimizaion: only send params that haven't already been sent with same value to this wafContext
+    for (const key of Object.keys(params)) {
+      if (this.requiredAddresses.has(key)) {
+        inputs[key] = params[key]
+        someInputAdded = true
+      }
+    }
+
+    if (!someInputAdded) return
+
+    try {
+      const start = process.hrtime.bigint()
+
+      const result = this.ddwafContext.run(inputs, this.wafTimeout)
+
+      const end = process.hrtime.bigint()
+
+      Reporter.reportMetrics({
+        duration: result.totalRuntime / 1e3,
+        durationExt: parseInt(end - start) / 1e3,
+        rulesVersion: this.rulesInfo.version
+      })
+
+      if (result.data && result.data !== '[]') {
+        Reporter.reportAttack(result.data)
+      }
+
+      return result.actions
+    } catch (err) {
+      log.error('Error while running the AppSec WAF')
+      log.error(err)
+    }
+  }
+
+  dispose () {
+    this.ddwafContext.dispose()
+  }
+}
+
+module.exports = WAFContextWrapper

package/packages/dd-trace/src/appsec/waf/waf_manager.js

@@ -0,0 +1,66 @@
+'use strict'
+
+const log = require('../../log')
+const Reporter = require('../reporter')
+const WAFContextWrapper = require('./waf_context_wrapper')
+
+const contexts = new WeakMap()
+
+class WAFManager {
+  constructor (rules, config) {
+    this.config = config
+    this.wafTimeout = config.wafTimeout
+    this.ddwaf = this._loadDDWAF(rules)
+    this._reportMetrics()
+  }
+
+  _loadDDWAF (rules) {
+    try {
+      // require in `try/catch` because this can throw at require time
+      const { DDWAF } = require('@datadog/native-appsec')
+
+      const { obfuscatorKeyRegex, obfuscatorValueRegex } = this.config
+      return new DDWAF(rules, { obfuscatorKeyRegex, obfuscatorValueRegex })
+    } catch (err) {
+      log.error('AppSec could not load native package. In-app WAF features will not be available.')
+
+      throw err
+    }
+  }
+
+  _reportMetrics () {
+    Reporter.metricsQueue.set('_dd.appsec.waf.version', this.ddwaf.constructor.version())
+
+    const { loaded, failed, errors } = this.ddwaf.rulesInfo
+
+    Reporter.metricsQueue.set('_dd.appsec.event_rules.loaded', loaded)
+    Reporter.metricsQueue.set('_dd.appsec.event_rules.error_count', failed)
+    if (failed) Reporter.metricsQueue.set('_dd.appsec.event_rules.errors', JSON.stringify(errors))
+
+    Reporter.metricsQueue.set('manual.keep', 'true')
+  }
+
+  getWAFContext (req) {
+    let wafContext = contexts.get(req)
+
+    if (!wafContext) {
+      wafContext = new WAFContextWrapper(
+        this.ddwaf.createContext(),
+        this.ddwaf.requiredAddresses,
+        this.wafTimeout,
+        this.ddwaf.rulesInfo
+      )
+      contexts.set(req, wafContext)
+    }
+
+    return wafContext
+  }
+
+  destroy () {
+    if (this.ddwaf) {
+      this.ddwaf.dispose()
+    }
+  }
+}
+
+module.exports = WAFManager

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

@@ -31,6 +31,19 @@ function safeJsonParse (input) {
   }
 }
 
+const namingVersions = ['v0', 'v1']
+const defaultVersion = 'v0'
+
+function validateNamingVersion (versionString) {
+  if (!namingVersions.includes(versionString)) {
+    log.warn(
+      `Unexpected input for config.spanAttributeSchema, picked default ${defaultVersion}`
+    )
+    return defaultVersion
+  }
+  return versionString
+}
+
 // Shallow clone with property name remapping
 function remapify (input, mappings) {
   if (!input) return
@@ -257,7 +270,9 @@ class Config {
       process.env.DD_TRACE_EXPERIMENTAL_GET_RUM_DATA_ENABLED,
       false
     )
-
+    const DD_TRACE_SPAN_ATTRIBUTE_SCHEMA = validateNamingVersion(
+      process.env.DD_TRACE_SPAN_ATTRIBUTE_SCHEMA
+    )
     const DD_TRACE_X_DATADOG_TAGS_MAX_LENGTH = coalesce(
       process.env.DD_TRACE_X_DATADOG_TAGS_MAX_LENGTH,
       '512'
@@ -464,6 +479,7 @@ ken|consumer_?(?:id|key|secret)|sign(?:ed|ature)?|auth(?:entication|orization)?)
       sourceMap: !isFalse(DD_PROFILING_SOURCE_MAP),
       exporters: DD_PROFILING_EXPORTERS
     }
+    this.spanAttributeSchema = DD_TRACE_SPAN_ATTRIBUTE_SCHEMA
     this.lookup = options.lookup
     this.startupLogs = isTrue(DD_TRACE_STARTUP_LOGS)
     // Disabled for CI Visibility's agentless
@@ -477,6 +493,7 @@ ken|consumer_?(?:id|key|secret)|sign(?:ed|ature)?|auth(?:entication|orization)?)
     this.appsec = {
       enabled: DD_APPSEC_ENABLED,
       rules: DD_APPSEC_RULES ? safeJsonParse(maybeFile(DD_APPSEC_RULES)) : require('./appsec/recommended.json'),
+      customRulesProvided: !!DD_APPSEC_RULES,
       rateLimit: DD_APPSEC_TRACE_RATE_LIMIT,
       wafTimeout: DD_APPSEC_WAF_TIMEOUT,
       obfuscatorKeyRegex: DD_APPSEC_OBFUSCATION_PARAMETER_KEY_REGEXP,

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

@@ -1,5 +1,7 @@
 'use strict'
 
+// TODO: Figure out why we can't use the internal version.
+// eslint-disable-next-line n/no-restricted-require
 const dc = require('diagnostics_channel')
 
 const CHANNEL_PREFIX = 'dd-trace:bundledModuleLoadStart'

package/packages/dd-trace/src/encode/0.4.js

@@ -3,6 +3,8 @@
 const { truncateSpan, normalizeSpan } = require('./tags-processors')
 const Chunk = require('./chunk')
 const log = require('../log')
+const { isTrue } = require('../util')
+const coalesce = require('koalas')
 
 const SOFT_LIMIT = 8 * 1024 * 1024 // 8MB
 
@@ -24,6 +26,10 @@ class AgentEncoder {
     this._stringBytes = new Chunk()
     this._writer = writer
     this._reset()
+    this._debugEncoding = isTrue(coalesce(
+      process.env.DD_TRACE_ENCODING_DEBUG,
+      false
+    ))
   }
 
   count () {
@@ -40,11 +46,13 @@ class AgentEncoder {
 
     const end = bytes.length
 
-    log.debug(() => {
-      const hex = bytes.buffer.subarray(start, end).toString('hex').match(/../g).join(' ')
+    if (this._debugEncoding) {
+      log.debug(() => {
+        const hex = bytes.buffer.subarray(start, end).toString('hex').match(/../g).join(' ')
 
-      return `Adding encoded trace to buffer: ${hex}`
-    })
+        return `Adding encoded trace to buffer: ${hex}`
+      })
+    }
 
     // we can go over the soft limit since the agent has a 50MB hard limit
     if (this._traceBytes.length > this._limit || this._stringBytes.length > this._limit) {

package/packages/dd-trace/src/encode/tags-processors.js

@@ -9,8 +9,6 @@ const MAX_META_KEY_LENGTH = 200
 const MAX_META_VALUE_LENGTH = 25000
 // MAX_METRIC_KEY_LENGTH the maximum length of a metric name key
 const MAX_METRIC_KEY_LENGTH = MAX_META_KEY_LENGTH
-// MAX_METRIC_VALUE_LENGTH the maximum length of a metric name value
-const MAX_METRIC_VALUE_LENGTH = MAX_META_VALUE_LENGTH
 
 // From agent normalizer:
 // https://github.com/DataDog/datadog-agent/blob/main/pkg/trace/traceutil/normalize.go
@@ -25,80 +23,55 @@ const MAX_SERVICE_LENGTH = 100
 // MAX_TYPE_LENGTH the maximum length a span type can have
 const MAX_TYPE_LENGTH = 100
 
-const fromEntries = Object.fromEntries || (entries =>
-  entries.reduce((obj, [k, v]) => Object.assign(obj, { [k]: v }), {}))
-
-function truncateToLength (value, maxLength) {
-  if (!value) {
-    return value
-  }
-  if (value.length > maxLength) {
-    return `${value.slice(0, maxLength)}...`
-  }
-  return value
-}
+// TODO (bengl) Pretty much everything in this file should happen in
+// `format.js`, so that we're not iterating over all the spans and modifying
+// them yet again.
 
 // normally the agent truncates the resource and parses it in certain scenarios (e.g. SQL Queries)
 function truncateSpan (span, shouldTruncateResourceName = true) {
-  return fromEntries(Object.entries(span).map(([key, value]) => {
-    switch (key) {
-      case 'resource':
-        return ['resource', shouldTruncateResourceName ? truncateToLength(value, MAX_RESOURCE_NAME_LENGTH) : value]
-      case 'meta':
-        return ['meta', fromEntries(Object.entries(value).map(([metaKey, metaValue]) =>
-          [truncateToLength(metaKey, MAX_META_KEY_LENGTH), truncateToLength(metaValue, MAX_META_VALUE_LENGTH)]
-        ))]
-      case 'metrics':
-        return ['metrics', fromEntries(Object.entries(value).map(([metricsKey, metricsValue]) =>
-          [truncateToLength(metricsKey, MAX_METRIC_KEY_LENGTH), truncateToLength(metricsValue, MAX_METRIC_VALUE_LENGTH)]
-        ))]
-      default:
-        return [key, value]
+  if (shouldTruncateResourceName && span.resource && span.resource.length > MAX_RESOURCE_NAME_LENGTH) {
+    span.resource = `${span.resource.slice(0, MAX_RESOURCE_NAME_LENGTH)}...`
+  }
+  for (let metaKey in span.meta) {
+    const val = span.meta[metaKey]
+    if (metaKey.length > MAX_META_KEY_LENGTH) {
+      delete span.meta[metaKey]
+      metaKey = `${metaKey.slice(0, MAX_META_KEY_LENGTH)}...`
+      span.metrics[metaKey] = val
+    }
+    if (val && val.length > MAX_META_VALUE_LENGTH) {
+      span.meta[metaKey] = `${val.slice(0, MAX_META_VALUE_LENGTH)}...`
+    }
+  }
+  for (let metricsKey in span.metrics) {
+    const val = span.metrics[metricsKey]
+    if (metricsKey.length > MAX_METRIC_KEY_LENGTH) {
+      delete span.metrics[metricsKey]
+      metricsKey = `${metricsKey.slice(0, MAX_METRIC_KEY_LENGTH)}...`
+      span.metrics[metricsKey] = val
     }
-  }))
+  }
+
+  return span
 }
 
 function normalizeSpan (span) {
-  const normalizedSpan = fromEntries(Object.entries(span).map(([key, value]) => {
-    switch (key) {
-      case 'service':
-        if (!value) {
-          return [key, DEFAULT_SERVICE_NAME]
-        }
-        if (value.length > MAX_SERVICE_LENGTH) {
-          return [key, value.slice(0, MAX_SERVICE_LENGTH)]
-        }
-        break
-      case 'name':
-        if (!value) {
-          return [key, DEFAULT_SPAN_NAME]
-        }
-        if (value.length > MAX_NAME_LENGTH) {
-          return [key, value.slice(0, MAX_NAME_LENGTH)]
-        }
-        break
-      case 'resource':
-        if (!value) {
-          return [key, span.name || DEFAULT_SPAN_NAME]
-        }
-        break
-      case 'type':
-        if (!value) {
-          return [key, value]
-        }
-        if (value.length > MAX_TYPE_LENGTH) {
-          return [key, value.slice(0, MAX_TYPE_LENGTH)]
-        }
-    }
-    return [key, value]
-  }))
-  if (!normalizedSpan.service) {
-    normalizedSpan.service = DEFAULT_SERVICE_NAME
+  span.service = span.service || DEFAULT_SERVICE_NAME
+  if (span.service.length > MAX_SERVICE_LENGTH) {
+    span.service = span.service.slice(0, MAX_SERVICE_LENGTH)
   }
-  if (!normalizedSpan.name) {
-    normalizedSpan.name = DEFAULT_SPAN_NAME
+  span.name = span.name || DEFAULT_SPAN_NAME
+  if (span.name.length > MAX_NAME_LENGTH) {
+    span.name = span.name.slice(0, MAX_NAME_LENGTH)
   }
-  return normalizedSpan
+  if (!span.resource) {
+    span.resource = span.name
+  }
+  if (span.type && span.type.length > MAX_TYPE_LENGTH) {
+    span.type = span.type.slice(0, MAX_TYPE_LENGTH)
+  }
+
+  return span
 }
 
 module.exports = {
@@ -107,7 +80,6 @@ module.exports = {
   MAX_META_KEY_LENGTH,
   MAX_META_VALUE_LENGTH,
   MAX_METRIC_KEY_LENGTH,
-  MAX_METRIC_VALUE_LENGTH,
   MAX_NAME_LENGTH,
   MAX_SERVICE_LENGTH,
   MAX_TYPE_LENGTH,

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

@@ -54,13 +54,13 @@ function request (data, options, callback) {
   }
 
   if (options.url) {
-    const url = typeof options.url === 'object' ? options.url : fromUrlString(options.url)
+    const url = typeof options.url === 'object' ? urlToOptions(options.url) : fromUrlString(options.url)
     if (url.protocol === 'unix:') {
       options.socketPath = url.pathname
     } else {
       if (!options.path) options.path = url.path
       options.protocol = url.protocol
-      options.hostname = url.hostname
+      options.hostname = url.hostname // for IPv6 this should be '::1' and not '[::1]'
       options.port = url.port
     }
   }

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

@@ -146,7 +146,8 @@ function extractError (trace, error) {
   trace.error = 1
 
   if (isError(error)) {
-    addTag(trace.meta, trace.metrics, ERROR_MESSAGE, error.message)
+    // AggregateError only has a code and no message.
+    addTag(trace.meta, trace.metrics, ERROR_MESSAGE, error.message || error.code)
     addTag(trace.meta, trace.metrics, ERROR_TYPE, error.name)
     addTag(trace.meta, trace.metrics, ERROR_STACK, error.stack)
   }

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

@@ -3,7 +3,7 @@
 const semver = require('semver')
 const logger = require('./log')
 const { addHook } = require('import-in-the-middle')
-const dc = require('diagnostics_channel')
+const dc = require('../../diagnostics_channel')
 
 if (semver.satisfies(process.versions.node, '^12.20.0 || >=14.13.1')) {
   const moduleLoadStartChannel = dc.channel('dd-trace:moduleLoadStart')

package/packages/dd-trace/src/log/channels.js

@@ -1,6 +1,6 @@
 'use strict'
 
-const dc = require('diagnostics_channel')
+const { channel } = require('../../../diagnostics_channel')
 
 const Level = {
   Debug: 'debug',
@@ -11,19 +11,18 @@ const Level = {
 
 const defaultLevel = Level.Debug
 
-class LogChannel extends dc.Channel {
-  constructor (name, logLevel) {
-    super(`datadog:log:${name}`)
-    this.logLevel = logLevel
-  }
-}
-
 // based on: https://github.com/trentm/node-bunyan#levels
 const logChannels = {
-  [Level.Debug]: new LogChannel(Level.Debug, 20),
-  [Level.Info]: new LogChannel(Level.Info, 30),
-  [Level.Warn]: new LogChannel(Level.Warn, 40),
-  [Level.Error]: new LogChannel(Level.Error, 50)
+  [Level.Debug]: createLogChannel(Level.Debug, 20),
+  [Level.Info]: createLogChannel(Level.Info, 30),
+  [Level.Warn]: createLogChannel(Level.Warn, 40),
+  [Level.Error]: createLogChannel(Level.Error, 50)
+}
+
+function createLogChannel (name, logLevel) {
+  const logChannel = channel(`datadog:log:${name}`)
+  logChannel.logLevel = logLevel
+  return logChannel
 }
 
 function getChannelLogLevel (level) {

package/packages/dd-trace/src/opentracing/propagation/text_map.js

@@ -343,10 +343,10 @@ class TextMapPropagator {
               spanContext._trace.origin = value
               break
             case 't.dm': {
-              const mechanism = parseInt(value, 10)
+              const mechanism = -Math.abs(parseInt(value, 10))
               if (Number.isInteger(mechanism)) {
                 spanContext._sampling.mechanism = mechanism
-                spanContext._trace.tags['_dd.p.dm'] = mechanism
+                spanContext._trace.tags['_dd.p.dm'] = String(mechanism)
               }
               break
             }

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

@@ -1,9 +1,10 @@
 'use strict'
 
-const { channel } = require('diagnostics_channel')
+const { channel } = require('../../diagnostics_channel')
 const { isFalse } = require('./util')
 const plugins = require('./plugins')
 const log = require('./log')
+const Nomenclature = require('./service-naming')
 
 const loadChannel = channel('dd-trace:instrumentation:load')
 
@@ -96,6 +97,7 @@ module.exports = class PluginManager {
   // like instrumenter.enable()
   configure (config = {}) {
     this._tracerConfig = config
+    Nomenclature.configure(config)
 
     for (const name in pluginClasses) {
       this.loadPlugin(name)

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

@@ -1,9 +1,10 @@
 'use strict'
 
-const OutgoingPlugin = require('./outgoing')
+const OutboundPlugin = require('./outbound')
 
-class ClientPlugin extends OutgoingPlugin {
+class ClientPlugin extends OutboundPlugin {
   static get operation () { return 'request' }
+  static get kind () { return 'client' }
 }
 
 module.exports = ClientPlugin

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

@@ -1,9 +1,24 @@
 'use strict'
 
-const IncomingPlugin = require('./incoming')
+const InboundPlugin = require('./inbound')
 
-class ConsumerPlugin extends IncomingPlugin {
+class ConsumerPlugin extends InboundPlugin {
   static get operation () { return 'receive' }
+  static get kind () { return 'consumer' }
+  static get type () { return 'messaging' }
+
+  startSpan (options) {
+    const spanDefaults = {
+      service: this.config.service || this.serviceName(),
+      kind: this.constructor.kind
+    }
+    Object.keys(spanDefaults).forEach(
+      key => {
+        if (!options[key]) options[key] = spanDefaults[key]
+      }
+    )
+    return super.startSpan(this.operationName(), options)
+  }
 }
 
 module.exports = ConsumerPlugin

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

@@ -0,0 +1,7 @@
+'use strict'
+
+const TracingPlugin = require('./tracing')
+
+class InboundPlugin extends TracingPlugin {}
+
+module.exports = InboundPlugin

package/packages/dd-trace/src/plugins/{outgoing.js → outbound.js}

@@ -4,7 +4,7 @@ const { CLIENT_PORT_KEY } = require('../constants')
 const TracingPlugin = require('./tracing')
 
 // TODO: Exit span on finish when AsyncResource instances are removed.
-class OutgoingPlugin extends TracingPlugin {
+class OutboundPlugin extends TracingPlugin {
   constructor (...args) {
     super(...args)
 
@@ -29,4 +29,4 @@ class OutgoingPlugin extends TracingPlugin {
   }
 }
 
-module.exports = OutgoingPlugin
+module.exports = OutboundPlugin

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

@@ -2,7 +2,7 @@
 
 // TODO: move anything related to tracing to TracingPlugin instead
 
-const dc = require('diagnostics_channel')
+const dc = require('../../../diagnostics_channel')
 const { storage } = require('../../../datadog-core')
 
 class Subscription {

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

@@ -1,9 +1,24 @@
 'use strict'
 
-const OutgoingPlugin = require('./outgoing')
+const OutboundPlugin = require('./outbound')
 
-class ProducerPlugin extends OutgoingPlugin {
+class ProducerPlugin extends OutboundPlugin {
   static get operation () { return 'publish' }
+  static get kind () { return 'producer' }
+  static get type () { return 'messaging' }
+
+  startSpan (options) {
+    const spanDefaults = {
+      service: this.config.service || this.serviceName(),
+      kind: this.constructor.kind
+    }
+    Object.keys(spanDefaults).forEach(
+      key => {
+        if (!options[key]) options[key] = spanDefaults[key]
+      }
+    )
+    return super.startSpan(this.operationName(), options)
+  }
 }
 
 module.exports = ProducerPlugin

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

@@ -1,8 +1,8 @@
 'use strict'
 
-const IncomingPlugin = require('./incoming')
+const InboundPlugin = require('./inbound')
 
-class ServerPlugin extends IncomingPlugin {
+class ServerPlugin extends InboundPlugin {
   static get operation () { return 'request' }
 }
 

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

@@ -4,6 +4,7 @@ const Plugin = require('./plugin')
 const { storage } = require('../../../datadog-core')
 const analyticsSampler = require('../analytics_sampler')
 const { COMPONENT } = require('../constants')
+const Nomenclature = require('../service-naming')
 
 class TracingPlugin extends Plugin {
   constructor (...args) {
@@ -31,6 +32,16 @@ class TracingPlugin extends Plugin {
     return store && store.span
   }
 
+  serviceName (serviceArgs) {
+    const { type, id, kind } = this.constructor
+    return Nomenclature.serviceName(type, kind, id, serviceArgs)
+  }
+
+  operationName (opNameArgs) {
+    const { type, id, kind } = this.constructor
+    return Nomenclature.opName(type, kind, id, opNameArgs)
+  }
+
   configure (config) {
     return super.configure({
       ...config,

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

@@ -36,6 +36,7 @@ const TEST_SKIP_REASON = 'test.skip_reason'
 const TEST_IS_RUM_ACTIVE = 'test.is_rum_active'
 const TEST_CODE_OWNERS = 'test.codeowners'
 const TEST_SOURCE_FILE = 'test.source.file'
+const TEST_SOURCE_START = 'test.source.start'
 const LIBRARY_VERSION = 'library_version'
 const TEST_COMMAND = 'test.command'
 const TEST_MODULE = 'test.module'
@@ -77,6 +78,7 @@ module.exports = {
   LIBRARY_VERSION,
   JEST_WORKER_TRACE_PAYLOAD_CODE,
   JEST_WORKER_COVERAGE_PAYLOAD_CODE,
+  TEST_SOURCE_START,
   getTestEnvironmentMetadata,
   getTestParametersString,
   finishAllTraceSpans,
@@ -104,7 +106,8 @@ module.exports = {
   getCoveredFilenamesFromCoverage,
   resetCoverage,
   mergeCoverage,
-  fromCoverageMapToCoverage
+  fromCoverageMapToCoverage,
+  getTestLineStart
 }
 
 // Returns pkg manager and its version, separated by '-', e.g. npm-8.15.0 or yarn-1.22.19
@@ -381,3 +384,18 @@ function fromCoverageMapToCoverage (coverageMap) {
     return acc
   }, {})
 }
+
+// Get the start line of a test by inspecting a given error's stack trace
+function getTestLineStart (err, testSuitePath) {
+  if (!err.stack) {
+    return null
+  }
+  // From https://github.com/felixge/node-stack-trace/blob/ba06dcdb50d465cd440d84a563836e293b360427/index.js#L40
+  const testFileLine = err.stack.split('\n').find(line => line.includes(testSuitePath))
+  try {
+    const testFileLineMatch = testFileLine.match(/at (?:(.+?)\s+\()?(?:(.+?):(\d+)(?::(\d+))?|([^)]+))\)?/)
+    return parseInt(testFileLineMatch[3], 10) || null
+  } catch (e) {
+    return null
+  }
+}

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

@@ -2,7 +2,7 @@
 
 const { storage } = require('../../../../datadog-core')
 
-const dc = require('diagnostics_channel')
+const dc = require('../../../../diagnostics_channel')
 
 const beforeCh = dc.channel('dd-trace:storage:before')
 const afterCh = dc.channel('dd-trace:storage:after')

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

@@ -3,7 +3,7 @@
 const path = require('path')
 const Module = require('module')
 const parse = require('module-details-from-path')
-const dc = require('diagnostics_channel')
+const dc = require('../../diagnostics_channel')
 
 const origRequire = Module.prototype.require