dd-trace 5.53.0 → 5.55.0

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

@@ -2,11 +2,22 @@ const path = require('path')
 const fs = require('fs')
 const { URL } = require('url')
 const log = require('../../log')
+const { getEnvironmentVariable } = require('../../config-helper')
 
 const istanbul = require('istanbul-lib-coverage')
 const ignore = require('ignore')
 
-const { getGitMetadata } = require('./git')
+const {
+  getGitMetadata,
+  getGitInformationDiscrepancy,
+  getGitDiff,
+  getGitRemoteName,
+  getSourceBranch,
+  checkAndFetchBranch,
+  getLocalBranches,
+  getMergeBase,
+  getCounts
+} = require('./git')
 const { getUserProviderGitMetadata, validateGitRepositoryUrl, validateGitCommitSha } = require('./user-provided-git')
 const { getCIMetadata } = require('./ci')
 const { getRuntimeAndOSMetadata } = require('./env')
@@ -23,6 +34,11 @@ const {
   CI_JOB_NAME
 } = require('./tags')
 const id = require('../../id')
+const {
+  incrementCountMetric,
+  TELEMETRY_GIT_COMMIT_SHA_DISCREPANCY,
+  TELEMETRY_GIT_SHA_MATCH
+} = require('../../ci-visibility/telemetry')
 
 const { SPAN_TYPE, RESOURCE_NAME, SAMPLING_PRIORITY } = require('../../../../../ext/tags')
 const { SAMPLING_RULE_DECISION } = require('../../constants')
@@ -59,7 +75,7 @@ const TEST_EARLY_FLAKE_ENABLED = 'test.early_flake.enabled'
 const TEST_EARLY_FLAKE_ABORT_REASON = 'test.early_flake.abort_reason'
 const TEST_RETRY_REASON = 'test.retry_reason'
 const TEST_HAS_FAILED_ALL_RETRIES = 'test.has_failed_all_retries'
-
+const TEST_IS_MODIFIED = 'test.is_modified'
 const CI_APP_ORIGIN = 'ciapp-test'
 
 const JEST_TEST_RUNNER = 'test.jest.test_runner'
@@ -101,18 +117,20 @@ const PLAYWRIGHT_WORKER_TRACE_PAYLOAD_CODE = 90
 
 // Early flake detection util strings
 const EFD_STRING = "Retried by Datadog's Early Flake Detection"
-const EFD_TEST_NAME_REGEX = new RegExp(EFD_STRING + ' \\(#\\d+\\): ', 'g')
+const EFD_TEST_NAME_REGEX = new RegExp(EFD_STRING + String.raw` \(#\d+\): `, 'g')
 
 // Library Capabilities Tagging
 const DD_CAPABILITIES_TEST_IMPACT_ANALYSIS = '_dd.library_capabilities.test_impact_analysis'
 const DD_CAPABILITIES_EARLY_FLAKE_DETECTION = '_dd.library_capabilities.early_flake_detection'
 const DD_CAPABILITIES_AUTO_TEST_RETRIES = '_dd.library_capabilities.auto_test_retries'
+const DD_CAPABILITIES_IMPACTED_TESTS = '_dd.library_capabilities.impacted_tests'
 const DD_CAPABILITIES_TEST_MANAGEMENT_QUARANTINE = '_dd.library_capabilities.test_management.quarantine'
 const DD_CAPABILITIES_TEST_MANAGEMENT_DISABLE = '_dd.library_capabilities.test_management.disable'
 const DD_CAPABILITIES_TEST_MANAGEMENT_ATTEMPT_TO_FIX = '_dd.library_capabilities.test_management.attempt_to_fix'
-const UNSUPPORTED_TIA_FRAMEWORKS = ['playwright', 'vitest']
-const UNSUPPORTED_TIA_FRAMEWORKS_PARALLEL_MODE = ['cucumber', 'mocha']
-const UNSUPPORTED_ATTEMPT_TO_FIX_FRAMEWORKS_PARALLEL_MODE = ['mocha']
+const UNSUPPORTED_TIA_FRAMEWORKS = new Set(['playwright', 'vitest'])
+const UNSUPPORTED_TIA_FRAMEWORKS_PARALLEL_MODE = new Set(['cucumber', 'mocha'])
+const UNSUPPORTED_ATTEMPT_TO_FIX_FRAMEWORKS_PARALLEL_MODE = new Set(['mocha'])
+const NOT_SUPPORTED_GRANULARITY_IMPACTED_TESTS_FRAMEWORKS = new Set(['mocha', 'playwright', 'vitest'])
 
 const TEST_LEVEL_EVENT_TYPES = [
   'test',
@@ -145,7 +163,11 @@ const TEST_MANAGEMENT_ATTEMPT_TO_FIX_PASSED = 'test.test_management.attempt_to_f
 
 // Test Management utils strings
 const ATTEMPT_TO_FIX_STRING = "Retried by Datadog's Test Management"
-const ATTEMPT_TEST_NAME_REGEX = new RegExp(ATTEMPT_TO_FIX_STRING + ' \\(#\\d+\\): ', 'g')
+const ATTEMPT_TEST_NAME_REGEX = new RegExp(ATTEMPT_TO_FIX_STRING + String.raw` \(#\d+\): `, 'g')
+
+// Impacted tests
+const POSSIBLE_BASE_BRANCHES = ['main', 'master', 'preprod', 'prod', 'dev', 'development', 'trunk']
+const BASE_LIKE_BRANCH_FILTER = /^(main|master|preprod|prod|dev|development|trunk|release\/.*|hotfix\/.*)$/
 
 module.exports = {
   TEST_CODE_OWNERS,
@@ -180,6 +202,7 @@ module.exports = {
   TEST_EARLY_FLAKE_ABORT_REASON,
   TEST_RETRY_REASON,
   TEST_HAS_FAILED_ALL_RETRIES,
+  TEST_IS_MODIFIED,
   getTestEnvironmentMetadata,
   getTestParametersString,
   finishAllTraceSpans,
@@ -212,6 +235,7 @@ module.exports = {
   mergeCoverage,
   fromCoverageMapToCoverage,
   getTestLineStart,
+  getTestEndLine,
   removeInvalidMetadata,
   parseAnnotations,
   EFD_STRING,
@@ -229,6 +253,7 @@ module.exports = {
   DD_CAPABILITIES_TEST_IMPACT_ANALYSIS,
   DD_CAPABILITIES_EARLY_FLAKE_DETECTION,
   DD_CAPABILITIES_AUTO_TEST_RETRIES,
+  DD_CAPABILITIES_IMPACTED_TESTS,
   DD_CAPABILITIES_TEST_MANAGEMENT_QUARANTINE,
   DD_CAPABILITIES_TEST_MANAGEMENT_DISABLE,
   DD_CAPABILITIES_TEST_MANAGEMENT_ATTEMPT_TO_FIX,
@@ -248,14 +273,20 @@ module.exports = {
   TEST_MANAGEMENT_IS_QUARANTINED,
   TEST_MANAGEMENT_ENABLED,
   TEST_MANAGEMENT_ATTEMPT_TO_FIX_PASSED,
-  getLibraryCapabilitiesTags
+  getLibraryCapabilitiesTags,
+  checkShaDiscrepancies,
+  getPullRequestDiff,
+  getPullRequestBaseBranch,
+  getModifiedTestsFromDiff,
+  isModifiedTest,
+  POSSIBLE_BASE_BRANCHES
 }
 
 // Returns pkg manager and its version, separated by '-', e.g. npm-8.15.0 or yarn-1.22.19
 function getPkgManager () {
   try {
-    return process.env.npm_config_user_agent.split(' ')[0].replace('/', '-')
-  } catch (e) {
+    return getEnvironmentVariable('npm_config_user_agent').split(' ')[0].replace('/', '-')
+  } catch {
     return ''
   }
 }
@@ -264,35 +295,124 @@ function validateUrl (url) {
   try {
     const urlObject = new URL(url)
     return (urlObject.protocol === 'https:' || urlObject.protocol === 'http:')
-  } catch (e) {
+  } catch {
     return false
   }
 }
 
 function removeInvalidMetadata (metadata) {
   return Object.keys(metadata).reduce((filteredTags, tag) => {
-    if (tag === GIT_REPOSITORY_URL) {
-      if (!validateGitRepositoryUrl(metadata[GIT_REPOSITORY_URL])) {
-        log.error('Repository URL is not a valid repository URL: %s.', metadata[GIT_REPOSITORY_URL])
-        return filteredTags
-      }
+    if (tag === GIT_REPOSITORY_URL && !validateGitRepositoryUrl(metadata[GIT_REPOSITORY_URL])) {
+      log.error('Repository URL is not a valid repository URL: %s.', metadata[GIT_REPOSITORY_URL])
+      return filteredTags
     }
-    if (tag === GIT_COMMIT_SHA) {
-      if (!validateGitCommitSha(metadata[GIT_COMMIT_SHA])) {
-        log.error('Git commit SHA must be a full-length git SHA: %s.', metadata[GIT_COMMIT_SHA])
-        return filteredTags
-      }
+    if (tag === GIT_COMMIT_SHA && !validateGitCommitSha(metadata[GIT_COMMIT_SHA])) {
+      log.error('Git commit SHA must be a full-length git SHA: %s.', metadata[GIT_COMMIT_SHA])
+      return filteredTags
     }
-    if (tag === CI_PIPELINE_URL) {
-      if (!validateUrl(metadata[CI_PIPELINE_URL])) {
-        return filteredTags
-      }
+    if (tag === CI_PIPELINE_URL && !validateUrl(metadata[CI_PIPELINE_URL])) {
+      return filteredTags
     }
     filteredTags[tag] = metadata[tag]
     return filteredTags
   }, {})
 }
 
+function checkShaDiscrepancies (ciMetadata, userProvidedGitMetadata) {
+  const {
+    [GIT_COMMIT_SHA]: ciCommitSHA,
+    [GIT_REPOSITORY_URL]: ciRepositoryUrl
+  } = ciMetadata
+  const {
+    [GIT_COMMIT_SHA]: userProvidedCommitSHA,
+    [GIT_REPOSITORY_URL]: userProvidedRepositoryUrl
+  } = userProvidedGitMetadata
+  const { gitRepositoryUrl, gitCommitSHA } = getGitInformationDiscrepancy()
+
+  const checkDiscrepancyAndSendMetrics = (
+    valueExpected,
+    valueDiscrepant,
+    discrepancyType,
+    expectedProvider,
+    discrepantProvider
+  ) => {
+    if (valueExpected && valueDiscrepant && valueExpected !== valueDiscrepant) {
+      incrementCountMetric(
+        TELEMETRY_GIT_COMMIT_SHA_DISCREPANCY,
+        {
+          type: discrepancyType,
+          expected_provider: expectedProvider,
+          discrepant_provider: discrepantProvider
+        }
+      )
+      return true
+    }
+    return false
+  }
+
+  const checkConfigs = [
+    // User provided vs Git metadata
+    {
+      v1: userProvidedRepositoryUrl,
+      v2: gitRepositoryUrl,
+      type: 'repository_discrepancy',
+      expected: 'user_supplied',
+      discrepant: 'git_client'
+    },
+    {
+      v1: userProvidedCommitSHA,
+      v2: gitCommitSHA,
+      type: 'commit_discrepancy',
+      expected: 'user_supplied',
+      discrepant: 'git_client'
+    },
+    // User provided vs CI metadata
+    {
+      v1: userProvidedRepositoryUrl,
+      v2: ciRepositoryUrl,
+      type: 'repository_discrepancy',
+      expected: 'user_supplied',
+      discrepant: 'ci_provider'
+    },
+    {
+      v1: userProvidedCommitSHA,
+      v2: ciCommitSHA,
+      type: 'commit_discrepancy',
+      expected: 'user_supplied',
+      discrepant: 'ci_provider'
+    },
+    // CI metadata vs Git metadata
+    {
+      v1: ciRepositoryUrl,
+      v2: gitRepositoryUrl,
+      type: 'repository_discrepancy',
+      expected: 'ci_provider',
+      discrepant: 'git_client'
+    },
+    {
+      v1: ciCommitSHA,
+      v2: gitCommitSHA,
+      type: 'commit_discrepancy',
+      expected: 'ci_provider',
+      discrepant: 'git_client'
+    }
+  ]
+
+  let gitCommitShaMatch = true
+  for (const checkConfig of checkConfigs) {
+    const { v1, v2, type, expected, discrepant } = checkConfig
+    const discrepancy = checkDiscrepancyAndSendMetrics(v1, v2, type, expected, discrepant)
+    if (discrepancy) {
+      gitCommitShaMatch = false
+    }
+  }
+
+  incrementCountMetric(
+    TELEMETRY_GIT_SHA_MATCH,
+    { match: gitCommitShaMatch }
+  )
+}
+
 function getTestEnvironmentMetadata (testFramework, config) {
   // TODO: eventually these will come from the tracer (generally available)
   const ciMetadata = getCIMetadata()
@@ -320,6 +440,8 @@ function getTestEnvironmentMetadata (testFramework, config) {
 
   const userProvidedGitMetadata = getUserProviderGitMetadata()
 
+  checkShaDiscrepancies(ciMetadata, userProvidedGitMetadata)
+
   const runtimeAndOSMetadata = getRuntimeAndOSMetadata()
 
   const metadata = {
@@ -344,7 +466,7 @@ function getTestParametersString (parametersByTestName, testName) {
     // test is invoked with each parameter set sequencially
     const testParameters = parametersByTestName[testName].shift()
     return JSON.stringify({ arguments: testParameters, metadata: {} })
-  } catch (e) {
+  } catch {
     // We can't afford to interrupt the test if `testParameters` is not serializable to JSON,
     // so we ignore the test parameters and move on
     return ''
@@ -413,7 +535,7 @@ function readCodeOwners (rootDir) {
   for (const location of POSSIBLE_CODEOWNERS_LOCATIONS) {
     try {
       return fs.readFileSync(path.join(rootDir, location)).toString()
-    } catch (e) {
+    } catch {
       // retry with next path
     }
   }
@@ -467,7 +589,7 @@ function getCodeOwnersForFilename (filename, entries) {
       if (isResponsible) {
         return JSON.stringify(entry.owners)
       }
-    } catch (e) {
+    } catch {
       return null
     }
   }
@@ -619,12 +741,19 @@ function getTestLineStart (err, testSuitePath) {
   const testFileLine = err.stack.split('\n').find(line => line.includes(testSuitePath))
   try {
     const testFileLineMatch = testFileLine.match(/at (?:(.+?)\s+\()?(?:(.+?):(\d+)(?::(\d+))?|([^)]+))\)?/)
-    return parseInt(testFileLineMatch[3], 10) || null
-  } catch (e) {
+    return Number.parseInt(testFileLineMatch[3], 10) || null
+  } catch {
     return null
   }
 }
 
+// Get the end line of a test by inspecting a given function's source code
+function getTestEndLine (testFn, startLine = 0) {
+  const source = testFn.toString()
+  const lineCount = source.split('\n').length
+  return startLine + lineCount - 1
+}
+
 /**
  * Gets an object of test tags from an Playwright annotations array.
  * @param {Object[]} annotations - Annotations from a Playwright test.
@@ -661,11 +790,11 @@ function addAttemptToFixStringToTestName (testName, numAttempt) {
 }
 
 function removeEfdStringFromTestName (testName) {
-  return testName.replace(EFD_TEST_NAME_REGEX, '')
+  return testName.replaceAll(EFD_TEST_NAME_REGEX, '')
 }
 
 function removeAttemptToFixStringFromTestName (testName) {
-  return testName.replace(ATTEMPT_TEST_NAME_REGEX, '')
+  return testName.replaceAll(ATTEMPT_TEST_NAME_REGEX, '')
 }
 
 function getIsFaultyEarlyFlakeDetection (projectSuites, testsBySuiteName, faultyThresholdPercentage) {
@@ -686,14 +815,14 @@ function getIsFaultyEarlyFlakeDetection (projectSuites, testsBySuiteName, faulty
   )
 }
 
-function getTestSessionName (config, testCommand, envTags) {
+function getTestSessionName (config, trimmedCommand, envTags) {
   if (config.ciVisibilityTestSessionName) {
     return config.ciVisibilityTestSessionName
   }
   if (envTags[CI_JOB_NAME]) {
-    return `${envTags[CI_JOB_NAME]}-${testCommand}`
+    return `${envTags[CI_JOB_NAME]}-${trimmedCommand}`
   }
-  return testCommand
+  return trimmedCommand
 }
 
 // Calculate the number of a tests from the known tests response, which has a shape like:
@@ -761,28 +890,21 @@ function getFormattedError (error, repositoryRoot) {
   return newError
 }
 
-function getLibraryCapabilitiesTags (testFramework, isParallel) {
-  function isTiaSupported (testFramework, isParallel) {
-    if (UNSUPPORTED_TIA_FRAMEWORKS.includes(testFramework)) {
-      return false
-    }
-    if (isParallel && UNSUPPORTED_TIA_FRAMEWORKS_PARALLEL_MODE.includes(testFramework)) {
-      return false
-    }
-    return true
-  }
+function isTiaSupported (testFramework, isParallel) {
+  return !(UNSUPPORTED_TIA_FRAMEWORKS.has(testFramework) ||
+           (isParallel && UNSUPPORTED_TIA_FRAMEWORKS_PARALLEL_MODE.has(testFramework)))
+}
 
-  function isAttemptToFixSupported (testFramework, isParallel) {
-    if (isParallel && UNSUPPORTED_ATTEMPT_TO_FIX_FRAMEWORKS_PARALLEL_MODE.includes(testFramework)) {
-      return false
-    }
-    return true
-  }
+function isAttemptToFixSupported (testFramework, isParallel) {
+  return !(isParallel && UNSUPPORTED_ATTEMPT_TO_FIX_FRAMEWORKS_PARALLEL_MODE.has(testFramework))
+}
 
+function getLibraryCapabilitiesTags (testFramework, isParallel) {
   return {
     [DD_CAPABILITIES_TEST_IMPACT_ANALYSIS]: isTiaSupported(testFramework, isParallel) ? '1' : undefined,
     [DD_CAPABILITIES_EARLY_FLAKE_DETECTION]: '1',
     [DD_CAPABILITIES_AUTO_TEST_RETRIES]: '1',
+    [DD_CAPABILITIES_IMPACTED_TESTS]: '1',
     [DD_CAPABILITIES_TEST_MANAGEMENT_QUARANTINE]: '1',
     [DD_CAPABILITIES_TEST_MANAGEMENT_DISABLE]: '1',
     [DD_CAPABILITIES_TEST_MANAGEMENT_ATTEMPT_TO_FIX]: isAttemptToFixSupported(testFramework, isParallel)
@@ -790,3 +912,145 @@ function getLibraryCapabilitiesTags (testFramework, isParallel) {
       : undefined
   }
 }
+
+function getPullRequestBaseBranch (pullRequestBaseBranch) {
+  const remoteName = getGitRemoteName()
+
+  const sourceBranch = getSourceBranch()
+  // TODO: We will get the default branch name from the backend in the future.
+  const POSSIBLE_DEFAULT_BRANCHES = ['main', 'master']
+
+  const candidateBranches = []
+  if (pullRequestBaseBranch) {
+    checkAndFetchBranch(pullRequestBaseBranch, remoteName)
+    candidateBranches.push(pullRequestBaseBranch)
+  } else {
+    for (const branch of POSSIBLE_BASE_BRANCHES) {
+      checkAndFetchBranch(branch, remoteName)
+    }
+
+    const localBranches = getLocalBranches(remoteName)
+    for (const branch of localBranches) {
+      const shortBranchName = branch.replace(new RegExp(`^${remoteName}/`), '')
+      if (branch !== sourceBranch && BASE_LIKE_BRANCH_FILTER.test(shortBranchName)) {
+        candidateBranches.push(branch)
+      }
+    }
+  }
+
+  if (candidateBranches.length === 1) {
+    return getMergeBase(candidateBranches[0], sourceBranch)
+  }
+
+  const metrics = {}
+  for (const candidate of candidateBranches) {
+    // Find common ancestor
+    const baseSha = getMergeBase(candidate, sourceBranch)
+    if (!baseSha) {
+      continue
+    }
+    // Count commits ahead/behind
+    const counts = getCounts(candidate, sourceBranch)
+    if (!counts) {
+      continue
+    }
+    const behind = counts.behind
+    const ahead = counts.ahead
+    metrics[candidate] = {
+      behind,
+      ahead,
+      baseSha
+    }
+  }
+
+  function isDefaultBranch (branch) {
+    return POSSIBLE_DEFAULT_BRANCHES.some(defaultBranch =>
+      branch === defaultBranch || branch === `${remoteName}/${defaultBranch}`
+    )
+  }
+
+  if (Object.keys(metrics).length === 0) {
+    return null
+  }
+  // Find branch with smallest "ahead" value, preferring default branch on tie
+  let bestBranch = null
+  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)) {
+      bestScore = score
+      bestBranch = branch
+    }
+  }
+  return bestBranch ? metrics[bestBranch].baseSha : null
+}
+
+function getPullRequestDiff (baseCommit, targetCommit) {
+  if (!baseCommit) {
+    return
+  }
+  return getGitDiff(baseCommit, targetCommit)
+}
+
+function getModifiedTestsFromDiff (diff) {
+  if (!diff) return null
+  const result = {}
+
+  const filesRegex = /^diff --git a\/(?<file>.+) b\/(?<file2>.+)$/g
+  const linesRegex = /^@@ -\d+(,\d+)? \+(?<start>\d+)(,(?<count>\d+))? @@/g
+
+  let currentFile = null
+
+  // Go line by line
+  const lines = diff.split('\n')
+  for (const line of lines) {
+    // Check for new file
+    const fileMatch = filesRegex.exec(line)
+    if (fileMatch && fileMatch.groups.file) {
+      currentFile = fileMatch.groups.file
+      result[currentFile] = []
+      continue
+    }
+
+    // Check for changed lines
+    const lineMatch = linesRegex.exec(line)
+    if (lineMatch && currentFile) {
+      const start = Number(lineMatch.groups.start)
+      const count = lineMatch.groups.count ? Number(lineMatch.groups.count) : 1
+      for (let j = 0; j < count; j++) {
+        result[currentFile].push(start + j)
+      }
+    }
+
+    // Reset regexes to allow re-use
+    filesRegex.lastIndex = 0
+    linesRegex.lastIndex = 0
+  }
+
+  if (Object.keys(result).length === 0) {
+    return null
+  }
+  return result
+}
+
+function isModifiedTest (testPath, testStartLine, testEndLine, modifiedTests, testFramework) {
+  if (modifiedTests === undefined) {
+    return false
+  }
+
+  const lines = modifiedTests[testPath]
+  if (!lines) {
+    return false
+  }
+
+  // For unsupported frameworks, consider the test modified if any lines were changed
+  if (NOT_SUPPORTED_GRANULARITY_IMPACTED_TESTS_FRAMEWORKS.has(testFramework)) {
+    return lines.length > 0
+  }
+
+  // For supported frameworks, check if the test's line range overlaps with modified lines
+  return lines.some(line => line >= testStartLine && line <= testEndLine)
+}

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

@@ -18,7 +18,7 @@ function filterSensitiveInfoFromRepository (repositoryUrl) {
     const { protocol, host, pathname } = new URL(repositoryUrl)
 
     return `${protocol}//${host}${pathname === '/' ? '' : pathname}`
-  } catch (e) {
+  } catch {
     return ''
   }
 }

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

@@ -2,6 +2,18 @@
 
 const log = require('../../log')
 
+function applyFilter (filter, uri) {
+  if (typeof filter === 'function') {
+    return filter(uri)
+  } else if (filter instanceof RegExp) {
+    return filter.test(uri)
+  } else if (Array.isArray(filter)) {
+    return filter.some(filter => applyFilter(filter, uri))
+  }
+
+  return filter === uri
+}
+
 const urlFilter = {
   getFilter (config) {
     if (typeof config.filter === 'function') {
@@ -13,23 +25,7 @@ const urlFilter = {
     const allowlist = config.allowlist || config.whitelist || /.*/
     const blocklist = config.blocklist || config.blacklist || []
 
-    return uri => {
-      const allowed = applyFilter(allowlist, uri)
-      const blocked = applyFilter(blocklist, uri)
-      return allowed && !blocked
-    }
-
-    function applyFilter (filter, uri) {
-      if (typeof filter === 'function') {
-        return filter(uri)
-      } else if (filter instanceof RegExp) {
-        return filter.test(uri)
-      } else if (filter instanceof Array) {
-        return filter.some(filter => applyFilter(filter, uri))
-      }
-
-      return filter === uri
-    }
+    return uri => applyFilter(allowlist, uri) && !applyFilter(blocklist, uri)
   }
 }
 

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

@@ -9,11 +9,15 @@ const {
   GIT_COMMIT_COMMITTER_NAME,
   GIT_COMMIT_AUTHOR_DATE,
   GIT_COMMIT_AUTHOR_EMAIL,
-  GIT_COMMIT_AUTHOR_NAME
+  GIT_COMMIT_AUTHOR_NAME,
+  GIT_PULL_REQUEST_BASE_BRANCH,
+  GIT_PULL_REQUEST_BASE_BRANCH_SHA,
+  GIT_COMMIT_HEAD_SHA
 } = require('./tags')
 
 const { normalizeRef } = require('./ci')
 const { filterSensitiveInfoFromRepository } = require('./url')
+const { getEnvironmentVariables } = require('../../config-helper')
 
 function removeEmptyValues (tags) {
   return Object.keys(tags).reduce((filteredTags, tag) => {
@@ -52,8 +56,11 @@ function getUserProviderGitMetadata () {
     DD_GIT_COMMIT_COMMITTER_DATE,
     DD_GIT_COMMIT_AUTHOR_NAME,
     DD_GIT_COMMIT_AUTHOR_EMAIL,
-    DD_GIT_COMMIT_AUTHOR_DATE
-  } = process.env
+    DD_GIT_COMMIT_AUTHOR_DATE,
+    DD_GIT_PULL_REQUEST_BASE_BRANCH,
+    DD_GIT_PULL_REQUEST_BASE_BRANCH_SHA,
+    DD_GIT_COMMIT_HEAD_SHA
+  } = getEnvironmentVariables()
 
   const branch = normalizeRef(DD_GIT_BRANCH)
   let tag = normalizeRef(DD_GIT_TAG)
@@ -74,7 +81,10 @@ function getUserProviderGitMetadata () {
     [GIT_COMMIT_COMMITTER_EMAIL]: DD_GIT_COMMIT_COMMITTER_EMAIL,
     [GIT_COMMIT_AUTHOR_NAME]: DD_GIT_COMMIT_AUTHOR_NAME,
     [GIT_COMMIT_AUTHOR_EMAIL]: DD_GIT_COMMIT_AUTHOR_EMAIL,
-    [GIT_COMMIT_AUTHOR_DATE]: DD_GIT_COMMIT_AUTHOR_DATE
+    [GIT_COMMIT_AUTHOR_DATE]: DD_GIT_COMMIT_AUTHOR_DATE,
+    [GIT_PULL_REQUEST_BASE_BRANCH]: DD_GIT_PULL_REQUEST_BASE_BRANCH,
+    [GIT_PULL_REQUEST_BASE_BRANCH_SHA]: DD_GIT_PULL_REQUEST_BASE_BRANCH_SHA,
+    [GIT_COMMIT_HEAD_SHA]: DD_GIT_COMMIT_HEAD_SHA
   })
 }
 

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

@@ -253,7 +253,7 @@ const web = {
     if (!context) return null
     if (context.middleware.length === 0) return context.span || null
 
-    return context.middleware.slice(-1)[0]
+    return context.middleware.at(-1)
   },
 
   // Extract the parent span from the headers and start a new span as its child
@@ -421,7 +421,7 @@ function addAllowHeaders (req, res, headers) {
   ]
 
   for (const header of contextHeaders) {
-    if (~requestHeaders.indexOf(header)) {
+    if (requestHeaders.includes(header)) {
       allowHeaders.push(header)
     }
   }
@@ -500,7 +500,7 @@ function addResourceTag (context) {
   if (tags['resource.name']) return
 
   const resource = [req.method, tags[HTTP_ROUTE]]
-    .filter(val => val)
+    .filter(Boolean)
     .join(' ')
 
   span.setTag(RESOURCE_NAME, resource)
@@ -530,10 +530,9 @@ function extractURL (req) {
 
   if (req.stream) {
     return `${headers[HTTP2_HEADER_SCHEME]}://${headers[HTTP2_HEADER_AUTHORITY]}${headers[HTTP2_HEADER_PATH]}`
-  } else {
-    const protocol = getProtocol(req)
-    return `${protocol}://${req.headers.host}${req.originalUrl || req.url}`
   }
+  const protocol = getProtocol(req)
+  return `${protocol}://${req.headers.host}${req.originalUrl || req.url}`
 }
 
 function getProtocol (req) {
@@ -567,9 +566,10 @@ function getStatusValidator (config) {
   return code => code < 500
 }
 
+const noop = () => {}
+
 function getHooks (config) {
-  const noop = () => {}
-  const request = (config.hooks && config.hooks.request) || noop
+  const request = config.hooks?.request ?? noop
 
   return { request }
 }