dd-trace 5.101.0 → 5.103.0

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

@@ -16,7 +16,7 @@ class DSMTextMapPropagator {
   inject (ctx, carrier) {
     if (!this.config.dsmEnabled) return
 
-    this._injectDatadogDSMContext(ctx, carrier)
+    DsmPathwayCodec.encode(ctx, carrier)
 
     // eslint-disable-next-line eslint-rules/eslint-log-printf-style
     log.debug(() => `Inject into carrier (DSM): ${JSON.stringify(pick(carrier, logKeys))}.`)
@@ -25,7 +25,7 @@ class DSMTextMapPropagator {
   extract (carrier) {
     if (!this.config.dsmEnabled) return
 
-    const dsmContext = this._extractDatadogDSMContext(carrier)
+    const dsmContext = DsmPathwayCodec.decode(carrier)
 
     if (!dsmContext) return dsmContext
 
@@ -33,15 +33,6 @@ class DSMTextMapPropagator {
     log.debug(() => `Extract from carrier (DSM): ${JSON.stringify(pick(carrier, logKeys))}.`)
     return dsmContext
   }
-
-  _injectDatadogDSMContext (ctx, carrier) {
-    DsmPathwayCodec.encode(ctx, carrier)
-  }
-
-  _extractDatadogDSMContext (carrier) {
-    const ctx = DsmPathwayCodec.decode(carrier)
-    return ctx
-  }
 }
 
 module.exports = DSMTextMapPropagator

package/packages/dd-trace/src/payload-tagging/config/index.js

@@ -30,8 +30,8 @@ function getSDKRules (sdk, requestInput, responseInput) {
  * Appends input rules to all supported SDKs and returns a structure mapping SDK
  * names to per-service rules.
  *
- * @param {string[]} [requestInput=[]]
- * @param {string[]} [responseInput=[]]
+ * @param {string[]} [requestInput]
+ * @param {string[]} [responseInput]
  * @returns {Record<string, SDKRules>}
  */
 function appendRules (requestInput = [], responseInput = []) {

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

@@ -49,6 +49,7 @@ const {
   getTestSuiteCommonTags,
   TEST_STATUS,
   TEST_SKIPPED_BY_ITR,
+  TEST_ITR_SKIPPING_ENABLED,
   ITR_CORRELATION_ID,
   TEST_SOURCE_FILE,
   TEST_LEVEL_EVENT_TYPES,
@@ -64,7 +65,11 @@ const {
   getModifiedFilesFromDiff,
   getPullRequestBaseBranch,
   getSessionRequestErrorTags,
-  DD_CI_LIBRARY_CONFIGURATION_ERROR,
+  DD_CI_LIBRARY_CONFIGURATION_ERROR_SETTINGS,
+  DD_CI_LIBRARY_CONFIGURATION_ERROR_SKIPPABLE_TESTS,
+  DD_CI_LIBRARY_CONFIGURATION_ERROR_KNOWN_TESTS,
+  DD_CI_LIBRARY_CONFIGURATION_ERROR_TEST_MANAGEMENT_TESTS,
+  getSessionItrSkippingEnabledTags,
   TEST_IS_TEST_FRAMEWORK_WORKER,
   TEST_IS_NEW,
   TEST_IS_RUM_ACTIVE,
@@ -74,6 +79,7 @@ const {
   TEST_IS_MODIFIED,
   TEST_IS_RETRY,
   TEST_RETRY_REASON,
+  DD_CAPABILITIES_TEST_IMPACT_ANALYSIS,
 } = require('./util/test')
 
 const FRAMEWORK_TO_TRIMMED_COMMAND = {
@@ -99,6 +105,21 @@ const TEST_FRAMEWORKS_TO_SKIP_GIT_METADATA_EXTRACTION = new Set([
   'cucumber',
 ])
 
+function setItrSkippingEnabledTagFromLibraryConfig (plugin, frameworkVersion) {
+  const libraryCapabilitiesTags = getLibraryCapabilitiesTags(plugin.constructor.id, frameworkVersion)
+
+  if (!libraryCapabilitiesTags[DD_CAPABILITIES_TEST_IMPACT_ANALYSIS] ||
+    !plugin.libraryConfig ||
+    !plugin.testSessionSpan ||
+    !plugin.testModuleSpan) {
+    return
+  }
+
+  const skippingEnabled = plugin.libraryConfig.isSuitesSkippingEnabled ? 'true' : 'false'
+  plugin.testSessionSpan.setTag(TEST_ITR_SKIPPING_ENABLED, skippingEnabled)
+  plugin.testModuleSpan.setTag(TEST_ITR_SKIPPING_ENABLED, skippingEnabled)
+}
+
 function getTestSuiteLevelVisibilityTags (testSuiteSpan, testFramework) {
   const testSuiteSpanContext = testSuiteSpan.context()
 
@@ -134,9 +155,10 @@ module.exports = class CiPlugin extends Plugin {
       this.tracer._exporter.getLibraryConfiguration(this.testConfiguration, (err, libraryConfig) => {
         if (err) {
           log.error('Library configuration could not be fetched. %s', err.message)
-          this._addRequestErrorTag(DD_CI_LIBRARY_CONFIGURATION_ERROR, err)
+          this._addRequestErrorTag(DD_CI_LIBRARY_CONFIGURATION_ERROR_SETTINGS, err)
         } else {
           this.libraryConfig = libraryConfig
+          setItrSkippingEnabledTagFromLibraryConfig(this, frameworkVersion)
         }
 
         const requestErrorTags = this.testSessionSpan
@@ -165,6 +187,7 @@ module.exports = class CiPlugin extends Plugin {
       this.tracer._exporter.getSkippableSuites(this.testConfiguration, (err, skippableSuites, itrCorrelationId) => {
         if (err) {
           log.error('Skippable suites could not be fetched. %s', err.message)
+          this._addRequestErrorTag(DD_CI_LIBRARY_CONFIGURATION_ERROR_SKIPPABLE_TESTS, err)
         } else {
           this.itrCorrelationId = itrCorrelationId
         }
@@ -225,6 +248,7 @@ module.exports = class CiPlugin extends Plugin {
         },
         integrationName: this.constructor.id,
       })
+      setItrSkippingEnabledTagFromLibraryConfig(this, frameworkVersion)
       // only for vitest
       // These are added for the worker threads to use
       if (this.constructor.id === 'vitest') {
@@ -246,6 +270,7 @@ module.exports = class CiPlugin extends Plugin {
         const testSuiteMetadata = {
           ...getTestSuiteCommonTags(testCommand, frameworkVersion, testSuite, this.constructor.id),
           ...getSessionRequestErrorTags(this.testSessionSpan),
+          ...getSessionItrSkippingEnabledTags(this.testSessionSpan),
         }
         if (this.itrCorrelationId) {
           testSuiteMetadata[ITR_CORRELATION_ID] = this.itrCorrelationId
@@ -277,6 +302,7 @@ module.exports = class CiPlugin extends Plugin {
       this.tracer._exporter.getKnownTests(this.testConfiguration, (err, knownTests) => {
         if (err) {
           log.error('Known tests could not be fetched. %s', err.message)
+          this._addRequestErrorTag(DD_CI_LIBRARY_CONFIGURATION_ERROR_KNOWN_TESTS, err)
           if (this.libraryConfig) {
             this.libraryConfig.isEarlyFlakeDetectionEnabled = false
             this.libraryConfig.isKnownTestsEnabled = false
@@ -297,6 +323,7 @@ module.exports = class CiPlugin extends Plugin {
       this.tracer._exporter.getTestManagementTests(this.testConfiguration, (err, testManagementTests) => {
         if (err) {
           log.error('Test management tests could not be fetched. %s', err.message)
+          this._addRequestErrorTag(DD_CI_LIBRARY_CONFIGURATION_ERROR_TEST_MANAGEMENT_TESTS, err)
           if (this.libraryConfig) {
             this.libraryConfig.isTestManagementEnabled = false
           }
@@ -342,6 +369,9 @@ module.exports = class CiPlugin extends Plugin {
 
           if (span.name?.startsWith(`${this.constructor.id}.`)) {
             span.meta[TEST_IS_TEST_FRAMEWORK_WORKER] = 'true'
+            if (span.name === `${this.constructor.id}.test` || span.name === `${this.constructor.id}.test_suite`) {
+              Object.assign(span.meta, getSessionItrSkippingEnabledTags(this.testSessionSpan))
+            }
             // augment with git information (since it will not be available in the worker)
             for (const key in this.testEnvironmentMetadata) {
               // CAREFUL: this bypasses the metadata/metrics distinction
@@ -372,7 +402,8 @@ module.exports = class CiPlugin extends Plugin {
 
           // Jest and Vitest worker test spans are serialized in the worker and may not include
           // request error tags; add them from the session span in the main process.
-          if ((span.name === 'jest.test' || span.name === 'vitest.test') && this.testSessionSpan) {
+          if ((span.name === 'jest.test' || span.name === 'vitest.test' || span.name === 'vitest.test_suite') &&
+              this.testSessionSpan) {
             Object.assign(span.meta, getSessionRequestErrorTags(this.testSessionSpan))
           }
         }
@@ -449,13 +480,16 @@ module.exports = class CiPlugin extends Plugin {
    * Adds a hidden _dd tag to the test session span when a test-optimization request fails.
    * If the session span does not exist yet (e.g. library-configuration failed before session:start),
    * the tag is queued and applied when the span is created.
-   * @param {string} tag - Tag name (e.g. DD_CI_LIBRARY_CONFIGURATION_ERROR)
+   * @param {string} tag - Tag name (e.g. DD_CI_LIBRARY_CONFIGURATION_ERROR_SETTINGS)
    * @param {Error} err - Request error
    */
   _addRequestErrorTag (tag, err) {
     const value = 'true'
     if (this.testSessionSpan) {
       this.testSessionSpan.setTag(tag, value)
+      if (this.testModuleSpan) {
+        this.testModuleSpan.setTag(tag, value)
+      }
     } else {
       this._pendingRequestErrorTags.push({ tag, value })
     }
@@ -469,6 +503,15 @@ module.exports = class CiPlugin extends Plugin {
     return getSessionRequestErrorTags(this.testSessionSpan)
   }
 
+  /**
+   * Returns ITR skipping-enabled tags from the test session span for propagation to child events.
+   *
+   * @returns {Record<string, string>}
+   */
+  getSessionItrSkippingEnabledTags () {
+    return getSessionItrSkippingEnabledTags(this.testSessionSpan)
+  }
+
   /**
    * @param {import('../config/config-base')} config - Tracer configuration
    * @param {boolean} shouldGetEnvironmentData - Whether to get environment data
@@ -596,6 +639,8 @@ module.exports = class CiPlugin extends Plugin {
       }
     }
 
+    Object.assign(testTags, getSessionItrSkippingEnabledTags(this.testSessionSpan))
+
     this.telemetry.ciVisEvent(TELEMETRY_EVENT_CREATED, 'test', { hasCodeOwners: !!codeOwners })
 
     const testSpan = this.tracer

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

@@ -1,13 +1,47 @@
 'use strict'
 
+const { LRUCache } = require('../../../../vendor/dist/lru-cache')
 const { PEER_SERVICE_KEY, PEER_SERVICE_SOURCE_KEY } = require('../constants')
 const propagationHash = require('../propagation-hash')
 const StoragePlugin = require('./storage')
 
+// Unreserved RFC 3986 set that `encodeURIComponent` leaves untouched (a conservative subset:
+// `! * ' ( )` are also untouched but rarely appear in db / host / service names so we skip them).
+const SAFE_ENCODE_RE = /^[\w\-.~]*$/
+
+// Cap `#dbmPrefixCache` so a high-cardinality `db.name` (MongoDB sets it to
+// `${database}.${collection}`) cannot grow the map without bound. Steady-state working sets
+// fit well below the cap; cache misses cost a few hundred nanoseconds, so an evicted entry
+// rebuilds cheaply on the next query.
+const DBM_PREFIX_CACHE_MAX = 256
+
 class DatabasePlugin extends StoragePlugin {
   static operation = 'query'
   static peerServicePrecursors = ['db.name']
 
+  // dde / ddps / ddpv are tracer-process constants. They are baked in at `configure()` time as
+  // two pre-templated fragments — `dbmEnvFragment` splices between dddbs and ddh; `dbmEndFragment`
+  // trails ddh — so per-query work shrinks to encoding dddb / dddbs / ddh and concatenating.
+  #dbmEnvFragment
+  #dbmEndFragment
+  // Cache the rendered prefix per `${db.name}\0${out.host}\0${dbmService}`. The triple is
+  // connection-stable for a real workload, so the steady state is one `LRUCache.get` plus the
+  // optional per-call `,ddprs='...'` suffix.
+  #dbmPrefixCache = new LRUCache({ max: DBM_PREFIX_CACHE_MAX })
+
+  /**
+   * @override
+   * @param {boolean | import('../config/config-base') & {enabled: boolean}} config
+   */
+  configure (config) {
+    super.configure(config)
+    // Match the previous shape exactly: `dde` is `encode`d; `ddps` / `ddpv` are template-literal
+    // coerced so `undefined` renders as the literal `'undefined'` the way the original did.
+    this.#dbmEnvFragment = `,dde='${encode(this.tracer._env)}',`
+    this.#dbmEndFragment = `,ddps='${this.tracer._service ?? ''}',ddpv='${this.tracer._version}'`
+    this.#dbmPrefixCache.clear()
+  }
+
   /**
    * @param {string} serviceName
    * @param {import('../../../..').Span} span
@@ -16,20 +50,21 @@ class DatabasePlugin extends StoragePlugin {
    */
   #createDBMPropagationCommentService (serviceName, span, peerData) {
     const spanTags = span.context()._tags
-    const encodedDddb = encode(spanTags['db.name'])
-    const encodedDddbs = encode(serviceName)
-    const encodedDde = encode(this.tracer._env)
-    const encodedDdh = encode(spanTags['out.host'])
-    const encodedDdps = this.tracer._service ?? ''
-    const encodedDdpv = this.tracer._version
-
-    let dbmComment = `dddb='${encodedDddb}',dddbs='${encodedDddbs}',dde='${encodedDde}',ddh='${encodedDdh}',` +
-      `ddps='${encodedDdps}',ddpv='${encodedDdpv}'`
+    const dddb = spanTags['db.name']
+    const ddh = spanTags['out.host']
+    const cacheKey = `${dddb ?? ''}\0${ddh ?? ''}\0${serviceName ?? ''}`
+
+    let prefix = this.#dbmPrefixCache.get(cacheKey)
+    if (prefix === undefined) {
+      prefix = `dddb='${encode(dddb)}',dddbs='${encode(serviceName)}'${this.#dbmEnvFragment}` +
+        `ddh='${encode(ddh)}'${this.#dbmEndFragment}`
+      this.#dbmPrefixCache.set(cacheKey, prefix)
+    }
 
     if (peerData !== undefined && peerData[PEER_SERVICE_SOURCE_KEY] === PEER_SERVICE_KEY) {
-      dbmComment += `,ddprs='${encode(peerData[PEER_SERVICE_KEY])}'`
+      return `${prefix},ddprs='${encode(peerData[PEER_SERVICE_KEY])}'`
     }
-    return dbmComment
+    return prefix
   }
 
   /**
@@ -118,6 +153,13 @@ class DatabasePlugin extends StoragePlugin {
   }
 }
 
-const encode = value => value ? encodeURIComponent(value) : ''
+/**
+ * @param {string | number | undefined | null} value
+ * @returns {string}
+ */
+function encode (value) {
+  if (!value) return ''
+  return SAFE_ENCODE_RE.test(value) ? value : encodeURIComponent(value)
+}
 
 module.exports = DatabasePlugin

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

@@ -49,6 +49,7 @@ const plugins = {
   get dns () { return require('../../../datadog-plugin-dns/src') },
   get 'dd-trace-api' () { return require('../../../datadog-plugin-dd-trace-api/src') },
   get elasticsearch () { return require('../../../datadog-plugin-elasticsearch/src') },
+  get electron () { return require('../../../datadog-plugin-electron/src') },
   get express () { return require('../../../datadog-plugin-express/src') },
   get fastify () { return require('../../../datadog-plugin-fastify/src') },
   get 'find-my-way' () { return require('../../../datadog-plugin-find-my-way/src') },

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

@@ -160,14 +160,12 @@ module.exports = class Plugin {
   /**
    * Enable or disable the plugin and (re)apply its configuration.
    *
-   * TODO: Remove the overloading with `enabled` and use the config object directly.
-   *
-   * @param {boolean | import('../config/config-base') & {enabled: boolean}} config Either a boolean to
+   * @param {boolean | Record<string, unknown> & {enabled: boolean}} config Either a boolean to
    * enable/disable or a configuration object containing at least `{ enabled: boolean }`.
    */
   configure (config) {
     if (typeof config === 'boolean') {
-      config = /** @type {import('../config/config-base') & {enabled: boolean}} */ ({ enabled: config })
+      config = { enabled: config }
     }
     this.config = config
     if (config.enabled) {

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

@@ -2,7 +2,8 @@
 
 const { readFileSync, readdirSync, existsSync } = require('fs')
 const path = require('path')
-const { getEnvironmentVariable, getEnvironmentVariables, getValueFromEnvSources } = require('../../config/helper')
+const getConfig = require('../../config')
+const { getEnvironmentVariable, getEnvironmentVariables } = require('../../config/helper')
 const {
   GIT_BRANCH,
   GIT_COMMIT_SHA,
@@ -217,7 +218,7 @@ const githubWellKnownDiagnosticDirPatternsWin = ['C:/actions-runner/*/_diag', 'C
 const githubJobIDRegex = /"job":\s*{[\s\S]*?"v"\s*:\s*(\d+)(?:\.0)?/
 
 function getJobIDFromDiagFile () {
-  const runnerTemp = getValueFromEnvSources('RUNNER_TEMP')
+  const runnerTemp = getEnvironmentVariable('RUNNER_TEMP')
   if (!runnerTemp || !existsSync(runnerTemp)) { return null }
 
   const isWin = process.platform === 'win32'
@@ -298,7 +299,7 @@ module.exports = {
         CHANGE_ID,
         CHANGE_TARGET,
       } = env
-      const DD_CUSTOM_TRACE_ID = getValueFromEnvSources('DD_CUSTOM_TRACE_ID')
+      const { DD_CUSTOM_TRACE_ID, DD_CUSTOM_PARENT_ID } = getConfig()
 
       tags = {
         [CI_PIPELINE_ID]: BUILD_TAG,
@@ -308,7 +309,7 @@ module.exports = {
         [GIT_COMMIT_SHA]: JENKINS_GIT_COMMIT,
         [GIT_REPOSITORY_URL]: JENKINS_GIT_REPOSITORY_URL || JENKINS_GIT_REPOSITORY_URL_1,
         [CI_WORKSPACE_PATH]: WORKSPACE,
-        [CI_ENV_VARS]: JSON.stringify({ DD_CUSTOM_TRACE_ID }),
+        [CI_ENV_VARS]: JSON.stringify({ DD_CUSTOM_TRACE_ID, DD_CUSTOM_PARENT_ID }),
         [CI_NODE_NAME]: NODE_NAME,
         [PR_NUMBER]: CHANGE_ID,
         [GIT_PULL_REQUEST_BASE_BRANCH]: CHANGE_TARGET,
@@ -650,7 +651,7 @@ module.exports = {
         [GIT_TAG]: BITBUCKET_TAG,
         [GIT_REPOSITORY_URL]: BITBUCKET_GIT_SSH_ORIGIN || BITBUCKET_GIT_HTTP_ORIGIN,
         [CI_WORKSPACE_PATH]: BITBUCKET_CLONE_DIR,
-        [CI_PIPELINE_ID]: BITBUCKET_PIPELINE_UUID && BITBUCKET_PIPELINE_UUID.replaceAll(/{|}/gm, ''),
+        [CI_PIPELINE_ID]: BITBUCKET_PIPELINE_UUID && BITBUCKET_PIPELINE_UUID.replaceAll(/[{}]/gm, ''),
         [GIT_PULL_REQUEST_BASE_BRANCH]: BITBUCKET_PR_DESTINATION_BRANCH,
         [PR_NUMBER]: BITBUCKET_PR_ID,
       }
@@ -738,11 +739,11 @@ module.exports = {
         }),
         [CI_NODE_NAME]: BUILDKITE_AGENT_ID,
         [CI_NODE_LABELS]: JSON.stringify(extraTags),
-        [PR_NUMBER]: BUILDKITE_PULL_REQUEST,
         [CI_JOB_ID]: BUILDKITE_JOB_ID,
       }
 
-      if (BUILDKITE_PULL_REQUEST) {
+      if (BUILDKITE_PULL_REQUEST && BUILDKITE_PULL_REQUEST !== 'false') {
+        tags[PR_NUMBER] = BUILDKITE_PULL_REQUEST
         tags[GIT_PULL_REQUEST_BASE_BRANCH] = BUILDKITE_PULL_REQUEST_BASE_BRANCH
       }
     }
@@ -868,8 +869,7 @@ module.exports = {
     }
 
     if (env.CODEBUILD_INITIATOR?.startsWith('codepipeline/')) {
-      const DD_ACTION_EXECUTION_ID = getValueFromEnvSources('DD_ACTION_EXECUTION_ID')
-      const DD_PIPELINE_EXECUTION_ID = getValueFromEnvSources('DD_PIPELINE_EXECUTION_ID')
+      const { DD_ACTION_EXECUTION_ID, DD_PIPELINE_EXECUTION_ID } = getConfig()
       tags = {
         [CI_PROVIDER_NAME]: 'awscodepipeline',
         [CI_PIPELINE_ID]: DD_PIPELINE_EXECUTION_ID,

package/packages/dd-trace/src/plugins/util/git-cache.js

@@ -7,24 +7,31 @@ const crypto = require('crypto')
 const cp = require('child_process')
 
 const log = require('../../log')
-const { getValueFromEnvSources } = require('../../config/helper')
-const { isTrue } = require('../../util')
+const getConfig = require('../../config')
 
-let isGitEnabled = isTrue(getValueFromEnvSources('DD_EXPERIMENTAL_TEST_OPT_GIT_CACHE_ENABLED'))
-const GIT_CACHE_DIR = getValueFromEnvSources('DD_EXPERIMENTAL_TEST_OPT_GIT_CACHE_DIR') ||
-  path.join(os.tmpdir(), 'dd-trace-git-cache')
+let isGitEnabled
+let gitCacheDir
 
 function ensureCacheDir () {
+  if (isGitEnabled === undefined) {
+    const config = getConfig()
+    isGitEnabled = config.DD_EXPERIMENTAL_TEST_OPT_GIT_CACHE_ENABLED
+    // TODO: Move the default to config/index.js applyCalculated
+    // when using the config singleton.
+    gitCacheDir = config.DD_EXPERIMENTAL_TEST_OPT_GIT_CACHE_DIR ||
+      path.join(os.tmpdir(), 'dd-trace-git-cache')
+  }
+
   if (!isGitEnabled) return false
 
   try {
-    if (fs.existsSync(GIT_CACHE_DIR)) {
-      const stats = fs.statSync(GIT_CACHE_DIR)
+    if (fs.existsSync(gitCacheDir)) {
+      const stats = fs.statSync(gitCacheDir)
       if (!stats.isDirectory()) {
-        throw new Error(`Cache directory path exists but is not a directory: ${GIT_CACHE_DIR}`)
+        throw new Error(`Cache directory path exists but is not a directory: ${gitCacheDir}`)
       }
     } else {
-      fs.mkdirSync(GIT_CACHE_DIR, { recursive: true })
+      fs.mkdirSync(gitCacheDir, { recursive: true })
     }
     return true
   } catch (err) {
@@ -34,9 +41,6 @@ function ensureCacheDir () {
   }
 }
 
-// Initialize cache directory at module load time
-ensureCacheDir()
-
 function getCacheKey (cmd, flags) {
   // Create a hash of the command and flags to use as cache key
   const commandString = `${cmd} ${flags.join(' ')}`
@@ -44,30 +48,26 @@ function getCacheKey (cmd, flags) {
 }
 
 function getCacheFilePath (cacheKey) {
-  return path.join(GIT_CACHE_DIR, `${cacheKey}.cache`)
+  ensureCacheDir()
+  return path.join(gitCacheDir, `${cacheKey}.cache`)
 }
 
 function getCache (cacheKey) {
-  if (!isGitEnabled) return null
+  if (!ensureCacheDir()) return null
 
   try {
     const cacheFilePath = getCacheFilePath(cacheKey)
     if (!fs.existsSync(cacheFilePath)) {
-      return null
+      return
     }
 
-    const content = fs.readFileSync(cacheFilePath, 'utf8')
-    return content
+    return fs.readFileSync(cacheFilePath, 'utf8')
   } catch (err) {
     log.error('Failed to read git cache', err)
-    return null
   }
 }
 
 function setCache (cacheKey, result) {
-  if (!isGitEnabled) return
-
-  // Ensure cache directory exists
   if (!ensureCacheDir()) return
 
   try {
@@ -82,12 +82,12 @@ function cachedExec (cmd, flags, options) {
   if (options === undefined) {
     options = { stdio: 'pipe' }
   }
-  if (!isGitEnabled) {
+  if (!ensureCacheDir()) {
     return cp.execFileSync(cmd, flags, options)
   }
   const cacheKey = getCacheKey(cmd, flags)
   const cachedResult = getCache(cacheKey)
-  if (cachedResult !== null) {
+  if (cachedResult !== undefined) {
     if (cachedResult.startsWith('__GIT_COMMAND_FAILED__')) {
       let error
       try {

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

@@ -14,7 +14,7 @@ const NODE_MODULES_PATTERN_START = `node_modules${sep}`
  * In production, these frames are already filtered by isNodeModulesFrame.
  */
 const SHOULD_FILTER_DD_TRACE_INSTRUMENTAION = __filename.endsWith(
-  join(sep, 'dd-trace-js', 'packages', 'dd-trace', 'src', 'plugins', 'util', 'stacktrace.js')
+  join('packages', 'dd-trace', 'src', 'plugins', 'util', 'stacktrace.js')
 )
 
 module.exports = {
@@ -46,7 +46,7 @@ function getCallSites (constructorOpt) {
  * Get stack trace of user-land frames.
  *
  * @param {string} stack - The stack trace to parse
- * @param {number} [limit=Infinity] - The maximum number of frames to return
+ * @param {number} [limit] - The maximum number of frames to return
  * @returns {StackFrame[]} - A list of stack frames from user-land code
  */
 function parseUserLandFrames (stack, limit = Infinity) {

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

@@ -163,8 +163,12 @@ const DD_CAPABILITIES_TEST_MANAGEMENT_DISABLE = '_dd.library_capabilities.test_m
 const DD_CAPABILITIES_TEST_MANAGEMENT_ATTEMPT_TO_FIX = '_dd.library_capabilities.test_management.attempt_to_fix'
 const DD_CAPABILITIES_FAILED_TEST_REPLAY = '_dd.library_capabilities.failed_test_replay'
 
-// Library configuration request error tag
-const DD_CI_LIBRARY_CONFIGURATION_ERROR = '_dd.ci.library_configuration_error'
+// Library configuration request error tags
+const DD_CI_LIBRARY_CONFIGURATION_ERROR_SETTINGS = '_dd.ci.library_configuration_error.settings'
+const DD_CI_LIBRARY_CONFIGURATION_ERROR_SKIPPABLE_TESTS = '_dd.ci.library_configuration_error.skippable_tests'
+const DD_CI_LIBRARY_CONFIGURATION_ERROR_KNOWN_TESTS = '_dd.ci.library_configuration_error.known_tests'
+const DD_CI_LIBRARY_CONFIGURATION_ERROR_TEST_MANAGEMENT_TESTS =
+  '_dd.ci.library_configuration_error.test_management_tests'
 
 const UNSUPPORTED_TIA_FRAMEWORKS = new Set(['playwright', 'vitest'])
 const MINIMUM_FRAMEWORK_VERSION_FOR_EFD = {
@@ -230,10 +234,34 @@ const BASE_LIKE_BRANCH_FILTER = /^(main|master|preprod|prod|dev|development|trun
  */
 function getSessionRequestErrorTags (sessionSpan) {
   const tags = sessionSpan?.context()._tags
+  const sessionRequestErrorTags = {}
   if (!tags || typeof tags !== 'object') return {}
-  if (tags[DD_CI_LIBRARY_CONFIGURATION_ERROR] === 'true') {
+  if (tags[DD_CI_LIBRARY_CONFIGURATION_ERROR_SETTINGS] === 'true') {
+    sessionRequestErrorTags[DD_CI_LIBRARY_CONFIGURATION_ERROR_SETTINGS] = 'true'
+  }
+  if (tags[DD_CI_LIBRARY_CONFIGURATION_ERROR_SKIPPABLE_TESTS] === 'true') {
+    sessionRequestErrorTags[DD_CI_LIBRARY_CONFIGURATION_ERROR_SKIPPABLE_TESTS] = 'true'
+  }
+  if (tags[DD_CI_LIBRARY_CONFIGURATION_ERROR_KNOWN_TESTS] === 'true') {
+    sessionRequestErrorTags[DD_CI_LIBRARY_CONFIGURATION_ERROR_KNOWN_TESTS] = 'true'
+  }
+  if (tags[DD_CI_LIBRARY_CONFIGURATION_ERROR_TEST_MANAGEMENT_TESTS] === 'true') {
+    sessionRequestErrorTags[DD_CI_LIBRARY_CONFIGURATION_ERROR_TEST_MANAGEMENT_TESTS] = 'true'
+  }
+  return sessionRequestErrorTags
+}
+
+/**
+ * Returns ITR skipping-enabled tags from a test session span for propagation to child events.
+ * @param {{ context: () => { _tags?: Record<string, string> } } | undefined} sessionSpan
+ * @returns {Record<string, string>}
+ */
+function getSessionItrSkippingEnabledTags (sessionSpan) {
+  const tags = sessionSpan?.context()._tags
+  if (!tags || typeof tags !== 'object') return {}
+  if (tags[TEST_ITR_SKIPPING_ENABLED] !== undefined) {
     return {
-      [DD_CI_LIBRARY_CONFIGURATION_ERROR]: 'true',
+      [TEST_ITR_SKIPPING_ENABLED]: tags[TEST_ITR_SKIPPING_ENABLED],
     }
   }
   return {}
@@ -318,6 +346,7 @@ module.exports = {
   parseAnnotations,
   getIsFaultyEarlyFlakeDetection,
   getEfdRetryCount,
+  getMaxEfdRetryCount,
   TEST_BROWSER_DRIVER,
   TEST_BROWSER_DRIVER_VERSION,
   TEST_BROWSER_NAME,
@@ -349,7 +378,11 @@ module.exports = {
   TEST_MANAGEMENT_ATTEMPT_TO_FIX_PASSED,
   getLibraryCapabilitiesTags,
   getSessionRequestErrorTags,
-  DD_CI_LIBRARY_CONFIGURATION_ERROR,
+  DD_CI_LIBRARY_CONFIGURATION_ERROR_SETTINGS,
+  DD_CI_LIBRARY_CONFIGURATION_ERROR_SKIPPABLE_TESTS,
+  DD_CI_LIBRARY_CONFIGURATION_ERROR_KNOWN_TESTS,
+  DD_CI_LIBRARY_CONFIGURATION_ERROR_TEST_MANAGEMENT_TESTS,
+  getSessionItrSkippingEnabledTags,
   checkShaDiscrepancies,
   getPullRequestDiff,
   getPullRequestBaseBranch,
@@ -922,9 +955,7 @@ function getCoveredFilenamesFromCoverage (coverage) {
     .filter(filename => {
       const fileCoverage = coverageMap.fileCoverageFor(filename)
       const lineCoverage = fileCoverage.getLineCoverage()
-      const isAnyLineExecuted = Object.entries(lineCoverage).some(([, numExecutions]) => !!numExecutions)
-
-      return isAnyLineExecuted
+      return Object.entries(lineCoverage).some(([, numExecutions]) => !!numExecutions)
     })
 }
 
@@ -1045,6 +1076,22 @@ function getEfdRetryCount (durationMs, slowTestRetries) {
   return 0 // ≥ 5 min — abort
 }
 
+/**
+ * Returns the maximum retry count configured by the backend for EFD.
+ *
+ * @param {Record<string, number>} slowTestRetries e.g. { '5s': 10, '10s': 5, '30s': 3, '5m': 2 }
+ * @returns {number}
+ */
+function getMaxEfdRetryCount (slowTestRetries) {
+  let maxRetries = 0
+  for (const retryCount of Object.values(slowTestRetries || {})) {
+    if (retryCount > maxRetries) {
+      maxRetries = retryCount
+    }
+  }
+  return maxRetries
+}
+
 function getIsFaultyEarlyFlakeDetection (projectSuites, testsBySuiteName, faultyThresholdPercentage) {
   let newSuites = 0
   for (const suite of projectSuites) {
@@ -1276,10 +1323,7 @@ function getPullRequestBaseBranch (pullRequestBaseBranch) {
   let bestScore = Infinity
   for (const branch of Object.keys(metrics)) {
     const score = metrics[branch].ahead
-    if (score < bestScore) {
-      bestScore = score
-      bestBranch = branch
-    } else if (score === bestScore && isDefaultBranch(branch)) {
+    if (score < bestScore || score === bestScore && isDefaultBranch(branch)) {
       bestScore = score
       bestBranch = branch
     }

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

@@ -108,11 +108,9 @@ function calculateHttpEndpoint (url) {
     return element
   })
 
-  const endpoint = normalizedElements.length > 0
+  return normalizedElements.length > 0
     ? '/' + normalizedElements.join('/')
     : '/'
-
-  return endpoint
 }
 
 function filterSensitiveInfoFromRepository (repositoryUrl) {