dd-trace 5.84.0 → 5.85.0

package/packages/dd-trace/src/appsec/telemetry/user.js

@@ -7,26 +7,26 @@ const appsecMetrics = telemetryMetrics.manager.namespace('appsec')
 function incrementMissingUserLogin (framework, eventType) {
   appsecMetrics.count('instrum.user_auth.missing_user_login', {
     framework,
-    event_type: eventType
+    event_type: eventType,
   }).inc()
 }
 
 function incrementMissingUserId (framework, eventType) {
   appsecMetrics.count('instrum.user_auth.missing_user_id', {
     framework,
-    event_type: eventType
+    event_type: eventType,
   }).inc()
 }
 
 function incrementSdkEvent (eventType, sdkVersion = 'v1') {
   appsecMetrics.count('sdk.event', {
     event_type: eventType,
-    sdk_version: sdkVersion
+    sdk_version: sdkVersion,
   }).inc()
 }
 
 module.exports = {
   incrementMissingUserLogin,
   incrementMissingUserId,
-  incrementSdkEvent
+  incrementSdkEvent,
 }

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

@@ -10,7 +10,7 @@ const DD_TELEMETRY_WAF_RESULT_TAGS = Symbol('_dd.appsec.telemetry.waf.result.tag
 const TRUNCATION_FLAGS = {
   STRING: 1,
   CONTAINER_SIZE: 2,
-  CONTAINER_DEPTH: 4
+  CONTAINER_DEPTH: 4,
 }
 
 function addWafRequestMetrics (store, { duration, durationExt, wafTimeout, errorCode }) {
@@ -83,7 +83,7 @@ function getOrCreateMetricTags (store, versionsTags) {
       [tags.WAF_ERROR]: false,
       [tags.WAF_TIMEOUT]: false,
 
-      ...versionsTags
+      ...versionsTags,
     }
     store[DD_TELEMETRY_WAF_RESULT_TAGS] = metricTags
   }
@@ -139,5 +139,5 @@ module.exports = {
   incrementWafInit,
   incrementWafUpdates,
   incrementWafConfigErrors,
-  incrementWafRequests
+  incrementWafRequests,
 }

package/packages/dd-trace/src/appsec/user_tracking.js

@@ -88,7 +88,7 @@ function trackLogin (framework, login, user, success, rootSpan) {
   let newTags
 
   const persistent = {
-    [addresses.USER_LOGIN]: login
+    [addresses.USER_LOGIN]: login,
   }
 
   const currentTags = rootSpan.context()._tags
@@ -103,7 +103,7 @@ function trackLogin (framework, login, user, success, rootSpan) {
     newTags = {
       'appsec.events.users.login.success.track': 'true',
       '_dd.appsec.events.users.login.success.auto.mode': collectionMode,
-      '_dd.appsec.usr.login': login
+      '_dd.appsec.usr.login': login,
     }
 
     if (shouldSetTag('appsec.events.users.login.success.usr.login')) {
@@ -124,7 +124,7 @@ function trackLogin (framework, login, user, success, rootSpan) {
     newTags = {
       'appsec.events.users.login.failure.track': 'true',
       '_dd.appsec.events.users.login.failure.auto.mode': collectionMode,
-      '_dd.appsec.usr.login': login
+      '_dd.appsec.usr.login': login,
     }
 
     if (shouldSetTag('appsec.events.users.login.failure.usr.login')) {
@@ -172,13 +172,13 @@ function trackUser (user, rootSpan) {
   if (!isSdkCalled) {
     rootSpan.addTags({
       'usr.id': userId,
-      '_dd.appsec.user.collection_mode': collectionMode
+      '_dd.appsec.user.collection_mode': collectionMode,
     })
 
     return waf.run({
       persistent: {
-        [addresses.USER_ID]: userId
-      }
+        [addresses.USER_ID]: userId,
+      },
     })
   }
 }
@@ -186,5 +186,5 @@ function trackUser (user, rootSpan) {
 module.exports = {
   setCollectionMode,
   trackLogin,
-  trackUser
+  trackUser,
 }

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

@@ -10,6 +10,6 @@ module.exports = {
     'scanners',
     'rules_override',
     'rules_data',
-    'exclusion_data'
-  ]
+    'exclusion_data',
+  ],
 }

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

@@ -38,7 +38,7 @@ const waf = {
   checkAsmDdFallback,
   run: noop,
   disposeContext: noop,
-  WafUpdateError
+  WafUpdateError,
 }
 
 /**

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

@@ -8,7 +8,7 @@ const { wafRunFinished } = require('../channels')
 
 // TODO: remove once ephemeral addresses are implemented
 const preventDuplicateAddresses = new Set([
-  addresses.HTTP_INCOMING_QUERY
+  addresses.HTTP_INCOMING_QUERY,
 ])
 
 class WAFContextWrapper {
@@ -96,7 +96,7 @@ class WAFContextWrapper {
       errorCode: null,
       maxTruncatedString: null,
       maxTruncatedContainerSize: null,
-      maxTruncatedContainerDepth: null
+      maxTruncatedContainerDepth: null,
     }
 
     try {

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

@@ -6,7 +6,7 @@ const os = require('os')
 const {
   getEnvironmentVariable,
   getEnvironmentVariables,
-  getValueFromEnvSources
+  getValueFromEnvSources,
 } = require('./config/helper')
 const { getIsAzureFunction, getIsFlexConsumptionAzureFunction } = require('./serverless')
 
@@ -31,11 +31,18 @@ function buildResourceID (subscriptionID, siteName, resourceGroup) {
     .toLowerCase()
 }
 
+/**
+ * @param {Record<string | symbol, unknown>} obj
+ * @returns {Partial<Record<string | symbol, unknown>>}
+ */
 function trimObject (obj) {
-  Object.entries(obj)
-    .filter(([_, value]) => value === undefined)
-    .forEach(([key, _]) => { delete obj[key] })
-  return obj
+  const cleanedObj = {}
+  for (const [key, value] of Object.entries(obj)) {
+    if (value !== undefined) {
+      cleanedObj[key] = value
+    }
+  }
+  return cleanedObj
 }
 
 function buildMetadata () {
@@ -48,7 +55,7 @@ function buildMetadata () {
     WEBSITE_OWNER_NAME,
     WEBSITE_OS,
     WEBSITE_RESOURCE_GROUP,
-    WEBSITE_SITE_NAME
+    WEBSITE_SITE_NAME,
   } = getEnvironmentVariables()
 
   const DD_AAS_DOTNET_EXTENSION_VERSION = getValueFromEnvSources('DD_AAS_DOTNET_EXTENSION_VERSION')
@@ -82,7 +89,7 @@ function buildMetadata () {
     siteKind,
     siteName,
     siteType,
-    subscriptionID
+    subscriptionID,
   })
 }
 
@@ -121,12 +128,12 @@ function getAzureTagsFromMetadata (metadata) {
     'aas.site.kind': metadata.siteKind,
     'aas.site.name': metadata.siteName,
     'aas.site.type': metadata.siteType,
-    'aas.subscription.id': metadata.subscriptionID
+    'aas.subscription.id': metadata.subscriptionID,
   })
 }
 
 module.exports = {
   getAzureAppMetadata,
   getAzureFunctionMetadata,
-  getAzureTagsFromMetadata
+  getAzureTagsFromMetadata,
 }

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

@@ -68,5 +68,5 @@ module.exports = {
   getBaggageItem,
   getAllBaggageItems,
   removeBaggageItem,
-  removeAllBaggageItems
+  removeAllBaggageItems,
 }

package/packages/dd-trace/src/ci-visibility/coverage-report-discovery.js

@@ -0,0 +1,82 @@
+'use strict'
+
+const fs = require('node:fs')
+const path = require('node:path')
+
+const log = require('../log')
+
+/**
+ * Coverage report file patterns to search for
+ * Each entry contains the relative path from root and the format identifier
+ */
+const COVERAGE_REPORT_PATTERNS = [
+  // LCOV format
+  { path: 'coverage/lcov.info', format: 'lcov' },
+  { path: 'lcov.info', format: 'lcov' },
+
+  // Cobertura XML format
+  { path: 'coverage/cobertura-coverage.xml', format: 'cobertura' },
+  { path: 'cobertura-coverage.xml', format: 'cobertura' },
+
+  // JaCoCo XML format
+  { path: 'coverage/jacoco.xml', format: 'jacoco' },
+  { path: 'jacoco.xml', format: 'jacoco' },
+
+  // Clover XML format
+  { path: 'coverage/clover.xml', format: 'clover' },
+  { path: 'clover.xml', format: 'clover' },
+
+  // OpenCover XML format
+  { path: 'coverage/opencover.xml', format: 'opencover' },
+  { path: 'opencover.xml', format: 'opencover' },
+
+  // SimpleCov JSON format
+  { path: 'coverage/.resultset.json', format: 'simplecov' },
+  { path: '.resultset.json', format: 'simplecov' },
+]
+
+/**
+ * Discovers code coverage report files in the given root directory
+ * @param {string} rootDir - The root directory to search for coverage reports
+ * @returns {Array<{filePath: string, format: string}>} Array of discovered coverage reports
+ */
+function discoverCoverageReports (rootDir) {
+  if (!rootDir) {
+    log.debug('No root directory provided for coverage report discovery')
+    return []
+  }
+
+  const discoveredReports = []
+
+  for (const pattern of COVERAGE_REPORT_PATTERNS) {
+    const fullPath = path.join(rootDir, pattern.path)
+
+    try {
+      if (fs.existsSync(fullPath)) {
+        const stats = fs.statSync(fullPath)
+
+        // Only include regular files, not directories or symlinks
+        if (stats.isFile()) {
+          discoveredReports.push({
+            filePath: fullPath,
+            format: pattern.format,
+          })
+          log.debug('Found coverage report: %s (format: %s)', fullPath, pattern.format)
+        }
+      }
+    } catch (err) {
+      // Log but don't fail if we can't access a file
+      log.debug('Error checking coverage report path %s: %s', fullPath, err.message)
+    }
+  }
+
+  if (discoveredReports.length === 0) {
+    log.debug('No coverage reports found in %s', rootDir)
+  } else {
+    log.debug('Discovered %d coverage report(s)', discoveredReports.length)
+  }
+
+  return discoveredReports
+}
+
+module.exports = { discoverCoverageReports }

package/packages/dd-trace/src/ci-visibility/dynamic-instrumentation/index.js

@@ -50,7 +50,7 @@ class TestVisDynamicInstrumentation {
       probeId,
       new Promise(resolve => {
         probeIdToResolveBreakpointSet.set(probeId, resolve)
-      })
+      }),
     ]
   }
 
@@ -84,7 +84,7 @@ class TestVisDynamicInstrumentation {
           DD_TEST_FAILED_TEST_REPLAY_ENABLED: 'false',
           DD_CIVISIBILITY_MANUAL_API_ENABLED: 'false',
           DD_TRACING_ENABLED: 'false',
-          DD_INSTRUMENTATION_TELEMETRY_ENABLED: 'false'
+          DD_INSTRUMENTATION_TELEMETRY_ENABLED: 'false',
         },
         workerData: {
           config: getDebuggerConfig(this._config),
@@ -93,15 +93,15 @@ class TestVisDynamicInstrumentation {
           configPort: configChannel.port1,
           breakpointSetChannel: this.breakpointSetChannel.port1,
           breakpointHitChannel: this.breakpointHitChannel.port1,
-          breakpointRemoveChannel: this.breakpointRemoveChannel.port1
+          breakpointRemoveChannel: this.breakpointRemoveChannel.port1,
         },
         transferList: [
           probeChannel.port1,
           configChannel.port1,
           this.breakpointSetChannel.port1,
           this.breakpointHitChannel.port1,
-          this.breakpointRemoveChannel.port1
-        ]
+          this.breakpointRemoveChannel.port1,
+        ],
       }
     )
     this.worker.on('online', () => {

package/packages/dd-trace/src/ci-visibility/dynamic-instrumentation/worker/index.js

@@ -5,8 +5,8 @@ const {
     config,
     breakpointSetChannel,
     breakpointHitChannel,
-    breakpointRemoveChannel
-  }
+    breakpointRemoveChannel,
+  },
 } = require('worker_threads')
 const { randomUUID } = require('crypto')
 
@@ -19,7 +19,7 @@ const { getLocalStateForCallFrame } = require('../../../debugger/devtools_client
 // TODO: move debugger/devtools_client/state to common place
 const {
   findScriptFromPartialPath,
-  getStackFromCallFrames
+  getStackFromCallFrames,
 } = require('../../../debugger/devtools_client/state')
 const log = require('../../../log')
 const processTags = require('../../../process-tags')
@@ -36,7 +36,7 @@ session.on('Debugger.paused', async ({ params: { hitBreakpoints: [hitBreakpoint]
     return session.post('Debugger.resume')
   }
 
-  const stack = getStackFromCallFrames(callFrames)
+  const stack = await getStackFromCallFrames(callFrames)
 
   const { processLocalState } = await getLocalStateForCallFrame(callFrames[0])
 
@@ -48,13 +48,13 @@ session.on('Debugger.paused', async ({ params: { hitBreakpoints: [hitBreakpoint]
     probe: {
       id: probe.id,
       version: '0',
-      location: probe.location
+      location: probe.location,
     },
     captures: {
-      lines: { [probe.location.lines[0]]: { locals: processLocalState() } }
+      lines: { [probe.location.lines[0]]: { locals: processLocalState() } },
     },
     stack,
-    language: 'javascript'
+    language: 'javascript',
   }
 
   if (config.propagateProcessTags?.enabled) {
@@ -126,8 +126,8 @@ async function addBreakpoint (probe) {
       location: {
         scriptId,
         lineNumber: lineNumber - 1,
-        columnNumber
-      }
+        columnNumber,
+      },
     })
 
     breakpointIdToProbe.set(breakpointId, probe)

package/packages/dd-trace/src/ci-visibility/early-flake-detection/get-known-tests.js

@@ -12,7 +12,7 @@ const {
   TELEMETRY_KNOWN_TESTS_MS,
   TELEMETRY_KNOWN_TESTS_ERRORS,
   TELEMETRY_KNOWN_TESTS_RESPONSE_TESTS,
-  TELEMETRY_KNOWN_TESTS_RESPONSE_BYTES
+  TELEMETRY_KNOWN_TESTS_RESPONSE_BYTES,
 } = require('../../ci-visibility/telemetry')
 
 const { getNumFromKnownTests } = require('../../plugins/util/test')
@@ -31,16 +31,16 @@ function getKnownTests ({
   osArchitecture,
   runtimeName,
   runtimeVersion,
-  custom
+  custom,
 }, done) {
   const options = {
     path: '/api/v2/ci/libraries/tests',
     method: 'POST',
     headers: {
-      'Content-Type': 'application/json'
+      'Content-Type': 'application/json',
     },
     timeout: 20_000,
-    url
+    url,
   }
 
   if (isGzipCompatible) {
@@ -70,14 +70,14 @@ function getKnownTests ({
           'os.architecture': osArchitecture,
           'runtime.name': runtimeName,
           'runtime.version': runtimeVersion,
-          custom
+          custom,
         },
         service,
         env,
         repository_url: repositoryUrl,
-        sha
-      }
-    }
+        sha,
+      },
+    },
   })
 
   incrementCountMetric(TELEMETRY_KNOWN_TESTS)

package/packages/dd-trace/src/ci-visibility/exporters/agent-proxy/index.js

@@ -5,10 +5,10 @@ const AgentlessWriter = require('../agentless/writer')
 const CoverageWriter = require('../agentless/coverage-writer')
 const CiVisibilityExporter = require('../ci-visibility-exporter')
 const { fetchAgentInfo } = require('../../../agent/info')
+const { DEBUGGER_INPUT_V1 } = require('../../../debugger/constants')
 
 const AGENT_EVP_PROXY_PATH_PREFIX = '/evp_proxy/v'
 const AGENT_EVP_PROXY_PATH_REGEX = /\/evp_proxy\/v(\d+)\/?/
-const AGENT_DEBUGGER_INPUT = '/debugger/v1/input'
 
 function getLatestEvpProxyVersion (err, agentInfo) {
   if (err) {
@@ -27,7 +27,7 @@ function getLatestEvpProxyVersion (err, agentInfo) {
 }
 
 function getCanForwardDebuggerLogs (err, agentInfo) {
-  return !err && agentInfo.endpoints.includes(AGENT_DEBUGGER_INPUT)
+  return !err && agentInfo.endpoints.includes(DEBUGGER_INPUT_V1)
 }
 
 class AgentProxyCiVisibilityExporter extends CiVisibilityExporter {
@@ -40,7 +40,7 @@ class AgentProxyCiVisibilityExporter extends CiVisibilityExporter {
       lookup,
       protocolVersion,
       headers,
-      isTestDynamicInstrumentationEnabled
+      isTestDynamicInstrumentationEnabled,
     } = config
 
     fetchAgentInfo(this._url, (err, agentInfo) => {
@@ -61,19 +61,20 @@ class AgentProxyCiVisibilityExporter extends CiVisibilityExporter {
         this._writer = new AgentlessWriter({
           url: this._url,
           tags,
-          evpProxyPrefix
+          evpProxyPrefix,
         })
         this._coverageWriter = new CoverageWriter({
           url: this._url,
-          evpProxyPrefix
+          evpProxyPrefix,
         })
+        this._codeCoverageReportUrl = this._url
         if (isTestDynamicInstrumentationEnabled) {
           const canFowardLogs = getCanForwardDebuggerLogs(err, agentInfo)
           if (canFowardLogs) {
             const DynamicInstrumentationLogsWriter = require('../agentless/di-logs-writer')
             this._logsWriter = new DynamicInstrumentationLogsWriter({
               url: this._url,
-              isAgentProxy: true
+              isAgentProxy: true,
             })
             this._canForwardLogs = true
           }
@@ -84,7 +85,7 @@ class AgentProxyCiVisibilityExporter extends CiVisibilityExporter {
           prioritySampler,
           lookup,
           protocolVersion,
-          headers
+          headers,
         })
         // coverages will never be used, so we discard them
         this._coverageBuffer = []

package/packages/dd-trace/src/ci-visibility/exporters/agentless/coverage-writer.js

@@ -13,7 +13,7 @@ const {
   TELEMETRY_ENDPOINT_PAYLOAD_BYTES,
   TELEMETRY_ENDPOINT_PAYLOAD_REQUESTS_MS,
   TELEMETRY_ENDPOINT_PAYLOAD_REQUESTS_ERRORS,
-  TELEMETRY_ENDPOINT_PAYLOAD_DROPPED
+  TELEMETRY_ENDPOINT_PAYLOAD_DROPPED,
 } = require('../../../ci-visibility/telemetry')
 
 class Writer extends BaseWriter {
@@ -30,10 +30,10 @@ class Writer extends BaseWriter {
       method: 'POST',
       headers: {
         'dd-api-key': getValueFromEnvSources('DD_API_KEY'),
-        ...form.getHeaders()
+        ...form.getHeaders(),
       },
       timeout: 15_000,
-      url: this._url
+      url: this._url,
     }
 
     if (this._evpProxyPrefix) {
@@ -42,6 +42,7 @@ class Writer extends BaseWriter {
       options.headers['X-Datadog-EVP-Subdomain'] = 'citestcov-intake'
     }
 
+    // eslint-disable-next-line eslint-rules/eslint-log-printf-style
     log.debug(() => `Request to the intake: ${safeJSONStringify(options)}`)
 
     const startRequestTime = Date.now()

package/packages/dd-trace/src/ci-visibility/exporters/agentless/di-logs-writer.js

@@ -4,6 +4,7 @@ const log = require('../../../log')
 const { safeJSONStringify } = require('../../../exporters/common/util')
 const { JSONEncoder } = require('../../encode/json-encoder')
 const { getValueFromEnvSources } = require('../../../config/helper')
+const { DEBUGGER_INPUT_V1 } = require('../../../debugger/constants')
 
 const BaseWriter = require('../../../exporters/common/writer')
 
@@ -26,17 +27,18 @@ class DynamicInstrumentationLogsWriter extends BaseWriter {
       method: 'POST',
       headers: {
         'dd-api-key': getValueFromEnvSources('DD_API_KEY'),
-        'Content-Type': 'application/json'
+        'Content-Type': 'application/json',
       },
       timeout: this.timeout,
-      url: this._url
+      url: this._url,
     }
 
     if (this._isAgentProxy) {
       delete options.headers['dd-api-key']
-      options.path = '/debugger/v1/input'
+      options.path = DEBUGGER_INPUT_V1
     }
 
+    // eslint-disable-next-line eslint-rules/eslint-log-printf-style
     log.debug(() => `Request to the logs intake: ${safeJSONStringify(options)}`)
 
     request(data, options, (err, res) => {

package/packages/dd-trace/src/ci-visibility/exporters/agentless/index.js

@@ -21,6 +21,8 @@ class AgentlessCiVisibilityExporter extends CiVisibilityExporter {
     this._coverageUrl = url || new URL(`https://citestcov-intake.${site}`)
     this._coverageWriter = new CoverageWriter({ url: this._coverageUrl })
 
+    this._codeCoverageReportUrl = url || new URL(`https://ci-intake.${site}`)
+
     if (isTestDynamicInstrumentationEnabled) {
       const DynamicInstrumentationLogsWriter = require('./di-logs-writer')
       this._logsUrl = url || new URL(`https://http-intake.logs.${site}`)

package/packages/dd-trace/src/ci-visibility/exporters/agentless/writer.js

@@ -13,7 +13,7 @@ const {
   TELEMETRY_ENDPOINT_PAYLOAD_BYTES,
   TELEMETRY_ENDPOINT_PAYLOAD_REQUESTS_MS,
   TELEMETRY_ENDPOINT_PAYLOAD_REQUESTS_ERRORS,
-  TELEMETRY_ENDPOINT_PAYLOAD_DROPPED
+  TELEMETRY_ENDPOINT_PAYLOAD_DROPPED,
 } = require('../../../ci-visibility/telemetry')
 
 class Writer extends BaseWriter {
@@ -31,10 +31,10 @@ class Writer extends BaseWriter {
       method: 'POST',
       headers: {
         'dd-api-key': getValueFromEnvSources('DD_API_KEY'),
-        'Content-Type': 'application/msgpack'
+        'Content-Type': 'application/msgpack',
       },
       timeout: 15_000,
-      url: this._url
+      url: this._url,
     }
 
     if (this._evpProxyPrefix) {
@@ -43,6 +43,7 @@ class Writer extends BaseWriter {
       options.headers['X-Datadog-EVP-Subdomain'] = 'citestcycle-intake'
     }
 
+    // eslint-disable-next-line eslint-rules/eslint-log-printf-style
     log.debug(() => `Request to the intake: ${safeJSONStringify(options)}`)
 
     const startRequestTime = Date.now()