dd-trace 6.13.0 → 6.14.0

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

@@ -1,6 +1,6 @@
 'use strict'
 
-module.exports = [
+const instrumentations = [
   {
     module: {
       name: 'graphql',
@@ -25,6 +25,54 @@ module.exports = [
     },
     channelName: 'apm:graphql:execute',
   },
+  {
+    module: {
+      name: 'graphql',
+      versionRange: '>=0.10 <16',
+      filePath: 'execution/execute.js',
+    },
+    functionQuery: {
+      functionName: 'asErrorInstance',
+      kind: 'Sync',
+    },
+    channelName: 'apm:graphql:resolve:error',
+  },
+  {
+    module: {
+      name: 'graphql',
+      versionRange: '>=0.10 <16',
+      filePath: 'execution/execute.mjs',
+    },
+    functionQuery: {
+      functionName: 'asErrorInstance',
+      kind: 'Sync',
+    },
+    channelName: 'apm:graphql:resolve:error',
+  },
+  {
+    module: {
+      name: 'graphql',
+      versionRange: '>=0.10',
+      filePath: 'error/locatedError.js',
+    },
+    functionQuery: {
+      functionName: 'locatedError',
+      kind: 'Sync',
+    },
+    channelName: 'apm:graphql:resolve:error',
+  },
+  {
+    module: {
+      name: 'graphql',
+      versionRange: '>=0.10',
+      filePath: 'error/locatedError.mjs',
+    },
+    functionQuery: {
+      functionName: 'locatedError',
+      kind: 'Sync',
+    },
+    channelName: 'apm:graphql:resolve:error',
+  },
   {
     module: {
       name: 'graphql',
@@ -102,6 +150,30 @@ module.exports = [
     },
     channelName: 'apm:graphql:execute',
   },
+  {
+    module: {
+      name: '@graphql-tools/executor',
+      versionRange: '>=0.0.14',
+      filePath: 'cjs/execution/execute.js',
+    },
+    functionQuery: {
+      functionName: 'handleFieldError',
+      kind: 'Sync',
+    },
+    channelName: 'apm:graphql:resolve:error',
+  },
+  {
+    module: {
+      name: '@graphql-tools/executor',
+      versionRange: '>=0.0.14',
+      filePath: 'esm/execution/execute.js',
+    },
+    functionQuery: {
+      functionName: 'handleFieldError',
+      kind: 'Sync',
+    },
+    channelName: 'apm:graphql:resolve:error',
+  },
   {
     module: {
       name: '@graphql-tools/executor',
@@ -199,3 +271,15 @@ module.exports = [
     channelName: 'dd:graphql:utilities:load',
   },
 ]
+
+const fastPathInstrumentations = []
+for (const instrumentation of instrumentations) {
+  if (instrumentation.functionQuery?.functionName === '__module_export__') continue
+
+  fastPathInstrumentations.push({
+    ...instrumentation,
+    transform: 'configureGraphqlFastPath',
+  })
+}
+
+module.exports = [...instrumentations, ...fastPathInstrumentations]

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

@@ -6,6 +6,7 @@ module.exports = [
   ...require('./bullmq'),
   ...require('./claude-agent-sdk'),
   ...require('./graphql'),
+  ...require('./graphql-jit'),
   ...require('./langchain'),
   ...require('./langgraph'),
   ...require('./mercurius'),

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

@@ -5,27 +5,45 @@
 // the per-request entry point). Wrapping that one function gives a single
 // top-level span per operation regardless of how the query reaches mercurius
 // — HTTP POST/GET, batched queries, or a programmatic `app.graphql()` call —
-// and regardless of whether the query runs through graphql's `execute` (cold)
-// or a JIT-compiled query (warm), where no `graphql.execute` span fires.
+// and regardless of whether the query runs through graphql's `execute` or its
+// JIT-compiled equivalent.
 //
 // The function name and signature `(source, context, variables, operationName)`
-// are stable across the supported major range (verified against 10.x and 16.x),
+// are stable across the supported major range (verified against 13.x and 16.x),
 // so a `functionName` match needs no per-version file paths.
+const FASTIFY_GRAPHQL_CONTEXT = 'FunctionDeclaration[id.name="fastifyGraphQl"]:has(Identifier[name="opts"]) ' +
+  'VariableDeclarator[id.name="__apm$ctx"] > ObjectExpression'
+const moduleDefinition = {
+  // Floor at 13: it is the oldest major whose fastify-plugin peer (^4)
+  // accepts fastify 4, which installs and runs on the oldest supported Node
+  // (18). 15+ requires Node 20 and fastify 5, covered on the latest-Node CI
+  // leg. The `fastifyGraphQl` funnel is unchanged across this whole range.
+  name: 'mercurius',
+  versionRange: '>=13',
+  filePath: 'index.js',
+}
+
 module.exports = [
   {
-    module: {
-      // Floor at 13: it is the oldest major whose fastify-plugin peer (^4)
-      // accepts fastify 4, which installs and runs on the oldest supported Node
-      // (18). 15+ requires Node 20 and fastify 5, covered on the latest-Node CI
-      // leg. The `fastifyGraphQl` funnel is unchanged across this whole range.
-      name: 'mercurius',
-      versionRange: '>=13',
-      filePath: 'index.js',
-    },
+    module: moduleDefinition,
     functionQuery: {
       functionName: 'fastifyGraphQl',
       kind: 'Async',
     },
     channelName: 'apm:graphql:request',
   },
+  {
+    module: moduleDefinition,
+    astQuery: FASTIFY_GRAPHQL_CONTEXT,
+    transform: 'configureMercuriusRequest',
+    channelName: 'apm:graphql:request',
+  },
+  {
+    module: moduleDefinition,
+    functionQuery: {
+      functionName: 'fastifyGraphQl',
+    },
+    transform: 'configureGraphqlFastPath',
+    channelName: 'apm:graphql:request',
+  },
 ]

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

@@ -3,6 +3,19 @@
 // Playwright keeps several hook targets in private local classes/functions.
 // Keep these rewrites limited to bundled internals that addHook cannot wrap.
 module.exports = [
+  {
+    module: {
+      name: 'playwright',
+      versionRange: '>=1.38.0',
+      filePath: 'lib/index.js',
+    },
+    astQuery: 'CallExpression[callee.object.name="videos"][callee.property.name="map"] > ' +
+      'ArrowFunctionExpression[async]',
+    functionQuery: {
+      kind: 'Async',
+    },
+    channelName: 'saveAutomaticVideo',
+  },
   {
     module: {
       name: 'playwright',

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

@@ -54,6 +54,41 @@ module.exports = [
     channelName: 'LocalRunner_shutdown',
     transform: 'waitForAsyncEnd',
   },
+  {
+    module: {
+      name: '@wdio/runner',
+      versionRange: '>=9.0.0',
+      filePath: 'build/index.js',
+    },
+    functionQuery: {
+      className: 'Runner',
+      methodName: 'run',
+      kind: 'Async',
+    },
+    channelName: 'Runner_run',
+  },
+  {
+    module: {
+      name: '@wdio/runner',
+      versionRange: '>=9.0.0',
+      filePath: 'build/index.js',
+    },
+    astQuery: 'VariableDeclarator[id.name="Runner"] > ClassExpression > ClassBody > ' +
+      'MethodDefinition[key.name="run"] IfStatement[test.operator="!"]' +
+      '[test.argument.object.name="args"][test.argument.property.name="watch"], ' +
+      'ClassDeclaration[id.name="Runner"] > ClassBody > MethodDefinition[key.name="run"] ' +
+      'IfStatement[test.operator="!"][test.argument.object.name="args"][test.argument.property.name="watch"], ' +
+      'VariableDeclarator[id.name="Runner"] > ClassExpression > ClassBody > ' +
+      'MethodDefinition[key.name="run"] IfStatement[test.object.type="ThisExpression"]' +
+      '[test.property.name="_sigintWasCalled"], ' +
+      'ClassDeclaration[id.name="Runner"] > ClassBody > MethodDefinition[key.name="run"] ' +
+      'IfStatement[test.object.type="ThisExpression"][test.property.name="_sigintWasCalled"]',
+    channelName: 'Runner_run',
+    transform: 'awaitContextCallback',
+    transformOptions: {
+      callbackName: 'rumCleanupCallback',
+    },
+  },
   {
     module: {
       name: '@wdio/runner',
@@ -188,6 +223,182 @@ module.exports = [
     },
     channelName: 'JasmineReporter_suiteDone',
   },
+  {
+    module: {
+      name: 'webdriver',
+      versionRange: '>=9.0.0',
+      filePath: 'build/index.js',
+    },
+    astQuery: 'FunctionDeclaration[id.name="command_default"]',
+    functionQuery: {
+      kind: 'Sync',
+    },
+    channelName: 'command',
+  },
+  {
+    module: {
+      name: 'webdriver',
+      versionRange: '>=9.0.0',
+      filePath: 'build/index.js',
+    },
+    astQuery: 'FunctionDeclaration[id.name="initiateBidi"]',
+    functionQuery: {
+      kind: 'Sync',
+    },
+    channelName: 'initiateBidi',
+  },
+  {
+    module: {
+      name: 'webdriver',
+      versionRange: '>=9.0.0',
+      filePath: 'build/node.js',
+    },
+    astQuery: 'FunctionDeclaration[id.name="command_default"]',
+    functionQuery: {
+      kind: 'Sync',
+    },
+    channelName: 'command',
+  },
+  {
+    module: {
+      name: 'webdriver',
+      versionRange: '>=9.0.0',
+      filePath: 'build/node.js',
+    },
+    astQuery: 'FunctionDeclaration[id.name="initiateBidi"]',
+    functionQuery: {
+      kind: 'Sync',
+    },
+    channelName: 'initiateBidi',
+  },
+  {
+    module: {
+      name: 'webdriverio',
+      versionRange: '>=9.0.0',
+      filePath: 'build/index.js',
+    },
+    astQuery: 'FunctionDeclaration[async][id.name=/^url[0-9]*$/]',
+    functionQuery: {
+      kind: 'Async',
+    },
+    channelName: 'url',
+  },
+  {
+    module: {
+      name: 'webdriverio',
+      versionRange: '>=9.0.0',
+      filePath: 'build/index.js',
+    },
+    astQuery: 'FunctionDeclaration[async][id.name=/^url[0-9]*$/] ReturnStatement > ' +
+      'CallExpression[callee.object.name="promise"][callee.property.name="then"]',
+    channelName: 'url',
+    transform: 'waitForAsyncEnd',
+  },
+  {
+    module: {
+      name: 'webdriverio',
+      versionRange: '>=9.0.0',
+      filePath: 'build/node.js',
+    },
+    astQuery: 'FunctionDeclaration[async][id.name=/^url[0-9]*$/]',
+    functionQuery: {
+      kind: 'Async',
+    },
+    channelName: 'url',
+  },
+  {
+    module: {
+      name: 'webdriverio',
+      versionRange: '>=9.0.0',
+      filePath: 'build/node.js',
+    },
+    astQuery: 'FunctionDeclaration[async][id.name=/^url[0-9]*$/] ReturnStatement > ' +
+      'CallExpression[callee.object.name="promise"][callee.property.name="then"]',
+    channelName: 'url',
+    transform: 'waitForAsyncEnd',
+  },
+  {
+    module: {
+      name: 'webdriverio',
+      versionRange: '>=9.0.0',
+      filePath: 'build/index.js',
+    },
+    astQuery: 'FunctionDeclaration[async=true][id.name=/^newWindow[0-9]*$/]',
+    functionQuery: {
+      kind: 'Async',
+    },
+    channelName: 'newWindow',
+  },
+  {
+    module: {
+      name: 'webdriverio',
+      versionRange: '>=9.0.0',
+      filePath: 'build/index.js',
+    },
+    astQuery: 'FunctionDeclaration[id.name=/^newWindow[0-9]*$/] ' +
+      'IfStatement[test.object.type="ThisExpression"][test.property.name="isBidi"], ' +
+      'FunctionDeclaration[id.name=/^newWindow[0-9]*$/] ' +
+      'IfStatement[test.operator="&&"][test.left.object.type="ThisExpression"]' +
+      '[test.left.property.name="isBidi"]',
+    channelName: 'newWindow',
+    transform: 'awaitContextCallback',
+    transformOptions: {
+      callbackName: 'rumPreloadCallback',
+      callbackThis: true,
+    },
+  },
+  {
+    module: {
+      name: 'webdriverio',
+      versionRange: '>=9.0.0',
+      filePath: 'build/index.js',
+    },
+    astQuery: 'FunctionDeclaration[async][id.name=/^newWindow[0-9]*$/] ReturnStatement > ' +
+      'CallExpression[callee.object.name="promise"][callee.property.name="then"]',
+    channelName: 'newWindow',
+    transform: 'waitForAsyncEnd',
+  },
+  {
+    module: {
+      name: 'webdriverio',
+      versionRange: '>=9.0.0',
+      filePath: 'build/node.js',
+    },
+    astQuery: 'FunctionDeclaration[async=true][id.name=/^newWindow[0-9]*$/]',
+    functionQuery: {
+      kind: 'Async',
+    },
+    channelName: 'newWindow',
+  },
+  {
+    module: {
+      name: 'webdriverio',
+      versionRange: '>=9.0.0',
+      filePath: 'build/node.js',
+    },
+    astQuery: 'FunctionDeclaration[id.name=/^newWindow[0-9]*$/] ' +
+      'IfStatement[test.object.type="ThisExpression"][test.property.name="isBidi"], ' +
+      'FunctionDeclaration[id.name=/^newWindow[0-9]*$/] ' +
+      'IfStatement[test.operator="&&"][test.left.object.type="ThisExpression"]' +
+      '[test.left.property.name="isBidi"]',
+    channelName: 'newWindow',
+    transform: 'awaitContextCallback',
+    transformOptions: {
+      callbackName: 'rumPreloadCallback',
+      callbackThis: true,
+    },
+  },
+  {
+    module: {
+      name: 'webdriverio',
+      versionRange: '>=9.0.0',
+      filePath: 'build/node.js',
+    },
+    astQuery: 'FunctionDeclaration[async][id.name=/^newWindow[0-9]*$/] ReturnStatement > ' +
+      'CallExpression[callee.object.name="promise"][callee.property.name="then"]',
+    channelName: 'newWindow',
+    transform: 'waitForAsyncEnd',
+  },
   {
     module: {
       name: '@wdio/utils',
@@ -200,6 +411,30 @@ module.exports = [
     },
     channelName: 'testFrameworkFnWrapper',
   },
+  {
+    module: {
+      name: '@wdio/utils',
+      versionRange: '>=9.0.0',
+      filePath: 'build/index.js',
+    },
+    astQuery: 'VariableDeclarator[id.name="testFrameworkFnWrapper"] > FunctionExpression ReturnStatement > ' +
+      'CallExpression[callee.object.name="promise"][callee.property.name="then"]',
+    channelName: 'testFrameworkFnWrapper',
+    transform: 'waitForAsyncEnd',
+  },
+  {
+    module: {
+      name: '@wdio/utils',
+      versionRange: '>=9.0.0',
+      filePath: 'build/index.js',
+    },
+    astQuery: 'VariableDeclarator[id.name="testFrameworkFnWrapper"] > FunctionExpression TryStatement',
+    channelName: 'testFrameworkFnWrapper',
+    transform: 'awaitContextCallbackAtFunctionStart',
+    transformOptions: {
+      callbackName: 'rumCleanupCallback',
+    },
+  },
   {
     module: {
       name: '@wdio/utils',
@@ -212,6 +447,22 @@ module.exports = [
     },
     channelName: 'executeAsync',
   },
+  {
+    module: {
+      name: '@wdio/utils',
+      versionRange: '>=9.0.0',
+      filePath: 'build/index.js',
+    },
+    astQuery: 'FunctionDeclaration[id.name="executeAsync"] CatchClause ' +
+      'IfStatement[test.operator=">"][test.left.object.name="retries"]' +
+      '[test.left.property.name="limit"][test.right.object.name="retries"]' +
+      '[test.right.property.name="attempts"]',
+    channelName: 'executeAsync',
+    transform: 'awaitContextCallbackAtTryStart',
+    transformOptions: {
+      callbackName: 'rumStartCallback',
+    },
+  },
   {
     module: {
       name: '@wdio/utils',

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

@@ -43,6 +43,12 @@
   "bullmq/dist/esm/classes/flow-producer.js": "bullmq",
   "bullmq/dist/esm/classes/queue.js": "bullmq",
   "bullmq/dist/esm/classes/worker.js": "bullmq",
+  "graphql-jit/dist/cjs/execution.js": "graphql-jit",
+  "graphql-jit/dist/esm/execution.js": "graphql-jit",
+  "graphql-jit/dist/execution.js": "graphql-jit",
+  "graphql-jit/dist/execution.mjs": "graphql-jit",
+  "graphql/error/locatedError.js": "graphql",
+  "graphql/error/locatedError.mjs": "graphql",
   "graphql/execution/execute.js": "graphql",
   "graphql/execution/execute.mjs": "graphql",
   "graphql/language/parser.js": "graphql",
@@ -59,5 +65,9 @@
   "mercurius/index.js": "mercurius",
   "playwright-core/lib/coreBundle.js": "playwright-core",
   "playwright/lib/index.js": "playwright",
-  "playwright/lib/runner/index.js": "playwright"
+  "playwright/lib/runner/index.js": "playwright",
+  "webdriver/build/index.js": "webdriver",
+  "webdriver/build/node.js": "webdriver",
+  "webdriverio/build/index.js": "webdriverio",
+  "webdriverio/build/node.js": "webdriverio"
 }