dd-trace 6.21.0 → 6.22.0

package/ci/diagnose.js

@@ -1743,9 +1743,7 @@ function readTextFiles (root, physicalRoot, files, maxTotalBytes) {
 
   for (const relativePath of files) {
     const file = getSafeScannedFile(root, physicalRoot, relativePath)
-    if (!file) continue
-
-    if (file.stat.size > MAX_TEXT_FILE_SIZE) continue
+    if (!file || file.stat.size > MAX_TEXT_FILE_SIZE) continue
     if (totalBytes + file.stat.size > maxTotalBytes) {
       textFiles.truncated = true
       break
@@ -1862,15 +1860,13 @@ function isTestSetupOrCiFile (file) {
   const relativePath = file.relativePath
   const basename = path.basename(relativePath)
 
-  if (isWorkflowFile(relativePath)) return true
-  if (basename === 'package.json') return true
-  if (/^(?:jest|config-jest|vitest|vite|playwright|cypress|cucumber)\.config\./.test(basename)) return true
-  if (/^\.mocharc\./.test(basename)) return true
-  if (basename === 'cypress.json') return true
-  if (/setup|bootstrap/i.test(basename)) return true
-  if (relativePath.startsWith('cypress/support/')) return true
-
-  return false
+  return isWorkflowFile(relativePath) ||
+    basename === 'package.json' ||
+    /^(?:jest|config-jest|vitest|vite|playwright|cypress|cucumber)\.config\./.test(basename) ||
+    /^\.mocharc\./.test(basename) ||
+    basename === 'cypress.json' ||
+    /setup|bootstrap/i.test(basename) ||
+    relativePath.startsWith('cypress/support/')
 }
 
 /**
@@ -2014,8 +2010,7 @@ function coerceVersion (rawVersion) {
  */
 function isAmbiguousRange (rawVersion) {
   const version = String(rawVersion || '').trim()
-  if (!version) return true
-  if (version.includes('||')) return true
+  if (!version || version.includes('||')) return true
   return /<=?\s*\d/.test(version)
 }
 

package/ci/init.js

@@ -32,8 +32,7 @@ function detectTestWorkerType () {
   if (getEnvironmentVariable('CUCUMBER_WORKER_ID')) return 'cucumber'
   if (getEnvironmentVariable('MOCHA_WORKER_ID')) return 'mocha'
   if (getValueFromEnvSources('DD_PLAYWRIGHT_WORKER')) return 'playwright'
-  if (getEnvironmentVariable('TINYPOOL_WORKER_ID')) return 'vitest'
-  if (getValueFromEnvSources('DD_VITEST_WORKER')) return 'vitest'
+  if (getEnvironmentVariable('TINYPOOL_WORKER_ID') || getValueFromEnvSources('DD_VITEST_WORKER')) return 'vitest'
   return null
 }
 

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

@@ -40,8 +40,7 @@ function buildCiDiscovery ({ manifest, diagnosis }) {
   const candidateFound = getManifestWorkflowLocations(manifest)
   const manifestFound = uniqueStrings([...declaredFound, ...candidateFound])
   const searched = normalizeStringArray(declared.searched)
-  let method = 'validator-static-diagnosis'
-  if (candidateFound.length > 0) method = 'framework-ci-command'
+  let method = candidateFound.length > 0 ? 'framework-ci-command' : 'validator-static-diagnosis'
   if (declaredFound.length > 0) method = 'manifest'
   if (typeof declared.method === 'string' && declared.method) method = declared.method
   const found = manifestFound.length > 0 ? manifestFound : staticFound
@@ -83,8 +82,14 @@ function getManifestWorkflowLocations (manifest) {
 
 function getFrameworkCiDiscoveryContradiction (framework, manifest) {
   const ciDiscovery = manifest?.ciDiscovery
-  if (!ciDiscovery || !Array.isArray(ciDiscovery.staticFound) || ciDiscovery.staticFound.length === 0) return null
-  if (!frameworkClaimsNoCi(framework)) return null
+  if (
+    !ciDiscovery ||
+    !Array.isArray(ciDiscovery.staticFound) ||
+    ciDiscovery.staticFound.length === 0 ||
+    !frameworkClaimsNoCi(framework)
+  ) {
+    return null
+  }
 
   return {
     reason: 'CI workflow files were found by validator static diagnosis, but this manifest entry says no CI ' +

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

@@ -158,11 +158,7 @@ function splitNodeOptions (source) {
       }
     }
     const next = source[index + 1]
-    if (character === '\\' && next && (next === quote || /[\s'"\\]/.test(next))) {
-      value += source[++index]
-    } else {
-      value += character
-    }
+    value += character === '\\' && next && (next === quote || /[\s'"\\]/.test(next)) ? source[++index] : character
     started = true
   }
   if (quote) throw new Error('NODE_OPTIONS contains an unterminated quoted value.')

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

@@ -37,10 +37,7 @@ function getTestExtension (filename) {
  * @param {string} input.testName generated test name
  */
 function getGeneratedTestContent ({ scenarioId, testName }) {
-  let content = ''
-  if (scenarioId === 'atr-fail-once') {
-    content = 'let attempt = 0\n\n'
-  }
+  let content = scenarioId === 'atr-fail-once' ? 'let attempt = 0\n\n' : ''
   content += "describe('dd-test-optimization-validation', () => {\n" +
     `  it(${JSON.stringify(testName)}, () => {\n` +
     (scenarioId === 'atr-fail-once'

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

@@ -361,7 +361,7 @@ function getDelimitedRanges (source, open, close) {
 function getLiteralStringProperties (source, property) {
   return getPropertyPositions(source, property).flatMap(({ index, valueStart }) => {
     const literal = /^(["'])([^"'\\]+)\1/.exec(source.slice(valueStart))
-    return literal ? [{ index, value: literal[2] }] : []
+    return literal ? { index, value: literal[2] } : []
   })
 }
 

package/ci/test-optimization-validation/generated-files.js

@@ -305,12 +305,14 @@ function isCleanupAuthorizationValid (filename, authorization) {
   try {
     const currentPhysicalRoot = fs.realpathSync(authorization.lexicalRoot)
     const rootStat = fs.statSync(currentPhysicalRoot, { bigint: true })
-    if (currentPhysicalRoot !== authorization.physicalRoot ||
-      rootStat.dev !== authorization.rootDevice || rootStat.ino !== authorization.rootInode) {
+    if (
+      currentPhysicalRoot !== authorization.physicalRoot ||
+      rootStat.dev !== authorization.rootDevice ||
+      rootStat.ino !== authorization.rootInode ||
+      authorization.physicalParent === undefined
+    ) {
       return false
     }
-
-    if (authorization.physicalParent === undefined) return false
     const physicalParent = fs.realpathSync(path.dirname(filename))
     const parentStat = fs.statSync(physicalParent, { bigint: true })
     if (physicalParent !== authorization.physicalParent ||

package/ci/test-optimization-validation/generated-test-contract.js

@@ -124,9 +124,13 @@ function getGeneratedTestContent ({ framework, moduleSystem, scenarioId, stateFi
  */
 function getGeneratedTestContractError (framework) {
   const strategy = framework.generatedTestStrategy
-  if (!strategy || !['planned', 'verified'].includes(strategy.status)) return
-
-  if (!['cucumber', 'cypress', 'jest', 'mocha', 'playwright', 'vitest'].includes(framework.framework)) return
+  if (
+    !strategy ||
+    !['planned', 'verified'].includes(strategy.status) ||
+    !['cucumber', 'cypress', 'jest', 'mocha', 'playwright', 'vitest'].includes(framework.framework)
+  ) {
+    return
+  }
   if (!['commonjs', 'esm'].includes(strategy.moduleSystem)) {
     return 'must retain generatedTestStrategy.moduleSystem as "commonjs" or "esm".'
   }

package/ci/test-optimization-validation/manifest-scaffold.js

@@ -750,8 +750,13 @@ function hasCucumberBrowserSupport (files, retainedInputs, projectRoot) {
 function isTestFile (filename, source, framework, projectRoot, allowDirectoryConvention) {
   const basename = path.basename(filename)
   const normalized = filename.replaceAll('\\', '/')
-  if (normalized.includes('/dd-test-optimization-validation-')) return false
-  if (TYPE_ONLY_TEST_PATTERN.test(basename) || TYPE_ONLY_DIRECTORY_PATTERN.test(normalized)) return false
+  if (
+    normalized.includes('/dd-test-optimization-validation-') ||
+    TYPE_ONLY_TEST_PATTERN.test(basename) ||
+    TYPE_ONLY_DIRECTORY_PATTERN.test(normalized)
+  ) {
+    return false
+  }
   if (framework === 'cucumber') return cucumber.isTestFile(filename)
   if (framework === 'cypress') return cypress.isTestFile(basename, path.dirname(filename), projectRoot)
   if (framework === 'playwright') return playwright.isTestFile(basename, path.dirname(filename), projectRoot)

package/ci/test-optimization-validation/manifest-schema.js

@@ -441,16 +441,15 @@ function validateCiWiring (repositoryRoot, ciWiring, prefix, errors) {
   if (typeof ciWiring.reviewComplete !== 'boolean') errors.push(`${prefix}.reviewComplete must be a boolean.`)
   validateStringArray(ciWiring.unresolved, `${prefix}.unresolved`, errors)
 
-  if (!isObject(ciWiring.initialization) ||
-    !INITIALIZATION_STATUSES.has(ciWiring.initialization.status)) {
-    errors.push(`${prefix}.initialization.status must be configured, not_configured, or unknown.`)
-  } else {
+  if (isObject(ciWiring.initialization) && INITIALIZATION_STATUSES.has(ciWiring.initialization.status)) {
     validateStringArray(ciWiring.initialization.evidence, `${prefix}.initialization.evidence`, errors)
-  }
-  if (!isObject(ciWiring.transport) || !TRANSPORT_MODES.has(ciWiring.transport.mode)) {
-    errors.push(`${prefix}.transport.mode must be agent, agentless, none, or unknown.`)
   } else {
+    errors.push(`${prefix}.initialization.status must be configured, not_configured, or unknown.`)
+  }
+  if (isObject(ciWiring.transport) && TRANSPORT_MODES.has(ciWiring.transport.mode)) {
     validateStringArray(ciWiring.transport.evidence, `${prefix}.transport.evidence`, errors)
+  } else {
+    errors.push(`${prefix}.transport.mode must be agent, agentless, none, or unknown.`)
   }
 }
 

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

@@ -332,8 +332,12 @@ function getActions (results) {
 function getActionPriority (result, localPasses) {
   if (result.evidence?.possibleLibraryBug) return 0
   if (result.scenario === 'ci-wiring' && localPasses.has(result.frameworkId)) return 0
-  if (result.evidence?.blockerCategory === 'EXECUTION_ENVIRONMENT_BLOCKED') return 1
-  if (result.evidence?.blockerCategory === 'VALIDATOR_LIMITATION') return 1
+  if (
+    result.evidence?.blockerCategory === 'EXECUTION_ENVIRONMENT_BLOCKED' ||
+    result.evidence?.blockerCategory === 'VALIDATOR_LIMITATION'
+  ) {
+    return 1
+  }
   if (result.scenario === 'ci-wiring') return 2
   return 3
 }

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

@@ -46,8 +46,7 @@ function getGeneratedCommand (framework, scenario) {
  * @returns {Array<[string, object]>} labeled direct-runner commands
  */
 function getFrameworkCommands (framework, requestedScenario = null) {
-  if (framework.status !== 'runnable') return []
-  if (requestedScenario === 'ci-wiring') return []
+  if (framework.status !== 'runnable' || requestedScenario === 'ci-wiring') return []
 
   const commands = [['basic-reporting', getBasicCommand(framework)]]
   const fallbackTests = framework.validation.fallbackTests
@@ -99,8 +98,7 @@ function getManifestInputFiles (manifest, { includeLocal = true } = {}) {
     for (const framework of manifest.frameworks) {
       addExistingFile(files, framework.ciWiring?.configFile)
       addExistingFile(files, framework.project?.packageJson)
-      if (!includeLocal) continue
-      if (framework.status !== 'runnable') continue
+      if (!includeLocal || framework.status !== 'runnable') continue
       addExistingFile(files, framework.validation?.runner)
       addExistingFile(files, framework.validation?.testFile)
       const fallbackTests = framework.validation?.fallbackTests

package/ci/test-optimization-validation/runner-contract.js

@@ -450,8 +450,7 @@ function getRunnerInputError (args, environment, projectRoot, repositoryRoot, co
  * @returns {{error?: string, runnerIndex: number, tokens: string[]}|undefined} parsed invocation
  */
 function getFrameworkInvocation (command, framework) {
-  if (CONTROL_PATTERN.test(String(command || ''))) return
-  if (command === `direct ${framework} binary`) return
+  if (CONTROL_PATTERN.test(String(command || '')) || command === `direct ${framework} binary`) return
   const tokens = tokenizeCommand(command)
   const executable = getRunnerExecutableName(framework)
   const runnerIndex = tokens.findIndex(token => {

package/ci/test-optimization-validation/scenarios/auto-test-retries.js

@@ -100,21 +100,7 @@ async function runAutoTestRetries ({ framework, out, options }) {
       })
     }
 
-    if (run.result.exitCode !== 0) {
-      return failWithDebugRerun({
-        command: scenario.runCommand,
-        fixtureConfig,
-        diagnosis: getAutoTestRetriesFailureDiagnosis(framework, evidence),
-        evidence,
-        framework,
-        options,
-        out,
-        outDir,
-        scenarioName,
-      })
-    }
-
-    if (tests.length < 2 || autoTestRetryEvents.length === 0) {
+    if (run.result.exitCode !== 0 || tests.length < 2 || autoTestRetryEvents.length === 0) {
       return failWithDebugRerun({
         command: scenario.runCommand,
         fixtureConfig,

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

@@ -3,7 +3,7 @@ import { afterEach, beforeAll, beforeEach, inject } from 'vitest'
 // Instrumentation-less setup for DD_EXPERIMENTAL_TEST_OPT_VITEST_NO_WORKER_INIT.
 // It applies Test Optimization execution changes without initializing dd-trace and also supports Browser Mode.
 const VITEST_NO_WORKER_INIT_ACTIVE_ENV = 'DD_TEST_OPT_VITEST_NO_WORKER_INIT_ACTIVE'
-const SERIALIZED_CONTEXT_PREFIX = '\u0000dd-vitest-context:'
+const SERIALIZED_CONTEXT_PREFIX = '\0dd-vitest-context:'
 const providedContext = getProvidedContext()
 const isNoWorkerInitActive = providedContext.isActive ?? getIsNoWorkerInitActive()
 const attemptToFixTests = providedContext.attemptToFixTests || {}
@@ -220,9 +220,8 @@ function getNextAttemptIndex (task) {
  */
 function prepareRumCorrelation (task, attemptIndex) {
   // A per-origin cookie cannot identify overlapping attempts without racing.
-  if (!isRumCorrelationEnabled || isConcurrentTask(task)) return
-
   if (
+    !isRumCorrelationEnabled || isConcurrentTask(task) ||
     typeof window === 'undefined' ||
     typeof document === 'undefined' ||
     typeof rumTestExecutionIdCookieName !== 'string'
@@ -289,8 +288,7 @@ function getRum () {
  * @param {object|undefined} rum
  */
 function getIsRumActive (rum) {
-  if (!rum) return false
-  if (typeof rum.getInternalContext !== 'function') return false
+  if (!rum || typeof rum.getInternalContext !== 'function') return false
 
   try {
     return !!rum.getInternalContext()
@@ -770,8 +768,13 @@ function getEarlyFlakeDetectionSuiteCandidate (suite) {
 
     const testSuite = getTestSuite(task)
     const testName = getTestName(task)
-    if (attemptToFixTests[testSuite]?.[testName] || disabledTests[testSuite]?.[testName]) continue
-    if (!isEarlyFlakeDetectionTest(testSuite, testName)) continue
+    if (
+      attemptToFixTests[testSuite]?.[testName] ||
+      disabledTests[testSuite]?.[testName] ||
+      !isEarlyFlakeDetectionTest(testSuite, testName)
+    ) {
+      continue
+    }
 
     candidate ||= {
       hasNewTest: false,

package/index.d.ts

@@ -218,7 +218,6 @@ interface Tracer extends opentracing.Tracer {
    * @env DD_FEATURE_FLAGS_ENABLED
    * @env DD_FEATURE_FLAGS_CONFIGURATION_SOURCE
    * @env DD_FLAGGING_EVALUATION_COUNTS_ENABLED
-   * @beta This feature is in preview and not ready for production use
    */
   openfeature: tracer.OpenFeatureProvider;
 
@@ -275,7 +274,7 @@ interface Tracer extends opentracing.Tracer {
    *
    * Removes all baggage items from the current context and returns the new context.
    *
-   * @see https://opentelemetry.io/docs/specs/otel/baggage/api/#remove-all-values
+   * @see https://opentelemetry.io/docs/specs/otel/baggage/api/#clear-baggage-in-the-context
    */
   removeAllBaggageItems (): Record<string, string>;
 }
@@ -818,6 +817,22 @@ declare namespace tracer {
      */
     site?: string;
 
+    /**
+     * Feature Flags configuration.
+     */
+    featureFlags?: {
+      /**
+       * Allow boolean true in dd_evaluation_telemetry_opt_out to suppress evaluation events, metrics, and span tags.
+       * The attribute remains available to targeting rules and exposure reporting.
+       * Enabling this option does not change exposure events or flag evaluation results.
+       * Captured when the provider is constructed.
+       * Explicit configuration takes precedence over the environment variable, including false.
+       * @default false
+       * @env DD_FEATURE_FLAGS_EVALUATION_TELEMETRY_PER_SUBJECT_OPT_OUT_ENABLED
+       */
+      enableEvaluationTelemetryOptOutParameter?: boolean
+    }
+
     /**
      * Experimental features can be enabled individually using key / value pairs.
      * @default {}
@@ -890,8 +905,6 @@ declare namespace tracer {
 
       /**
        * Configuration for Feature Flagging & Experimentation.
-       *
-       * @beta This feature is in preview and not ready for production use
        */
       flaggingProvider?: {
         /**
@@ -1728,8 +1741,6 @@ declare namespace tracer {
    *
    * Wraps @datadog/openfeature-node-server with agentless and Agent Remote Config delivery.
    * Implements the OpenFeature Provider interface for flag evaluation.
-   *
-   * @beta This feature is in preview and not ready for production use
    */
   export interface OpenFeatureProvider {
     /**
@@ -2494,14 +2505,14 @@ declare namespace tracer {
     /**
      * This plugin patches the [browser-bunyan](https://github.com/philmander/browser-bunyan)
      * to automatically inject trace identifiers in log records when the
-     * [logInjection](interfaces/traceroptions.html#logInjection) option is enabled
+     * {@link TracerOptions.logInjection | logInjection} option is enabled
      * on the tracer.
      */
     interface browser_bunyan extends Integration {}
 
     /**
      * This plugin automatically instruments the
-     * [bullmq](https://github.com/npmjs/package/bullmq) message queue library.
+     * [bullmq](https://www.npmjs.com/package/bullmq) message queue library.
      */
     interface bullmq extends Instrumentation {
       /**
@@ -2522,7 +2533,7 @@ declare namespace tracer {
     /**
      * This plugin patches the [bunyan](https://github.com/trentm/node-bunyan)
      * to automatically inject trace identifiers in log records when the
-     * [logInjection](interfaces/traceroptions.html#logInjection) option is enabled
+     * {@link TracerOptions.logInjection | logInjection} option is enabled
      * on the tracer.
      */
     interface bunyan extends Integration {}
@@ -2975,7 +2986,7 @@ declare namespace tracer {
 
     /**
      * This plugin automatically instruments the
-     * [langgraph](https://github.com/npmjs/package/langgraph) library.
+     * [langgraph](https://www.npmjs.com/package/@langchain/langgraph) library.
      */
     interface langgraph extends Instrumentation, LLMObsIntegration {}
 
@@ -3011,7 +3022,7 @@ declare namespace tracer {
 
     /**
      * This plugin automatically instruments the
-     * [modelcontextprotocol-sdk](https://github.com/npmjs/package/@modelcontextprotocol/sdk) library.
+     * [modelcontextprotocol-sdk](https://www.npmjs.com/package/@modelcontextprotocol/sdk) library.
      */
     interface modelcontextprotocol_sdk extends Instrumentation, LLMObsIntegration {}
 
@@ -3190,7 +3201,7 @@ declare namespace tracer {
     /**
      * This plugin patches the [pino](http://getpino.io)
      * to automatically inject trace identifiers in log records when the
-     * [logInjection](interfaces/traceroptions.html#logInjection) option is enabled
+     * {@link TracerOptions.logInjection | logInjection} option is enabled
      * on the tracer.
      */
     interface pino extends Integration {}
@@ -3361,7 +3372,7 @@ declare namespace tracer {
     /**
      * This plugin patches the [winston](https://github.com/winstonjs/winston)
      * to automatically inject trace identifiers in log records when the
-     * [logInjection](interfaces/traceroptions.html#logInjection) option is enabled
+     * {@link TracerOptions.logInjection | logInjection} option is enabled
      * on the tracer.
      */
     interface winston extends Integration {}
@@ -3652,7 +3663,7 @@ declare namespace tracer {
        * key/value pair separated by an equals sign `=`. Spaces and horizontal tabs
        * surrounding `list-members` are ignored. There can be a maximum of 32
        * `list-members` in a `list`.
-       * More Info: https://www.w3.org/TR/trace-context/#tracestate-field
+       * More Info: https://www.w3.org/TR/trace-context/#tracestate-header
        *
        * Examples:
        *     Single tracing system (generic format):

package/initialize.mjs

@@ -101,8 +101,6 @@ if (isMainThread) {
   // Only register the loader hook when instrumentation initialized. On a bailout the
   // loader has nothing to instrument and can keep a short-lived process from exiting.
   if (Module.register && initialized) {
-    // The loader builds its own include/exclude matcher in `initialize`, so no
-    // options need to cross the registration boundary.
-    Module.register('./loader-hook.mjs', import.meta.url)
+    require('./register.js')
   }
 }

package/openfeature/rules-based.d.ts

@@ -0,0 +1,11 @@
+export {
+  configurationToString,
+  ConfigurationFetchError,
+  fetchRulesConfiguration,
+} from '../vendor/dist/@datadog/openfeature-node-server/rules-based';
+export type {
+  ConfigurationFetchErrorCode,
+  FlagsConfiguration,
+  FlagsConfigurationWire,
+  RulesConfigurationFetchOptions,
+} from '../vendor/dist/@datadog/openfeature-node-server/rules-based';

package/openfeature/rules-based.js

@@ -0,0 +1,7 @@
+'use strict'
+
+const rules = require('../vendor/dist/@datadog/openfeature-node-server/rules-based')
+
+exports.configurationToString = rules.configurationToString
+exports.ConfigurationFetchError = rules.ConfigurationFetchError
+exports.fetchRulesConfiguration = rules.fetchRulesConfiguration

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dd-trace",
-  "version": "6.21.0",
+  "version": "6.22.0",
   "description": "Datadog APM tracing client for JavaScript",
   "main": "index.js",
   "typings": "index.d.ts",
@@ -109,7 +109,7 @@
     "test:integration:webdriverio": "mocha --timeout 60000 \"integration-tests/webdriverio/${SPEC:-*}.spec.js\"",
     "test:integration:webdriverio:coverage": "node ./integration-tests/coverage/run-suite.js --timeout 60000 \"integration-tests/webdriverio/${SPEC:-*}.spec.js\"",
     "test:integration:vitest": "mocha --timeout 60000 \"integration-tests/vitest/${SPEC:-vitest*}.spec.js\"",
-    "test:integration:vitest:coverage": "node ./integration-tests/coverage/run-suite.js --timeout 60000 \"integration-tests/vitest/${SPEC:-vitest*}.spec.js\"",
+    "test:integration:vitest:coverage": "node ./integration-tests/vitest/run-with-coverage.js --timeout 60000 \"integration-tests/vitest/${SPEC:-vitest*}.spec.js\"",
     "test:integration:testopt": "mocha --timeout 120000 \"integration-tests/ci-visibility/*.spec.js\"",
     "test:integration:testopt:coverage": "node ./integration-tests/coverage/run-suite.js --timeout 120000 \"integration-tests/ci-visibility/*.spec.js\"",
     "test:integration:profiler": "mocha --timeout 180000 \"integration-tests/profiler/*.spec.js\"",
@@ -143,7 +143,7 @@
   "bugs": {
     "url": "https://github.com/DataDog/dd-trace-js/issues"
   },
-  "homepage": "https://github.com/DataDog/dd-trace-js#readme",
+  "homepage": "https://github.com/DataDog/dd-trace-js",
   "engines": {
     "node": ">=22"
   },
@@ -169,6 +169,8 @@
     "loader-hook.mjs",
     "openfeature.d.ts",
     "openfeature.js",
+    "openfeature/rules-based.js",
+    "openfeature/rules-based.d.ts",
     "packages/*/index.js",
     "packages/*/index.electron.js",
     "packages/*/lib/**/*",
@@ -202,11 +204,11 @@
   "devDependencies": {
     "@actions/core": "^3.0.1",
     "@actions/github": "^9.1.1",
-    "@babel/helpers": "^8.0.5",
+    "@babel/helpers": "^8.0.7",
     "@eslint/eslintrc": "^3.3.7",
     "@eslint/js": "^10.0.1",
     "@eslint/plugin-kit": "^0.7.3",
-    "@datadog/openfeature-node-server": "2.4.0",
+    "@datadog/openfeature-node-server": "2.5.0",
     "@msgpack/msgpack": "^3.1.3",
     "@openfeature/core": "^1.12.0",
     "@openfeature/server-sdk": "~1.23.0",
@@ -218,20 +220,20 @@
     "@yarnpkg/lockfile": "^1.1.0",
     "benchmark": "^2.1.4",
     "body-parser": "^2.3.0",
-    "bun": "1.4.2",
+    "bun": "1.4.3",
     "c8": "^12.0.0",
     "codeowners-audit": "^2.9.0",
-    "eslint": "^10.11.0",
+    "eslint": "^10.13.0",
     "eslint-plugin-cypress": "^7.0.2",
     "eslint-plugin-import-x": "^4.16.2",
-    "eslint-plugin-jsdoc": "^64.5.4",
+    "eslint-plugin-jsdoc": "^65.3.12",
     "eslint-plugin-mocha": "^12.0.2",
-    "eslint-plugin-n": "^18.4.0",
+    "eslint-plugin-n": "^18.5.0",
     "eslint-plugin-promise": "^7.3.0",
     "eslint-plugin-regexp": "^3.3.1",
     "eslint-plugin-sonarjs": "^4.2.2",
     "eslint-plugin-unicorn": "^74.0.0",
-    "express": "^5.1.0",
+    "express": "^5.3.0",
     "glob": "^10.4.5",
     "globals": "^17.13.0",
     "graphql": "*",

package/packages/datadog-core/src/storage.js

@@ -56,12 +56,28 @@ const isACFActive = (() => {
 if (!isACFActive) {
   const superGetStore = AsyncLocalStorage.prototype.getStore
   const superEnterWith = AsyncLocalStorage.prototype.enterWith
+  // @ts-expect-error Node calls this undocumented AsyncLocalStorage hook.
+  const superPropagate = AsyncLocalStorage.prototype._propagate
 
   // Without ACF, ALS writes the entered value onto the async resource. Keep the
   // real store off the resource by entering a small handle and mapping it to
   // the store through a WeakMap, then reversing the lookup on read.
   const stores = new WeakMap()
 
+  /**
+   * Node can omit the trigger resource while the inspector is paused. Guard
+   * the shared hook because every enabled AsyncLocalStorage receives the call.
+   *
+   * @param {object} resource
+   * @param {object | undefined} triggerResource
+   * @param {string} type
+   */
+  AsyncLocalStorage.prototype._propagate = function _propagate (resource, triggerResource, type) {
+    if (triggerResource) {
+      superPropagate.call(this, resource, triggerResource, type)
+    }
+  }
+
   /**
    * @param {Store<unknown>} [store]
    */

package/packages/datadog-esbuild/index.js

@@ -8,6 +8,7 @@ const { pathToFileURL, fileURLToPath } = require('node:url')
 const instrumentations = require('../datadog-instrumentations/src/helpers/instrumentations')
 const extractPackageAndModulePath = require('../datadog-instrumentations/src/helpers/extract-package-and-module-path')
 const hooks = require('../datadog-instrumentations/src/helpers/hooks')
+const { getValueFromEnvSources } = require('../dd-trace/src/config/helper')
 const log = require('./src/log')
 const { createEsmResolver } = require('./src/resolver')
 const { isESMFile, processModule } = require('./src/utils')
@@ -60,6 +61,7 @@ for (const builtin of builtinModules) {
 
 // eslint-disable-next-line eslint-rules/eslint-process-env
 const DD_IAST_ENABLED = process.env.DD_IAST_ENABLED?.toLowerCase() === 'true' || process.env.DD_IAST_ENABLED === '1'
+const DD_BUNDLER_INJECT_GIT_METADATA = getValueFromEnvSources('DD_BUNDLER_INJECT_GIT_METADATA') !== false
 
 module.exports.name = 'datadog-esbuild'
 
@@ -143,26 +145,30 @@ globalThis.__dirname ??= $dd_dirname(globalThis.__filename);
 ${build.initialOptions.banner.js}`
   }
 
-  // Get git metadata at build time and add it to the banner for both ESM and CommonJS builds
-  const gitMetadata = getGitMetadata()
-  if (gitMetadata.repositoryURL || gitMetadata.commitSHA) {
-    build.initialOptions.banner ??= {}
-    build.initialOptions.banner.js ??= ''
+  // Bake DD_GIT_* into the banner unless DD_BUNDLER_INJECT_GIT_METADATA=false (stable artifact hashes).
+  if (DD_BUNDLER_INJECT_GIT_METADATA) {
+    const gitMetadata = getGitMetadata()
+    if (gitMetadata.repositoryURL || gitMetadata.commitSHA) {
+      build.initialOptions.banner ??= {}
+      build.initialOptions.banner.js ??= ''
 
-    build.initialOptions.banner.js = `if (typeof process === 'object' && process !== null &&
+      build.initialOptions.banner.js = `if (typeof process === 'object' && process !== null &&
     process.env !== null && typeof process.env === 'object') {
   ${gitMetadata.repositoryURL ? `process.env.DD_GIT_REPOSITORY_URL = '${gitMetadata.repositoryURL}';` : ''}
   ${gitMetadata.commitSHA ? `process.env.DD_GIT_COMMIT_SHA = '${gitMetadata.commitSHA}';` : ''}
 }
 ${build.initialOptions.banner.js}`
 
-    log.debug(
-      'Automatically injected git metadata (DD_GIT_REPOSITORY_URL: %s, DD_GIT_COMMIT_SHA: %s)',
-      gitMetadata.repositoryURL || 'not available',
-      gitMetadata.commitSHA || 'not available'
-    )
+      log.debug(
+        'Automatically injected git metadata (DD_GIT_REPOSITORY_URL: %s, DD_GIT_COMMIT_SHA: %s)',
+        gitMetadata.repositoryURL || 'not available',
+        gitMetadata.commitSHA || 'not available'
+      )
+    } else {
+      log.warn('No git metadata available - skipping injection')
+    }
   } else {
-    log.warn('No git metadata available - skipping injection')
+    log.debug('Skipping git metadata injection (DD_BUNDLER_INJECT_GIT_METADATA=false)')
   }
 
   let resolver