dd-trace 6.12.0 → 6.14.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dd-trace",
-  "version": "6.12.0",
+  "version": "6.14.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",
@@ -115,7 +115,7 @@
     "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:release": "mocha \"scripts/release/**/*.spec.js\"",
-    "test:scripts": "mocha \"benchmark/sirun/*.spec.js\" \"scripts/helpers/**/*.spec.js\" \"scripts/*.spec.mjs\"",
+    "test:scripts": "mocha \"benchmark/e2e-test-optimization/*.spec.js\" \"benchmark/sirun/*.spec.js\" \"scripts/helpers/**/*.spec.js\" \"scripts/*.spec.mjs\"",
     "test:shimmer": "mocha \"packages/datadog-shimmer/test/**/*.spec.js\"",
     "test:shimmer:ci": "node scripts/c8-ci.js test:shimmer",
     "verify:workflow-job-names": "node scripts/verify-workflow-job-names.js",
@@ -183,12 +183,13 @@
     "opentracing": ">=0.14.7"
   },
   "optionalDependencies": {
-    "@datadog/libdatadog": "0.12.1",
-    "@datadog/native-appsec": "11.0.1",
-    "@datadog/native-iast-taint-tracking": "4.2.0",
-    "@datadog/native-metrics": "3.1.2",
+    "@datadog/libdatadog": "^0.20.0",
+    "@datadog/libdatadog-extras": "^0.20.0",
+    "@datadog/native-appsec": "11.0.2",
+    "@datadog/native-iast-taint-tracking": "4.2.1",
+    "@datadog/native-metrics": "4.0.0",
     "@datadog/pprof": "5.18.1",
-    "@datadog/wasm-js-rewriter": "5.0.3",
+    "@datadog/wasm-js-rewriter": "5.0.4",
     "@opentelemetry/api": ">=1.0.0 <1.10.0",
     "@opentelemetry/api-logs": "<1.0.0",
     "oxc-parser": "^0.132.0"
@@ -200,7 +201,7 @@
     "@eslint/eslintrc": "^3.3.6",
     "@eslint/js": "^10.0.1",
     "@eslint/plugin-kit": "^0.7.2",
-    "@datadog/openfeature-node-server": "2.1.0",
+    "@datadog/openfeature-node-server": "2.2.0",
     "@msgpack/msgpack": "^3.1.3",
     "@openfeature/core": "^1.12.0",
     "@openfeature/server-sdk": "~1.23.0",
@@ -208,28 +209,30 @@
     "@types/mocha": "^10.0.10",
     "@types/node": "^18.19.106",
     "@types/sinon": "^22.0.0",
-    "@vercel/nft": "^1.10.2",
+    "@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.3.14",
+    "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.0",
-    "eslint-plugin-mocha": "^11.3.0",
+    "eslint-plugin-jsdoc": "^64.2.1",
+    "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/bunyan.js

@@ -1,9 +1,11 @@
 'use strict'
 
 const wrapLogger = require('./helpers/bunyan')
-const { addHook } = require('./helpers/instrument')
+const { addHook, channel } = require('./helpers/instrument')
+
+const logSubmissionCh = channel('ci:log-submission:log')
 
 addHook({ name: 'bunyan', versions: ['>=1'] }, Logger => {
-  wrapLogger(Logger, 'bunyan')
+  wrapLogger(Logger, 'bunyan', logSubmissionCh)
   return Logger
 })

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).

package/packages/datadog-instrumentations/src/helpers/bunyan.js

@@ -6,17 +6,26 @@ const { channel } = require('./instrument')
 /**
  * @param {{ prototype: object }} Logger
  * @param {string} id
+ * @param {import('node:diagnostics_channel').Channel} [logSubmissionCh]
  */
-module.exports = function wrapLogger (Logger, id) {
+module.exports = function wrapLogger (Logger, id, logSubmissionCh) {
   const logCh = channel(`apm:${id}:log`)
+  // The record must be replaceable before Bunyan emits it, while the serialized line is only available afterward.
+  // This before-and-after contract requires the existing runtime wrapper rather than an Orchestrion subscriber.
   shimmer.wrap(Logger.prototype, '_emit', emit => {
     return function wrappedEmit (rec) {
       if (logCh.hasSubscribers) {
         const payload = { message: rec }
         logCh.publish(payload)
-        arguments[0] = payload.message
+        rec = arguments[0] = payload.message
       }
-      return emit.apply(this, arguments)
+
+      // Reuse Bunyan's cycle-safe serialization instead of serializing the record again.
+      const line = emit.apply(this, arguments)
+      if (logSubmissionCh?.hasSubscribers && logCh.hasSubscribers && !arguments[1]) {
+        logSubmissionCh.publish({ source: id, message: line ?? rec })
+      }
+      return line
     }
   })
 }