dd-trace 5.98.0 → 5.99.1

package/LICENSE-3rdparty.csv

@@ -68,7 +68,6 @@
 "esquery","https://github.com/estools/esquery","['BSD-3-Clause']","['Joel Feenstra']"
 "estraverse","https://github.com/estools/estraverse","['BSD-2-Clause']","['estools']"
 "fast-fifo","https://github.com/mafintosh/fast-fifo","['MIT']","['Mathias Buus']"
-"ignore","https://github.com/kaelzhang/node-ignore","['MIT']","['kael']"
 "import-in-the-middle","https://github.com/nodejs/import-in-the-middle","['Apache-2.0']","['Bryan English']"
 "istanbul-lib-coverage","https://github.com/istanbuljs/istanbuljs","['BSD-3-Clause']","['Krishnan Anantheswaran']"
 "jest-docblock","https://github.com/jestjs/jest","['MIT']","['jestjs']"

package/ext/tags.js

@@ -25,6 +25,7 @@ const tags = {
   HTTP_RESPONSE_HEADERS: 'http.response.headers',
   HTTP_USERAGENT: 'http.useragent',
   HTTP_CLIENT_IP: 'http.client_ip',
+  NETWORK_CLIENT_IP: 'network.client.ip',
 
   // Messaging
 

package/index.d.ts

@@ -272,6 +272,7 @@ interface Plugins {
   "memcached": tracer.plugins.memcached;
   "microgateway-core": tracer.plugins.microgateway_core;
   "mocha": tracer.plugins.mocha;
+  "modelcontextprotocol-sdk": tracer.plugins.modelcontextprotocol_sdk;
   "moleculer": tracer.plugins.moleculer;
   "mongodb-core": tracer.plugins.mongodb_core;
   "mongoose": tracer.plugins.mongoose;
@@ -2848,11 +2849,18 @@ declare namespace tracer {
      * [mocha](https://mochajs.org/) module.
      */
     interface mocha extends Integration {}
-
+    
+    /**
+     * This plugin automatically instruments the
+     * [modelcontextprotocol-sdk](https://github.com/npmjs/package/@modelcontextprotocol/sdk) library.
+     */
+    interface modelcontextprotocol_sdk extends Instrumentation {}
+    
     /**
      * This plugin automatically instruments the
      * [moleculer](https://moleculer.services/) module.
      */
+
     interface moleculer extends Moleculer {
       /**
        * Configuration for Moleculer clients. Set to false to disable client

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dd-trace",
-  "version": "5.98.0",
+  "version": "5.99.1",
   "description": "Datadog APM tracing client for JavaScript",
   "main": "index.js",
   "typings": "index.d.ts",
@@ -13,6 +13,8 @@
     "dependencies:dedupe": "yarn-deduplicate yarn.lock",
     "generate:config:types": "node scripts/generate-config-types.js",
     "verify:config:types": "node scripts/generate-config-types.js --check",
+    "generate:supported-integrations": "node scripts/generate-supported-integrations.js",
+    "verify:supported-integrations": "node scripts/generate-supported-integrations.js --check",
     "type:check": "tsc --noEmit -p tsconfig.dev.json",
     "type:doc:build": "cd docs && yarn && yarn build",
     "type:doc:test": "cd docs && yarn && yarn test",
@@ -24,66 +26,82 @@
     "release:proposal": "node scripts/release/proposal",
     "services": "node ./scripts/install_plugin_modules && node packages/dd-trace/test/setup/services",
     "test": "echo '\nError: The root \"npm test\" command is intentionally disabled.\n\nInstead, run specific test suites:\n  - npm run test:trace:core\n  - npm run test:appsec\n  - etc.\n\nOr run individual test files:\n  npx mocha path/to/test.spec.js\n\nSee CONTRIBUTING.md (Testing section) for more details.\n' && exit 1",
-    "test:aiguard": "mocha packages/dd-trace/test/aiguard/**/*.spec.js",
-    "test:aiguard:ci": "nyc -- npm run test:aiguard",
+    "test:aiguard": "mocha \"packages/dd-trace/test/aiguard/**/*.spec.js\"",
+    "test:aiguard:ci": "nyc --silent node init && nyc -- npm run test:aiguard",
     "test:appsec": "mocha --exclude \"packages/dd-trace/test/appsec/**/*.plugin.spec.js\" \"packages/dd-trace/test/appsec/**/*.spec.js\"",
-    "test:appsec:ci": "nyc -- npm run test:appsec",
+    "test:appsec:ci": "nyc --silent node init && nyc -- npm run test:appsec",
     "test:appsec:plugins": "mocha \"packages/dd-trace/test/appsec/**/*.@(${PLUGINS}).plugin.spec.js\"",
-    "test:appsec:plugins:ci": "yarn services && nyc -- npm run test:appsec:plugins",
-    "test:debugger": "mocha packages/dd-trace/test/debugger/**/*.spec.js",
-    "test:debugger:ci": "nyc -- npm run test:debugger",
+    "test:appsec:plugins:ci": "yarn services && nyc --silent node init && nyc -- npm run test:appsec:plugins",
+    "test:debugger": "mocha \"packages/dd-trace/test/debugger/**/*.spec.js\"",
+    "test:debugger:ci": "nyc --silent node init && nyc -- npm run test:debugger",
     "test:eslint-rules": "node 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:ci": "nyc -- npm run test:trace:core",
-    "test:trace:guardrails": "mocha packages/dd-trace/test/guardrails/**/*.spec.js",
-    "test:trace:guardrails:ci": "nyc -- npm run test:trace:guardrails",
-    "test:esbuild": "mocha packages/datadog-esbuild/test/**/*.spec.js",
-    "test:esbuild:ci": "nyc -- npm run test:esbuild",
-    "test:webpack": "mocha packages/datadog-webpack/test/**/*.spec.js",
-    "test:webpack:ci": "nyc -- npm run test:webpack",
+    "test:trace:core:ci": "nyc --silent node init && nyc -- npm run test:trace:core",
+    "test:trace:guardrails": "mocha \"packages/dd-trace/test/guardrails/**/*.spec.js\"",
+    "test:trace:guardrails:ci": "nyc --silent node init && nyc -- npm run test:trace:guardrails",
+    "test:esbuild": "mocha \"packages/datadog-esbuild/test/**/*.spec.js\"",
+    "test:esbuild:ci": "nyc --silent node init && nyc -- npm run test:esbuild",
+    "test:webpack": "mocha \"packages/datadog-webpack/test/**/*.spec.js\"",
+    "test:webpack:ci": "nyc --silent node init && nyc -- npm run test:webpack",
     "test:instrumentations": "mocha \"packages/datadog-instrumentations/test/@(${PLUGINS}).spec.js\"",
-    "test:instrumentations:ci": "yarn services && nyc -- npm run test:instrumentations",
-    "test:instrumentations:misc": "mocha packages/datadog-instrumentations/test/*/**/*.spec.js",
-    "test:instrumentations:misc:ci": "nyc -- npm run test:instrumentations:misc",
-    "test:core": "node scripts/mocha-parallel-files.js --expose-gc --timeout 30000 -- packages/datadog-core/test/**/*.spec.js",
-    "test:core:ci": "nyc -- npm run test:core",
-    "test:code-origin": "mocha packages/datadog-code-origin/test/**/*.spec.js",
-    "test:code-origin:ci": "nyc -- npm run test:code-origin",
-    "test:lambda": "mocha packages/dd-trace/test/lambda/**/*.spec.js",
-    "test:lambda:ci": "nyc -- npm run test:lambda",
+    "test:instrumentations:ci": "yarn services && nyc --silent node init && nyc -- npm run test:instrumentations",
+    "test:instrumentations:misc": "mocha \"packages/datadog-instrumentations/test/*/**/*.spec.js\"",
+    "test:instrumentations:misc:ci": "nyc --silent node init && nyc -- npm run test:instrumentations:misc",
+    "test:core": "node scripts/mocha-parallel-files.js --expose-gc --timeout 30000 -- \"packages/datadog-core/test/**/*.spec.js\"",
+    "test:core:ci": "nyc --silent node init && nyc -- npm run test:core",
+    "test:code-origin": "mocha \"packages/datadog-code-origin/test/**/*.spec.js\"",
+    "test:code-origin:ci": "nyc --silent node init && nyc -- npm run test:code-origin",
+    "test:lambda": "mocha \"packages/dd-trace/test/lambda/**/*.spec.js\"",
+    "test:lambda:ci": "nyc --silent node init && nyc -- npm run test:lambda",
     "test:llmobs:sdk": "mocha --exclude \"packages/dd-trace/test/llmobs/plugins/**/*.spec.js\" \"packages/dd-trace/test/llmobs/**/*.spec.js\"",
-    "test:llmobs:sdk:ci": "nyc -- npm run test:llmobs:sdk",
+    "test:llmobs:sdk:ci": "nyc --silent node init && nyc -- npm run test:llmobs:sdk",
     "test:llmobs:plugins": "mocha \"packages/dd-trace/test/llmobs/plugins/@(${PLUGINS})/*.spec.js\"",
-    "test:llmobs:plugins:ci": "yarn services && nyc -- npm run test:llmobs:plugins",
-    "test:openfeature": "mocha packages/dd-trace/test/openfeature/**/*.spec.js",
-    "test:openfeature:ci": "nyc -- npm run test:openfeature",
+    "test:llmobs:plugins:ci": "yarn services && nyc --silent node init && nyc -- npm run test:llmobs:plugins",
+    "test:openfeature": "mocha \"packages/dd-trace/test/openfeature/**/*.spec.js\"",
+    "test:openfeature:ci": "nyc --silent node init && nyc -- npm run test:openfeature",
     "test:plugins": "node --expose-gc ./node_modules/mocha/bin/mocha.js \"packages/datadog-plugin-@(${PLUGINS})/test/**/${SPEC:-*}*.spec.js\"",
-    "test:plugins:ci": "yarn services && nyc -- npm run test:plugins",
-    "test:plugins:ci:flaky": "yarn services && nyc -- npm run test:plugins -- --bail --retries 2",
+    "test:plugins:ci": "yarn services && nyc --silent node init && nyc -- npm run test:plugins",
+    "test:plugins:ci:flaky": "yarn services && nyc --silent node init && nyc -- npm run test:plugins -- --bail --retries 2",
     "test:plugins:upstream": "node ./packages/dd-trace/test/plugins/suite.js",
-    "test:profiler": "node scripts/mocha-parallel-files.js --expose-gc --timeout 30000 -- packages/dd-trace/test/profiling/**/*.spec.js",
-    "test:profiler:ci": "nyc -- npm run test:profiler",
+    "test:profiler": "node scripts/mocha-parallel-files.js --expose-gc --timeout 30000 -- \"packages/dd-trace/test/profiling/**/*.spec.js\"",
+    "test:profiler:ci": "nyc --silent node init && nyc -- npm run test:profiler",
     "test:integration": "mocha --timeout 60000 \"integration-tests/*.spec.js\"",
+    "test:integration:coverage": "node ./integration-tests/coverage/run-suite.js --timeout 60000 \"integration-tests/*.spec.js\"",
     "test:integration:aiguard": "mocha --timeout 60000 \"integration-tests/aiguard/*.spec.js\"",
+    "test:integration:aiguard:coverage": "node ./integration-tests/coverage/run-suite.js --timeout 60000 \"integration-tests/aiguard/*.spec.js\"",
     "test:integration:appsec": "mocha --timeout 60000 \"integration-tests/appsec/*.spec.js\"",
+    "test:integration:appsec:coverage": "node ./integration-tests/coverage/run-suite.js --timeout 60000 \"integration-tests/appsec/*.spec.js\"",
     "test:integration:bun": "mocha --timeout 60000 \"integration-tests/bun/*.spec.js\"",
     "test:integration:cucumber": "mocha --timeout 60000 \"integration-tests/cucumber/*.spec.js\"",
-    "test:integration:cypress": "mocha --timeout 60000 \"integration-tests/cypress/*.spec.js\"",
+    "test:integration:cucumber:coverage": "node ./integration-tests/coverage/run-suite.js --timeout 60000 \"integration-tests/cucumber/*.spec.js\"",
+    "test:integration:cypress": "mocha --timeout 60000 \"integration-tests/cypress/${SPEC:-cypress-*}.spec.js\"",
+    "test:integration:cypress:coverage": "node ./integration-tests/coverage/run-suite.js --timeout 60000 \"integration-tests/cypress/${SPEC:-cypress-*}.spec.js\"",
     "test:integration:debugger": "mocha --timeout 60000 \"integration-tests/debugger/*.spec.js\"",
+    "test:integration:debugger:coverage": "node ./integration-tests/coverage/run-suite.js --timeout 60000 \"integration-tests/debugger/*.spec.js\"",
     "test:integration:esbuild": "mocha --timeout 60000 \"integration-tests/esbuild/*.spec.js\"",
+    "test:integration:esbuild:coverage": "node ./integration-tests/coverage/run-suite.js --timeout 60000 \"integration-tests/esbuild/*.spec.js\"",
     "test:integration:webpack": "mocha --timeout 60000 \"integration-tests/webpack/*.spec.js\"",
     "test:integration:openfeature": "mocha --timeout 60000 \"integration-tests/openfeature/*.spec.js\"",
+    "test:integration:openfeature:coverage": "node ./integration-tests/coverage/run-suite.js --timeout 60000 \"integration-tests/openfeature/*.spec.js\"",
     "test:integration:jest": "mocha --timeout 60000 \"integration-tests/jest/*.spec.js\"",
+    "test:integration:jest:coverage": "node ./integration-tests/coverage/run-suite.js --timeout 60000 \"integration-tests/jest/*.spec.js\"",
     "test:integration:mocha": "mocha --timeout 60000 \"integration-tests/mocha/*.spec.js\"",
-    "test:integration:playwright": "mocha --timeout 60000 \"integration-tests/playwright/*.spec.js\"",
+    "test:integration:mocha:coverage": "node ./integration-tests/coverage/run-suite.js --timeout 60000 \"integration-tests/mocha/*.spec.js\"",
+    "test:integration:playwright": "mocha --timeout 60000 \"integration-tests/playwright/${SPEC:-playwright-*}.spec.js\"",
+    "test:integration:playwright:coverage": "node ./integration-tests/coverage/run-suite.js --timeout 60000 \"integration-tests/playwright/${SPEC:-playwright-*}.spec.js\"",
     "test:integration:selenium": "mocha --timeout 60000 \"integration-tests/selenium/*.spec.js\"",
+    "test:integration:selenium:coverage": "node ./integration-tests/coverage/run-suite.js --timeout 60000 \"integration-tests/selenium/*.spec.js\"",
     "test:integration:vitest": "mocha --timeout 60000 \"integration-tests/vitest/*.spec.js\"",
+    "test:integration:vitest:coverage": "node ./integration-tests/coverage/run-suite.js --timeout 60000 \"integration-tests/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\"",
-    "test:integration:plugins": "mocha \"packages/datadog-plugin-@(${PLUGINS})/test/integration-test/**/*.spec.js\"",
+    "test:integration:profiler:coverage": "node ./integration-tests/coverage/run-suite.js --timeout 180000 \"integration-tests/profiler/*.spec.js\"",
+    "test:integration:plugins": "yarn services && mocha \"packages/datadog-plugin-@(${PLUGINS})/test/integration-test/**/${SPEC:-*}*.spec.js\"",
+    "test:integration:plugins:coverage": "yarn services && node ./integration-tests/coverage/run-suite.js \"packages/datadog-plugin-@(${PLUGINS})/test/integration-test/**/${SPEC:-*}*.spec.js\"",
     "test:unit:plugins": "mocha \"packages/datadog-instrumentations/test/@(${PLUGINS}).spec.js\" \"packages/datadog-plugin-@(${PLUGINS})/test/**/*.spec.js\" --exclude \"packages/datadog-plugin-@(${PLUGINS})/test/integration-test/**/*.spec.js\"",
     "test:shimmer": "mocha \"packages/datadog-shimmer/test/**/*.spec.js\"",
-    "test:shimmer:ci": "nyc -- npm run test:shimmer",
+    "test:shimmer:ci": "nyc --silent node init && nyc -- npm run test:shimmer",
     "verify:workflow-job-names": "node scripts/verify-workflow-job-names.js",
     "verify-exercised-tests": "node scripts/verify-exercised-tests.js"
   },
@@ -153,28 +171,28 @@
     "@datadog/wasm-js-rewriter": "5.0.1",
     "@opentelemetry/api": ">=1.0.0 <1.10.0",
     "@opentelemetry/api-logs": "<1.0.0",
-    "oxc-parser": "^0.121.0"
+    "oxc-parser": "^0.127.0"
   },
   "devDependencies": {
-    "@actions/core": "^3.0.0",
-    "@actions/github": "^9.0.0",
+    "@actions/core": "^3.0.1",
+    "@actions/github": "^9.1.1",
     "@babel/helpers": "^7.29.2",
     "@eslint/eslintrc": "^3.3.5",
     "@eslint/js": "^9.39.2",
     "@msgpack/msgpack": "^3.1.3",
-    "@openfeature/core": "^1.8.1",
-    "@openfeature/server-sdk": "~1.20.0",
+    "@openfeature/core": "^1.10.0",
+    "@openfeature/server-sdk": "~1.21.0",
     "@stylistic/eslint-plugin": "^5.10.0",
     "@types/mocha": "^10.0.10",
     "@types/node": "^18.19.106",
-    "@types/sinon": "^21.0.0",
-    "axios": "^1.15.0",
+    "@types/sinon": "^21.0.1",
+    "axios": "^1.15.2",
     "benchmark": "^2.1.4",
     "body-parser": "^2.2.2",
-    "bun": "1.3.11",
+    "bun": "1.3.13",
     "codeowners-audit": "^2.9.0",
     "eslint": "^9.39.2",
-    "eslint-plugin-cypress": "^6.2.2",
+    "eslint-plugin-cypress": "^6.3.1",
     "eslint-plugin-import": "^2.32.0",
     "eslint-plugin-jsdoc": "^62.9.0",
     "eslint-plugin-mocha": "^11.2.0",
@@ -186,12 +204,15 @@
     "globals": "^17.2.0",
     "graphql": "*",
     "husky": "^9.1.7",
+    "istanbul-lib-report": "^3.0.0",
+    "istanbul-reports": "^3.0.2",
     "jszip": "^3.10.1",
     "mocha": "^11.6.0",
     "mocha-junit-reporter": "^2.2.1",
     "mocha-multi-reporters": "^1.5.1",
     "multer": "^2.1.1",
     "nock": "^13.5.6",
+    "node-preload": "^0.2.1",
     "nyc": "^18.0.0",
     "octokit": "^5.0.3",
     "opentracing": ">=0.14.7",
@@ -200,10 +221,10 @@
     "retry": "^0.13.1",
     "semifies": "^1.0.0",
     "semver": "^7.7.2",
-    "sinon": "^21.0.3",
+    "sinon": "^21.1.2",
     "tiktoken": "^1.0.21",
-    "typescript": "^6.0.2",
-    "workerpool": "^10.0.0",
+    "typescript": "^6.0.3",
+    "workerpool": "^10.0.2",
     "yaml": "^2.8.3",
     "yarn-deduplicate": "^6.0.2"
   }

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

@@ -5,6 +5,7 @@ const {
   channel,
   addHook,
 } = require('./helpers/instrument')
+const { createCallbackInstrumentor } = require('./helpers/callback-instrumentor')
 
 const cryptoHashCh = channel('datadog:crypto:hashing:start')
 const cryptoCipherCh = channel('datadog:crypto:cipher:start')
@@ -12,9 +13,35 @@ const cryptoCipherCh = channel('datadog:crypto:cipher:start')
 const hashMethods = ['createHash', 'createHmac', 'createSign', 'createVerify', 'sign', 'verify']
 const cipherMethods = ['createCipheriv', 'createDecipheriv']
 
+// Async crypto APIs that offload work to the libuv worker thread pool. The mapped sparse array
+// names each callback-preceding argument position whose value should be captured on the context
+// (string or number only). Unused positions are elided so iteration can skip them. Consumers of
+// the context (e.g. the events profiler) read these fields as sample labels.
+const asyncParamsByMethod = {
+  checkPrime: [],
+  generateKey: ['type'],
+  generateKeyPair: ['type'],
+  generatePrime: ['size'],
+  hkdf: ['digest', , , , 'keylen'], // eslint-disable-line no-sparse-arrays
+  pbkdf2: [, , 'iterations', 'keylen', 'digest'], // eslint-disable-line no-sparse-arrays
+  randomBytes: ['size'],
+  randomFill: [, 'offset', 'size'], // eslint-disable-line no-sparse-arrays
+  randomInt: [],
+  scrypt: [, , 'keylen'], // eslint-disable-line no-sparse-arrays
+  sign: ['algorithm'],
+  verify: ['algorithm'],
+}
+
 addHook({ name: 'crypto' }, crypto => {
   shimmer.massWrap(crypto, hashMethods, wrapCryptoMethod(cryptoHashCh))
   shimmer.massWrap(crypto, cipherMethods, wrapCryptoMethod(cryptoCipherCh))
+
+  const instrument = createCallbackInstrumentor('apm:crypto:operation')
+  for (const [method, paramNames] of Object.entries(asyncParamsByMethod)) {
+    if (typeof crypto[method] === 'function') {
+      shimmer.wrap(crypto, method, instrument(buildAsyncContext(method, paramNames)))
+    }
+  }
   return crypto
 })
 
@@ -30,3 +57,21 @@ function wrapCryptoMethod (channel) {
   }
   return wrapMethod
 }
+
+function buildAsyncContext (operation, paramNames) {
+  return function (_, args) {
+    const ctx = { operation }
+    const lastIndex = args.length - 1
+    // paramNames is a sparse array; for-in yields only populated slot indices, in ascending
+    // numeric order, so we can break once we pass the callback position.
+    for (const i in paramNames) {
+      if (i >= lastIndex) break
+      const name = paramNames[i]
+      const value = args[i]
+      if (typeof value === 'string' || typeof value === 'number') {
+        ctx[name] = value
+      }
+    }
+    return ctx
+  }
+}

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

@@ -229,32 +229,139 @@ function wrapConfig (config) {
   return config
 }
 
+/**
+ * Returns `true` if the nearest package.json walking up from `filePath`
+ * sets `"type": "module"`. Used to decide whether ambiguous extensions
+ * (`.js`, `.ts`) are loaded as ESM or CJS.
+ *
+ * @param {string} filePath absolute path to a file under the project
+ * @returns {boolean}
+ */
+function isUnderEsmPackage (filePath) {
+  let dir = path.dirname(filePath)
+  while (true) {
+    const candidate = path.join(dir, 'package.json')
+    try {
+      const pkg = JSON.parse(fs.readFileSync(candidate, 'utf8'))
+      return pkg && pkg.type === 'module'
+    } catch { /* no package.json at this level */ }
+    const parent = path.dirname(dir)
+    if (parent === dir) return false
+    dir = parent
+  }
+}
+
 /**
  * @param {string} originalConfigFile absolute path to the original config file
  * @returns {string} path to the generated wrapper file
  */
 function createConfigWrapper (originalConfigFile) {
+  // Decide the wrapper's module mode (ESM vs CJS). It must match how
+  // Cypress would interpret the user's original config so that (1) Cypress
+  // keeps the loader it would have used (notably the ts-node registration
+  // for `.ts` configs), and (2) the wrapper body parses in that mode.
+  const originalExt = path.extname(originalConfigFile)
+  const isEsm = originalExt === '.mjs' || originalExt === '.mts' ||
+    (originalExt !== '.cjs' && originalExt !== '.cts' && isUnderEsmPackage(originalConfigFile))
+
+  // Preserve `.ts`/`.cts`/`.mts` so Cypress keeps ts-node registered for
+  // the wrapper. For plain JS originals, pick the extension that encodes
+  // the chosen module mode directly.
+  let wrapperExt
+  if (originalExt === '.ts' || originalExt === '.cts' || originalExt === '.mts') {
+    wrapperExt = originalExt
+  } else {
+    wrapperExt = isEsm ? '.mjs' : '.cjs'
+  }
+
   const wrapperFile = path.join(
     path.dirname(originalConfigFile),
-    `.dd-cypress-config-${process.pid}.mjs`
+    `.dd-cypress-config-${process.pid}${wrapperExt}`
   )
 
   const cypressConfigPath = require.resolve('./cypress-config')
 
-  // Always use ESM: it can import both CJS and ESM configs, so it works
-  // regardless of the original file's extension or "type": "module" in package.json.
-  // Import cypress-config.js directly (CJS default = module.exports object).
-  fs.writeFileSync(wrapperFile, [
-    `import originalConfig from ${JSON.stringify(pathToFileURL(originalConfigFile).href)}`,
-    `import cypressConfig from ${JSON.stringify(pathToFileURL(cypressConfigPath).href)}`,
-    '',
-    'export default cypressConfig.wrapConfig(originalConfig)',
-    '',
-  ].join('\n'))
-
+  // ESM body: `import` default-interops a CJS module (cypress-config.js)
+  //   by exposing its `module.exports` as the default binding, and handles
+  //   both CJS and ESM user configs transparently.
+  // CJS body: avoids top-level `import` — older Cypress transpiles `.ts`
+  //   configs through CJS ts-node, where `require('file://...')` is not
+  //   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')
+
+  fs.writeFileSync(wrapperFile, body)
   return wrapperFile
 }
 
+/**
+ * @param {string} projectRoot
+ * @returns {boolean}
+ */
+function isTypeScript6OrNewer (projectRoot) {
+  try {
+    // eslint-disable-next-line n/no-unpublished-require
+    const packageJsonPath = require.resolve('typescript/package.json', { paths: [projectRoot] })
+    const { version } = JSON.parse(fs.readFileSync(packageJsonPath, 'utf8'))
+    const major = Number(String(version).split('.')[0])
+    return major >= 6
+  } catch {
+    return false
+  }
+}
+
+/**
+ * @param {string} projectRoot
+ * @param {string} configFilePath
+ * @returns {() => void}
+ */
+function configureTsNodeForTypeScript6 (projectRoot, configFilePath) {
+  const configExt = path.extname(configFilePath)
+  if (configExt !== '.ts' && configExt !== '.cts' && configExt !== '.mts') return () => {}
+  if (!isTypeScript6OrNewer(projectRoot)) return () => {}
+
+  /* eslint-disable eslint-rules/eslint-process-env */
+  const previousCompilerOptions = process.env.TS_NODE_COMPILER_OPTIONS
+  let compilerOptions = {}
+  if (previousCompilerOptions) {
+    try {
+      compilerOptions = JSON.parse(previousCompilerOptions)
+    } catch {
+      compilerOptions = {}
+    }
+  }
+
+  process.env.TS_NODE_COMPILER_OPTIONS = JSON.stringify({
+    ...compilerOptions,
+    ignoreDeprecations: '6.0',
+  })
+
+  return () => {
+    if (previousCompilerOptions === undefined) {
+      delete process.env.TS_NODE_COMPILER_OPTIONS
+    } else {
+      process.env.TS_NODE_COMPILER_OPTIONS = previousCompilerOptions
+    }
+  }
+  /* eslint-enable eslint-rules/eslint-process-env */
+}
+
 /**
  * Wraps the Cypress config file for a CLI start() call. When an explicit
  * configFile is provided, creates a temp wrapper that imports the original
@@ -291,17 +398,16 @@ function wrapCliConfigFileOptions (options) {
     }
   }
 
-  // Skip .ts files — Cypress transpiles them internally via its own loader.
-  // The ESM wrapper can't import .ts directly. The defineConfig shimmer
-  // handles .ts configs since they're transpiled to CJS by Cypress.
-  if (!configFilePath || !fs.existsSync(configFilePath) || path.extname(configFilePath) === '.ts') return noop
+  if (!configFilePath || !fs.existsSync(configFilePath)) return noop
 
   try {
     const wrapperFile = createConfigWrapper(configFilePath)
+    const restoreTsNodeCompilerOptions = configureTsNodeForTypeScript6(projectRoot, configFilePath)
 
     return {
       options: { ...options, configFile: wrapperFile },
       cleanup: () => {
+        restoreTsNodeCompilerOptions()
         try { fs.unlinkSync(wrapperFile) } catch { /* best effort */ }
       },
     }

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

@@ -1,7 +1,8 @@
 'use strict'
 
 const shimmer = require('../../datadog-shimmer')
-const { channel, addHook } = require('./helpers/instrument')
+const { addHook } = require('./helpers/instrument')
+const { createCallbackInstrumentor } = require('./helpers/callback-instrumentor')
 
 const rrtypes = {
   resolveAny: 'ANY',
@@ -20,78 +21,45 @@ const rrtypes = {
 const rrtypeMap = new WeakMap()
 
 addHook({ name: 'dns' }, dns => {
-  shimmer.wrap(dns, 'lookup', fn => wrap('apm:dns:lookup', fn, 2))
-  shimmer.wrap(dns, 'lookupService', fn => wrap('apm:dns:lookup_service', fn, 2))
-  shimmer.wrap(dns, 'resolve', fn => wrap('apm:dns:resolve', fn, 2))
-  shimmer.wrap(dns, 'reverse', fn => wrap('apm:dns:reverse', fn, 2))
+  const lookup = createCallbackInstrumentor('apm:dns:lookup', { captureResult: true })
+  const lookupService = createCallbackInstrumentor('apm:dns:lookup_service', { captureResult: true })
+  const resolve = createCallbackInstrumentor('apm:dns:resolve', { captureResult: true })
+  const reverse = createCallbackInstrumentor('apm:dns:reverse', { captureResult: true })
 
-  patchResolveShorthands(dns)
+  shimmer.wrap(dns, 'lookup', lookup(buildArgsContext()))
+  shimmer.wrap(dns, 'lookupService', lookupService(buildArgsContext()))
+  shimmer.wrap(dns, 'resolve', resolve(buildArgsContext()))
+  shimmer.wrap(dns, 'reverse', reverse(buildArgsContext()))
+
+  patchResolveShorthands(dns, resolve)
 
   if (dns.Resolver) {
-    shimmer.wrap(dns.Resolver.prototype, 'resolve', fn => wrap('apm:dns:resolve', fn, 2))
-    shimmer.wrap(dns.Resolver.prototype, 'reverse', fn => wrap('apm:dns:reverse', fn, 2))
+    shimmer.wrap(dns.Resolver.prototype, 'resolve', resolve(buildArgsContext()))
+    shimmer.wrap(dns.Resolver.prototype, 'reverse', reverse(buildArgsContext()))
 
-    patchResolveShorthands(dns.Resolver.prototype)
+    patchResolveShorthands(dns.Resolver.prototype, resolve)
   }
 
   return dns
 })
 
-function patchResolveShorthands (prototype) {
+function patchResolveShorthands (prototype, resolve) {
   for (const method of Object.keys(rrtypes)) {
     if (prototype[method]) {
       rrtypeMap.set(prototype[method], rrtypes[method])
-      shimmer.wrap(prototype, method, fn => wrap('apm:dns:resolve', fn, 2, rrtypes[method]))
+      shimmer.wrap(prototype, method, resolve(buildArgsContext(rrtypes[method])))
     }
   }
 }
 
-function wrap (prefix, fn, expectedArgs, rrtype) {
-  const startCh = channel(prefix + ':start')
-  const finishCh = channel(prefix + ':finish')
-  const errorCh = channel(prefix + ':error')
-
-  const wrapped = function () {
-    const cb = arguments[arguments.length - 1]
-    if (
-      !startCh.hasSubscribers ||
-      arguments.length < expectedArgs ||
-      typeof cb !== 'function'
-    ) {
-      return fn.apply(this, arguments)
-    }
-
-    const args = [...arguments]
-    args.pop() // gets rid of the callback
+function buildArgsContext (rrtype) {
+  return function (_, args) {
+    if (args.length < 2) return
+    const captured = [...args]
+    captured.pop() // remove the callback
     if (rrtype) {
-      args.push(rrtype)
+      captured.push(rrtype)
     }
-
-    const ctx = { args }
-
-    return startCh.runStores(ctx, () => {
-      arguments[arguments.length - 1] = shimmer.wrapFunction(cb, cb => function (error, result, ...args) {
-        if (error) {
-          ctx.error = error
-          errorCh.publish(ctx)
-        }
-
-        ctx.result = result
-        finishCh.runStores(ctx, cb, this, error, result, ...args)
-      })
-
-      try {
-        return fn.apply(this, arguments)
-      // TODO deal with promise versions when we support `dns/promises`
-      } catch (error) {
-        void error.stack // trigger getting the stack at the original throwing point
-        ctx.error = error
-        errorCh.publish(ctx)
-
-        throw error
-      }
-    })
+    return { args: captured }
   }
-
-  return wrapped
 }

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

@@ -129,7 +129,7 @@ function wrapValidate (validate) {
       try {
         errors = validate.apply(this, arguments)
         if (errors && errors[0]) {
-          ctx.error = errors && errors[0]
+          ctx.error = errors[0]
           validateErrorCh.publish(ctx)
         }
         return errors