dd-trace 6.13.0 → 6.15.0

package/LICENSE-3rdparty.csv

@@ -1,7 +1,9 @@
 "component","origin","license","copyright"
 "@apm-js-collab/code-transformer","https://github.com/nodejs/orchestrion-js","['Apache-2.0']","['nodejs']"
 "@datadog/flagging-core","https://github.com/DataDog/openfeature-js-client","['Apache-2.0']","['DataDog']"
-"@datadog/libdatadog","https://github.com/DataDog/libdatadog-nodejs","['Apache-2.0']","['Datadog Inc.']"
+"@datadog/libdatadog","https://github.com/DataDog/libdatadog-nodejs","['Apache-2.0']","['DataDog']"
+"@datadog/libdatadog-extras","https://github.com/DataDog/libdatadog-nodejs","['Apache-2.0']","['Datadog Inc.']"
+"@datadog/libdatadog-wasm","https://github.com/DataDog/libdatadog-nodejs","['Apache-2.0']","['DataDog']"
 "@datadog/native-appsec","https://github.com/DataDog/dd-native-appsec-js","['Apache-2.0']","['Datadog Inc.']"
 "@datadog/native-iast-taint-tracking","https://github.com/DataDog/dd-native-iast-taint-tracking-js","['Apache-2.0']","['Datadog Inc.']"
 "@datadog/native-metrics","https://github.com/DataDog/dd-native-metrics-js","['Apache-2.0']","['Datadog Inc.']"

package/ci/init.js

@@ -7,7 +7,7 @@ const { getEnvironmentVariable, getValueFromEnvSources } = require('../packages/
 const { isFalse, isTrue } = require('../packages/dd-trace/src/util')
 
 const PACKAGE_MANAGERS = ['npm', 'yarn', 'pnpm']
-const DEFAULT_FLUSH_INTERVAL = 5000
+const DEFAULT_FLUSH_INTERVAL = 10_000
 const JEST_FLUSH_INTERVAL = 0
 const VITEST_NO_WORKER_INIT_ACTIVE_ENV = 'DD_TEST_OPT_VITEST_NO_WORKER_INIT_ACTIVE'
 const VALIDATION_MODE_ENV = '_DD_TEST_OPTIMIZATION_VALIDATION_MODE'
@@ -63,7 +63,9 @@ if (isValidationModeRequested && !isValidationMode) {
 let shouldInit = isValidationModeRequested
   ? isValidationMode && !isFalse(getEnvironmentVariable('DD_CIVISIBILITY_ENABLED'))
   : getValueFromEnvSources('DD_CIVISIBILITY_ENABLED', true) !== false
-const isAgentlessEnabled = getValueFromEnvSources('DD_CIVISIBILITY_AGENTLESS_ENABLED')
+const isGlobalAgentlessEnabled = getValueFromEnvSources('DD_AGENTLESS_ENABLED')
+const isAgentlessEnabled = isGlobalAgentlessEnabled ||
+  getValueFromEnvSources('DD_CIVISIBILITY_AGENTLESS_ENABLED')
 
 if (!isTestWorker && isPackageManager()) {
   log.debug('dd-trace is not initialized in a package manager.')
@@ -85,8 +87,11 @@ if (isTestWorker) {
         exporter: 'datadog',
       }
     } else {
+      const configurationName = isGlobalAgentlessEnabled
+        ? 'DD_AGENTLESS_ENABLED'
+        : 'DD_CIVISIBILITY_AGENTLESS_ENABLED'
       console.error(
-        'DD_CIVISIBILITY_AGENTLESS_ENABLED is set, but neither ' +
+        `${configurationName} is set, but neither ` +
         'DD_API_KEY nor DATADOG_API_KEY are set in your environment, so ' +
         'dd-trace will not be initialized.'
       )

package/ci/test-optimization-validation/ci-package-scripts.js

@@ -146,7 +146,7 @@ function getPackageScriptInvocation (command) {
   const literalPrefix = parseLiteralEnvironmentPrefix(command)
   const source = command.slice(literalPrefix.length).trim()
     .replace(/^(?:c8|nyc)(?:\.cmd)?\s+/, '')
-  const match = /^(bun|npm(?:\.cmd)?|pnpm(?:\.cmd)?|yarn(?:pkg)?(?:\.cmd)?)\s+(?:(run|run-script)\s+)?([\w:-]+)(?:\s+(.+))?$/
+  const match = /^(bun|npm(?:\.cmd)?|pnpm(?:\.cmd)?|yarn(?:pkg)?(?:\.cmd)?)\s+(?:(run|run-script)\s+)?([\w:-]+)(?:\s+(\S.*))?$/
     .exec(source)
   if (!match) return
 
@@ -155,7 +155,7 @@ function getPackageScriptInvocation (command) {
   if (manager === 'bun' && match[2] !== 'run') return
   if (!match[2] && RESERVED_PACKAGE_MANAGER_COMMANDS[manager]?.has(match[3])) return
   const args = match[4]?.trim()
-  const separatedArguments = args ? /^--(?:\s+(.+))?$/.exec(args) : undefined
+  const separatedArguments = args ? /^--(?:\s+(\S.*))?$/.exec(args) : undefined
   if (['npm', 'pnpm'].includes(manager) && args && !separatedArguments) return
   const scriptArguments = ['npm', 'pnpm'].includes(manager) ? separatedArguments?.[1]?.trim() : args
   if (scriptArguments && !splitLiteralAndChain(scriptArguments)) return

package/ci/test-optimization-validation/ci-remediation.js

@@ -54,12 +54,12 @@ function getConfiguredTransport (framework) {
 }
 
 function getCiLocation (ciWiring) {
-  const parts = []
-  if (ciWiring.configFile) parts.push(`configuration ${formatPath(ciWiring.configFile)}`)
-  if (ciWiring.workflow) parts.push(`workflow ${JSON.stringify(String(ciWiring.workflow))}`)
-  if (ciWiring.job) parts.push(`job ${JSON.stringify(String(ciWiring.job))}`)
-  if (ciWiring.step) parts.push(`step ${JSON.stringify(String(ciWiring.step))}`)
-  return parts.length > 0 ? parts.join(', ') : 'the selected CI test step'
+  let location = ''
+  if (ciWiring.configFile) location += `configuration ${formatPath(ciWiring.configFile)}`
+  if (ciWiring.workflow) location += `${location ? ', ' : ''}workflow ${JSON.stringify(String(ciWiring.workflow))}`
+  if (ciWiring.job) location += `${location ? ', ' : ''}job ${JSON.stringify(String(ciWiring.job))}`
+  if (ciWiring.step) location += `${location ? ', ' : ''}step ${JSON.stringify(String(ciWiring.step))}`
+  return location || 'the selected CI test step'
 }
 
 function formatPath (filename) {

package/ci/test-optimization-validation/command-blocker.js

@@ -16,13 +16,15 @@ const MODULE_OR_TRANSFORM_PATTERN =
   /\b(?:Cannot find (?:module|package)|ERR_MODULE_NOT_FOUND|MODULE_NOT_FOUND|ERR_PACKAGE_PATH_NOT_EXPORTED|Package subpath\b[\s\S]+\bnot defined by "exports"|Could not resolve|transform failed)\b/i
 const BUILD_ARTIFACT_PATH_PATTERN = String.raw`(?:^|[\\/])(?:build|dist|generated)(?:[\\/]|['"])`
 const MISSING_ARTIFACT_MESSAGE_PATTERN =
-  '(?:Cannot find (?:module|package)|ERR_MODULE_NOT_FOUND|MODULE_NOT_FOUND|ENOENT|no such file or directory|' +
-  'is not found|does not exist|could not be found)'
+  /Cannot find (?:module|package)|ERR_MODULE_NOT_FOUND|MODULE_NOT_FOUND|ENOENT|no such file or directory|is not found|does not exist|could not be found/
+/* eslint-disable regexp/no-useless-non-capturing-group, regexp/prefer-character-class --
+ * The interpolated message fragment contains alternatives and must stay grouped on both sides of the path. */
 const BUILD_ARTIFACT_MISSING_PATTERN = new RegExp(
-  String.raw`(?:${MISSING_ARTIFACT_MESSAGE_PATTERN}[^\r\n]{0,500}${BUILD_ARTIFACT_PATH_PATTERN}|` +
-    String.raw`${BUILD_ARTIFACT_PATH_PATTERN}[^\r\n]{0,500}${MISSING_ARTIFACT_MESSAGE_PATTERN})`,
+  String.raw`(?:(?:${MISSING_ARTIFACT_MESSAGE_PATTERN.source})[^\r\n]{0,500}${BUILD_ARTIFACT_PATH_PATTERN}|` +
+    String.raw`${BUILD_ARTIFACT_PATH_PATTERN}[^\r\n]{0,500}(?:${MISSING_ARTIFACT_MESSAGE_PATTERN.source}))`,
   'im'
 )
+/* eslint-enable regexp/no-useless-non-capturing-group, regexp/prefer-character-class */
 const FILE_PATH_REFERENCE_PATTERN = /(?:^|[\s('"`])((?:\.{1,2}[\\/]|[\\/]|[A-Za-z]:[\\/])[^'"`\s),;]*)/g
 const CUCUMBER_CONFIG_OPTION_UNSUPPORTED_PATTERN = /unknown option ['"]--config['"]/i
 const CYPRESS_BINARY_PATTERN =
@@ -41,7 +43,7 @@ const PUPPETEER_BROWSER_PATTERN =
 const PUPPETEER_BROWSER_ABORT_PATTERN =
   /Failed to launch the browser process[\s\S]*?(?:signal=SIGABRT|Received signal 6|Abort trap: 6)/i
 const CUCUMBER_BROWSER_FAILURE_PATTERN =
-  /(?:(?:browser|puppeteer|playwright|webdriver)[^\r\n]{0,160}\b(?:aborted|closed|crashed|failed|terminated|unavailable)\b|(?:Failed|Unable) to (?:connect to|launch|start) (?:the )?browser)/i
+  /(?:browser|puppeteer|playwright|webdriver)[^\r\n]{1,160}\b(?:aborted|closed|crashed|failed|terminated|unavailable)\b|(?:Failed|Unable) to (?:connect to|launch|start) (?:the )?browser/i
 const VITEST_BROWSER_PROVIDER_PATTERN =
   /Cannot find (?:module|package).*@vitest\/browser|@vitest\/browser-[^\s'"].*(?:missing|not (?:found|installed))/i
 const RUNNER_COMMAND_NOT_FOUND_PATTERN =

package/ci/test-optimization-validation/framework-adapters/cucumber.js

@@ -478,7 +478,7 @@ function getYamlStringProfileDefinitions (source) {
   const definitions = new Map()
   for (const line of source.split(/\r?\n/)) {
     if (!line.trim() || /^\s*#/.test(line)) continue
-    const match = /^([A-Za-z0-9_-]+):\s*(.*)$/.exec(line)
+    const match = /^([A-Za-z0-9_-]+):(.*)$/.exec(line)
     const definition = match && !/^\s/.test(line) ? getYamlStringProfileDefinition(match[2]) : undefined
     if (definition === undefined) {
       throw new Error('YAML profiles must be literal one-line command strings')

package/ci/test-optimization-validation/framework-adapters/vitest.js

@@ -213,7 +213,7 @@ function getProjectObject (source, nameIndex, workspaceConfig) {
 function isStandaloneProjectObject (source, range) {
   const before = maskJavaScriptNonCode(source.slice(0, range.start))
   const after = maskJavaScriptNonCode(source.slice(range.end + 1))
-  return PROJECT_CALL_PATTERN.test(before) && /^\s*,?\s*\)[\s;]*$/.test(after)
+  return PROJECT_CALL_PATTERN.test(before) && /^\s*(?:,\s*)?\)[\s;]*$/.test(after)
 }
 
 /**
@@ -259,7 +259,7 @@ function isExportedConfigObject (source, range) {
   const before = maskJavaScriptNonCode(source.slice(0, range.start))
   const after = maskJavaScriptNonCode(source.slice(range.end + 1))
   return (DIRECT_EXPORT_PATTERN.test(before) && /^[\s;]*$/.test(after)) ||
-    (CONFIG_CALL_PATTERN.test(before) && /^\s*,?\s*\)[\s;]*$/.test(after))
+    (CONFIG_CALL_PATTERN.test(before) && /^\s*(?:,\s*)?\)[\s;]*$/.test(after))
 }
 
 /**
@@ -276,7 +276,7 @@ function isWorkspaceProjectEntry (source, range) {
   const before = maskJavaScriptNonCode(source.slice(0, workspaceArray.start))
   const after = maskJavaScriptNonCode(source.slice(workspaceArray.end + 1))
   return (DIRECT_EXPORT_PATTERN.test(before) && /^[\s;]*$/.test(after)) ||
-    (WORKSPACE_ARRAY_CALL_PATTERN.test(before) && /^\s*,?\s*\)[\s;]*$/.test(after))
+    (WORKSPACE_ARRAY_CALL_PATTERN.test(before) && /^\s*(?:,\s*)?\)[\s;]*$/.test(after))
 }
 
 /**

package/ci/test-optimization-validation/package-check.js

@@ -88,7 +88,7 @@ function getFailureDetail (result) {
 }
 
 function sanitizeLine (value) {
-  return sanitizeString(String(value)).replaceAll(/\p{Cc}+/gu, ' ').trim().slice(0, 1000).replace(/[.]+$/, '')
+  return sanitizeString(String(value)).replaceAll(/\p{Cc}+/gu, ' ').trim().slice(0, 1000).replace(/\.+$/, '')
 }
 
 module.exports = { checkInstalledPackage, getInstalledPackageFailure }

package/ci/test-optimization-validation/report-writer.js

@@ -273,11 +273,13 @@ function getCiVerdict (results) {
   if (ci.evidence?.reasonCode === 'remote-ci-command-unavailable') {
     return 'INCOMPLETE — test execution is delegated to unavailable remote CI code'
   }
-  const facts = []
-  if (ci.evidence?.ciFacts?.initialization?.status === 'missing') facts.push('initialization not visible')
-  if (ci.evidence?.ciFacts?.transport?.status === 'missing') facts.push('transport not visible')
-  if (ci.evidence?.ciFacts?.runnerInvocation?.status === 'unresolved') facts.push('runner path unresolved')
-  return `INCOMPLETE${facts.length > 0 ? ` — ${facts.join('; ')}` : ''}`
+  let facts = ''
+  if (ci.evidence?.ciFacts?.initialization?.status === 'missing') facts = 'initialization not visible'
+  if (ci.evidence?.ciFacts?.transport?.status === 'missing') facts += `${facts ? '; ' : ''}transport not visible`
+  if (ci.evidence?.ciFacts?.runnerInvocation?.status === 'unresolved') {
+    facts += `${facts ? '; ' : ''}runner path unresolved`
+  }
+  return `INCOMPLETE${facts ? ` — ${facts}` : ''}`
 }
 
 function getPrerequisiteVerdict (results) {

package/ci/vitest-no-worker-init-runner-setup.mjs

@@ -0,0 +1,8 @@
+try {
+  // Vitest does not expose setFn from its public setup API; keep this optional for strict installers.
+  const vitestRunner = await import('@vitest/runner')
+  globalThis[Symbol.for('dd-trace.vitest.set-fn')] = vitestRunner.setFn
+} catch {}
+globalThis[Symbol.for('dd-trace.vitest.browser-context-importer')] = () => import('@vitest/browser/context')
+
+await import('./vitest-no-worker-init-setup.mjs')

package/ci/vitest-no-worker-init-setup.mjs

@@ -23,14 +23,9 @@ const quarantinedTests = providedContext.quarantinedTests || {}
 const isRumCorrelationEnabled = providedContext.isRumCorrelationEnabled !== false
 const rumTestExecutionIdCookieName = providedContext.rumTestExecutionIdCookieName
 const testPropertiesByFilepath = providedContext.testPropertiesByFilepath || {}
-let setVitestTaskFn
-if (isNoWorkerInitActive) {
-  try {
-    // Vitest does not expose setFn from the public setup API; keep this optional for strict installers.
-    const vitestRunner = await import('@vitest/runner')
-    setVitestTaskFn = vitestRunner.setFn
-  } catch {}
-}
+const setVitestTaskFn = globalThis[Symbol.for('dd-trace.vitest.set-fn')]
+const skipVitestTask = globalThis[Symbol.for('dd-trace.vitest.skip-task')]
+const importVitestBrowserContext = globalThis[Symbol.for('dd-trace.vitest.browser-context-importer')]
 const earlyFlakeDetectionRetriesByTask = new WeakMap()
 const earlyFlakeDetectionSkippedResults = new WeakMap()
 const earlyFlakeDetectionStartByTask = new WeakMap()
@@ -62,7 +57,7 @@ if (typeof globalThis.process?.uptime === 'function') {
 async function requestBrowserEfdSuiteAdmission (testSuite, hasNewTest) {
   try {
     if (!browserCommands) {
-      const vitestBrowser = await import('@vitest/browser/context')
+      const vitestBrowser = await importVitestBrowserContext()
       browserCommands = vitestBrowser.commands
     }
     return await browserCommands[efdSuiteAdmissionBrowserCommand](testSuite, hasNewTest) === true
@@ -100,7 +95,7 @@ if (isNoWorkerInitActive) {
     } else if (isAttemptToFixTest && attemptIndex > 0) {
       task.result.state = 'run'
     } else if (isEarlyFlakeDetectionTestAttempt) {
-      const isSkippedRepeat = prepareEarlyFlakeDetectionAttempt(task, attemptIndex)
+      const isSkippedRepeat = prepareEarlyFlakeDetectionAttempt(task, attemptIndex, skip)
       if (!isSkippedRepeat && attemptIndex > 0) {
         task.result.state = 'run'
       }
@@ -624,7 +619,7 @@ function getPreviousErrorCount (errorCounts, repeatCount) {
   return 0
 }
 
-function prepareEarlyFlakeDetectionAttempt (task, attemptIndex) {
+function prepareEarlyFlakeDetectionAttempt (task, attemptIndex, skip) {
   if (attemptIndex === 0) {
     earlyFlakeDetectionStartByTask.set(task, now())
     return false
@@ -646,7 +641,8 @@ function prepareEarlyFlakeDetectionAttempt (task, attemptIndex) {
     return false
   }
 
-  if (!canReplaceVitestTaskFn()) {
+  const canReplaceTaskFn = canReplaceVitestTaskFn()
+  if (!canReplaceTaskFn && typeof skipVitestTask !== 'function') {
     earlyFlakeDetectionStartByTask.set(task, now())
     return false
   }
@@ -658,7 +654,11 @@ function prepareEarlyFlakeDetectionAttempt (task, attemptIndex) {
     })
   }
   task.meta.__ddTestOptEfdSkipCurrentAttempt = true
-  replaceVitestTaskFn(task, noopTest)
+  if (canReplaceTaskFn) {
+    replaceVitestTaskFn(task, noopTest)
+  } else {
+    skipVitestTask(skip)
+  }
   return true
 }
 

package/ci/vitest-no-worker-init-v5-setup.mjs

@@ -0,0 +1,4 @@
+globalThis[Symbol.for('dd-trace.vitest.browser-context-importer')] = () => import('vitest/browser')
+globalThis[Symbol.for('dd-trace.vitest.skip-task')] = skip => skip('Skipped by Datadog Test Optimization')
+
+await import('./vitest-no-worker-init-setup.mjs')

package/index.d.ts

@@ -466,6 +466,13 @@ declare namespace tracer {
      * Maximum number of traces matching this rule to sample per second.
      */
     maxPerSecond?: number
+
+    /**
+     * When `true`, a trace chunk rejected by this rule is fully dropped:
+     * it is excluded from client-side stats and never sent to the Agent.
+     * @default false
+     */
+    discard?: boolean
   }
 
   /**
@@ -650,6 +657,7 @@ declare namespace tracer {
      * Sampling rules to apply to priority sampling. Each rule matches against a trace's
      * `service`, `name`, `resource`, and `tags`, and applies the rule's `sampleRate`. Use a
      * `sampleRate` of `0` to drop matching traces (for example to filter out unwanted resources).
+     * Specify `"discard": true` to fully drop it from stats as well.
      * If not specified, will defer to global sampling rate for all spans.
      * @default []
      * @env DD_TRACE_SAMPLING_RULES

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dd-trace",
-  "version": "6.13.0",
+  "version": "6.15.0",
   "description": "Datadog APM tracing client for JavaScript",
   "main": "index.js",
   "typings": "index.d.ts",
@@ -22,8 +22,8 @@
     "type:check": "tsc --noEmit -p tsconfig.dev.json",
     "type:doc:build": "cd docs && yarn && yarn build",
     "type:doc:test": "cd docs && yarn && yarn test",
-    "lint": "node scripts/check_licenses.js && node scripts/check-no-coverage-artifacts.js && node scripts/check-no-mcr-images.js && node scripts/check-docker-image-shas.js && eslint . --concurrency=auto --max-warnings 0 && npm run verify:carrier-fields && npm run lint:codeowners:ci && npm run verify-exercised-tests",
-    "lint:fix": "node scripts/check_licenses.js && node scripts/check-no-coverage-artifacts.js && node scripts/check-no-mcr-images.js && node scripts/check-docker-image-shas.js && eslint . --concurrency=auto --max-warnings 0 --fix",
+    "lint": "node scripts/check_licenses.js && node scripts/check-agents-md-size.js && node scripts/check-no-coverage-artifacts.js && node scripts/check-no-mcr-images.js && node scripts/check-docker-image-shas.js && eslint . --concurrency=auto --max-warnings 0 && npm run verify:carrier-fields && npm run lint:codeowners:ci && npm run verify-exercised-tests",
+    "lint:fix": "node scripts/check_licenses.js && node scripts/check-agents-md-size.js && node scripts/check-no-coverage-artifacts.js && node scripts/check-no-mcr-images.js && node scripts/check-docker-image-shas.js && eslint . --concurrency=auto --max-warnings 0 --fix",
     "verify:carrier-fields": "node scripts/verify-carrier-fields.mjs",
     "lint:inspect": "npx @eslint/config-inspector@latest",
     "lint:codeowners": "codeowners-audit",
@@ -41,7 +41,7 @@
     "test:debugger": "mocha \"packages/dd-trace/test/debugger/**/*.spec.js\"",
     "test:debugger:ci": "node scripts/c8-ci.js test:debugger",
     "test:eslint-rules": "node scripts/run-eslint-rule-tests.mjs eslint-rules/*.test.mjs",
-    "test:trace:core": "node scripts/mocha-parallel-files.js --expose-gc --timeout 30000 -- \"packages/dd-trace/test/*.spec.js\" \"packages/dd-trace/test/{agent,ci-visibility,config,crashtracking,datastreams,encode,exporters,msgpack,opentelemetry,opentracing,payload-tagging,plugins,remote_config,service-naming,standalone,telemetry,external-logger}/**/*.spec.js\"",
+    "test:trace:core": "node scripts/mocha-parallel-files.js --expose-gc --timeout 30000 -- \"packages/dd-trace/test/*.spec.js\" \"packages/dd-trace/test/{agent,ci-visibility,config,crashtracking,datastreams,encode,exporters,log-submission,msgpack,opentelemetry,opentracing,payload-tagging,plugins,remote_config,service-naming,standalone,telemetry,external-logger}/**/*.spec.js\"",
     "test:trace:core:ci": "node scripts/c8-ci.js test:trace:core",
     "test:trace:guardrails": "mocha \"packages/dd-trace/test/guardrails/**/*.spec.js\"",
     "test:trace:guardrails:ci": "node scripts/c8-ci.js test:trace:guardrails",
@@ -183,7 +183,8 @@
     "opentracing": ">=0.14.7"
   },
   "optionalDependencies": {
-    "@datadog/libdatadog": "0.12.1",
+    "@datadog/libdatadog": "^0.21.0",
+    "@datadog/libdatadog-extras": "^0.21.0",
     "@datadog/native-appsec": "11.0.2",
     "@datadog/native-iast-taint-tracking": "4.2.1",
     "@datadog/native-metrics": "4.0.0",
@@ -210,26 +211,28 @@
     "@types/sinon": "^22.0.0",
     "@vercel/nft": "^1.11.0",
     "@yarnpkg/lockfile": "^1.1.0",
-    "axios": "^1.19.0",
+    "axios": "^1.20.0",
     "benchmark": "^2.1.4",
     "body-parser": "^2.3.0",
     "bun": "1.4.0",
     "c8": "^12.0.0",
     "codeowners-audit": "^2.9.0",
-    "eslint": "^10.8.1",
-    "eslint-plugin-cypress": "^7.0.0",
+    "eslint": "^10.9.1",
+    "eslint-plugin-cypress": "^7.0.1",
     "eslint-plugin-import-x": "^4.16.2",
     "eslint-plugin-jsdoc": "^64.2.1",
-    "eslint-plugin-mocha": "^11.3.0",
+    "eslint-plugin-mocha": "^12.0.2",
     "eslint-plugin-n": "^18.3.0",
     "eslint-plugin-promise": "^7.3.0",
+    "eslint-plugin-regexp": "^3.1.0",
     "eslint-plugin-sonarjs": "^4.2.0",
-    "eslint-plugin-unicorn": "^73.0.0",
+    "eslint-plugin-unicorn": "^74.0.0",
     "express": "^5.1.0",
     "glob": "^10.4.5",
     "globals": "^17.11.0",
     "graphql": "*",
     "husky": "^9.1.7",
+    "istanbul-lib-coverage": "^3.2.2",
     "istanbul-lib-report": "^3.0.0",
     "istanbul-reports": "^3.0.2",
     "jsonc-parser": "^3.3.1",

package/packages/datadog-esbuild/index.js

@@ -370,7 +370,9 @@ register(${JSON.stringify(toRegister)}, _, set, get, ${JSON.stringify(data.raw)}
       return {
         contents,
         loader: 'js',
-        resolveDir: path.dirname(args.path),
+        resolveDir: data.internal
+          ? build.initialOptions.absWorkingDir ?? process.cwd()
+          : path.dirname(args.path),
       }
     }
     if (DD_IAST_ENABLED && args.pluginData?.applicationFile) {

package/packages/datadog-instrumentations/src/cypress-config.js

@@ -67,7 +67,13 @@ function formatFileSystemError (error, fallbackPath) {
  * @returns {void}
  */
 function warnFileCreationFailures (artifact, failures, consequence, customerVisible = false) {
-  const details = failures.map(({ directory, error }) => formatFileSystemError(error, directory)).join('; ')
+  let details = ''
+  let isFirstFailure = true
+  for (const { directory, error } of failures) {
+    if (!isFirstFailure) details += '; '
+    details += formatFileSystemError(error, directory)
+    isFirstFailure = false
+  }
   const message = 'Datadog could not create %s. Attempts failed: %s. %s'
 
   if (customerVisible) {
@@ -790,22 +796,18 @@ function createConfigWrapper (originalConfigFile, wrapperDirectory) {
   //   supported. Guards against ES-module-default shape so TS-authored
   //   configs using `export default` still work.
   const body = isEsm
-    ? [
-        `import originalConfig from ${JSON.stringify(pathToFileURL(originalConfigFile).href)}`,
-        `import cypressConfig from ${JSON.stringify(pathToFileURL(cypressConfigPath).href)}`,
-        '',
-        'export default cypressConfig.wrapConfig(originalConfig)',
-        '',
-      ].join('\n')
-    : [
-        `const cypressConfig = require(${JSON.stringify(cypressConfigPath)})`,
-        `const originalExports = require(${JSON.stringify(originalConfigFile)})`,
-        'const originalConfig = originalExports && originalExports.__esModule',
-        '  ? originalExports.default',
-        '  : originalExports',
-        'module.exports = cypressConfig.wrapConfig(originalConfig)',
-        '',
-      ].join('\n')
+    ? `import originalConfig from ${JSON.stringify(pathToFileURL(originalConfigFile).href)}
+import cypressConfig from ${JSON.stringify(pathToFileURL(cypressConfigPath).href)}
+
+export default cypressConfig.wrapConfig(originalConfig)
+`
+    : `const cypressConfig = require(${JSON.stringify(cypressConfigPath)})
+const originalExports = require(${JSON.stringify(originalConfigFile)})
+const originalConfig = originalExports && originalExports.__esModule
+  ? originalExports.default
+  : originalExports
+module.exports = cypressConfig.wrapConfig(originalConfig)
+`
 
   writeExclusiveFile(wrapperFile, body)
   return wrapperFile

package/packages/datadog-instrumentations/src/fs.js

@@ -191,32 +191,36 @@ function wrapCreateStream (original) {
     const ctx = getMessage(name, ['path', 'options'], arguments)
 
     return startChannel.runStores(ctx, () => {
-      try {
-        const stream = original.apply(this, arguments)
-        const onError = error => {
-          ctx.error = error
-          errorChannel.publish(ctx)
-          onFinish()
-        }
-        const onFinish = () => {
-          finishChannel.runStores(ctx, () => {})
-          stream.removeListener('close', onFinish)
-          stream.removeListener('end', onFinish)
-          stream.removeListener('finish', onFinish)
-          stream.removeListener(errorMonitor, onError)
-        }
+      let stream
 
-        stream.once('close', onFinish)
-        stream.once('end', onFinish)
-        stream.once('finish', onFinish)
-        stream.once(errorMonitor, onError)
-
-        return stream
+      try {
+        stream = original.apply(this, arguments)
       } catch (error) {
         ctx.error = error
         errorChannel.publish(ctx)
         finishChannel.runStores(ctx, () => {})
+        throw error
       }
+
+      const onError = error => {
+        ctx.error = error
+        errorChannel.publish(ctx)
+        onFinish()
+      }
+      const onFinish = () => {
+        finishChannel.runStores(ctx, () => {})
+        stream.removeListener('close', onFinish)
+        stream.removeListener('end', onFinish)
+        stream.removeListener('finish', onFinish)
+        stream.removeListener(errorMonitor, onError)
+      }
+
+      stream.once('close', onFinish)
+      stream.once('end', onFinish)
+      stream.once('finish', onFinish)
+      stream.once(errorMonitor, onError)
+
+      return stream
     })
   }
 }

package/packages/datadog-instrumentations/src/google-cloud-vertexai.js

@@ -13,7 +13,7 @@ function wrapGenerate (generate) {
     const ctx = {
       request,
       instance: this,
-      resource: [this.constructor.name, generate.name].join('.'),
+      resource: `${this.constructor.name}.${generate.name}`,
     }
 
     return vertexaiTracingChannel.tracePromise(generate, ctx, this, ...arguments)
@@ -29,7 +29,7 @@ function wrapGenerateStream (generateStream) {
     const ctx = {
       request,
       instance: this,
-      resource: [this.constructor.name, generateStream.name].join('.'),
+      resource: `${this.constructor.name}.${generateStream.name}`,
       stream: true,
     }
 

package/packages/datadog-instrumentations/src/graphql.js

@@ -3,26 +3,26 @@
 const { addHook, getHooks } = require('./helpers/instrument')
 
 // Orchestrion rewriter handles wrapping of:
-// - graphql: execute, parse, validate (CJS + ESM)
-// - @graphql-tools/executor: execute, normalizedExecutor (CJS + ESM)
+// - graphql: execute, locatedError, parse, validate (CJS + ESM)
+// - @graphql-tools/executor: execute, handleFieldError, normalizedExecutor (CJS + ESM)
 // See helpers/rewriter/instrumentations/graphql.js for the full config.
-//
-// The plugin (packages/datadog-plugin-graphql/src/execute.js) handles the
-// `apm:graphql:execute:start` AppSec/WAF contract from inside its bindStart:
-// publishing the channel synchronously runs subscribers, and an
-// `abortController.abort()` from a subscriber is observed by replacing
-// `ctx.arguments[0]` with an object whose getters throw AbortError. The
-// orchestrion-emitted wrapper's `catch { ...; throw err }` block propagates
-// that throw to the caller of graphql.execute. No outer wrap needed.
-
-for (const hook of getHooks('graphql')) {
-  addHook(hook, exports => exports)
-}
 
-for (const hook of getHooks('@graphql-tools/executor')) {
-  addHook(hook, exports => exports)
+/**
+ * @param {string} name
+ */
+function addRewriterHooks (name) {
+  const files = new Set()
+  for (const hook of getHooks(name)) {
+    if (files.has(hook.file)) continue
+    files.add(hook.file)
+    addHook(hook, exports => exports)
+  }
 }
 
+addRewriterHooks('graphql')
+addRewriterHooks('@graphql-tools/executor')
+addRewriterHooks('graphql-jit')
+
 // Module-load hooks: capture references on ddGlobal for cross-plugin access
 // (read lazily inside each callback so agent.load() between mocha suites can
 // rebind globalThis[dd-trace] without us stashing a stale reference).