dd-trace 4.11.1 → 4.16.0

package/LICENSE-3rdparty.csv

@@ -32,6 +32,7 @@ require,retry,MIT,Copyright 2011 Tim Koschützki Felix Geisendörfer
 require,semver,ISC,Copyright Isaac Z. Schlueter and Contributors
 dev,@types/node,MIT,Copyright Authors
 dev,autocannon,MIT,Copyright 2016 Matteo Collina
+dev,aws-sdk,Apache 2.0,Copyright 2012-2017 Amazon.com, Inc. or its affiliates. All Rights Reserved.
 dev,axios,MIT,Copyright 2014-present Matt Zabriskie
 dev,benchmark,MIT,Copyright 2010-2016 Mathias Bynens Robert Kieffer John-David Dalton
 dev,body-parser,MIT,Copyright 2014 Jonathan Ong 2014-2015 Douglas Christopher Wilson

package/README.md

@@ -2,8 +2,6 @@
 
 [![npm v4](https://img.shields.io/npm/v/dd-trace/latest?color=blue&label=dd-trace%40v4&logo=npm)](https://www.npmjs.com/package/dd-trace)
 [![npm v3](https://img.shields.io/npm/v/dd-trace/latest-node14?color=blue&label=dd-trace%40v3&logo=npm)](https://www.npmjs.com/package/dd-trace/v/latest-node12)
-[![npm v2](https://img.shields.io/npm/v/dd-trace/latest-node12?color=blue&label=dd-trace%40v2&logo=npm)](https://www.npmjs.com/package/dd-trace/v/latest-node12)
-[![npm dev](https://img.shields.io/npm/v/dd-trace/dev?color=orange&label=dd-trace%40dev&logo=npm)](https://www.npmjs.com/package/dd-trace/v/dev)
 [![codecov](https://codecov.io/gh/DataDog/dd-trace-js/branch/master/graph/badge.svg)](https://codecov.io/gh/DataDog/dd-trace-js)
 
 <img align="right" src="https://user-images.githubusercontent.com/551402/208212084-1d0c07e2-4135-4c61-b2da-8f2fddbc66ed.png" alt="Bits the dog  JavaScript" width="200px"/>
@@ -28,12 +26,12 @@ Most of the documentation for `dd-trace` is available on these webpages:
 | Release Line                                             | Latest Version                                                                                         | Node.js  | Status          |Initial Release | End of Life |
 | :---:                                                    | :---:                                                                                                  | :---:    | :---:           | :---:          | :---:       |
 | [`v1`](https://github.com/DataDog/dd-trace-js/tree/v1.x) | ![npm v1](https://img.shields.io/npm/v/dd-trace/legacy-v1?color=white&label=%20&style=flat-square)     | `>= v12` | **End of Life** | 2021-07-13     | 2022-02-25  |
-| [`v2`](https://github.com/DataDog/dd-trace-js/tree/v2.x) | ![npm v2](https://img.shields.io/npm/v/dd-trace/latest-node12?color=white&label=%20&style=flat-square) | `>= v12` | **Maintenance** | 2022-01-28     | 2023-08-15  |
+| [`v2`](https://github.com/DataDog/dd-trace-js/tree/v2.x) | ![npm v2](https://img.shields.io/npm/v/dd-trace/latest-node12?color=white&label=%20&style=flat-square) | `>= v12` | **End of Life** | 2022-01-28     | 2023-08-15  |
 | [`v3`](https://github.com/DataDog/dd-trace-js/tree/v3.x) | ![npm v3](https://img.shields.io/npm/v/dd-trace/latest-node14?color=white&label=%20&style=flat-square) | `>= v14` | **Maintenance** | 2022-08-15     | 2024-05-15  |
 | [`v4`](https://github.com/DataDog/dd-trace-js/tree/v4.x) | ![npm v4](https://img.shields.io/npm/v/dd-trace/latest?color=white&label=%20&style=flat-square)        | `>= v16` | **Current**     | 2023-05-12     | Unknown     |
 
-We currently maintain three release lines, namely `v2`, `v3` and `v4`.
-Features and bug fixes that are merged are released to the `v4` line and, if appropriate, also the `v2` and `v3` line.
+We currently maintain two release lines, namely `v3` and `v4`.
+Features and bug fixes that are merged are released to the `v4` line and, if appropriate, also the `v3` line.
 
 For any new projects it is recommended to use the `v4` release line:
 
@@ -42,15 +40,12 @@ $ npm install dd-trace
 $ yarn add dd-trace
 ```
 
-However, existing projects that already use the `v2` or `v3` release lines, or projects that need to support EOL versions of Node.js, may continue to use these release lines.
+However, existing projects that already use the `v3` release line, or projects that need to support EOL versions of Node.js, may continue to use these release lines.
 This is done by specifying the version when installing the package.
-Note that we also publish to npm using a `latest-node12` and `latest-node14` tag that can also be used for install:
 
 ```sh
 $ npm install dd-trace@3
 $ yarn add dd-trace@3
-$ npm install dd-trace@latest-node14
-$ yarn add dd-trace@latest-node14
 ```
 
 Any backwards-breaking functionality that is introduced into the library will result in an increase of the major version of the library and therefore a new release line.

package/ext/tags.d.ts

@@ -9,6 +9,7 @@ declare const tags: {
   MANUAL_KEEP: 'manual.keep'
   MANUAL_DROP: 'manual.drop'
   MEASURED: '_dd.measured'
+  BASE_SERVICE: '_dd.base_service'
   HTTP_URL: 'http.url'
   HTTP_METHOD: 'http.method'
   HTTP_STATUS_CODE: 'http.status_code'

package/ext/tags.js

@@ -12,6 +12,7 @@ const tags = {
   MANUAL_KEEP: 'manual.keep',
   MANUAL_DROP: 'manual.drop',
   MEASURED: '_dd.measured',
+  BASE_SERVICE: '_dd.base_service',
 
   // HTTP
   HTTP_URL: 'http.url',

package/index.d.ts

@@ -121,6 +121,8 @@ export declare interface Tracer extends opentracing.Tracer {
   appsec: Appsec;
 
   TracerProvider: opentelemetry.TracerProvider;
+
+  dogstatsd: DogStatsD;
 }
 
 export declare interface TraceOptions extends Analyzable {
@@ -642,6 +644,47 @@ export declare interface User {
   [key: string]: string | undefined
 }
 
+export declare interface DogStatsD {
+  /**
+   * Increments a metric by the specified value, optionally specifying tags.
+   * @param {string} stat The dot-separated metric name.
+   * @param {number} value The amount to increment the stat by.
+   * @param {[tag:string]:string|number} tags Tags to pass along, such as `{ foo: 'bar' }`. Values are combined with config.tags.
+   */
+  increment(stat: string, value?: number, tags?: { [tag: string]: string|number }): void
+
+  /**
+   * Decrements a metric by the specified value, optionally specifying tags.
+   * @param {string} stat The dot-separated metric name.
+   * @param {number} value The amount to decrement the stat by.
+   * @param {[tag:string]:string|number} tags Tags to pass along, such as `{ foo: 'bar' }`. Values are combined with config.tags.
+   */
+  decrement(stat: string, value?: number, tags?: { [tag: string]: string|number }): void
+
+  /**
+   * Sets a distribution value, optionally specifying tags.
+   * @param {string} stat The dot-separated metric name.
+   * @param {number} value The amount to increment the stat by.
+   * @param {[tag:string]:string|number} tags Tags to pass along, such as `{ foo: 'bar' }`. Values are combined with config.tags.
+   */
+  distribution(stat: string, value?: number, tags?: { [tag: string]: string|number }): void
+
+  /**
+   * Sets a gauge value, optionally specifying tags.
+   * @param {string} stat The dot-separated metric name.
+   * @param {number} value The amount to increment the stat by.
+   * @param {[tag:string]:string|number} tags Tags to pass along, such as `{ foo: 'bar' }`. Values are combined with config.tags.
+   */
+  gauge(stat: string, value?: number, tags?: { [tag: string]: string|number }): void
+
+  /**
+   * Forces any unsent metrics to be sent
+   *
+   * @beta This method is experimental and could be removed in future versions.
+   */
+  flush(): void
+}
+
 export declare interface Appsec {
   /**
    * Links a successful login event to the current trace. Will link the passed user to the current trace with Appsec.setUser() internally.
@@ -786,6 +829,7 @@ interface Plugins {
   "mysql2": plugins.mysql2;
   "net": plugins.net;
   "next": plugins.next;
+  "openai": plugins.openai;
   "opensearch": plugins.opensearch;
   "oracledb": plugins.oracledb;
   "paperplane": plugins.paperplane;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dd-trace",
-  "version": "4.11.1",
+  "version": "4.16.0",
   "description": "Datadog APM tracing client for JavaScript",
   "main": "index.js",
   "typings": "index.d.ts",
@@ -18,7 +18,7 @@
     "test:appsec": "mocha --colors --exit -r \"packages/dd-trace/test/setup/mocha.js\" --exclude \"packages/dd-trace/test/appsec/**/*.plugin.spec.js\" \"packages/dd-trace/test/appsec/**/*.spec.js\"",
     "test:appsec:ci": "nyc --no-clean --include \"packages/dd-trace/src/appsec/**/*.js\" --exclude \"packages/dd-trace/test/appsec/**/*.plugin.spec.js\" -- npm run test:appsec",
     "test:appsec:plugins": "mocha --colors --exit -r \"packages/dd-trace/test/setup/mocha.js\" \"packages/dd-trace/test/appsec/**/*.@($(echo $PLUGINS)).plugin.spec.js\"",
-    "test:appsec:plugins:ci": "yarn services && nyc --no-clean --include \"packages/dd-trace/test/appsec/**/*.@($(echo $PLUGINS)).plugin.spec.js\" -- npm run test:appsec:plugins",
+    "test:appsec:plugins:ci": "yarn services && nyc --no-clean --include \"packages/dd-trace/src/appsec/**/*.js\" -- npm run test:appsec:plugins",
     "test:trace:core": "tap packages/dd-trace/test/*.spec.js \"packages/dd-trace/test/{ci-visibility,encode,exporters,opentelemetry,opentracing,plugins,service-naming,telemetry}/**/*.spec.js\"",
     "test:trace:core:ci": "npm run test:trace:core -- --coverage --nyc-arg=--include=\"packages/dd-trace/src/**/*.js\"",
     "test:instrumentations": "mocha --colors -r 'packages/dd-trace/test/setup/mocha.js' 'packages/datadog-instrumentations/test/**/*.spec.js'",
@@ -37,6 +37,8 @@
     "test:integration:cypress": "mocha --colors --timeout 30000 \"integration-tests/cypress/*.spec.js\"",
     "test:integration:playwright": "mocha --colors --timeout 30000 \"integration-tests/playwright/*.spec.js\"",
     "test:integration:serverless": "mocha --colors --timeout 30000 \"integration-tests/serverless/*.spec.js\"",
+    "test:integration:plugins": "mocha --colors --exit -r \"packages/dd-trace/test/setup/mocha.js\" \"packages/datadog-plugin-@($(echo $PLUGINS))/test/integration-test/**/*.spec.js\"",
+    "test:unit:plugins": "mocha --colors --exit -r \"packages/dd-trace/test/setup/mocha.js\" \"packages/datadog-instrumentations/test/@($(echo $PLUGINS)).spec.js\" \"packages/datadog-plugin-@($(echo $PLUGINS))/test/**/*.spec.js\" --exclude \"packages/datadog-plugin-@($(echo $PLUGINS))/test/integration-test/**/*.spec.js\"",
     "test:shimmer": "mocha --colors 'packages/datadog-shimmer/test/**/*.spec.js'",
     "test:shimmer:ci": "nyc --no-clean --include 'packages/datadog-shimmer/src/**/*.js' -- npm run test:shimmer",
     "leak:core": "node ./scripts/install_plugin_modules && (cd packages/memwatch && yarn) && NODE_PATH=./packages/memwatch/node_modules node --no-warnings ./node_modules/.bin/tape 'packages/dd-trace/test/leak/**/*.js'",
@@ -57,7 +59,7 @@
     "apm"
   ],
   "author": "Datadog Inc. <info@datadoghq.com>",
-  "license": "BSD-3-Clause",
+  "license": "(Apache-2.0 OR BSD-3-Clause)",
   "bugs": {
     "url": "https://github.com/DataDog/dd-trace-js/issues"
   },
@@ -66,11 +68,11 @@
     "node": ">=16"
   },
   "dependencies": {
-    "@datadog/native-appsec": "^3.2.0",
-    "@datadog/native-iast-rewriter": "2.0.1",
+    "@datadog/native-appsec": "^4.0.0",
+    "@datadog/native-iast-rewriter": "2.1.3",
     "@datadog/native-iast-taint-tracking": "1.5.0",
     "@datadog/native-metrics": "^2.0.0",
-    "@datadog/pprof": "3.1.0",
+    "@datadog/pprof": "3.2.0",
     "@datadog/sketches-js": "^2.1.0",
     "@opentelemetry/api": "^1.0.0",
     "@opentelemetry/core": "^1.14.0",
@@ -101,6 +103,7 @@
   "devDependencies": {
     "@types/node": ">=16",
     "autocannon": "^4.5.2",
+    "aws-sdk": "^2.1446.0",
     "axios": "^0.21.2",
     "benchmark": "^2.1.4",
     "body-parser": "^1.20.2",

package/packages/datadog-esbuild/index.js

@@ -23,11 +23,12 @@ for (const instrumentation of Object.values(instrumentations)) {
   }
 }
 
-const NAMESPACE = 'datadog'
 const NM = 'node_modules/'
 const INSTRUMENTED = Object.keys(instrumentations)
 const RAW_BUILTINS = require('module').builtinModules
 const CHANNEL = 'dd-trace:bundler:load'
+const path = require('path')
+const fs = require('fs')
 
 const builtins = new Set()
 
@@ -50,21 +51,41 @@ for (const pkg of INSTRUMENTED) {
 module.exports.name = 'datadog-esbuild'
 
 module.exports.setup = function (build) {
+  const externalModules = new Set(build.initialOptions.external || [])
   build.onResolve({ filter: /.*/ }, args => {
+    if (externalModules.has(args.path)) {
+      // Internal Node.js packages will still be instrumented via require()
+      if (DEBUG) console.log(`EXTERNAL: ${args.path}`)
+      return
+    }
+
+    // TODO: Should this also check for namespace === 'file'?
+    if (args.path.startsWith('.') && !args.importer.includes('node_modules/')) {
+      // This is local application code, not an instrumented package
+      if (DEBUG) console.log(`LOCAL: ${args.path}`)
+      return
+    }
+
+    // TODO: Should this also check for namespace === 'file'?
+    if (args.path.startsWith('@') && !args.importer.includes('node_modules/')) {
+      // This is the Next.js convention for loading local files
+      if (DEBUG) console.log(`@LOCAL: ${args.path}`)
+      return
+    }
+
     let fullPathToModule
     try {
       fullPathToModule = dotFriendlyResolve(args.path, args.resolveDir)
     } catch (err) {
-      console.warn(`Unable to find "${args.path}". Is the package dead code?`)
+      console.warn(`MISSING: Unable to find "${args.path}". Is the package dead code?`)
       return
     }
     const extracted = extractPackageAndModulePath(fullPathToModule)
-    const packageName = args.path
 
     const internal = builtins.has(args.path)
 
     if (args.namespace === 'file' && (
-      modulesOfInterest.has(packageName) || modulesOfInterest.has(`${extracted.pkg}/${extracted.path}`))
+      modulesOfInterest.has(args.path) || modulesOfInterest.has(`${extracted.pkg}/${extracted.path}`))
     ) {
       // The file namespace is used when requiring files from disk in userland
 
@@ -74,7 +95,7 @@ module.exports.setup = function (build) {
       } catch (err) {
         if (err.code === 'MODULE_NOT_FOUND') {
           if (!internal) {
-            console.warn(`Unable to find "${extracted.pkg}/package.json". Is the package dead code?`)
+            console.warn(`MISSING: Unable to find "${extracted.pkg}/package.json". Is the package dead code?`)
           }
           return
         } else {
@@ -84,60 +105,64 @@ module.exports.setup = function (build) {
 
       const packageJson = require(pathToPackageJson)
 
-      if (DEBUG) console.log(`RESOLVE ${packageName}@${packageJson.version}`)
+      if (DEBUG) console.log(`RESOLVE: ${args.path}@${packageJson.version}`)
 
       // https://esbuild.github.io/plugins/#on-resolve-arguments
       return {
         path: fullPathToModule,
-        namespace: NAMESPACE,
         pluginData: {
           version: packageJson.version,
           pkg: extracted.pkg,
           path: extracted.path,
           full: fullPathToModule,
-          raw: packageName,
+          raw: args.path,
+          pkgOfInterest: true,
           internal
         }
       }
-    } else if (args.namespace === NAMESPACE) {
-      // The datadog namespace is used when requiring files that are injected during the onLoad stage
-
-      if (builtins.has(packageName)) return
-
-      return {
-        path: require.resolve(packageName, { paths: [ args.resolveDir ] }),
-        namespace: 'file'
-      }
     }
   })
 
-  build.onLoad({ filter: /.*/, namespace: NAMESPACE }, args => {
+  build.onLoad({ filter: /.*/ }, args => {
+    if (!args.pluginData?.pkgOfInterest) {
+      return
+    }
+
     const data = args.pluginData
 
-    if (DEBUG) console.log(`LOAD ${data.pkg}@${data.version}, pkg "${data.path}"`)
+    if (DEBUG) console.log(`LOAD: ${data.pkg}@${data.version}, pkg "${data.path}"`)
 
-    const path = data.raw !== data.pkg
+    const pkgPath = data.raw !== data.pkg
       ? `${data.pkg}/${data.path}`
       : data.pkg
 
+    // Read the content of the module file of interest
+    const fileCode = fs.readFileSync(args.path, 'utf8')
+
     const contents = `
-      const dc = require('diagnostics_channel');
-      const ch = dc.channel('${CHANNEL}');
-      const mod = require('${args.path}');
-      const payload = {
-        module: mod,
-        version: '${data.version}',
-        package: '${data.pkg}',
-        path: '${path}'
-      };
-      ch.publish(payload);
-      module.exports = payload.module;
+      (function() {
+        ${fileCode}
+      })(...arguments);
+      {
+        const dc = require('diagnostics_channel');
+        const ch = dc.channel('${CHANNEL}');
+        const mod = module.exports
+        const payload = {
+          module: mod,
+          version: '${data.version}',
+          package: '${data.pkg}',
+          path: '${pkgPath}'
+        };
+        ch.publish(payload);
+        module.exports = payload.module;
+    }
     `
 
     // https://esbuild.github.io/plugins/#on-load-results
     return {
       contents,
-      loader: 'js'
+      loader: 'js',
+      resolveDir: path.dirname(args.path)
     }
   })
 }

package/packages/datadog-instrumentations/src/body-parser.js

@@ -16,7 +16,7 @@ function publishRequestBodyAndNext (req, res, next) {
       if (abortController.signal.aborted) return
     }
 
-    next.apply(this, arguments)
+    return next.apply(this, arguments)
   }
 }
 
@@ -27,6 +27,6 @@ addHook({
 }, read => {
   return shimmer.wrap(read, function (req, res, next) {
     arguments[2] = publishRequestBodyAndNext(req, res, next)
-    read.apply(this, arguments)
+    return read.apply(this, arguments)
   })
 })

package/packages/datadog-instrumentations/src/cookie-parser.js

@@ -0,0 +1,37 @@
+'use strict'
+
+const { AbortController } = require('node-abort-controller') // AbortController is not available in node <15
+const shimmer = require('../../datadog-shimmer')
+const { channel, addHook } = require('./helpers/instrument')
+
+const cookieParserReadCh = channel('datadog:cookie-parser:read:finish')
+
+function publishRequestCookieAndNext (req, res, next) {
+  return function cookieParserWrapper () {
+    if (cookieParserReadCh.hasSubscribers && req) {
+      const abortController = new AbortController()
+
+      const mergedCookies = Object.assign({}, req.cookies, req.signedCookies)
+
+      cookieParserReadCh.publish({ req, res, abortController, cookies: mergedCookies })
+
+      if (abortController.signal.aborted) return
+    }
+
+    return next.apply(this, arguments)
+  }
+}
+
+addHook({
+  name: 'cookie-parser',
+  versions: ['>=1.0.0']
+}, cookieParser => {
+  return shimmer.wrap(cookieParser, function () {
+    const cookieMiddleware = cookieParser.apply(this, arguments)
+
+    return shimmer.wrap(cookieMiddleware, function (req, res, next) {
+      arguments[2] = publishRequestCookieAndNext(req, res, next)
+      return cookieMiddleware.apply(this, arguments)
+    })
+  })
+})

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

@@ -21,6 +21,8 @@ const skippableSuitesCh = channel('ci:cucumber:test-suite:skippable')
 const sessionStartCh = channel('ci:cucumber:session:start')
 const sessionFinishCh = channel('ci:cucumber:session:finish')
 
+const itrSkippedSuitesCh = channel('ci:cucumber:itr:skipped-suites')
+
 const {
   getCoveredFilenamesFromCoverage,
   resetCoverage,
@@ -37,7 +39,6 @@ const patched = new WeakSet()
 
 let pickleByFile = {}
 const pickleResultByFile = {}
-let isSuitesSkipped = false
 
 function getSuiteStatusFromTestStatuses (testStatuses) {
   if (testStatuses.some(status => status === 'fail')) {
@@ -216,11 +217,18 @@ addHook({
   file: 'lib/runtime/test_case_runner.js'
 }, testCaseHook)
 
-function getPicklesToRun (runtime, suitesToSkip) {
-  return runtime.pickleIds.filter((pickleId) => {
+function getFilteredPickles (runtime, suitesToSkip) {
+  return runtime.pickleIds.reduce((acc, pickleId) => {
     const test = runtime.eventDataCollector.getPickle(pickleId)
-    return !suitesToSkip.includes(getTestSuitePath(test.uri, process.cwd()))
-  }, {})
+    const testSuitePath = getTestSuitePath(test.uri, process.cwd())
+    const isSkipped = suitesToSkip.includes(testSuitePath)
+    if (isSkipped) {
+      acc.skippedSuites.add(testSuitePath)
+    } else {
+      acc.picklesToRun.push(pickleId)
+    }
+    return acc
+  }, { skippedSuites: new Set(), picklesToRun: [] })
 }
 
 function getPickleByFile (runtime) {
@@ -239,7 +247,7 @@ addHook({
   name: '@cucumber/cucumber',
   versions: ['>=7.0.0'],
   file: 'lib/runtime/index.js'
-}, (runtimePackage, cucumberVersion) => {
+}, (runtimePackage, frameworkVersion) => {
   shimmer.wrap(runtimePackage.default.prototype, 'start', start => async function () {
     const asyncResource = new AsyncResource('bound-anonymous-fn')
     let onDone
@@ -263,11 +271,16 @@ addHook({
     })
 
     const { err, skippableSuites } = await skippableSuitesPromise
+    let skippedSuites = []
+    let isSuitesSkipped = false
 
     if (!err) {
-      const newPickleIds = getPicklesToRun(this, skippableSuites)
-      isSuitesSkipped = newPickleIds.length !== this.pickleIds.length
-      this.pickleIds = newPickleIds
+      const filteredPickles = getFilteredPickles(this, skippableSuites)
+      const { picklesToRun } = filteredPickles
+      isSuitesSkipped = picklesToRun.length !== this.pickleIds.length
+      this.pickleIds = picklesToRun
+
+      skippedSuites = Array.from(filteredPickles.skippedSuites)
     }
 
     pickleByFile = getPickleByFile(this)
@@ -276,8 +289,13 @@ addHook({
     const command = process.env.npm_lifecycle_script || `cucumber-js ${processArgv}`
 
     asyncResource.runInAsyncScope(() => {
-      sessionStartCh.publish({ command, frameworkVersion: cucumberVersion })
+      sessionStartCh.publish({ command, frameworkVersion })
     })
+
+    if (!err && skippedSuites.length) {
+      itrSkippedSuitesCh.publish({ skippedSuites, frameworkVersion })
+    }
+
     const success = await start.apply(this, arguments)
 
     let testCodeCoverageLinesTotal
@@ -296,7 +314,8 @@ addHook({
       sessionFinishCh.publish({
         status: success ? 'pass' : 'fail',
         isSuitesSkipped,
-        testCodeCoverageLinesTotal
+        testCodeCoverageLinesTotal,
+        numSkippedSuites: skippedSuites.length
       })
     })
     return success

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

@@ -39,7 +39,7 @@ function publishQueryParsedAndNext (req, res, next) {
       if (abortController.signal.aborted) return
     }
 
-    next.apply(this, arguments)
+    return next.apply(this, arguments)
   }
 }
 

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

@@ -188,7 +188,7 @@ function wrapExecute (execute) {
             executeErrorCh.publish(error)
           }
 
-          finishExecuteCh.publish({ res, args })
+          finishExecuteCh.publish({ res, args, context })
         })
       })
     }
@@ -205,7 +205,7 @@ function wrapResolve (resolve) {
 
     if (!context) return resolve.apply(this, arguments)
 
-    const field = assertField(context, info)
+    const field = assertField(context, info, args)
 
     return callInAsyncScope(resolve, field.asyncResource, this, arguments, (err) => {
       updateFieldCh.publish({ field, info, err })
@@ -250,7 +250,7 @@ function pathToArray (path) {
   return flattened.reverse()
 }
 
-function assertField (context, info) {
+function assertField (context, info, args) {
   const pathInfo = info && info.path
 
   const path = pathToArray(pathInfo)
@@ -272,7 +272,8 @@ function assertField (context, info) {
       childResource.runInAsyncScope(() => {
         startResolveCh.publish({
           info,
-          context
+          context,
+          args
         })
       })
 
@@ -349,6 +350,11 @@ function finishResolvers ({ fields }) {
   })
 }
 
+addHook({ name: '@graphql-tools/executor', file: 'cjs/execution/execute.js', versions: ['>=0.0.14'] }, execute => {
+  shimmer.wrap(execute, 'execute', wrapExecute(execute))
+  return execute
+})
+
 addHook({ name: 'graphql', file: 'execution/execute.js', versions: ['>=0.10'] }, execute => {
   shimmer.wrap(execute, 'execute', wrapExecute(execute))
   return execute

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

@@ -7,6 +7,7 @@ module.exports = {
   '@elastic/elasticsearch': () => require('../elasticsearch'),
   '@elastic/transport': () => require('../elasticsearch'),
   '@google-cloud/pubsub': () => require('../google-cloud-pubsub'),
+  '@graphql-tools/executor': () => require('../graphql'),
   '@grpc/grpc-js': () => require('../grpc'),
   '@hapi/hapi': () => require('../hapi'),
   '@jest/core': () => require('../jest'),
@@ -30,6 +31,7 @@ module.exports = {
   'node:child_process': () => require('../child-process'),
   'connect': () => require('../connect'),
   'cookie': () => require('../cookie'),
+  'cookie-parser': () => require('../cookie-parser'),
   'couchbase': () => require('../couchbase'),
   'crypto': () => require('../crypto'),
   'cypress': () => require('../cypress'),
@@ -81,6 +83,7 @@ module.exports = {
   'pg': () => require('../pg'),
   'pino': () => require('../pino'),
   'pino-pretty': () => require('../pino'),
+  'playwright': () => require('../playwright'),
   'promise-js': () => require('../promise-js'),
   'promise': () => require('../promise'),
   'q': () => require('../q'),

package/packages/datadog-instrumentations/src/http/server.js

@@ -29,7 +29,7 @@ addHook({ name: 'http' }, http => {
 
 function wrapResponseEmit (emit) {
   return function (eventName, event) {
-    if (!startServerCh.hasSubscribers) {
+    if (!finishServerCh.hasSubscribers) {
       return emit.apply(this, arguments)
     }