dd-trace 5.83.0 → 5.85.0

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

@@ -4,7 +4,7 @@ const RemoteConfigCapabilities = require('../remote_config/capabilities')
 const log = require('../log')
 
 module.exports = {
-  enable
+  enable,
 }
 
 /**
@@ -169,6 +169,7 @@ function enable (rc, config, onConfigUpdated) {
 
   // Debugger
   rc.updateCapabilities(RemoteConfigCapabilities.APM_TRACING_ENABLE_DYNAMIC_INSTRUMENTATION, true)
+  rc.updateCapabilities(RemoteConfigCapabilities.APM_TRACING_ENABLE_LIVE_DEBUGGING, true)
 
   // Code Origin
   rc.updateCapabilities(RemoteConfigCapabilities.APM_TRACING_ENABLE_CODE_ORIGIN, true)

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

@@ -43,13 +43,13 @@ class StableConfig {
       // eslint-disable-next-line eslint-rules/eslint-process-env
       configurator.set_envp(Object.entries(process.env).map(([key, value]) => `${key}=${value}`))
       configurator.set_args(process.argv)
-      configurator.get_configuration(localConfig, fleetConfig).forEach((entry) => {
+      for (const entry of configurator.get_configuration(localConfig, fleetConfig)) {
         if (entry.source === 'local_stable_config') {
           this.localEntries[entry.name] = entry.value
         } else if (entry.source === 'fleet_stable_config') {
           this.fleetEntries[entry.name] = entry.value
         }
-      })
+      }
     } catch (e) {
       this.warnings.push(`Error parsing configuration from file: ${e.message}`)
     }

package/packages/dd-trace/src/config/supported-configurations.json

@@ -73,11 +73,11 @@
     "DD_ENV": ["A"],
     "DD_EXPERIMENTAL_APPSEC_STANDALONE_ENABLED": ["A"],
     "DD_EXPERIMENTAL_FLAGGING_PROVIDER_ENABLED": ["A"],
+    "DD_EXPERIMENTAL_FLAGGING_PROVIDER_INITIALIZATION_TIMEOUT_MS": ["A"],
     "DD_EXPERIMENTAL_PROPAGATE_PROCESS_TAGS_ENABLED": ["A"],
     "DD_EXPERIMENTAL_TEST_OPT_GIT_CACHE_ENABLED": ["A"],
     "DD_EXPERIMENTAL_TEST_OPT_GIT_CACHE_DIR": ["A"],
     "DD_EXTERNAL_ENV": ["A"],
-    "DD_FLAGGING_PROVIDER_ENABLED": ["A"],
     "DD_GIT_BRANCH": ["A"],
     "DD_GIT_COMMIT_AUTHOR_DATE": ["A"],
     "DD_GIT_COMMIT_AUTHOR_EMAIL": ["A"],
@@ -183,6 +183,7 @@
     "DD_TEST_LOCAL_CONFIG_PATH": ["A"],
     "DD_TEST_MANAGEMENT_ATTEMPT_TO_FIX_RETRIES": ["A"],
     "DD_TEST_MANAGEMENT_ENABLED": ["A"],
+    "DD_EXPERIMENTAL_TEST_OPT_SETTINGS_CACHE": ["A"],
     "DD_TEST_SESSION_NAME": ["A"],
     "DD_TRACE_128_BIT_TRACEID_GENERATION_ENABLED": ["A"],
     "DD_TRACE_128_BIT_TRACEID_LOGGING_ENABLED": ["A"],

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

@@ -53,10 +53,10 @@ module.exports = {
   WEBSOCKET_PTR_KIND: 'websocket',
   SPAN_POINTER_DIRECTION: Object.freeze({
     UPSTREAM: 'u',
-    DOWNSTREAM: 'd'
+    DOWNSTREAM: 'd',
   }),
   SPAN_POINTER_DIRECTION_NAME: Object.freeze({
     UPSTREAM: 'span-pointer-up',
-    DOWNSTREAM: 'span-pointer-down'
-  })
+    DOWNSTREAM: 'span-pointer-down',
+  }),
 }

package/packages/dd-trace/src/crashtracking/crashtracker.js

@@ -1,13 +1,11 @@
 'use strict'
 
-const { URL } = require('url')
-
 // Load binding first to not import other modules if it throws
 const libdatadog = require('@datadog/libdatadog')
 const binding = libdatadog.load('crashtracker')
 
 const log = require('../log')
-const defaults = require('../config/defaults')
+const { getAgentUrl } = require('../agent/url')
 const pkg = require('../../../../package.json')
 const processTags = require('../process-tags')
 
@@ -52,8 +50,7 @@ class Crashtracker {
 
   // TODO: Send only configured values when defaults are fixed.
   #getConfig (config) {
-    const { hostname = defaults.hostname, port = defaults.port } = config
-    const url = config.url || new URL(`http://${hostname}:${port}`)
+    const url = getAgentUrl(config)
 
     return {
       additional_files: [],
@@ -66,13 +63,13 @@ class Crashtracker {
           authority: url.protocol === 'unix:'
             ? Buffer.from(url.pathname).toString('hex')
             : url.host,
-          path_and_query: ''
+          path_and_query: '',
         },
-        timeout_ms: 3000
+        timeout_ms: 3000,
       },
       timeout_ms: 5000,
       // TODO: Use `EnabledWithSymbolsInReceiver` instead for Linux when fixed.
-      resolve_frames: 'EnabledWithInprocessSymbols'
+      resolve_frames: 'EnabledWithInprocessSymbols',
     }
   }
 
@@ -97,8 +94,8 @@ class Crashtracker {
         `library_version:${pkg.version}`,
         'runtime:nodejs',
         `runtime_version:${process.versions.node}`,
-        'severity:crash'
-      ]
+        'severity:crash',
+      ],
     }
   }
 
@@ -108,7 +105,7 @@ class Crashtracker {
       env: [],
       path_to_receiver_binary: libdatadog.find('crashtracker-receiver', true),
       stderr_filename: null,
-      stdout_filename: null
+      stdout_filename: null,
     }
   }
 }

package/packages/dd-trace/src/datastreams/checkpointer.js

@@ -63,5 +63,5 @@ class DataStreamsCheckpointer {
 }
 
 module.exports = {
-  DataStreamsCheckpointer
+  DataStreamsCheckpointer,
 }

package/packages/dd-trace/src/datastreams/context.js

@@ -16,5 +16,5 @@ function setDataStreamsContext (dataStreamsContext) {
 
 module.exports = {
   getDataStreamsContext,
-  setDataStreamsContext
+  setDataStreamsContext,
 }

package/packages/dd-trace/src/datastreams/encoding.js

@@ -95,5 +95,5 @@ function decodeUvarint64 (
 
 module.exports = {
   encodeVarint,
-  decodeVarint
+  decodeVarint,
 }

package/packages/dd-trace/src/datastreams/fnv.js

@@ -21,5 +21,5 @@ function fnv64 (data) {
 }
 
 module.exports = {
-  fnv64
+  fnv64,
 }

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

@@ -4,7 +4,7 @@ const {
   getAmqpMessageSize,
   getHeadersSize,
   getMessageSize,
-  getSizeOrZero
+  getSizeOrZero,
 } = require('./size')
 
 // This is only needed because DSM code is spread across existing tracing
@@ -62,7 +62,7 @@ function lazyClass (classGetter, methods = [], staticMethods = []) {
  */
 const DsmPathwayCodec = lazyClass(() => require('./pathway').DsmPathwayCodec, [], [
   'encode',
-  'decode'
+  'decode',
 ])
 
 /**
@@ -70,7 +70,7 @@ const DsmPathwayCodec = lazyClass(() => require('./pathway').DsmPathwayCodec, []
  */
 const DataStreamsCheckpointer = lazyClass(() => require('./checkpointer').DataStreamsCheckpointer, [
   'setProduceCheckpoint',
-  'setConsumeCheckpoint'
+  'setConsumeCheckpoint',
 ])
 
 /**
@@ -78,7 +78,7 @@ const DataStreamsCheckpointer = lazyClass(() => require('./checkpointer').DataSt
  */
 const DataStreamsManager = lazyClass(() => require('./manager').DataStreamsManager, [
   'setCheckpoint',
-  'decodeDataStreamsContext'
+  'decodeDataStreamsContext',
 ])
 
 // TODO: Are all those methods actually public?
@@ -95,7 +95,7 @@ const DataStreamsProcessor = lazyClass(() => require('./processor').DataStreamsP
   'setUrl',
   'trySampleSchema',
   'canSampleSchema',
-  'getSchema'
+  'getSchema',
 ])
 
 /**
@@ -104,11 +104,11 @@ const DataStreamsProcessor = lazyClass(() => require('./processor').DataStreamsP
 const SchemaBuilder = lazyClass(() => require('./schemas/schema_builder').SchemaBuilder, [
   'build',
   'addProperty',
-  'shouldExtractSchema'
+  'shouldExtractSchema',
 ], [
   'getCache',
   'getSchemaDefinition',
-  'getSchema'
+  'getSchema',
 ])
 
 module.exports = {
@@ -122,5 +122,5 @@ module.exports = {
   getAmqpMessageSize,
   getHeadersSize,
   getMessageSize,
-  getSizeOrZero
+  getSizeOrZero,
 }

package/packages/dd-trace/src/datastreams/pathway.js

@@ -54,7 +54,7 @@ function encodePathwayContext (dataStreamsContext) {
   return Buffer.concat([
     dataStreamsContext.hash,
     Buffer.from(encodeVarint(Math.round(dataStreamsContext.pathwayStartNs / 1e6))),
-    Buffer.from(encodeVarint(Math.round(dataStreamsContext.edgeStartNs / 1e6)))
+    Buffer.from(encodeVarint(Math.round(dataStreamsContext.edgeStartNs / 1e6))),
   ], 20)
 }
 
@@ -123,6 +123,7 @@ const DsmPathwayCodec = {
     }
     carrier[CONTEXT_PROPAGATION_KEY_BASE64] = encodePathwayContextBase64(dataStreamsContext)
 
+    // eslint-disable-next-line eslint-rules/eslint-log-printf-style
     log.debug(() => `Injected into DSM carrier: ${JSON.stringify(pick(carrier, logKeys))}.`)
   },
 
@@ -131,6 +132,7 @@ const DsmPathwayCodec = {
    * @returns {ReturnType<typeof decodePathwayContext>|undefined}
    */
   decode (carrier) {
+    // eslint-disable-next-line eslint-rules/eslint-log-printf-style
     log.debug(() => `Attempting extract from DSM carrier: ${JSON.stringify(pick(carrier, logKeys))}.`)
 
     if (carrier == null) return
@@ -153,7 +155,7 @@ const DsmPathwayCodec = {
     }
 
     return ctx
-  }
+  },
 }
 
 module.exports = {
@@ -162,5 +164,5 @@ module.exports = {
   decodePathwayContext,
   encodePathwayContextBase64,
   decodePathwayContextBase64,
-  DsmPathwayCodec
+  DsmPathwayCodec,
 }

package/packages/dd-trace/src/datastreams/processor.js

@@ -41,7 +41,7 @@ class StatsPoint {
       EdgeTags: this.edgeTags,
       EdgeLatency: this.edgeLatency.toProto(),
       PathwayLatency: this.pathwayLatency.toProto(),
-      PayloadSize: this.payloadSize.toProto()
+      PayloadSize: this.payloadSize.toProto(),
     }
   }
 }
@@ -62,7 +62,7 @@ class Backlog {
   encode () {
     return {
       Tags: this.tags,
-      Value: this.offset
+      Value: this.offset,
     }
   }
 }
@@ -133,12 +133,12 @@ class DataStreamsProcessor {
     tags,
     version,
     service,
-    flushInterval
+    flushInterval,
   } = {}) {
     this.writer = new DataStreamsWriter({
       hostname,
       port,
-      url
+      url,
     })
     this.bucketSizeNs = 1e10
     this.buckets = new TimeBuckets()
@@ -169,7 +169,7 @@ class DataStreamsProcessor {
       TracerVersion: pkg.version,
       Version: this.version,
       Lang: 'javascript',
-      Tags: Object.entries(this.tags).map(([key, value]) => `${key}:${value}`)
+      Tags: Object.entries(this.tags).map(([key, value]) => `${key}:${value}`),
     }
     this.writer.flush(payload)
   }
@@ -229,7 +229,9 @@ class DataStreamsProcessor {
         closestOppositeDirectionEdgeStart = edgeStartNs
       }
       log.debug(
-        () => `Setting DSM Checkpoint from extracted parent context with hash: ${parentHash} and edge tags: ${edgeTags}`
+        'Setting DSM Checkpoint from extracted parent context with hash: %s and edge tags: %s',
+        parentHash,
+        edgeTags
       )
     }
     const hash = computePathwayHash(this.service, this.env, edgeTags, parentHash)
@@ -241,7 +243,7 @@ class DataStreamsProcessor {
       pathwayStartNs,
       previousDirection: direction,
       closestOppositeDirectionHash,
-      closestOppositeDirectionEdgeStart
+      closestOppositeDirectionEdgeStart,
     }
     if (direction === 'direction:out') {
       // Add the header for this now, as the callee doesn't have access to context when producing
@@ -257,7 +259,7 @@ class DataStreamsProcessor {
       edgeTags,
       edgeLatencyNs,
       pathwayLatencyNs,
-      payloadSize
+      payloadSize,
     }
     this.recordCheckpoint(checkpoint, span)
     return dataStreamsContext
@@ -274,7 +276,7 @@ class DataStreamsProcessor {
     const nowNs = Date.now() * 1e6
     const backlogData = {
       ...offsetObj,
-      timestamp: nowNs
+      timestamp: nowNs,
     }
     this.recordOffset(backlogData)
   }
@@ -300,14 +302,14 @@ class DataStreamsProcessor {
         Start: BigInt(timeNs),
         Duration: BigInt(this.bucketSizeNs),
         Stats: points,
-        Backlogs: backlogs
+        Backlogs: backlogs,
       })
     }
 
     this.buckets.clear()
 
     return {
-      Stats: serializedBuckets
+      Stats: serializedBuckets,
     }
   }
 
@@ -352,5 +354,5 @@ module.exports = {
   getHeadersSize,
   getSizeOrZero,
   getAmqpMessageSize,
-  ENTRY_PARENT_HASH
+  ENTRY_PARENT_HASH,
 }

package/packages/dd-trace/src/datastreams/schemas/schema_builder.js

@@ -98,38 +98,40 @@ class OpenApiComponents {
 // TODO: Add tests to verify this behavior. A couple of cases are not
 // covered by the existing tests.
 function toJSON (value) {
-  // eslint-disable-next-line eslint-rules/eslint-safe-typeof-object
-  if (typeof value === 'object') {
-    if (value === null) {
-      return 'null'
-    }
-    if (Array.isArray(value)) {
-      let result = '['
-      for (let i = 0; i < value.length; i++) {
-        if (value[i] !== null) {
-          if (i !== 0) {
-            result += ', '
-          }
-          result += value[i] === undefined ? 'null' : toJSON(value[i])
+  if (typeof value !== 'object') {
+    return JSON.stringify(value)
+  }
+
+  if (value === null) {
+    return 'null'
+  }
+
+  if (Array.isArray(value)) {
+    let result = '['
+    for (let i = 0; i < value.length; i++) {
+      if (value[i] !== null) {
+        if (i !== 0) {
+          result += ', '
         }
+        result += value[i] === undefined ? 'null' : toJSON(value[i])
       }
-      return `${result}]`
     }
-    let result = '{'
-    for (const [key, objectValue] of Object.entries(value)) {
-      if (objectValue != null && typeof key === 'string') {
-        const converted = toJSON(objectValue)
-        if (converted !== undefined) {
-          if (result !== '{') {
-            result += ', '
-          }
-          result += `"${key}": ${converted}`
+    return `${result}]`
+  }
+
+  let result = '{'
+  for (const [key, objectValue] of Object.entries(value)) {
+    if (objectValue != null && typeof key === 'string') {
+      const converted = toJSON(objectValue)
+      if (converted !== undefined) {
+        if (result !== '{') {
+          result += ', '
         }
+        result += `"${key}": ${converted}`
       }
     }
-    return `${result}}`
   }
-  return JSON.stringify(value)
+  return `${result}}`
 }
 
 module.exports = {

package/packages/dd-trace/src/datastreams/schemas/schema_sampler.js

@@ -23,5 +23,5 @@ class SchemaSampler {
 }
 
 module.exports = {
-  SchemaSampler
+  SchemaSampler,
 }

package/packages/dd-trace/src/datastreams/size.js

@@ -15,9 +15,9 @@ function getSizeOrZero (obj) {
   if (Array.isArray(obj) && obj.length > 0) {
     if (typeof obj[0] === 'number') return Buffer.from(obj).length
     let payloadSize = 0
-    obj.forEach(item => {
+    for (const item of obj) {
       payloadSize += getSizeOrZero(item)
-    })
+    }
     return payloadSize
   }
   if (obj !== null && typeof obj === 'object') {
@@ -49,5 +49,5 @@ module.exports = {
   getMessageSize,
   getHeadersSize,
   getSizeOrZero,
-  getAmqpMessageSize
+  getAmqpMessageSize,
 }

package/packages/dd-trace/src/datastreams/writer.js

@@ -1,12 +1,11 @@
 'use strict'
 
-const { URL, format } = require('url')
 const zlib = require('zlib')
 const pkg = require('../../../../package.json')
 const log = require('../log')
 const request = require('../exporters/common/request')
 const { MsgpackEncoder } = require('../msgpack')
-const defaults = require('../config/defaults')
+const { getAgentUrl } = require('../agent/url')
 
 const msgpack = new MsgpackEncoder()
 
@@ -18,9 +17,9 @@ function makeRequest (data, url, cb) {
       'Datadog-Meta-Lang': 'javascript',
       'Datadog-Meta-Tracer-Version': pkg.version,
       'Content-Type': 'application/msgpack',
-      'Content-Encoding': 'gzip'
+      'Content-Encoding': 'gzip',
     },
-    url
+    url,
   }
 
   log.debug('Request to the intake: %j', options)
@@ -32,12 +31,7 @@ function makeRequest (data, url, cb) {
 
 class DataStreamsWriter {
   constructor (config) {
-    const { hostname = defaults.hostname, port = defaults.port, url } = config
-    this._url = url || new URL(format({
-      protocol: 'http:',
-      hostname,
-      port
-    }))
+    this._url = getAgentUrl(config)
   }
 
   flush (payload) {
@@ -72,5 +66,5 @@ class DataStreamsWriter {
 }
 
 module.exports = {
-  DataStreamsWriter
+  DataStreamsWriter,
 }

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

@@ -1,6 +1,6 @@
 'use strict'
 
-module.exports = function getDebuggerConfig (config) {
+module.exports = function getDebuggerConfig (config, inputPath) {
   return {
     commitSHA: config.commitSHA,
     debug: config.debug,
@@ -13,5 +13,6 @@ module.exports = function getDebuggerConfig (config) {
     runtimeId: config.tags['runtime-id'],
     service: config.service,
     url: config.url?.toString(),
+    inputPath,
   }
 }

package/packages/dd-trace/src/debugger/constants.js

@@ -0,0 +1,7 @@
+'use strict'
+
+module.exports = {
+  DEBUGGER_DIAGNOSTICS_V1: '/debugger/v1/diagnostics',
+  DEBUGGER_INPUT_V1: '/debugger/v1/input',
+  DEBUGGER_INPUT_V2: '/debugger/v2/input',
+}

package/packages/dd-trace/src/debugger/devtools_client/breakpoints.js

@@ -10,10 +10,14 @@ const {
   clearState,
   locationToBreakpoint,
   breakpointToProbes,
-  probeToLocation
+  probeToLocation,
 } = require('./state')
 const log = require('./log')
 
+/**
+ * @typedef {import('inspector').Debugger.SetBreakpointReturnType} SetBreakpointResponse
+ */
+
 let sessionStarted = false
 const probes = new Map()
 let scriptLoadingStabilizedResolve
@@ -38,7 +42,7 @@ session.on('scriptLoadingStabilized', () => {
 module.exports = {
   addBreakpoint: lock(addBreakpoint),
   removeBreakpoint: lock(removeBreakpoint),
-  modifyBreakpoint: lock(modifyBreakpoint)
+  modifyBreakpoint: lock(modifyBreakpoint),
 }
 
 async function addBreakpoint (probe) {
@@ -50,7 +54,7 @@ async function addBreakpoint (probe) {
   let lineNumber = Number(probe.where.lines[0]) // Tracer doesn't support multiple-line breakpoints
   let columnNumber = 0 // Probes do not contain/support column information
 
-  // Optimize for sending data to /debugger/v1/input endpoint
+  // Optimize for sending data to debugger input endpoint
   probe.location = { file, lines: [String(lineNumber)] }
 
   // Optimize for fast calculations when probe is hit
@@ -119,14 +123,14 @@ async function addBreakpoint (probe) {
     const location = {
       scriptId,
       lineNumber: lineNumber - 1, // Beware! lineNumber is zero-indexed
-      columnNumber
+      columnNumber,
     }
     let result
     try {
-      result = await session.post('Debugger.setBreakpoint', {
+      result = /** @type {SetBreakpointResponse} */ (await session.post('Debugger.setBreakpoint', {
         location,
-        condition: probe.condition
-      })
+        condition: probe.condition,
+      }))
     } catch (err) {
       throw new Error(`Error setting breakpoint for probe ${probe.id} (version: ${probe.version})`, { cause: err })
     }
@@ -200,10 +204,10 @@ async function updateBreakpointInternal (breakpoint, probe) {
     breakpointToProbes.delete(breakpoint.id)
     let result
     try {
-      result = await session.post('Debugger.setBreakpoint', {
+      result = /** @type {SetBreakpointResponse} */ (await session.post('Debugger.setBreakpoint', {
         location: breakpoint.location,
-        condition
-      })
+        condition,
+      }))
     } catch (err) {
       throw new Error(`Error setting breakpoint for probe ${probe.id} (version: ${probe.version})`, { cause: err })
     }

package/packages/dd-trace/src/debugger/devtools_client/condition.js

@@ -3,7 +3,7 @@
 module.exports = {
   compile,
   compileSegments,
-  templateRequiresEvaluation
+  templateRequiresEvaluation,
 }
 
 const identifierRegex = /^[@a-zA-Z_$][\w$]*$/
@@ -34,7 +34,7 @@ const reservedWords = new Set([
   'implements', 'interface', 'package', 'private', 'protected', 'public',
 
   // Literals
-  'NaN'
+  'NaN',
 ])
 
 const PRIMITIVE_TYPES = new Set(['string', 'number', 'bigint', 'boolean', 'undefined', 'symbol', 'null'])

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

@@ -1,29 +1,23 @@
 'use strict'
 
 const { workerData: { config: parentConfig, parentThreadId, configPort } } = require('node:worker_threads')
-const { format } = require('node:url')
-const defaults = require('../../config/defaults')
+const { getAgentUrl } = require('../../agent/url')
 const log = require('./log')
 
 const config = module.exports = {
   ...parentConfig,
   parentThreadId,
-  maxTotalPayloadSize: 5 * 1024 * 1024 // 5MB
+  maxTotalPayloadSize: 5 * 1024 * 1024, // 5MB
 }
 
-updateUrl(parentConfig)
+updateConfig(parentConfig)
 
-configPort.on('message', updateUrl)
+configPort.on('message', updateConfig)
 configPort.on('messageerror', (err) =>
   log.error('[debugger:devtools_client] received "messageerror" on config port', err)
 )
 
-function updateUrl (updates) {
-  config.url = updates.url || format({
-    protocol: 'http:',
-    hostname: updates.hostname || defaults.hostname,
-    port: updates.port
-  })
-
+function updateConfig (updates) {
+  config.url = getAgentUrl(updates)
   config.dynamicInstrumentation.captureTimeoutNs = BigInt(updates.dynamicInstrumentation.captureTimeoutMs) * 1_000_000n
 }

package/packages/dd-trace/src/debugger/devtools_client/defaults.js

@@ -3,5 +3,5 @@
 module.exports = {
   MAX_SNAPSHOTS_PER_SECOND_GLOBALLY: 25,
   MAX_SNAPSHOTS_PER_SECOND_PER_PROBE: 1,
-  MAX_NON_SNAPSHOTS_PER_SECOND_PER_PROBE: 5000
+  MAX_NON_SNAPSHOTS_PER_SECOND_PER_PROBE: 5000,
 }