dd-trace 5.86.0 → 5.88.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dd-trace",
-  "version": "5.86.0",
+  "version": "5.88.0",
   "description": "Datadog APM tracing client for JavaScript",
   "main": "index.js",
   "typings": "index.d.ts",
@@ -16,6 +16,7 @@
     "lint": "node scripts/check_licenses.js && node scripts/check-no-coverage-artifacts.js && eslint . --concurrency=auto --max-warnings 0",
     "lint:fix": "node scripts/check_licenses.js && node scripts/check-no-coverage-artifacts.js && eslint . --concurrency=auto --max-warnings 0 --fix",
     "lint:inspect": "npx @eslint/config-inspector@latest",
+    "lint:codeowners": "node scripts/codeowners.mjs",
     "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",
@@ -134,15 +135,16 @@
     "import-in-the-middle": "^2.0.6"
   },
   "optionalDependencies": {
-    "@datadog/libdatadog": "0.7.0",
-    "@datadog/native-appsec": "10.3.0",
+    "@datadog/libdatadog": "0.8.1",
+    "@datadog/native-appsec": "11.0.1",
     "@datadog/native-iast-taint-tracking": "4.1.0",
     "@datadog/native-metrics": "3.1.1",
     "@datadog/openfeature-node-server": "^0.3.3",
-    "@datadog/pprof": "5.13.3",
+    "@datadog/pprof": "5.13.4",
     "@datadog/wasm-js-rewriter": "5.0.1",
     "@opentelemetry/api": ">=1.0.0 <1.10.0",
-    "@opentelemetry/api-logs": "<1.0.0"
+    "@opentelemetry/api-logs": "<1.0.0",
+    "oxc-parser": "^0.115.0"
   },
   "devDependencies": {
     "@babel/helpers": "^7.28.6",
@@ -151,6 +153,7 @@
     "@msgpack/msgpack": "^3.1.3",
     "@openfeature/core": "^1.8.1",
     "@openfeature/server-sdk": "~1.20.0",
+    "@snyk/github-codeowners": "^1.1.0",
     "@stylistic/eslint-plugin": "^5.7.1",
     "@types/mocha": "^10.0.10",
     "@types/node": "^18.19.106",
@@ -171,6 +174,7 @@
     "glob": "^10.4.5",
     "globals": "^17.2.0",
     "graphql": "*",
+    "husky": "^9.1.7",
     "jszip": "^3.10.1",
     "mocha": "^11.6.0",
     "mocha-junit-reporter": "^2.2.1",
@@ -190,7 +194,6 @@
     "typescript": "^5.9.2",
     "workerpool": "^10.0.0",
     "yaml": "^2.8.0",
-    "husky": "^9.1.7",
     "yarn-deduplicate": "^6.0.2"
   }
 }

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

@@ -2,45 +2,11 @@
 
 const { channel, tracingChannel } = require('dc-polyfill')
 const shimmer = require('../../datadog-shimmer')
-const { addHook } = require('./helpers/instrument')
-
-const toolCreationChannel = channel('dd-trace:vercel-ai:tool')
-
-const TRACED_FUNCTIONS = {
-  generateText: wrapWithTracer,
-  streamText: wrapWithTracer,
-  generateObject: wrapWithTracer,
-  streamObject: wrapWithTracer,
-  embed: wrapWithTracer,
-  embedMany: wrapWithTracer,
-  tool: wrapTool,
-}
+const { addHook, getHooks } = require('./helpers/instrument')
 
 const vercelAiTracingChannel = tracingChannel('dd-trace:vercel-ai')
 const vercelAiSpanSetAttributesChannel = channel('dd-trace:vercel-ai:span:setAttributes')
 
-const noopTracer = {
-  startActiveSpan () {
-    const fn = arguments[arguments.length - 1]
-
-    const span = {
-      spanContext () { return { traceId: '', spanId: '', traceFlags: 0 } },
-      setAttribute () { return this },
-      setAttributes () { return this },
-      addEvent () { return this },
-      addLink () { return this },
-      addLinks () { return this },
-      setStatus () { return this },
-      updateName () { return this },
-      end () { return this },
-      isRecording () { return false },
-      recordException () { return this },
-    }
-
-    return fn(span)
-  },
-}
-
 const tracers = new WeakSet()
 
 function wrapTracer (tracer) {
@@ -63,21 +29,27 @@ function wrapTracer (tracer) {
 
       arguments[arguments.length - 1] = shimmer.wrapFunction(cb, function (originalCb) {
         return function (span) {
-          shimmer.wrap(span, 'end', function (spanEnd) {
+          // the below is necessary in the case that the span is vercel ai's noopSpan.
+          // while we don't want to patch the noopSpan more than once, we do want to treat each as a
+          // fresh instance. However, this is really not necessary for non-noop spans, but not sure
+          // how to differentiate.
+          const freshSpan = Object.create(span) // TODO: does this cause memory leaks?
+
+          shimmer.wrap(freshSpan, 'end', function (spanEnd) {
             return function () {
               vercelAiTracingChannel.asyncEnd.publish(ctx)
               return spanEnd.apply(this, arguments)
             }
           })
 
-          shimmer.wrap(span, 'setAttributes', function (setAttributes) {
+          shimmer.wrap(freshSpan, 'setAttributes', function (setAttributes) {
             return function (attributes) {
               vercelAiSpanSetAttributesChannel.publish({ ctx, attributes })
               return setAttributes.apply(this, arguments)
             }
           })
 
-          shimmer.wrap(span, 'recordException', function (recordException) {
+          shimmer.wrap(freshSpan, 'recordException', function (recordException) {
             return function (exception) {
               ctx.error = exception
               vercelAiTracingChannel.error.publish(ctx)
@@ -85,7 +57,7 @@ function wrapTracer (tracer) {
             }
           })
 
-          return originalCb.apply(this, arguments)
+          return originalCb.call(this, freshSpan)
         }
       })
 
@@ -98,58 +70,50 @@ function wrapTracer (tracer) {
   })
 }
 
-function wrapWithTracer (fn) {
-  return function () {
-    const options = arguments[0]
-
-    const experimentalTelemetry = options.experimental_telemetry
-    if (experimentalTelemetry?.isEnabled === false) {
-      return fn.apply(this, arguments)
-    }
-
-    if (experimentalTelemetry == null) {
-      options.experimental_telemetry = { isEnabled: true, tracer: noopTracer }
-    } else {
-      experimentalTelemetry.isEnabled = true
-      experimentalTelemetry.tracer ??= noopTracer
-    }
-
-    wrapTracer(options.experimental_telemetry.tracer)
-
-    return fn.apply(this, arguments)
+for (const hook of getHooks('ai')) {
+  if (hook.file === 'dist/index.js') {
+    // if not removed, the below hook will never match correctly
+    // however, it is still needed in the orchestrion definition
+    hook.file = null
   }
-}
-
-function wrapTool (tool) {
-  return function () {
-    const args = arguments[0]
-    toolCreationChannel.publish(args)
-
-    return tool.apply(this, arguments)
-  }
-}
 
-// CJS exports
-addHook({
-  name: 'ai',
-  versions: ['>=4.0.0'],
-}, exports => {
-  for (const [fnName, patchingFn] of Object.entries(TRACED_FUNCTIONS)) {
-    exports = shimmer.wrap(exports, fnName, patchingFn, { replaceGetter: true })
-  }
+  addHook(hook, exports => {
+    const getTracerChannel = tracingChannel('orchestrion:ai:getTracer')
+    getTracerChannel.subscribe({
+      end (ctx) {
+        const { arguments: args, result: tracer } = ctx
+        const { isEnabled } = args[0] ?? {}
 
-  return exports
-})
-
-// ESM exports
-addHook({
-  name: 'ai',
-  versions: ['>=4.0.0'],
-  file: 'dist/index.mjs',
-}, exports => {
-  for (const [fnName, patchingFn] of Object.entries(TRACED_FUNCTIONS)) {
-    exports = shimmer.wrap(exports, fnName, patchingFn, { replaceGetter: true })
-  }
+        if (isEnabled !== false) {
+          wrapTracer(tracer)
+        }
+      },
+    })
+
+    /**
+     * We patch this function to ensure that the telemetry attributes/tags are set always,
+     * even when telemetry options are not specified. This is to ensure easy use of this integration.
+     *
+     * If it is explicitly disabled, however, we will not change the options.
+     */
+    const selectTelemetryAttributesChannel = tracingChannel('orchestrion:ai:selectTelemetryAttributes')
+    selectTelemetryAttributesChannel.subscribe({
+      start (ctx) {
+        const { arguments: args } = ctx
+        const options = args[0]
+
+        if (options.telemetry?.isEnabled !== false) {
+          args[0] = {
+            ...options,
+            telemetry: {
+              ...options.telemetry,
+              isEnabled: true,
+            },
+          }
+        }
+      },
+    })
 
-  return exports
-})
+    return exports
+  })
+}

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

@@ -353,6 +353,20 @@ function wrapRun (pl, isLatestVersion, version) {
           isEfdRetry = numRetries > 0
         }
 
+        // Check if all EFD retries failed
+        if (isEfdRetry && (isNew || isModified)) {
+          const statuses = lastStatusByPickleId.get(this.pickle.id)
+          if (statuses.length === earlyFlakeDetectionNumRetries + 1) {
+            const { fail } = statuses.reduce((acc, status) => {
+              acc[status]++
+              return acc
+            }, { pass: 0, fail: 0 })
+            if (fail === earlyFlakeDetectionNumRetries + 1) {
+              hasFailedAllRetries = true
+            }
+          }
+        }
+
         const attemptCtx = numAttemptToCtx.get(numAttempt)
 
         const error = getErrorFromCucumberResult(result)

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

@@ -26,31 +26,37 @@ function Hook (modules, hookOptions, onrequire) {
     const parts = [moduleBaseDir, moduleName].filter(Boolean)
     const filename = path.join(...parts)
 
-    if (this._patched[filename] && patched.has(moduleExports)) {
-      return patched.get(moduleExports)
-    }
-
     let defaultWrapResult
 
+    const wrappedOnrequire = (moduleExports, ...args) => {
+      if (this._patched[filename] && patched.has(moduleExports)) {
+        return patched.get(moduleExports)
+      }
+
+      const result = onrequire(moduleExports, ...args)
+      if (result && (typeof result === 'object' || typeof result === 'function')) {
+        patched.set(moduleExports, result)
+        patched.set(result, result)
+      }
+
+      return result
+    }
+
     if (
       isIitm &&
       moduleExports.default &&
       (typeof moduleExports.default === 'object' ||
       typeof moduleExports.default === 'function')
     ) {
-      defaultWrapResult = onrequire(moduleExports.default, moduleName, moduleBaseDir, moduleVersion, isIitm)
+      defaultWrapResult = wrappedOnrequire(moduleExports.default, moduleName, moduleBaseDir, moduleVersion, isIitm)
     }
 
-    const newExports = onrequire(moduleExports, moduleName, moduleBaseDir, moduleVersion, isIitm)
+    const newExports = wrappedOnrequire(moduleExports, moduleName, moduleBaseDir, moduleVersion, isIitm)
 
     if (defaultWrapResult) newExports.default = defaultWrapResult
 
     this._patched[filename] = true
-    if (newExports &&
-      (typeof newExports === 'object' ||
-      typeof newExports === 'function')) {
-      patched.set(moduleExports, newExports)
-    }
+
     return newExports
   }
 

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

@@ -136,6 +136,7 @@ module.exports = {
   'selenium-webdriver': () => require('../selenium'),
   sequelize: () => require('../sequelize'),
   sharedb: () => require('../sharedb'),
+  stripe: () => require('../stripe'),
   tedious: () => require('../tedious'),
   tinypool: { esmFirst: true, fn: () => require('../vitest') },
   undici: () => require('../undici'),

package/packages/datadog-instrumentations/src/helpers/rewriter/compiler.js

@@ -1,33 +1,74 @@
 'use strict'
 
-let meriyah
-let astring
-let esquery
+const log = require('../../../../dd-trace/src/log')
 
-module.exports = {
-  parse: (...args) => {
-    meriyah ??= require('../../../../../vendor/dist/meriyah')
+// eslint-disable-next-line camelcase, no-undef
+const runtimeRequire = typeof __webpack_require__ === 'function' ? __non_webpack_require__ : require
+
+const compiler = {
+  parse: (sourceText, options) => {
+    try {
+      // TODO: Figure out ESBuild `createRequire` issue and remove this hack.
+      const oxc = runtimeRequire(['oxc', 'parser'].join('-'))
+
+      compiler.parse = (sourceText, options) => {
+        const { program, errors } = oxc.parseSync('index.js', sourceText, {
+          ...options,
+          preserveParens: false,
+        })
+
+        if (errors?.length > 0) throw errors[0]
+
+        return program
+      }
+    } catch (e) {
+      log.error(e)
+
+      // Fallback for when OXC is not available.
+      const meriyah = require('../../../../../vendor/dist/meriyah')
 
-    return meriyah.parse(...args)
+      compiler.parse = (sourceText, { range, sourceType } = {}) => {
+        return meriyah.parse(sourceText.toString(), {
+          loc: range,
+          ranges: range,
+          module: sourceType === 'module',
+        })
+      }
+    }
+
+    return compiler.parse(sourceText, options)
   },
 
   generate: (...args) => {
-    astring ??= require('../../../../../vendor/dist/astring')
+    const astring = require('../../../../../vendor/dist/astring')
+
+    compiler.generate = astring.generate
 
-    return astring.generate(...args)
+    return compiler.generate(...args)
   },
 
   traverse: (ast, query, visitor) => {
-    esquery ??= require('../../../../../vendor/dist/esquery').default
+    const esquery = require('../../../../../vendor/dist/esquery').default
 
-    const selector = esquery.parse(query)
+    compiler.traverse = (ast, query, visitor) => {
+      return esquery.traverse(ast, esquery.parse(query), visitor)
+    }
 
-    return esquery.traverse(ast, selector, visitor)
+    return compiler.traverse(ast, query, visitor)
   },
 
   query: (ast, query) => {
-    esquery ??= require('../../../../../vendor/dist/esquery').default
+    const esquery = require('../../../../../vendor/dist/esquery').default
+
+    compiler.query = esquery.query
 
-    return esquery.query(ast, query)
+    return compiler.query(ast, query)
   },
 }
+
+module.exports = {
+  parse: (...args) => compiler.parse(...args),
+  generate: (...args) => compiler.generate(...args),
+  traverse: (...args) => compiler.traverse(...args),
+  query: (...args) => compiler.query(...args),
+}

package/packages/datadog-instrumentations/src/helpers/rewriter/index.js

@@ -29,6 +29,7 @@ Orchestrion-JS that will need to be backported:
   is not a function. We'll see over time if something like this is needed to be
   backported or if it can be replaced by simpler queries.
 - Supports replacing methods of child class instances in the base constructor.
+- Supports tracing iterator (sync/async) returning functions (sync/async).
 */
 
 const { readFileSync } = require('fs')
@@ -36,12 +37,13 @@ const { join } = require('path')
 const semifies = require('../../../../../vendor/dist/semifies')
 const log = require('../../../../dd-trace/src/log')
 const { getEnvironmentVariable } = require('../../../../dd-trace/src/config/helper')
-const transforms = require('./transforms')
+const { transform } = require('./transformer')
 const { generate, parse, traverse } = require('./compiler')
 const instrumentations = require('./instrumentations')
 
 const NODE_OPTIONS = getEnvironmentVariable('NODE_OPTIONS')
 
+/** @type {Record<string, Set<string>>} map of module base name to supported function query versions */
 const supported = {}
 const disabled = new Set()
 
@@ -54,6 +56,8 @@ let SourceMapGenerator
 function rewrite (content, filename, format) {
   if (!content) return content
 
+  const sourceType = format === 'module' ? 'module' : 'script'
+
   try {
     let ast
 
@@ -61,19 +65,15 @@ function rewrite (content, filename, format) {
 
     for (const inst of instrumentations) {
       const { astQuery, functionQuery = {}, module: { name, versionRange, filePath } } = inst
-      const { kind } = functionQuery
-      const operator = kind === 'Async' ? 'tracePromise' : kind === 'Callback' ? 'traceCallback' : 'traceSync'
-      const transform = transforms[operator]
 
       if (disabled.has(name)) continue
       if (!filename.endsWith(`${name}/${filePath}`)) continue
-      if (!transform) continue
       if (!satisfies(filename, filePath, versionRange)) continue
 
-      ast ??= parse(content.toString(), { loc: true, ranges: true, module: format === 'module' })
+      ast ??= parse(content.toString(), { range: true, sourceType })
 
       const query = astQuery || fromFunctionQuery(functionQuery)
-      const state = { ...inst, format, functionQuery, operator }
+      const state = { ...inst, sourceType, functionQuery }
 
       traverse(ast, query, (...args) => transform(state, ...args))
     }
@@ -104,19 +104,21 @@ function disable (instrumentation) {
 function satisfies (filename, filePath, versions) {
   const [basename] = filename.split(filePath)
 
-  if (supported[basename] === undefined) {
+  supported[basename] ??= new Set()
+
+  if (!supported[basename].has(versions)) {
     try {
       const pkg = JSON.parse(readFileSync(
         join(basename, 'package.json'), 'utf8'
       ))
 
-      supported[basename] = semifies(pkg.version, versions)
-    } catch {
-      supported[basename] = false
-    }
+      if (semifies(pkg.version, versions)) {
+        supported[basename].add(versions)
+      }
+    } catch {}
   }
 
-  return supported[basename]
+  return supported[basename].has(versions)
 }
 
 // TODO: Support index

package/packages/datadog-instrumentations/src/helpers/rewriter/instrumentations/ai.js

@@ -0,0 +1,103 @@
+'use strict'
+
+module.exports = [
+  // getTracer - for patching tracer
+  {
+    module: {
+      name: 'ai',
+      versionRange: '>=4.0.0',
+      filePath: 'dist/index.js',
+    },
+    functionQuery: {
+      functionName: 'getTracer',
+      kind: 'Sync',
+    },
+    channelName: 'getTracer',
+  },
+  {
+    module: {
+      name: 'ai',
+      versionRange: '>=4.0.0',
+      filePath: 'dist/index.mjs',
+    },
+    functionQuery: {
+      functionName: 'getTracer',
+      kind: 'Sync',
+    },
+    channelName: 'getTracer',
+  },
+  // selectTelemetryAttributes - makes sure we set isEnabled properly
+  {
+    module: {
+      name: 'ai',
+      versionRange: '>=4.0.0 <6.0.0',
+      filePath: 'dist/index.js',
+    },
+    functionQuery: {
+      functionName: 'selectTelemetryAttributes',
+      kind: 'Sync',
+    },
+    channelName: 'selectTelemetryAttributes',
+  },
+  {
+    module: {
+      name: 'ai',
+      versionRange: '>=4.0.0 <6.0.0',
+      filePath: 'dist/index.mjs',
+    },
+    functionQuery: {
+      functionName: 'selectTelemetryAttributes',
+      kind: 'Sync',
+    },
+    channelName: 'selectTelemetryAttributes',
+  },
+  {
+    module: {
+      name: 'ai',
+      versionRange: '>=6.0.0',
+      filePath: 'dist/index.js',
+    },
+    functionQuery: {
+      functionName: 'selectTelemetryAttributes',
+      kind: 'Async',
+    },
+    channelName: 'selectTelemetryAttributes',
+  },
+  {
+    module: {
+      name: 'ai',
+      versionRange: '>=6.0.0',
+      filePath: 'dist/index.mjs',
+    },
+    functionQuery: {
+      functionName: 'selectTelemetryAttributes',
+      kind: 'Async',
+    },
+    channelName: 'selectTelemetryAttributes',
+  },
+  // tool
+  {
+    module: {
+      name: 'ai',
+      versionRange: '>=4.0.0',
+      filePath: 'dist/index.js',
+    },
+    functionQuery: {
+      functionName: 'tool',
+      kind: 'Sync',
+    },
+    channelName: 'tool',
+  },
+  {
+    module: {
+      name: 'ai',
+      versionRange: '>=4.0.0',
+      filePath: 'dist/index.mjs',
+    },
+    functionQuery: {
+      functionName: 'tool',
+      kind: 'Sync',
+    },
+    channelName: 'tool',
+  },
+]