dd-trace 5.110.0 → 5.111.0

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

@@ -0,0 +1,201 @@
+'use strict'
+
+module.exports = [
+  {
+    module: {
+      name: 'graphql',
+      versionRange: '>=0.10',
+      filePath: 'execution/execute.js',
+    },
+    functionQuery: {
+      functionName: 'execute',
+      kind: 'Sync',
+    },
+    channelName: 'apm:graphql:execute',
+  },
+  {
+    module: {
+      name: 'graphql',
+      versionRange: '>=0.10',
+      filePath: 'execution/execute.mjs',
+    },
+    functionQuery: {
+      functionName: 'execute',
+      kind: 'Sync',
+    },
+    channelName: 'apm:graphql:execute',
+  },
+  {
+    module: {
+      name: 'graphql',
+      versionRange: '>=0.10',
+      filePath: 'language/parser.js',
+    },
+    functionQuery: {
+      functionName: 'parse',
+      kind: 'Sync',
+    },
+    channelName: 'apm:graphql:parser',
+  },
+  {
+    module: {
+      name: 'graphql',
+      versionRange: '>=0.10',
+      filePath: 'language/parser.mjs',
+    },
+    functionQuery: {
+      functionName: 'parse',
+      kind: 'Sync',
+    },
+    channelName: 'apm:graphql:parser',
+  },
+  {
+    module: {
+      name: 'graphql',
+      versionRange: '>=0.10',
+      filePath: 'validation/validate.js',
+    },
+    functionQuery: {
+      functionName: 'validate',
+      kind: 'Sync',
+    },
+    channelName: 'apm:graphql:validate',
+  },
+  {
+    module: {
+      name: 'graphql',
+      versionRange: '>=0.10',
+      filePath: 'validation/validate.mjs',
+    },
+    functionQuery: {
+      functionName: 'validate',
+      kind: 'Sync',
+    },
+    channelName: 'apm:graphql:validate',
+  },
+  // executeField / resolveField intentionally NOT instrumented here. Resolve spans
+  // are produced by wrapping user resolvers + the default field resolver at execute
+  // time (see packages/datadog-plugin-graphql/src/execute.js). That gives a zero-cost
+  // fast path when no subscribers are active, which per-field orchestrion hooks
+  // cannot offer (the publish is baked into graphql's compiled code).
+  {
+    module: {
+      name: '@graphql-tools/executor',
+      versionRange: '>=0.0.14',
+      filePath: 'cjs/execution/execute.js',
+    },
+    functionQuery: {
+      functionName: 'execute',
+      kind: 'Sync',
+    },
+    channelName: 'apm:graphql:execute',
+  },
+  {
+    module: {
+      name: '@graphql-tools/executor',
+      versionRange: '>=0.0.14',
+      filePath: 'esm/execution/execute.js',
+    },
+    functionQuery: {
+      functionName: 'execute',
+      kind: 'Sync',
+    },
+    channelName: 'apm:graphql:execute',
+  },
+  {
+    module: {
+      name: '@graphql-tools/executor',
+      versionRange: '>=0.0.14',
+      filePath: 'cjs/execution/normalizedExecutor.js',
+    },
+    functionQuery: {
+      functionName: 'normalizedExecutor',
+      kind: 'Sync',
+    },
+    channelName: 'apm:graphql:execute',
+  },
+  {
+    module: {
+      name: '@graphql-tools/executor',
+      versionRange: '>=0.0.14',
+      filePath: 'esm/execution/normalizedExecutor.js',
+    },
+    functionQuery: {
+      functionName: 'normalizedExecutor',
+      kind: 'Sync',
+    },
+    channelName: 'apm:graphql:execute',
+  },
+  {
+    module: {
+      name: 'graphql',
+      versionRange: '>=0.10',
+      filePath: 'language/printer.js',
+    },
+    functionQuery: {
+      functionName: '__module_export__',
+      kind: 'Sync',
+    },
+    channelName: 'dd:graphql:printer:load',
+  },
+  {
+    module: {
+      name: 'graphql',
+      versionRange: '>=0.10',
+      filePath: 'language/printer.mjs',
+    },
+    functionQuery: {
+      functionName: '__module_export__',
+      kind: 'Sync',
+    },
+    channelName: 'dd:graphql:printer:load',
+  },
+  {
+    module: {
+      name: 'graphql',
+      versionRange: '>=0.10',
+      filePath: 'language/visitor.js',
+    },
+    functionQuery: {
+      functionName: '__module_export__',
+      kind: 'Sync',
+    },
+    channelName: 'dd:graphql:visitor:load',
+  },
+  {
+    module: {
+      name: 'graphql',
+      versionRange: '>=0.10',
+      filePath: 'language/visitor.mjs',
+    },
+    functionQuery: {
+      functionName: '__module_export__',
+      kind: 'Sync',
+    },
+    channelName: 'dd:graphql:visitor:load',
+  },
+  {
+    module: {
+      name: 'graphql',
+      versionRange: '>=0.10',
+      filePath: 'utilities/index.js',
+    },
+    functionQuery: {
+      functionName: '__module_export__',
+      kind: 'Sync',
+    },
+    channelName: 'dd:graphql:utilities:load',
+  },
+  {
+    module: {
+      name: 'graphql',
+      versionRange: '>=0.10',
+      filePath: 'utilities/index.mjs',
+    },
+    functionQuery: {
+      functionName: '__module_export__',
+      kind: 'Sync',
+    },
+    channelName: 'dd:graphql:utilities:load',
+  },
+]

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

@@ -4,6 +4,7 @@ module.exports = [
   ...require('./ai'),
   ...require('./azure-cosmos'),
   ...require('./bullmq'),
+  ...require('./graphql'),
   ...require('./langchain'),
   ...require('./langgraph'),
   ...require('./modelcontextprotocol-sdk'),

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

@@ -6,6 +6,12 @@ const { wrapThen } = require('./helpers/promise')
 
 const startCh = channel('datadog:mongoose:model:filter:start')
 const finishCh = channel('datadog:mongoose:model:filter:finish')
+// Bound around the deferred query execution. A subscriber returns the store that
+// stays active for the whole async scope that reaches the mongodb driver, so the
+// nested driver query can see the parent's analysis marker without it leaking
+// past the query. `runStores` enters the store only for that scope and restores
+// the parent on its own.
+const execCh = channel('datadog:mongoose:model:filter:exec')
 // this channel is for wrapping the callback of exec methods and handling store context
 const execStartCh = channel('apm:mongoose:exec:start')
 const execFinishCh = channel('apm:mongoose:exec:finish')
@@ -103,7 +109,13 @@ addHook({
         return startCh.runStores(ctx, () => {
           wrapCallbackIfExist(args, ctx)
 
-          const res = method.apply(this, args)
+          // A callback query executes synchronously inside `method.apply`, so the
+          // exec scope (and the deferred driver call it spawns) must be entered
+          // here. A promise query defers execution to a later `exec`/`then`, which
+          // is bound separately below.
+          const res = callbackWrapped
+            ? execCh.runStores(ctx, () => method.apply(this, args))
+            : method.apply(this, args)
 
           // if it is not callback, wrap exec method and its then
           if (!callbackWrapped) {
@@ -113,7 +125,7 @@ addHook({
                   wrapCallbackIfExist(args, ctx)
                 }
 
-                const execResult = originalExec.apply(this, args)
+                const execResult = execCh.runStores(ctx, () => originalExec.apply(this, args))
 
                 if (callbackWrapped || typeof execResult?.then !== 'function') {
                   return execResult