dd-trace 6.8.0 → 6.9.0

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

@@ -9,6 +9,7 @@ const rrtypes = {
   resolveAny: 'ANY',
   resolve4: 'A',
   resolve6: 'AAAA',
+  resolveCaa: 'CAA',
   resolveCname: 'CNAME',
   resolveMx: 'MX',
   resolveNs: 'NS',
@@ -17,6 +18,7 @@ const rrtypes = {
   resolvePtr: 'PTR',
   resolveNaptr: 'NAPTR',
   resolveSoa: 'SOA',
+  resolveTlsa: 'TLSA',
 }
 
 // `dns.promises` and `require('dns/promises')` resolve to the same exports object. Both
@@ -81,7 +83,7 @@ function buildCallbackArgsContext (rrtype) {
     const captured = [...args]
     captured.pop() // remove the callback
     if (rrtype) {
-      captured.push(rrtype)
+      insertRrtype(captured, rrtype)
     }
     return { args: captured }
   }
@@ -91,8 +93,25 @@ function buildPromiseArgsContext (rrtype) {
   return function (_, args) {
     const captured = [...args]
     if (rrtype) {
-      captured.push(rrtype)
+      insertRrtype(captured, rrtype)
     }
     return { args: captured }
   }
 }
+
+/**
+ * @param {unknown[]} captured
+ * @param {string} rrtype
+ */
+function insertRrtype (captured, rrtype) {
+  if (captured.length === 0) {
+    captured.push(rrtype)
+    return
+  }
+
+  captured.push(rrtype)
+  for (let index = captured.length - 1; index > 1; index--) {
+    captured[index] = captured[index - 1]
+  }
+  captured[1] = rrtype
+}

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

@@ -149,6 +149,7 @@ function wrapBrowserWindow (electron) {
 
       // BrowserWindow doesn't support subclassing because it's all native code
       // so we return an instance of it instead of the subclass.
+      // eslint-disable-next-line no-constructor-return
       return win
     }
   }

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

@@ -25,6 +25,8 @@ const bodyPublished = new WeakSet()
 let lastPublishedError
 let lastPublishedReq
 
+/** @typedef {{ length: number, [index: number]: unknown } & Iterable<unknown>} ArgumentsLike */
+
 function wrapFastify (fastify, hasParsingEvents) {
   if (typeof fastify !== 'function') return fastify
 
@@ -81,7 +83,7 @@ function wrapAddHook (addHook) {
  * @param {string} name Lifecycle phase the hook was registered against.
  * @param {Function} fn User-supplied hook.
  * @param {unknown} thisArg `this` Fastify passes to the hook.
- * @param {ArrayLike<unknown>} args Fastify's positional args; the dispatcher always
+ * @param {ArgumentsLike} args Fastify's positional args; the dispatcher always
  *   places `done` as the trailing positional (see fastify/lib/hooks.js hookIterator,
  *   onSendHookRunner, preParsingHookRunner, onRequestAbortHookRunner).
  */

package/packages/datadog-instrumentations/src/grpc/client.js

@@ -13,6 +13,8 @@ const errorChannel = channel('apm:grpc:client:request:error')
 const finishChannel = channel('apm:grpc:client:request:finish')
 const emitChannel = channel('apm:grpc:client:request:emit')
 
+/** @typedef {{ length: number, [index: number]: unknown } & Iterable<unknown>} ArgumentsLike */
+
 function createWrapMakeRequest (type, hasPeer = false) {
   const metadataIndex = type === types.client_stream || type === types.bidi ? 3 : 4
 
@@ -186,9 +188,9 @@ function callMethod (client, method, args, path, metadata, type, hasPeer = false
  * one at `index` when the user did not pass their own.
  *
  * @param {object} client
- * @param {ArrayLike<unknown>} args
+ * @param {ArgumentsLike} args
  * @param {number} index
- * @returns {{ metadata: object | undefined, args: ArrayLike<unknown> }}
+ * @returns {{ metadata: object | undefined, args: ArgumentsLike }}
  */
 function resolveMetadata (client, args, index) {
   const grpc = client && getGrpc(client)

package/packages/datadog-instrumentations/src/helpers/callback-instrumentor.js

@@ -3,6 +3,8 @@
 const shimmer = require('../../../datadog-shimmer')
 const { channel } = require('./instrument')
 
+/** @typedef {{ length: number, [index: number]: unknown } & Iterable<unknown>} ArgumentsLike */
+
 /**
  * Create a shimmer-compatible instrumentor for callback-style APIs whose work is offloaded to the
  * libuv worker thread pool (e.g. zlib.gzip, crypto.pbkdf2, dns.lookup). Builds a set of three
@@ -22,7 +24,7 @@ const { channel } = require('./instrument')
  * @param {boolean} [options.captureResult] set `ctx.result` to the callback's first
  *   non-error argument before publishing `:finish`. Plugins that tag spans from the call's
  *   return value (e.g. the DNS lookup plugin) rely on this.
- * @returns {(buildContext: (thisArg: unknown, args: IArguments) => object | undefined) =>
+ * @returns {(buildContext: (thisArg: unknown, args: ArgumentsLike) => object | undefined) =>
  *   (fn: Function) => Function}
  */
 function createCallbackInstrumentor (prefix, { captureResult = false } = {}) {

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

@@ -59,7 +59,9 @@ module.exports = {
   '@smithy/smithy-client': () => require('../aws-sdk'),
   '@vitest/runner': { esmFirst: true, fn: () => require('../vitest') },
   '@wdio/cli': { esmFirst: true, fn: () => require('../webdriverio') },
+  '@wdio/jasmine-framework': { esmFirst: true, fn: () => require('../webdriverio') },
   '@wdio/local-runner': { esmFirst: true, fn: () => require('../webdriverio') },
+  '@wdio/utils': { esmFirst: true, fn: () => require('../webdriverio') },
   aerospike: () => require('../aerospike'),
   ai: () => require('../ai'),
   amqp10: () => require('../amqp10'),

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

@@ -5,8 +5,9 @@ const { join } = require('path')
 const { pathToFileURL } = require('url')
 const log = require('../../../../dd-trace/src/log')
 const { create } = require('../../../../../vendor/dist/@apm-js-collab/code-transformer')
-const { waitForAsyncEnd } = require('./transforms')
 const instrumentations = require('./instrumentations')
+const { getRewriteTarget } = require('./targets')
+const { waitForAsyncEnd } = require('./transforms')
 
 // `dc-polyfill` is referenced from injected `require()` (CJS) and `import`
 // (ESM) statements that the transformer splices into the rewritten module.
@@ -42,18 +43,23 @@ for (const matcher of [matcherCjs, matcherEsm]) {
 // eslint-disable-next-line unicorn/no-useless-concat -- Keep the source-map marker non-contiguous.
 const SOURCE_MAP_PREFIX = '//# sourceMapping' + 'URL=data:application/json;base64,'
 
-function rewrite (content, filename, format) {
+/**
+ * @param {string|Buffer|ArrayBuffer|Uint8Array} content
+ * @param {string} filename
+ * @param {string} [format]
+ * @param {{ moduleName: string, filePath: string }} [target]
+ * @returns {string|Buffer|ArrayBuffer|Uint8Array}
+ */
+function rewrite (content, filename, format, target) {
   if (!content) return content
-  if (!filename.includes('node_modules')) return content
+
+  target ||= getRewriteTarget(filename)
+  if (!target) return content
 
   filename = filename.replace('file://', '')
 
   const moduleType = format === 'module' ? 'esm' : 'cjs'
-  const [modulePath] = filename.split('/node_modules/').reverse()
-  const moduleParts = modulePath.split('/')
-  const splitIndex = moduleParts[0].startsWith('@') ? 2 : 1
-  const moduleName = moduleParts.slice(0, splitIndex).join('/')
-  const filePath = moduleParts.slice(splitIndex).join('/')
+  const { moduleName, filePath } = target
   const version = getVersion(filename, filePath)
 
   if (disabled.has(moduleName)) return content
@@ -64,8 +70,10 @@ function rewrite (content, filename, format) {
   if (!transformer) return content
 
   try {
+    const source = getSourceText(content)
+
     // TODO: pass existing sourcemap as input for remapping
-    const { code, map } = transformer.transform(content, moduleType)
+    const { code, map } = transformer.transform(source, moduleType)
 
     if (!map) return code
 
@@ -79,6 +87,22 @@ function rewrite (content, filename, format) {
   return content
 }
 
+/** @typedef {{ buffer: ArrayBuffer | SharedArrayBuffer, byteLength: number, byteOffset: number }} BufferView */
+
+/**
+ * Convert the source representations accepted by Node.js loader hooks to text.
+ *
+ * @param {string | ArrayBuffer | BufferView} source
+ * @returns {string}
+ */
+function getSourceText (source) {
+  if (typeof source === 'string') return source
+  if (ArrayBuffer.isView(source)) {
+    return Buffer.from(source.buffer, source.byteOffset, source.byteLength).toString('utf8')
+  }
+  return Buffer.from(source).toString('utf8')
+}
+
 function disable (instrumentation) {
   disabled.add(instrumentation)
 }

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

@@ -54,4 +54,122 @@ module.exports = [
     channelName: 'LocalRunner_shutdown',
     transform: 'waitForAsyncEnd',
   },
+  {
+    module: {
+      name: '@wdio/jasmine-framework',
+      versionRange: '>=9.0.0',
+      filePath: 'build/index.js',
+    },
+    functionQuery: {
+      className: 'JasmineAdapter',
+      methodName: 'init',
+      kind: 'Async',
+    },
+    channelName: 'JasmineAdapter_init',
+  },
+  {
+    module: {
+      name: '@wdio/jasmine-framework',
+      versionRange: '>=9.0.0',
+      filePath: 'build/index.js',
+    },
+    astQuery: 'VariableDeclarator[id.name="JasmineAdapter"] > ClassExpression > ClassBody > ' +
+      'MethodDefinition[key.name="init"] ReturnStatement > ' +
+      'CallExpression[callee.object.name="promise"][callee.property.name="then"], ' +
+      'ClassDeclaration[id.name="JasmineAdapter"] > ClassBody > MethodDefinition[key.name="init"] ReturnStatement > ' +
+      'CallExpression[callee.object.name="promise"][callee.property.name="then"]',
+    channelName: 'JasmineAdapter_init',
+    transform: 'waitForAsyncEnd',
+  },
+  {
+    module: {
+      name: '@wdio/jasmine-framework',
+      versionRange: '>=9.0.0',
+      filePath: 'build/index.js',
+    },
+    functionQuery: {
+      className: 'JasmineAdapter',
+      methodName: 'run',
+      kind: 'Async',
+    },
+    channelName: 'JasmineAdapter_run',
+  },
+  {
+    module: {
+      name: '@wdio/jasmine-framework',
+      versionRange: '>=9.0.0',
+      filePath: 'build/index.js',
+    },
+    astQuery: 'VariableDeclarator[id.name="JasmineAdapter"] > ClassExpression > ClassBody > ' +
+      'MethodDefinition[key.name="run"] ReturnStatement > ' +
+      'CallExpression[callee.object.name="promise"][callee.property.name="then"], ' +
+      'ClassDeclaration[id.name="JasmineAdapter"] > ClassBody > MethodDefinition[key.name="run"] ReturnStatement > ' +
+      'CallExpression[callee.object.name="promise"][callee.property.name="then"]',
+    channelName: 'JasmineAdapter_run',
+    transform: 'waitForAsyncEnd',
+  },
+  {
+    module: {
+      name: '@wdio/jasmine-framework',
+      versionRange: '>=9.0.0',
+      filePath: 'build/index.js',
+    },
+    functionQuery: {
+      className: 'JasmineReporter',
+      methodName: 'specDone',
+      kind: 'Sync',
+    },
+    channelName: 'JasmineReporter_specDone',
+  },
+  {
+    module: {
+      name: '@wdio/jasmine-framework',
+      versionRange: '>=9.0.0',
+      filePath: 'build/index.js',
+    },
+    functionQuery: {
+      className: 'JasmineReporter',
+      methodName: 'specStarted',
+      kind: 'Sync',
+    },
+    channelName: 'JasmineReporter_specStarted',
+  },
+  {
+    module: {
+      name: '@wdio/jasmine-framework',
+      versionRange: '>=9.0.0',
+      filePath: 'build/index.js',
+    },
+    functionQuery: {
+      className: 'JasmineReporter',
+      methodName: 'suiteStarted',
+      kind: 'Sync',
+    },
+    channelName: 'JasmineReporter_suiteStarted',
+  },
+  {
+    module: {
+      name: '@wdio/jasmine-framework',
+      versionRange: '>=9.0.0',
+      filePath: 'build/index.js',
+    },
+    functionQuery: {
+      className: 'JasmineReporter',
+      methodName: 'suiteDone',
+      kind: 'Sync',
+    },
+    channelName: 'JasmineReporter_suiteDone',
+  },
+  {
+    module: {
+      name: '@wdio/utils',
+      versionRange: '>=9.0.0',
+      filePath: 'build/index.js',
+    },
+    functionQuery: {
+      expressionName: 'testFrameworkFnWrapper',
+      kind: 'Async',
+    },
+    channelName: 'testFrameworkFnWrapper',
+  },
 ]

package/packages/datadog-instrumentations/src/helpers/rewriter/loader.mjs

@@ -1,4 +1,8 @@
-import { rewrite } from './index.js'
+import * as Module from 'module'
+
+const require = Module.createRequire(import.meta.url)
+const { getRewriteTarget } = require('./targets.js')
+let rewriter
 
 async function load (url, context, nextLoad) {
   const result = await nextLoad(url, context)
@@ -12,6 +16,11 @@ function loadSync (url, context, nextLoad) {
   return rewriteResult(result, url, context)
 }
 
+/**
+ * @param {{ format?: string, source?: unknown }} result
+ * @param {string} url
+ * @param {{ format?: string }} context
+ */
 function rewriteResult (result, url, context) {
   const format = result.format || context.format
 
@@ -19,7 +28,16 @@ function rewriteResult (result, url, context) {
   // double-instruments CommonJS entrypoints loaded through sync hooks.
   if (format === 'commonjs') return result
 
-  result.source = rewrite(result.source, url, format)
+  if (result.source) {
+    const target = getRewriteTarget(url)
+    if (target) {
+      if (!rewriter) {
+        rewriter = require('./index.js')
+      }
+
+      result.source = rewriter.rewrite(result.source, url, format, target)
+    }
+  }
 
   return result
 }

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

@@ -0,0 +1,32 @@
+'use strict'
+
+// Generated by scripts/generate-rewriter-targets.js from ./instrumentations. Do not edit by hand.
+const targets = require('./targets.json')
+
+const NODE_MODULES = '/node_modules/'
+
+/**
+ * @typedef {object} RewriteTarget
+ * @property {string} moduleName
+ * @property {string} filePath
+ */
+
+/**
+ * @param {string} filename
+ * @returns {RewriteTarget|undefined}
+ */
+function getRewriteTarget (filename) {
+  const nodeModulesIndex = filename.lastIndexOf(NODE_MODULES)
+  if (nodeModulesIndex === -1) return
+
+  const modulePath = filename.slice(nodeModulesIndex + NODE_MODULES.length)
+  const moduleName = targets[modulePath]
+  if (typeof moduleName !== 'string') return
+
+  return {
+    moduleName,
+    filePath: modulePath.slice(moduleName.length + 1),
+  }
+}
+
+module.exports = { getRewriteTarget }

package/packages/datadog-instrumentations/src/helpers/rewriter/targets.json

@@ -0,0 +1,61 @@
+{
+  "@anthropic-ai/claude-agent-sdk/sdk.mjs": "@anthropic-ai/claude-agent-sdk",
+  "@aws/durable-execution-sdk-js/dist-cjs/index.js": "@aws/durable-execution-sdk-js",
+  "@aws/durable-execution-sdk-js/dist/index.mjs": "@aws/durable-execution-sdk-js",
+  "@azure/cosmos/dist/browser/plugins/Plugin.js": "@azure/cosmos",
+  "@azure/cosmos/dist/commonjs/plugins/Plugin.js": "@azure/cosmos",
+  "@azure/cosmos/dist/esm/plugins/Plugin.js": "@azure/cosmos",
+  "@azure/cosmos/dist/react-native/plugins/Plugin.js": "@azure/cosmos",
+  "@graphql-tools/executor/cjs/execution/execute.js": "@graphql-tools/executor",
+  "@graphql-tools/executor/cjs/execution/normalizedExecutor.js": "@graphql-tools/executor",
+  "@graphql-tools/executor/esm/execution/execute.js": "@graphql-tools/executor",
+  "@graphql-tools/executor/esm/execution/normalizedExecutor.js": "@graphql-tools/executor",
+  "@langchain/core/dist/embeddings.cjs": "@langchain/core",
+  "@langchain/core/dist/embeddings.js": "@langchain/core",
+  "@langchain/core/dist/language_models/chat_models.cjs": "@langchain/core",
+  "@langchain/core/dist/language_models/chat_models.js": "@langchain/core",
+  "@langchain/core/dist/language_models/llms.cjs": "@langchain/core",
+  "@langchain/core/dist/language_models/llms.js": "@langchain/core",
+  "@langchain/core/dist/runnables/base.cjs": "@langchain/core",
+  "@langchain/core/dist/runnables/base.js": "@langchain/core",
+  "@langchain/core/dist/tools/index.cjs": "@langchain/core",
+  "@langchain/core/dist/tools/index.js": "@langchain/core",
+  "@langchain/core/dist/vectorstores.cjs": "@langchain/core",
+  "@langchain/core/dist/vectorstores.js": "@langchain/core",
+  "@langchain/langgraph/dist/pregel/index.cjs": "@langchain/langgraph",
+  "@langchain/langgraph/dist/pregel/index.js": "@langchain/langgraph",
+  "@modelcontextprotocol/sdk/dist/cjs/client/index.js": "@modelcontextprotocol/sdk",
+  "@modelcontextprotocol/sdk/dist/cjs/server/mcp.js": "@modelcontextprotocol/sdk",
+  "@modelcontextprotocol/sdk/dist/esm/client/index.js": "@modelcontextprotocol/sdk",
+  "@modelcontextprotocol/sdk/dist/esm/server/mcp.js": "@modelcontextprotocol/sdk",
+  "@openai/agents-openai/dist/openaiChatCompletionsModel.js": "@openai/agents-openai",
+  "@openai/agents-openai/dist/openaiChatCompletionsModel.mjs": "@openai/agents-openai",
+  "@wdio/cli/build/index.js": "@wdio/cli",
+  "@wdio/jasmine-framework/build/index.js": "@wdio/jasmine-framework",
+  "@wdio/local-runner/build/index.js": "@wdio/local-runner",
+  "@wdio/utils/build/index.js": "@wdio/utils",
+  "ai/dist/index.js": "ai",
+  "ai/dist/index.mjs": "ai",
+  "bullmq/dist/cjs/classes/flow-producer.js": "bullmq",
+  "bullmq/dist/cjs/classes/queue.js": "bullmq",
+  "bullmq/dist/cjs/classes/worker.js": "bullmq",
+  "bullmq/dist/esm/classes/flow-producer.js": "bullmq",
+  "bullmq/dist/esm/classes/queue.js": "bullmq",
+  "bullmq/dist/esm/classes/worker.js": "bullmq",
+  "graphql/execution/execute.js": "graphql",
+  "graphql/execution/execute.mjs": "graphql",
+  "graphql/language/parser.js": "graphql",
+  "graphql/language/parser.mjs": "graphql",
+  "graphql/language/printer.js": "graphql",
+  "graphql/language/printer.mjs": "graphql",
+  "graphql/language/visitor.js": "graphql",
+  "graphql/language/visitor.mjs": "graphql",
+  "graphql/utilities/index.js": "graphql",
+  "graphql/utilities/index.mjs": "graphql",
+  "graphql/validation/validate.js": "graphql",
+  "graphql/validation/validate.mjs": "graphql",
+  "mercurius/index.js": "mercurius",
+  "playwright-core/lib/coreBundle.js": "playwright-core",
+  "playwright/lib/index.js": "playwright",
+  "playwright/lib/runner/index.js": "playwright"
+}

package/packages/datadog-instrumentations/src/helpers/router-helper.js

@@ -7,10 +7,25 @@ const routerMountPaths = new WeakMap() // to track mount paths for router instan
 const layerMeta = new WeakMap() // per-layer middleware dispatch metadata (resolved name + route matchers)
 const appMountedRouters = new WeakSet() // to track routers mounted via app.use()
 
+/**
+ * @typedef {object} LayerMeta
+ * @property {string} [name]
+ * @property {string} [captureRoute]
+ * @property {boolean} [needMultiMatch]
+ * @property {Array<{ path?: string, regex?: RegExp }> & {
+ *   hasStarPath?: boolean,
+ *   hasSlashPath?: boolean
+ * }} [matchers]
+ */
+
 const METHODS = [...require('http').METHODS.map(v => v.toLowerCase()), 'all']
 
 const routeAddedChannel = channel('apm:express:route:added')
 
+/**
+ * @typedef {{ stack?: Array<{ route?: unknown, handle?: ExpressRouter }> }} ExpressRouter
+ */
+
 /**
  * Joins two URL path segments into a single path
  *
@@ -57,12 +72,14 @@ function collectRoutesFromRouter (router, prefix) {
       const fullPaths = getRouteFullPaths(route, prefix)
 
       for (const fullPath of fullPaths) {
-        for (const [method, enabled] of Object.entries(route.methods || {})) {
-          if (!enabled) continue
-          routeAddedChannel.publish({
-            method: normalizeMethodName(method),
-            path: fullPath,
-          })
+        if (route.methods) {
+          for (const [method, enabled] of Object.entries(route.methods)) {
+            if (!enabled) continue
+            routeAddedChannel.publish({
+              method: normalizeMethodName(method),
+              path: fullPath,
+            })
+          }
         }
       }
     } else if (layer.handle?.stack?.length) {
@@ -121,10 +138,19 @@ function getRouterMountPaths (router) {
   return [...paths]
 }
 
+/**
+ * @param {object} layer
+ * @param {LayerMeta} meta
+ * @returns {void}
+ */
 function setLayerMeta (layer, meta) {
   layerMeta.set(layer, meta)
 }
 
+/**
+ * @param {object} layer
+ * @returns {LayerMeta | undefined}
+ */
 function getLayerMeta (layer) {
   return layerMeta.get(layer)
 }
@@ -157,6 +183,8 @@ function isAppMounted (router) {
  * Express accepts strings, regex, arrays (possibly nested), or
  * no mount path at all; this helper returns the flattened set of paths along
  * with the index where actual middleware arguments start.
+ *
+ * @param {unknown} path First `use()` argument, which may be a mount path or already a middleware.
  */
 function extractMountPaths (path) {
   const hasMount = typeof path === 'string' || path instanceof RegExp || Array.isArray(path)
@@ -174,6 +202,9 @@ function extractMountPaths (path) {
 
 /**
  * Detect cycle router graphs.
+ *
+ * @param {ExpressRouter | undefined} router
+ * @param {Set<ExpressRouter>} [stack]
  */
 function hasRouterCycle (router, stack = new Set()) {
   if (!router?.stack?.length) return false

package/packages/datadog-instrumentations/src/jest/coverage-backfill.js

@@ -14,7 +14,7 @@ const TRANSFORM_OPTIONS = {
 
 function getCoverageBackfillFiles (skippableSuitesCoverage, rootDir, getTestSuitePath) {
   const files = []
-  for (const filename of Object.keys(skippableSuitesCoverage || {})) {
+  for (const filename of Object.keys(skippableSuitesCoverage)) {
     const relativeFilename = path.isAbsolute(filename)
       ? getTestSuitePath(filename, rootDir)
       : filename