dd-trace 4.40.0 → 4.42.0

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

@@ -18,6 +18,7 @@ module.exports = {
   get '@opensearch-project/opensearch' () { return require('../../../datadog-plugin-opensearch/src') },
   get '@redis/client' () { return require('../../../datadog-plugin-redis/src') },
   get '@smithy/smithy-client' () { return require('../../../datadog-plugin-aws-sdk/src') },
+  get '@vitest/runner' () { return require('../../../datadog-plugin-vitest/src') },
   get aerospike () { return require('../../../datadog-plugin-aerospike/src') },
   get amqp10 () { return require('../../../datadog-plugin-amqp10/src') },
   get amqplib () { return require('../../../datadog-plugin-amqplib/src') },
@@ -54,6 +55,7 @@ module.exports = {
   get 'microgateway-core' () { return require('../../../datadog-plugin-microgateway-core/src') },
   get mocha () { return require('../../../datadog-plugin-mocha/src') },
   get 'mocha-each' () { return require('../../../datadog-plugin-mocha/src') },
+  get vitest () { return require('../../../datadog-plugin-vitest/src') },
   get workerpool () { return require('../../../datadog-plugin-mocha/src') },
   get moleculer () { return require('../../../datadog-plugin-moleculer/src') },
   get mongodb () { return require('../../../datadog-plugin-mongodb-core/src') },
@@ -81,5 +83,6 @@ module.exports = {
   get 'selenium-webdriver' () { return require('../../../datadog-plugin-selenium/src') },
   get sharedb () { return require('../../../datadog-plugin-sharedb/src') },
   get tedious () { return require('../../../datadog-plugin-tedious/src') },
+  get undici () { return require('../../../datadog-plugin-undici/src') },
   get winston () { return require('../../../datadog-plugin-winston/src') }
 }

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

@@ -95,6 +95,9 @@ const MOCHA_WORKER_TRACE_PAYLOAD_CODE = 80
 const EFD_STRING = "Retried by Datadog's Early Flake Detection"
 const EFD_TEST_NAME_REGEX = new RegExp(EFD_STRING + ' \\(#\\d+\\): ', 'g')
 
+// Flaky test retries
+const NUM_FAILED_TEST_RETRIES = 5
+
 module.exports = {
   TEST_CODE_OWNERS,
   TEST_FRAMEWORK,
@@ -167,7 +170,8 @@ module.exports = {
   TEST_BROWSER_DRIVER,
   TEST_BROWSER_DRIVER_VERSION,
   TEST_BROWSER_NAME,
-  TEST_BROWSER_VERSION
+  TEST_BROWSER_VERSION,
+  NUM_FAILED_TEST_RETRIES
 }
 
 // Returns pkg manager and its version, separated by '-', e.g. npm-8.15.0 or yarn-1.22.19

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

@@ -4,6 +4,7 @@ const RateLimiter = require('./rate_limiter')
 const Sampler = require('./sampler')
 const { setSamplingRules } = require('./startup-log')
 const SamplingRule = require('./sampling_rule')
+const { hasOwn } = require('./util')
 
 const {
   SAMPLING_MECHANISM_DEFAULT,
@@ -66,7 +67,7 @@ class PrioritySampler {
     if (context._sampling.priority !== undefined) return
     if (!root) return // noop span
 
-    const tag = this._getPriorityFromTags(context._tags)
+    const tag = this._getPriorityFromTags(context._tags, context)
 
     if (this.validate(tag)) {
       context._sampling.priority = tag
@@ -202,8 +203,4 @@ class PrioritySampler {
   }
 }
 
-function hasOwn (object, prop) {
-  return Object.prototype.hasOwnProperty.call(object, prop)
-}
-
 module.exports = PrioritySampler

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

@@ -69,7 +69,7 @@ class Profiler extends EventEmitter {
       setLogger(config.logger)
 
       mapper = await maybeSourceMap(config.sourceMap, SourceMapper, config.debugSourceMaps)
-      if (config.SourceMap && config.debugSourceMaps) {
+      if (config.sourceMap && config.debugSourceMaps) {
         this._logger.debug(() => {
           return mapper.infoMap.size === 0
             ? 'Found no source maps'

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

@@ -15,6 +15,7 @@ const NoopDogStatsDClient = require('./noop/dogstatsd')
 const spanleak = require('./spanleak')
 const { SSIHeuristics } = require('./profiling/ssi-heuristics')
 const telemetryLog = require('dc-polyfill').channel('datadog:telemetry:log')
+const appsecStandalone = require('./appsec/standalone')
 
 class LazyModule {
   constructor (provider) {
@@ -178,7 +179,8 @@ class Tracer extends NoopProxy {
         this._modules.appsec.enable(config)
       }
       if (!this._tracingInitialized) {
-        this._tracer = new DatadogTracer(config)
+        const prioritySampler = appsecStandalone.configure(config)
+        this._tracer = new DatadogTracer(config, prioritySampler)
         this.appsec = new AppsecSdk(this._tracer, config)
         this._tracingInitialized = true
       }

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

@@ -3,9 +3,9 @@
 const limiter = require('limiter')
 
 class RateLimiter {
-  constructor (rateLimit) {
+  constructor (rateLimit, interval = 'second') {
     this._rateLimit = parseInt(rateLimit)
-    this._limiter = new limiter.RateLimiter(this._rateLimit, 'second')
+    this._limiter = new limiter.RateLimiter(this._rateLimit, interval)
     this._tokensRequested = 0
     this._prevIntervalTokens = 0
     this._prevTokensRequested = 0

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

@@ -30,6 +30,10 @@ const web = {
     lambda: {
       opName: () => 'aws.request',
       serviceName: awsServiceV0
+    },
+    undici: {
+      opName: () => 'undici.request',
+      serviceName: httpPluginClientService
     }
   },
   server: {

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

@@ -29,6 +29,10 @@ const web = {
     lambda: {
       opName: () => 'aws.lambda.invoke',
       serviceName: identityService
+    },
+    undici: {
+      opName: () => 'undici.request',
+      serviceName: httpPluginClientService
     }
   },
   server: {

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

@@ -126,7 +126,8 @@ class SpanStatsProcessor {
     port,
     url,
     env,
-    tags
+    tags,
+    appsec
   } = {}) {
     this.exporter = new SpanStatsExporter({
       hostname,
@@ -138,12 +139,12 @@ class SpanStatsProcessor {
     this.bucketSizeNs = interval * 1e9
     this.buckets = new TimeBuckets()
     this.hostname = os.hostname()
-    this.enabled = enabled
+    this.enabled = enabled && !appsec?.standalone?.enabled
     this.env = env
     this.tags = tags || {}
     this.sequence = 0
 
-    if (enabled) {
+    if (this.enabled) {
       this.timer = setInterval(this.onInterval.bind(this), interval * 1e3)
       this.timer.unref()
     }

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

@@ -1,6 +1,10 @@
 'use strict'
 
+const constants = require('./constants')
 const log = require('./log')
+const ERROR_MESSAGE = constants.ERROR_MESSAGE
+const ERROR_STACK = constants.ERROR_STACK
+const ERROR_TYPE = constants.ERROR_TYPE
 
 const otelTagMap = {
   'deployment.environment': 'env',
@@ -14,7 +18,6 @@ function add (carrier, keyValuePairs, parseOtelTags = false) {
   if (Array.isArray(keyValuePairs)) {
     return keyValuePairs.forEach(tags => add(carrier, tags))
   }
-
   try {
     if (typeof keyValuePairs === 'string') {
       const segments = keyValuePairs.split(',')
@@ -32,6 +35,12 @@ function add (carrier, keyValuePairs, parseOtelTags = false) {
         carrier[key.trim()] = value.trim()
       }
     } else {
+      // HACK: to ensure otel.recordException does not influence trace.error
+      if (ERROR_MESSAGE in keyValuePairs || ERROR_STACK in keyValuePairs || ERROR_TYPE in keyValuePairs) {
+        if (!('doNotSetTraceError' in keyValuePairs)) {
+          carrier.setTraceError = true
+        }
+      }
       Object.assign(carrier, keyValuePairs)
     }
   } catch (e) {

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

@@ -0,0 +1,75 @@
+'use strict'
+
+const fs = require('fs')
+const { spawn } = require('child_process')
+const tracerVersion = require('../../../../package.json').version
+const log = require('../log')
+
+module.exports = sendTelemetry
+
+if (!process.env.DD_INJECTION_ENABLED) {
+  module.exports = () => {}
+}
+
+if (!process.env.DD_TELEMETRY_FORWARDER_PATH) {
+  module.exports = () => {}
+}
+
+if (!fs.existsSync(process.env.DD_TELEMETRY_FORWARDER_PATH)) {
+  module.exports = () => {}
+}
+
+const metadata = {
+  language_name: 'nodejs',
+  language_version: process.versions.node,
+  runtime_name: 'nodejs',
+  runtime_version: process.versions.node,
+  tracer_version: tracerVersion,
+  pid: process.pid
+}
+
+const seen = []
+function hasSeen (point) {
+  if (point.name === 'abort') {
+    // This one can only be sent once, regardless of tags
+    return seen.includes('abort')
+  }
+  if (point.name === 'abort.integration') {
+    // For now, this is the only other one we want to dedupe
+    const compiledPoint = point.name + point.tags.join('')
+    return seen.includes(compiledPoint)
+  }
+  return false
+}
+
+function sendTelemetry (name, tags = []) {
+  let points = name
+  if (typeof name === 'string') {
+    points = [{ name, tags }]
+  }
+  if (['1', 'true', 'True'].includes(process.env.DD_INJECT_FORCE)) {
+    points = points.filter(p => ['error', 'complete'].includes(p.name))
+  }
+  points = points.filter(p => !hasSeen(p))
+  points.forEach(p => {
+    p.name = `library_entrypoint.${p.name}`
+  })
+  if (points.length === 0) {
+    return
+  }
+  const proc = spawn(process.env.DD_TELEMETRY_FORWARDER_PATH, ['library_entrypoint'], {
+    stdio: 'pipe'
+  })
+  proc.on('error', () => {
+    log.error('Failed to spawn telemetry forwarder')
+  })
+  proc.on('exit', (code) => {
+    if (code !== 0) {
+      log.error(`Telemetry forwarder exited with code ${code}`)
+    }
+  })
+  proc.stdin.on('error', () => {
+    log.error('Failed to write telemetry data to telemetry forwarder')
+  })
+  proc.stdin.end(JSON.stringify({ metadata, points }))
+}

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

@@ -20,8 +20,8 @@ const SERVICE_NAME = tags.SERVICE_NAME
 const MEASURED = tags.MEASURED
 
 class DatadogTracer extends Tracer {
-  constructor (config) {
-    super(config)
+  constructor (config, prioritySampler) {
+    super(config, prioritySampler)
     this._dataStreamsProcessor = new DataStreamsProcessor(config)
     this._scope = new Scope()
     setStartupLogConfig(config)

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

@@ -69,10 +69,15 @@ function calculateDDBasePath (dirname) {
   return dirSteps.slice(0, packagesIndex + 1).join(path.sep) + path.sep
 }
 
+function hasOwn (object, prop) {
+  return Object.prototype.hasOwnProperty.call(object, prop)
+}
+
 module.exports = {
   isTrue,
   isFalse,
   isError,
   globMatch,
-  calculateDDBasePath
+  calculateDDBasePath,
+  hasOwn
 }

package/packages/datadog-core/src/storage/async_hooks.js

@@ -1,49 +0,0 @@
-'use strict'
-
-const { executionAsyncId } = require('async_hooks')
-const AsyncResourceStorage = require('./async_resource')
-
-class AsyncHooksStorage extends AsyncResourceStorage {
-  constructor () {
-    super()
-
-    this._resources = new Map()
-  }
-
-  disable () {
-    super.disable()
-
-    this._resources.clear()
-  }
-
-  _createHook () {
-    return {
-      ...super._createHook(),
-      destroy: this._destroy.bind(this)
-    }
-  }
-
-  _init (asyncId, type, triggerAsyncId, resource) {
-    super._init.apply(this, arguments)
-
-    this._resources.set(asyncId, resource)
-  }
-
-  _destroy (asyncId) {
-    this._resources.delete(asyncId)
-  }
-
-  _executionAsyncResource () {
-    const asyncId = executionAsyncId()
-
-    let resource = this._resources.get(asyncId)
-
-    if (!resource) {
-      this._resources.set(asyncId, resource = {})
-    }
-
-    return resource
-  }
-}
-
-module.exports = AsyncHooksStorage