dd-trace 5.99.1 → 5.101.0

package/packages/datadog-plugin-cypress/src/cypress-plugin.js

@@ -4,6 +4,7 @@
 const { performance } = require('perf_hooks')
 const dateNow = Date.now
 
+const satisfies = require('../../../vendor/dist/semifies')
 const {
   TEST_STATUS,
   TEST_IS_RUM_ACTIVE,
@@ -55,7 +56,9 @@ const {
   TEST_IS_MODIFIED,
   TEST_HAS_DYNAMIC_NAME,
   DYNAMIC_NAME_RE,
-  logDynamicNamesWarning,
+  recordAttemptToFixExecution,
+  logAttemptToFixTestExecution,
+  logTestOptimizationSummary,
   getPullRequestBaseBranch,
   TEST_FINAL_STATUS,
 } = require('../../dd-trace/src/plugins/util/test')
@@ -106,6 +109,7 @@ const {
 } = require('./source-map-utils')
 
 const TEST_FRAMEWORK_NAME = 'cypress'
+let hasWarnedDeprecatedCypressVersion = false
 
 const CYPRESS_STATUS_TO_TEST_STATUS = {
   passed: 'pass',
@@ -134,6 +138,20 @@ function getCypressVersion (details) {
   return ''
 }
 
+function warnDeprecatedCypressVersion (version) {
+  if (DD_MAJOR >= 6 || hasWarnedDeprecatedCypressVersion || !version || !satisfies(version, '<12.0.0')) {
+    return
+  }
+
+  hasWarnedDeprecatedCypressVersion = true
+  // console.warn does not seem to work reliably in Cypress, so use console.log instead.
+  // eslint-disable-next-line no-console
+  console.log(
+    'WARNING: dd-trace support for Cypress<12.0.0 is deprecated' +
+    ' and will not be supported in dd-trace v6. Please upgrade Cypress to >=12.0.0.'
+  )
+}
+
 function getRootDir (details) {
   if (details?.config) {
     return details.config.projectRoot || details.config.repoRoot || process.cwd()
@@ -278,9 +296,8 @@ function getFinalStatus ({
   isQuarantined,
   isDisabled,
 }) {
-  // If the test is quarantined or disabled, regardless of its actual execution result or active retry features,
-  // the final status of its last execution should be reported as 'skip'.
-  if (isQuarantined || isDisabled || status === 'skip') {
+  // If the test is quarantined or disabled, its final status is skip unless attempt-to-fix takes precedence.
+  if (status === 'skip' || (retryKind !== FINAL_STATUS_RETRY_KIND.atf && (isQuarantined || isDisabled))) {
     return 'skip'
   }
 
@@ -322,6 +339,8 @@ class CypressPlugin {
   isImpactedTestsEnabled = false
   modifiedFiles = []
   newTestsWithDynamicNames = new Set()
+  attemptToFixExecutions = new Map()
+  loggedAttemptToFixTests = new Set()
 
   constructor () {
     const {
@@ -394,6 +413,8 @@ class CypressPlugin {
     this.testManagementTests = undefined
     this.isImpactedTestsEnabled = false
     this.modifiedFiles = []
+    this.attemptToFixExecutions = new Map()
+    this.loggedAttemptToFixTests = new Set()
     this.activeTestSpan = null
     this.testSuiteSpan = null
     this.testModuleSpan = null
@@ -429,6 +450,7 @@ class CypressPlugin {
     this._isInit = true
     this.tracer = tracer
     this.cypressConfig = cypressConfig
+    warnDeprecatedCypressVersion(cypressConfig.version)
 
     this.isTestIsolationEnabled = getIsTestIsolationEnabled(cypressConfig)
 
@@ -800,7 +822,10 @@ class CypressPlugin {
         this.testSessionSpan.setTag(TEST_MANAGEMENT_ENABLED, 'true')
       }
 
-      logDynamicNamesWarning(this.newTestsWithDynamicNames)
+      logTestOptimizationSummary({
+        attemptToFixExecutions: this.attemptToFixExecutions,
+        newTestsWithDynamicNames: this.newTestsWithDynamicNames,
+      })
 
       this.testModuleSpan.finish()
       this.ciVisEvent(TELEMETRY_EVENT_FINISHED, 'module')
@@ -939,10 +964,10 @@ class CypressPlugin {
         if (cypressTest.displayError) {
           latestError = new Error(cypressTest.displayError)
         }
-        // Update test status - but NOT for quarantined tests where we intentionally
+        // Update test status - but NOT for non-ATF quarantined tests where we intentionally
         // report 'fail' to Datadog even though Cypress sees it as 'pass'
         const isQuarantinedTest = finishedTest.testSpan?.context()?._tags?.[TEST_MANAGEMENT_IS_QUARANTINED] === 'true'
-        if (cypressTestStatus !== finishedTest.testStatus && !isQuarantinedTest) {
+        if (cypressTestStatus !== finishedTest.testStatus && (!isQuarantinedTest || finishedTest.isAttemptToFix)) {
           finishedTest.testSpan.setTag(TEST_STATUS, cypressTestStatus)
           finishedTest.testSpan.setTag('error', latestError)
         }
@@ -1050,6 +1075,10 @@ class CypressPlugin {
           return { shouldSkip: true }
         }
 
+        if (isAttemptToFix) {
+          logAttemptToFixTestExecution(testSuite, testName, this.loggedAttemptToFixTests)
+        }
+
         // For disabled tests (not attemptToFix), skip them
         if (!isAttemptToFix && isDisabled) {
           return { shouldSkip: true }
@@ -1090,6 +1119,7 @@ class CypressPlugin {
           isAttemptToFix,
           isModified,
           isQuarantined: isQuarantinedFromSupport,
+          isDisabled: isDisabledFromSupport,
         } = test
         if (coverage && this.isCodeCoverageEnabled && this.tracer._tracer._exporter?.exportCoverage) {
           const coverageFiles = getCoveredFilenamesFromCoverage(coverage)
@@ -1119,6 +1149,7 @@ class CypressPlugin {
           this.testStatuses[testName] = [testStatus]
         }
         const testStatuses = this.testStatuses[testName]
+        const activeSpanTags = this.activeTestSpan.context()._tags
 
         if (error) {
           this.activeTestSpan.setTag('error', error)
@@ -1194,6 +1225,13 @@ class CypressPlugin {
               this.activeTestSpan.setTag(TEST_MANAGEMENT_ATTEMPT_TO_FIX_PASSED, 'true')
             }
           }
+          recordAttemptToFixExecution(this.attemptToFixExecutions, {
+            testSuite,
+            testName,
+            status: testStatus,
+            isDisabled: activeSpanTags[TEST_MANAGEMENT_IS_DISABLED] === 'true',
+            isQuarantined: activeSpanTags[TEST_MANAGEMENT_IS_QUARANTINED] === 'true',
+          })
         }
         // ATR: set TEST_HAS_FAILED_ALL_RETRIES when all auto test retries were exhausted and every attempt failed
         if (this.isFlakyTestRetriesEnabled && !isAttemptToFix && !isEfdRetry &&
@@ -1207,6 +1245,9 @@ class CypressPlugin {
         if (isQuarantinedFromSupport) {
           this.activeTestSpan.setTag(TEST_MANAGEMENT_IS_QUARANTINED, 'true')
         }
+        if (isDisabledFromSupport) {
+          this.activeTestSpan.setTag(TEST_MANAGEMENT_IS_DISABLED, 'true')
+        }
 
         const finishedTest = {
           testName,
@@ -1222,13 +1263,12 @@ class CypressPlugin {
           this.finishedTestsByFile[testSuite] = [finishedTest]
         }
         // test spans are finished at after:spec
-        const activeSpanTags = this.activeTestSpan.context()._tags
         this.ciVisEvent(TELEMETRY_EVENT_FINISHED, 'test', {
           hasCodeOwners: !!activeSpanTags[TEST_CODE_OWNERS],
           isNew,
           isRum: isRUMActive,
           browserDriver: 'cypress',
-          isQuarantined: isQuarantinedFromSupport,
+          isQuarantined: activeSpanTags[TEST_MANAGEMENT_IS_QUARANTINED] === 'true',
           isModified,
           isDisabled: activeSpanTags[TEST_MANAGEMENT_IS_DISABLED] === 'true',
         })

package/packages/datadog-plugin-cypress/src/plugin.js

@@ -23,22 +23,13 @@ const noopTask = {
 module.exports = function CypressPlugin (on, config) {
   const tracer = require('../../dd-trace')
 
-  if (satisfies(config.version, '<10.2.0')) {
-    if (DD_MAJOR >= 6) {
-      // eslint-disable-next-line no-console
-      console.error(
-        'ERROR: dd-trace v6 has deleted support for Cypress<10.2.0.'
-      )
-      on('task', noopTask)
-      return config
-    }
-
-    // console.warn does not seem to work in cypress, so using console.log instead
+  if (DD_MAJOR >= 6 && satisfies(config.version, '<12.0.0')) {
     // eslint-disable-next-line no-console
-    console.log(
-      'WARNING: dd-trace support for Cypress<10.2.0 is deprecated' +
-      ' and will not be supported in future versions of dd-trace.'
+    console.error(
+      'ERROR: dd-trace v6 has deleted support for Cypress<12.0.0.'
     )
+    on('task', noopTask)
+    return config
   }
 
   // The tracer was not init correctly for whatever reason (such as invalid DD_SITE)

package/packages/datadog-plugin-cypress/src/support.js

@@ -15,8 +15,8 @@ let isModifiedTest = false
 let isTestIsolationEnabled = false
 // Array of test names that have been retried and the reason
 const retryReasonsByTestName = new Map()
-// Track quarantined test errors - we catch them in Cypress.on('fail') but need to report to Datadog
-const quarantinedTestErrors = new Map()
+// Track test errors suppressed by test management so we can still report them to Datadog.
+const suppressedTestFailures = new Map()
 
 // Track the most recently loaded window in the AUT. Updated via the 'window:load'
 // event so we always get the real app window (after cy.visit()), not the
@@ -61,13 +61,12 @@ Cypress.on('fail', (err, runnable) => {
   }
 
   const testName = runnable.fullTitle()
-  const { isQuarantined, isDisabled } = getTestProperties(testName)
+  const { isAttemptToFix, isQuarantined, isDisabled } = getTestProperties(testName)
 
   // Suppress failures for quarantined or disabled tests so they don't affect the exit code.
-  // This applies regardless of attempt-to-fix status: per spec, quarantined/disabled test
-  // results are always ignored.
-  if (isQuarantined || isDisabled) {
-    quarantinedTestErrors.set(testName, err)
+  // Attempt-to-fix ignores quarantine/disabled suppression and keeps the normal framework result.
+  if (!isAttemptToFix && (isQuarantined || isDisabled)) {
+    suppressedTestFailures.set(testName, { error: err, isQuarantined, isDisabled })
     return
   }
 
@@ -245,13 +244,14 @@ afterEach(function () {
   const currentTest = Cypress.mocha.getRunner().suite.ctx.currentTest
   const testName = currentTest.fullTitle()
 
-  // Check if this was a quarantined test that we suppressed the failure for
-  const quarantinedError = quarantinedTestErrors.get(testName)
-  const isQuarantinedTestThatFailed = !!quarantinedError
+  // Check if this was a test management test that we suppressed the failure for.
+  const suppressedTestFailure = suppressedTestFailures.get(testName)
+  const suppressedError = suppressedTestFailure && suppressedTestFailure.error
+  const isTestManagementTestThatFailed = !!suppressedError
 
-  // For quarantined tests, convert Error to a serializable format for cy.task
-  const errorToReport = isQuarantinedTestThatFailed
-    ? { message: quarantinedError.message, stack: quarantinedError.stack }
+  // For suppressed test management tests, convert Error to a serializable format for cy.task.
+  const errorToReport = isTestManagementTestThatFailed
+    ? { message: suppressedError.message, stack: suppressedError.stack }
     : currentTest.err
 
   const testInfo = {
@@ -259,16 +259,17 @@ afterEach(function () {
     testItTitle: currentTest.title,
     testSuite: Cypress.mocha.getRootSuite().file,
     testSuiteAbsolutePath: Cypress.spec && Cypress.spec.absolute,
-    // For quarantined tests, report the actual state (failed) to Datadog, not what Cypress thinks (passed)
-    state: isQuarantinedTestThatFailed ? 'failed' : currentTest.state,
-    // For quarantined tests, include the actual error that was suppressed
+    // Report the actual failed state to Datadog, not the pass state Cypress sees after suppression.
+    state: isTestManagementTestThatFailed ? 'failed' : currentTest.state,
+    // Include the actual error that was suppressed.
     error: errorToReport,
     isNew: currentTest._ddIsNew,
     isEfdRetry: currentTest._ddIsEfdRetry,
     isAttemptToFix: currentTest._ddIsAttemptToFix,
     isModified: currentTest._ddIsModified,
-    // Mark quarantined tests that failed so the plugin knows to tag them appropriately
-    isQuarantined: isQuarantinedTestThatFailed,
+    // Mark suppressed tests so the plugin can tag them with the correct test management reason.
+    isQuarantined: isTestManagementTestThatFailed && suppressedTestFailure.isQuarantined,
+    isDisabled: isTestManagementTestThatFailed && suppressedTestFailure.isDisabled,
   }
   try {
     const invocationDetails = Cypress.mocha.getRunner().currentRunnable.invocationDetails
@@ -292,9 +293,9 @@ afterEach(function () {
     // ignore error and continue
   }
 
-  // Clean up the quarantined error tracking
-  if (isQuarantinedTestThatFailed) {
-    quarantinedTestErrors.delete(testName)
+  // Clean up the suppressed error tracking.
+  if (isTestManagementTestThatFailed) {
+    suppressedTestFailures.delete(testName)
   }
 
   cy.task('dd:afterEach', { test: testInfo, coverage })

package/packages/datadog-plugin-grpc/src/client.js

@@ -64,7 +64,7 @@ class GrpcClientPlugin extends ClientPlugin {
 
   error ({ span = this.activeSpan, error }) {
     this.addCode(span, error.code)
-    if (error.code && !this._tracerConfig.grpc.client.error.statuses.includes(error.code)) {
+    if (error.code && !this._tracerConfig.DD_GRPC_CLIENT_ERROR_STATUSES.includes(error.code)) {
       return
     }
     this.addError(error, span)

package/packages/datadog-plugin-grpc/src/server.js

@@ -70,7 +70,7 @@ class GrpcServerPlugin extends ServerPlugin {
     if (!span) return
 
     this.addCode(span, error.code)
-    if (error.code && !this._tracerConfig.grpc.server.error.statuses.includes(error.code)) {
+    if (error.code && !this._tracerConfig.DD_GRPC_SERVER_ERROR_STATUSES.includes(error.code)) {
       return
     }
     this.addError(error)

package/packages/datadog-plugin-kafkajs/src/consumer.js

@@ -56,15 +56,8 @@ class KafkajsConsumerPlugin extends ConsumerPlugin {
 
   commit (commitList) {
     if (!this.config.dsmEnabled) return
-    const keys = [
-      'consumer_group',
-      'type',
-      'partition',
-      'offset',
-      'topic',
-    ]
-    for (const commit of commitList.map(this.transformCommit)) {
-      if (keys.some(key => !commit.hasOwnProperty(key))) continue
+    for (const rawCommit of commitList) {
+      const commit = this.transformCommit(rawCommit)
       this.tracer.setOffset(commit)
     }
   }

package/packages/datadog-plugin-kafkajs/src/producer.js

@@ -64,14 +64,8 @@ class KafkajsProducerPlugin extends ProducerPlugin {
 
     if (!this.config.dsmEnabled) return
     if (!commitList || !Array.isArray(commitList)) return
-    const keys = [
-      'type',
-      'partition',
-      'offset',
-      'topic',
-    ]
-    for (const commit of commitList.map(r => this.transformProduceResponse(r, clusterId))) {
-      if (keys.some(key => !commit.hasOwnProperty(key))) continue
+    for (const rawCommit of commitList) {
+      const commit = this.transformProduceResponse(rawCommit, clusterId)
       this.tracer.setOffset(commit)
     }
   }

package/packages/datadog-plugin-mongodb-core/src/index.js

@@ -160,10 +160,9 @@ function limitDepth (input) {
       input, output, depth,
     } = queue.pop()
     const nextDepth = depth + 1
-    for (const key in input) {
-      if (typeof input[key] === 'function') continue
-
+    for (const key of Object.keys(input)) {
       let child = input[key]
+      if (typeof child === 'function') continue
 
       if (isBSON(child)) {
         child = typeof child.toJSON === 'function' ? child.toJSON() : '?'

package/packages/datadog-plugin-playwright/src/index.js

@@ -39,6 +39,7 @@ const {
   TEST_SUITE,
   TEST_HAS_DYNAMIC_NAME,
   DYNAMIC_NAME_RE,
+  TEST_FINAL_STATUS,
 } = require('../../dd-trace/src/plugins/util/test')
 const { RESOURCE_NAME } = require('../../../ext/tags')
 const { COMPONENT } = require('../../dd-trace/src/constants')
@@ -319,6 +320,7 @@ class PlaywrightPlugin extends CiPlugin {
       hasFailedAttemptToFixRetries,
       isAtrRetry,
       isModified,
+      finalStatus,
       onDone,
     }) => {
       if (!span) return
@@ -379,6 +381,9 @@ class PlaywrightPlugin extends CiPlugin {
           span.setTag(TEST_RETRY_REASON, TEST_RETRY_REASON_TYPES.efd)
         }
       }
+      if (finalStatus) {
+        span.setTag(TEST_FINAL_STATUS, finalStatus)
+      }
       for (const step of steps) {
         const stepStartTime = step.startTime.getTime()
         const stepSpan = this.tracer.startSpan('playwright.step', {
@@ -451,6 +456,7 @@ class PlaywrightPlugin extends CiPlugin {
       )
 
       span.setTag(TEST_STATUS, 'skip')
+      span.setTag(TEST_FINAL_STATUS, 'skip')
 
       if (isNew) {
         span.setTag(TEST_IS_NEW, 'true')

package/packages/datadog-plugin-router/src/index.js

@@ -157,6 +157,13 @@ class RouterPlugin extends WebPlugin {
 }
 
 function isMoreSpecificThan (routeA, routeB) {
+  // Concrete paths beat catch-all wildcards (`/*splat`, `/api/*`) on the same
+  // request so that `/foo/bar` wins over `/foo/*splat` regardless of length.
+  if (routeA && routeB) {
+    const aWild = hasWildcard(routeA)
+    const bWild = hasWildcard(routeB)
+    if (aWild !== bWild) return !aWild
+  }
   if (!routeIsRegex(routeA) && routeIsRegex(routeB)) {
     return true
   }
@@ -167,4 +174,10 @@ function routeIsRegex (route) {
   return route.includes('(/')
 }
 
+function hasWildcard (route) {
+  // RegExp routes are encoded as `(/.../)` and may legitimately contain `*`,
+  // so only treat plain string patterns as wildcards.
+  return !routeIsRegex(route) && route.includes('*')
+}
+
 module.exports = RouterPlugin

package/packages/dd-trace/index.js

@@ -30,9 +30,10 @@ if (!global._ddtrace) {
     configurable: true,
     writable: true,
   })
-
-  global._ddtrace.default = global._ddtrace
-  global._ddtrace.tracer = global._ddtrace
 }
 
 module.exports = global._ddtrace
+// Static aliases so cjs-module-lexer surfaces them as ESM named exports
+// (`import { tracer } from 'dd-trace'`).
+module.exports.tracer = global._ddtrace
+module.exports.default = global._ddtrace

package/packages/dd-trace/src/aiguard/sdk.js

@@ -70,7 +70,7 @@ class AIGuard extends NoopAIGuard {
   constructor (tracer, config) {
     super()
 
-    if (!config.apiKey || !config.appKey) {
+    if (!config.apiKey || !config.DD_APP_KEY) {
       log.error('AIGuard: missing api and/or app keys, use env DD_API_KEY and DD_APP_KEY')
       this.#initialized = false
       return
@@ -78,7 +78,7 @@ class AIGuard extends NoopAIGuard {
     this.#tracer = tracer
     this.#headers = {
       'DD-API-KEY': config.apiKey,
-      'DD-APPLICATION-KEY': config.appKey,
+      'DD-APPLICATION-KEY': config.DD_APP_KEY,
       'DD-AI-GUARD-VERSION': tracerVersion,
       'DD-AI-GUARD-SOURCE': 'SDK',
       'DD-AI-GUARD-LANGUAGE': 'nodejs',

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

@@ -8,6 +8,7 @@ const web = require('../plugins/util/web')
 const { ipHeaderList } = require('../plugins/util/ip_extractor')
 const { keepTrace } = require('../priority_sampler')
 const { ASM } = require('../standalone/product')
+const { isEmpty } = require('../util')
 const { getActiveRequest } = require('./store')
 const {
   incrementWafInitMetric,
@@ -170,7 +171,9 @@ function getCollectedHeaders (req, res, shouldCollectEventHeaders, storedRespons
   // Basic collection
   if (!shouldCollectEventHeaders) return mandatoryCollectedHeaders
 
-  const responseHeaders = Object.keys(storedResponseHeaders).length === 0
+  // Skip the spread when the stored side is empty -- common during the early
+  // request lifecycle when no upstream response headers have been captured.
+  const responseHeaders = isEmpty(storedResponseHeaders)
     ? res.getHeaders()
     : { ...storedResponseHeaders, ...res.getHeaders() }
 

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

@@ -66,8 +66,18 @@ function removeAllBaggageItems () {
   return EMPTY_STORE
 }
 
+/**
+ * @param {BaggageStore} items Frozen in place; do not mutate after.
+ */
+function setAllBaggageItems (items) {
+  Object.freeze(items)
+  baggageStorage.enterWith(items)
+  return items
+}
+
 module.exports = {
   setBaggageItem,
+  setAllBaggageItems,
   getBaggageItem,
   getAllBaggageItems,
   removeBaggageItem,

package/packages/dd-trace/src/ci-visibility/lage.js

@@ -2,6 +2,7 @@
 
 const { getEnvironmentVariable } = require('../config/helper')
 const { isTrue } = require('../util')
+const { DD_MAJOR } = require('../../../../version')
 
 /**
  * Returns the current Lage package name if the Lage package name override is enabled.
@@ -9,7 +10,7 @@ const { isTrue } = require('../util')
  * @returns {string|undefined}
  */
 function getLagePackageName () {
-  if (!isTrue(getEnvironmentVariable('DD_ENABLE_LAGE_PACKAGE_NAME'))) {
+  if (DD_MAJOR < 6 && !isTrue(getEnvironmentVariable('DD_ENABLE_LAGE_PACKAGE_NAME'))) {
     return
   }
 

package/packages/dd-trace/src/ci-visibility/requests/request.js

@@ -7,39 +7,13 @@ const zlib = require('zlib')
 const { storage } = require('../../../../datadog-core')
 const log = require('../../log')
 const { httpAgent, httpsAgent } = require('../../exporters/common/agents')
+const {
+  RATE_LIMIT_MAX_WAIT_MS,
+  isRetriableNetworkError,
+  singleJitteredDelay,
+} = require('../../exporters/common/retry')
 const { urlToHttpOptions } = require('../../exporters/common/url-to-http-options-polyfill')
 
-const RATE_LIMIT_MAX_WAIT_MS = 30_000
-const RETRY_BASE_MS = 5000
-const RETRY_JITTER_MS = 2500
-
-/**
- * Calculates retry delay with jitter to prevent thundering herd.
- * Delay is RETRY_BASE_MS + random(0, RETRY_JITTER_MS) (e.g. 5–7.5 seconds).
- *
- * @returns {number} Delay in milliseconds
- */
-function getRetryDelay () {
-  return RETRY_BASE_MS + (Math.random() * RETRY_JITTER_MS)
-}
-
-/**
- * Determines if a network error is retriable (transient failures only).
- * ECONNREFUSED is retried because it can be transient (service starting up,
- * restarts, rolling deploys, k8s pod/readiness transitions). ENOTFOUND is
- * excluded as it indicates DNS failure or wrong host and is usually not transient.
- *
- * @param {Error} err - The error to check
- * @returns {boolean}
- */
-function isRetriableNetworkError (err) {
-  if (!err.code) return false
-  return err.code === 'ECONNREFUSED' ||
-    err.code === 'ECONNRESET' ||
-    err.code === 'ETIMEDOUT' ||
-    err.code === 'EPIPE'
-}
-
 function parseUrl (urlObjOrString) {
   if (urlObjOrString !== null && typeof urlObjOrString === 'object') {
     return urlToHttpOptions(urlObjOrString)
@@ -63,6 +37,10 @@ function parseUrl (urlObjOrString) {
  * Destroys connections on errors to prevent reuse of bad connections. Preserves
  * original status code across retries for telemetry.
  *
+ * Retry timers stay ref'd. Test-runner plugins block the suite via
+ * `delay: true` channels until this callback fires; an unref'd retry would
+ * let the host exit first and the suite would never run.
+ *
  * @param {string} data - Request body (e.g. JSON string)
  * @param {object} options - { url, path?, method?, headers?, timeout? } (may be mutated)
  * @param {Function} callback - (err, res, statusCode) => void
@@ -157,7 +135,7 @@ function request (data, options, callback) {
               // ignore
             }
             hasRetried = true
-            setTimeout(makeRequest, getRetryDelay())
+            setTimeout(makeRequest, singleJitteredDelay())
             return
           }
 
@@ -177,7 +155,7 @@ function request (data, options, callback) {
         // Retry on retriable network errors
         if (!hasRetried && isRetriableNetworkError(err)) {
           hasRetried = true
-          setTimeout(makeRequest, getRetryDelay())
+          setTimeout(makeRequest, singleJitteredDelay())
           return
         }
 

package/packages/dd-trace/src/config/config-types.d.ts

@@ -8,7 +8,6 @@ export interface ConfigProperties extends GeneratedConfig {
     responsesEnabled: boolean
     rules: PayloadTaggingRules
   }
-  commitSHA: string | undefined
   debug: boolean
   instrumentationSource: 'manual' | 'ssi'
   isCiVisibility: boolean
@@ -18,7 +17,6 @@ export interface ConfigProperties extends GeneratedConfig {
   lookup: NonNullable<import('../../../../index').TracerOptions['lookup']>
   readonly parsedDdTags: Record<string, string>
   plugins: boolean
-  repositoryUrl: string | undefined
   sampler: {
     rateLimit: number
     rules: import('../../../../index').SamplingRule[]