dd-trace 5.57.1 → 5.59.0

package/LICENSE-3rdparty.csv

@@ -15,6 +15,7 @@ require,ignore,MIT,Copyright 2013 Kael Zhang and contributors
 require,import-in-the-middle,Apache license 2.0,Copyright 2021 Datadog Inc.
 require,istanbul-lib-coverage,BSD-3-Clause,Copyright 2012-2015 Yahoo! Inc.
 require,jest-docblock,MIT,Copyright Meta Platforms, Inc. and affiliates.
+require,jsonpath-plus,MIT,Copyright (c) 2011-2019 Stefan Goessner, Subbu Allamaraju, Mike Brevoort, Robert Krahn, Brett Zamir, Richard Schneider
 require,koalas,MIT,Copyright 2013-2017 Brian Woodward
 require,limiter,MIT,Copyright 2011 John Hurliman
 require,lodash.sortby,MIT,Copyright JS Foundation and other contributors
@@ -43,7 +44,7 @@ dev,benchmark,MIT,Copyright 2010-2016 Mathias Bynens Robert Kieffer John-David D
 dev,body-parser,MIT,Copyright 2014 Jonathan Ong 2014-2015 Douglas Christopher Wilson
 dev,chai,MIT,Copyright 2017 Chai.js Assertion Library
 dev,eslint,MIT,Copyright JS Foundation and other contributors https://js.foundation
-dev,eslint-config-standard,MIT,Copyright Feross Aboukhadijeh
+dev,eslint-plugin-cypress,MIT,Copyright (c) 2019 Cypress.io
 dev,eslint-plugin-import,MIT,Copyright 2015 Ben Mosher
 dev,eslint-plugin-mocha,MIT,Copyright 2014 Mathias Schreck
 dev,eslint-plugin-n,MIT,Copyright 2015 Toru Nagashima
@@ -67,6 +68,7 @@ dev,sinon,BSD-3-Clause,Copyright 2010-2017 Christian Johansen
 dev,sinon-chai,WTFPL and BSD-2-Clause,Copyright 2004 Sam Hocevar 2012–2017 Domenic Denicola
 dev,tap,ISC,Copyright 2011-2022 Isaac Z. Schlueter and Contributors
 dev,tiktoken,MIT,Copyright (c) 2022 OpenAI, Shantanu Jain
+dev,workerpool,Apache license 2.0,Copyright (C) 2014-2024 Jos de Jong wjosdejong@gmail.com
 dev,yaml,ISC,Copyright Eemeli Aro <eemeli@gmail.com>
 dev,yarn-deduplicate,Apache license 2.0,Copyright [yyyy] [name of copyright owner]
 file,aws-lambda-nodejs-runtime-interface-client,Apache 2.0,Copyright 2019 Amazon.com Inc. or its affiliates. All Rights Reserved.

package/ci/cypress/after-run.js

@@ -1 +1,3 @@
+'use strict'
+
 module.exports = require('../../packages/datadog-plugin-cypress/src/after-run')

package/ci/cypress/after-spec.js

@@ -1 +1,3 @@
+'use strict'
+
 module.exports = require('../../packages/datadog-plugin-cypress/src/after-spec')

package/ci/cypress/plugin.js

@@ -1,3 +1,5 @@
+'use strict'
+
 const { NODE_MAJOR } = require('../../version')
 
 // These polyfills are here because cypress@6.7.0, which we still support for v5, runs its plugin code

package/ci/cypress/polyfills.js

@@ -1,3 +1,5 @@
+'use strict'
+
 if (!Object.hasOwn) {
   Object.defineProperty(Object, 'hasOwn', {
     // eslint-disable-next-line prefer-object-has-own

package/ci/cypress/support.js

@@ -1 +1,3 @@
+'use strict'
+
 require('../../packages/datadog-plugin-cypress/src/support')

package/ci/init.js

@@ -1,3 +1,5 @@
+'use strict'
+
 /* eslint-disable no-console */
 const tracer = require('../packages/dd-trace')
 const { isTrue, isFalse } = require('../packages/dd-trace/src/util')

package/index.d.ts

@@ -186,6 +186,7 @@ interface Plugins {
   "graphql": tracer.plugins.graphql;
   "grpc": tracer.plugins.grpc;
   "hapi": tracer.plugins.hapi;
+  "hono": tracer.plugins.hono;
   "http": tracer.plugins.http;
   "http2": tracer.plugins.http2;
   "ioredis": tracer.plugins.ioredis;
@@ -1603,6 +1604,12 @@ declare namespace tracer {
      */
     interface hapi extends HttpServer {}
 
+    /**
+     * This plugin automatically instruments the
+     * [hono](https://hono.dev/) module.
+     */
+    interface hono extends HttpServer {}
+
     /**
      * This plugin automatically instruments the
      * [http](https://nodejs.org/api/http.html) module.

package/init.js

@@ -1,12 +1,7 @@
 'use strict'
 
-/* eslint-disable no-var */
-
 var guard = require('./packages/dd-trace/src/guardrails')
 
 module.exports = guard(function () {
-  var INSTRUMENTED_BY_SSI = require('./packages/dd-trace/src/constants').INSTRUMENTED_BY_SSI
-  var obj = {}
-  obj[INSTRUMENTED_BY_SSI] = 'ssi'
-  return require('.').init(obj)
+  return require('.').init()
 })

package/initialize.mjs

@@ -10,6 +10,8 @@
   * hook will always be active for ESM support.
   */
 
+/* eslint n/no-unsupported-features/node-builtins: ['error', { ignores: ['module.register'] }] */
+
 import { isMainThread } from 'worker_threads'
 
 import * as Module from 'node:module'

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dd-trace",
-  "version": "5.57.1",
+  "version": "5.59.0",
   "description": "Datadog APM tracing client for JavaScript",
   "main": "index.js",
   "typings": "index.d.ts",
@@ -24,8 +24,11 @@
     "test:appsec:plugins:ci": "yarn services && nyc --no-clean --include \"packages/dd-trace/src/appsec/**/*.js\" -- npm run test:appsec:plugins",
     "test:debugger": "mocha -r 'packages/dd-trace/test/setup/mocha.js' 'packages/dd-trace/test/debugger/**/*.spec.js'",
     "test:debugger:ci": "nyc --no-clean --include 'packages/dd-trace/src/debugger/**/*.js' -- npm run test:debugger",
-    "test:trace:core": "tap packages/dd-trace/test/*.spec.js \"packages/dd-trace/test/{ci-visibility,datastreams,encode,exporters,opentelemetry,opentracing,plugins,service-naming,standalone,telemetry}/**/*.spec.js\"",
+    "test:eslint-rules": "node eslint-rules/*.test.mjs",
+    "test:trace:core": "tap packages/dd-trace/test/*.spec.js \"packages/dd-trace/test/{ci-visibility,datastreams,encode,exporters,opentelemetry,opentracing,plugins,remote_config,service-naming,standalone,telemetry}/**/*.spec.js\"",
     "test:trace:core:ci": "npm run test:trace:core -- --coverage --nyc-arg=--include=\"packages/dd-trace/src/**/*.js\"",
+    "test:trace:guardrails": "mocha -r \"packages/dd-trace/test/setup/mocha.js\" \"packages/dd-trace/test/guardrails/**/*.spec.js\"",
+    "test:trace:guardrails:ci": "nyc --no-clean --include \"packages/dd-trace/src/guardrails/**/*.js\" -- npm run test:trace:guardrails",
     "test:instrumentations": "mocha -r 'packages/dd-trace/test/setup/mocha.js' \"packages/datadog-instrumentations/test/@($(echo $PLUGINS)).spec.js\"",
     "test:instrumentations:ci": "yarn services && nyc --no-clean --include \"packages/datadog-instrumentations/src/@($(echo $PLUGINS)).js\" --include \"packages/datadog-instrumentations/src/@($(echo $PLUGINS))/**/*.js\" -- npm run test:instrumentations",
     "test:instrumentations:misc": "mocha -r 'packages/dd-trace/test/setup/mocha.js' 'packages/datadog-instrumentations/test/*/**/*.spec.js'",
@@ -54,6 +57,7 @@
     "test:integration:playwright": "mocha --timeout 60000 -r \"packages/dd-trace/test/setup/core.js\" \"integration-tests/playwright/*.spec.js\"",
     "test:integration:selenium": "mocha --timeout 60000 -r \"packages/dd-trace/test/setup/core.js\" \"integration-tests/selenium/*.spec.js\"",
     "test:integration:vitest": "mocha --timeout 60000 -r \"packages/dd-trace/test/setup/core.js\" \"integration-tests/vitest/*.spec.js\"",
+    "test:integration:testopt": "mocha --timeout 60000 -r \"packages/dd-trace/test/setup/core.js\" \"integration-tests/ci-visibility/*.spec.js\"",
     "test:integration:profiler": "mocha --timeout 180000 -r \"packages/dd-trace/test/setup/core.js\" \"integration-tests/profiler/*.spec.js\"",
     "test:integration:plugins": "mocha -r \"packages/dd-trace/test/setup/mocha.js\" \"packages/datadog-plugin-@($(echo $PLUGINS))/test/integration-test/**/*.spec.js\"",
     "test:unit:plugins": "mocha -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\"",
@@ -83,9 +87,34 @@
   "engines": {
     "node": ">=18"
   },
+  "files": [
+    "ci/**/*",
+    "cypress/**/*",
+    "esbuild.js",
+    "ext/**/*",
+    "index.d.ts",
+    "index.js",
+    "init.js",
+    "initialize.mjs",
+    "LICENSE-3rdparty.csv",
+    "LICENSE",
+    "LICENSE.Apache",
+    "LICENSE.BSD3",
+    "loader-hook.mjs",
+    "package.json",
+    "packages/*/index.js",
+    "packages/*/lib/**/*",
+    "packages/*/src/**/*",
+    "packages/datadog-instrumentations/orchestrion.yml",
+    "README.md",
+    "register.js",
+    "scripts/preinstall.js",
+    "vendor/**/*",
+    "version.js"
+  ],
   "dependencies": {
     "@datadog/libdatadog": "0.7.0",
-    "@datadog/native-appsec": "8.5.2",
+    "@datadog/native-appsec": "10.0.0",
     "@datadog/native-iast-taint-tracking": "4.0.0",
     "@datadog/native-metrics": "3.1.1",
     "@datadog/pprof": "5.9.0",
@@ -96,17 +125,18 @@
     "@opentelemetry/core": "^1.14.0",
     "crypto-randomuuid": "^1.0.0",
     "dc-polyfill": "^0.1.9",
-    "ignore": "^5.2.4",
+    "ignore": "^7.0.5",
     "import-in-the-middle": "^1.14.2",
     "istanbul-lib-coverage": "^3.2.2",
     "jest-docblock": "^29.7.0",
+    "jsonpath-plus": "^10.3.0",
     "koalas": "^1.0.2",
     "limiter": "^1.1.5",
     "lodash.sortby": "^4.7.0",
-    "lru-cache": "^7.18.3",
+    "lru-cache": "^10.4.3",
     "module-details-from-path": "^1.0.4",
     "mutexify": "^1.4.0",
-    "opentracing": ">=0.12.1",
+    "opentracing": ">=0.14.7",
     "path-to-regexp": "^0.1.12",
     "pprof-format": "^2.1.0",
     "protobufjs": "^7.5.3",
@@ -130,13 +160,13 @@
     "body-parser": "^2.2.0",
     "chai": "^4.5.0",
     "eslint": "^9.29.0",
-    "eslint-config-standard": "^17.1.0",
+    "eslint-plugin-cypress": "^5.1.0",
     "eslint-plugin-import": "^2.32.0",
     "eslint-plugin-mocha": "^10.5.0",
     "eslint-plugin-n": "^17.20.0",
     "eslint-plugin-promise": "^7.2.1",
-    "eslint-plugin-unicorn": "^57.0.0",
-    "express": "^4.21.2",
+    "eslint-plugin-unicorn": "^59.0.1",
+    "express": "^5.1.0",
     "get-port": "^5.1.1",
     "glob": "^7.2.3",
     "globals": "^15.15.0",
@@ -154,6 +184,7 @@
     "sinon-chai": "^3.7.0",
     "tap": "^16.3.10",
     "tiktoken": "^1.0.21",
+    "workerpool": "^9.2.0",
     "yaml": "^2.8.0",
     "yarn-deduplicate": "^6.0.2"
   }

package/packages/datadog-code-origin/index.js

@@ -1,6 +1,6 @@
 'use strict'
 
-const { getUserLandFrames } = require('../dd-trace/src/plugins/util/stacktrace')
+const { parseUserLandFrames } = require('../dd-trace/src/plugins/util/stacktrace')
 
 const ENTRY_SPAN_STACK_FRAMES_LIMIT = 1
 const EXIT_SPAN_STACK_FRAMES_LIMIT = Number(process.env._DD_CODE_ORIGIN_FOR_SPANS_EXIT_SPAN_MAX_USER_FRAMES) || 8
@@ -36,20 +36,25 @@ function exitTags (topOfStackFunc) {
  * @returns {Record<string, string>}
  */
 function tag (type, topOfStackFunc, limit) {
-  const frames = getUserLandFrames(topOfStackFunc, limit)
+  // The `Error.prepareStackTrace` API doesn't support resolving source maps.
+  // Fall back to manually parsing the stack trace.
+  const dummy = {}
+  Error.captureStackTrace(dummy, topOfStackFunc)
+  const frames = parseUserLandFrames(dummy.stack, limit)
+
   const tags = {
     '_dd.code_origin.type': type
   }
   for (let i = 0; i < frames.length; i++) {
     const frame = frames[i]
-    tags[`_dd.code_origin.frames.${i}.file`] = frame.file
-    tags[`_dd.code_origin.frames.${i}.line`] = String(frame.line)
-    tags[`_dd.code_origin.frames.${i}.column`] = String(frame.column)
-    if (frame.method) {
-      tags[`_dd.code_origin.frames.${i}.method`] = frame.method
+    tags[`_dd.code_origin.frames.${i}.file`] = frame.fileName
+    tags[`_dd.code_origin.frames.${i}.line`] = frame.lineNumber
+    tags[`_dd.code_origin.frames.${i}.column`] = frame.columnNumber
+    if (frame.methodName || frame.functionName) {
+      tags[`_dd.code_origin.frames.${i}.method`] = frame.methodName || frame.functionName
     }
-    if (frame.type) {
-      tags[`_dd.code_origin.frames.${i}.type`] = frame.type
+    if (frame.typeName) {
+      tags[`_dd.code_origin.frames.${i}.type`] = frame.typeName
     }
   }
   return tags

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

@@ -1,3 +1,5 @@
+'use strict'
+
 const {
   addHook,
   channel
@@ -16,20 +18,15 @@ const CHANNELS = {
 
 const generalErrorCh = channel('apm:apollo:gateway:general:error')
 
-function wrapExecutor (executor) {
-  return function (...args) {
-    const channel = CHANNELS['gateway.request']
-    const ctx = { requestContext: args[0], gateway: this }
-
-    return channel.tracePromise(executor, ctx, this, ...args)
-  }
-}
-
 function wrapApolloGateway (ApolloGateway) {
   class ApolloGatewayWrapper extends ApolloGateway {
     constructor (...args) {
       super(...args)
-      shimmer.wrap(this, 'executor', wrapExecutor)
+      shimmer.wrap(this, 'executor', (originalExecutor) => (...args) => {
+        const channel = CHANNELS['gateway.request']
+        const ctx = { requestContext: args[0], gateway: this }
+        return channel.tracePromise(originalExecutor, ctx, this, ...args)
+      })
     }
   }
   return ApolloGatewayWrapper

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

@@ -1,3 +1,5 @@
+'use strict'
+
 const shimmer = require('../../datadog-shimmer')
 const { addHook } = require('./helpers/instrument')
 

package/packages/datadog-instrumentations/src/azure-functions.js

@@ -25,7 +25,7 @@ addHook({ name: '@azure/functions', versions: ['>=4'] }, azureFunction => {
 // The arguments are either an object with a handler property or the handler function itself
 function wrapHandler (method) {
   return function (name, arg) {
-    if (typeof arg === 'object' && arg.hasOwnProperty('handler')) {
+    if (arg !== null && typeof arg === 'object' && arg.hasOwnProperty('handler')) {
       const options = arg
       shimmer.wrap(options, 'handler', handler => traceHandler(handler, name, method.name))
     } else if (typeof arg === 'function') {

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

@@ -4,8 +4,7 @@ const { errorMonitor } = require('events')
 const util = require('util')
 
 const {
-  addHook,
-  AsyncResource
+  addHook
 } = require('./helpers/instrument')
 const shimmer = require('../../datadog-shimmer')
 const dc = require('dc-polyfill')
@@ -80,7 +79,8 @@ function createContextFromChildProcessInfo (childProcessInfo) {
   const context = {
     command: childProcessInfo.command,
     file: childProcessInfo.file,
-    shell: childProcessInfo.shell
+    shell: childProcessInfo.shell,
+    abortController: new AbortController()
   }
 
   if (childProcessInfo.fileArgs) {
@@ -98,17 +98,12 @@ function wrapChildProcessSyncMethod (returnError, shell = false) {
       }
 
       const childProcessInfo = normalizeArgs(arguments, shell)
+      const context = createContextFromChildProcessInfo(childProcessInfo)
 
-      const innerResource = new AsyncResource('bound-anonymous-fn')
-      return innerResource.runInAsyncScope(() => {
-        const context = createContextFromChildProcessInfo(childProcessInfo)
-        const abortController = new AbortController()
-
-        childProcessChannel.start.publish({ ...context, abortController })
-
+      return childProcessChannel.start.runStores(context, () => {
         try {
-          if (abortController.signal.aborted) {
-            const error = abortController.signal.reason || new Error('Aborted')
+          if (context.abortController.signal.aborted) {
+            const error = context.abortController.signal.reason || new Error('Aborted')
             // expected behaviors on error are different
             return returnError(error, context)
           }
@@ -141,21 +136,17 @@ function wrapChildProcessCustomPromisifyMethod (customPromisifyMethod, shell) {
     const context = createContextFromChildProcessInfo(childProcessInfo)
 
     const { start, end, asyncStart, asyncEnd, error } = childProcessChannel
-    const abortController = new AbortController()
-
-    start.publish({
-      ...context,
-      abortController
-    })
+    start.publish(context)
 
     let result
-    if (abortController.signal.aborted) {
-      result = Promise.reject(abortController.signal.reason || new Error('Aborted'))
+    if (context.abortController.signal.aborted) {
+      result = Promise.reject(context.abortController.signal.reason || new Error('Aborted'))
     } else {
       try {
         result = customPromisifyMethod.apply(this, arguments)
       } catch (error) {
-        error.publish({ ...context, error })
+        context.error = error
+        error.publish(context)
         throw error
       } finally {
         end.publish(context)
@@ -179,7 +170,7 @@ function wrapChildProcessCustomPromisifyMethod (customPromisifyMethod, shell) {
       return result
     }
 
-    return Promise.prototype.then.call(result, resolve, reject)
+    return Promise.resolve(result).then(resolve, reject)
   }
 }
 
@@ -192,26 +183,15 @@ function wrapChildProcessAsyncMethod (ChildProcess, shell = false) {
 
       const childProcessInfo = normalizeArgs(arguments, shell)
 
-      const cb = arguments[arguments.length - 1]
-      if (typeof cb === 'function') {
-        const callbackResource = new AsyncResource('bound-anonymous-fn')
-        arguments[arguments.length - 1] = callbackResource.bind(cb)
-      }
-
-      const innerResource = new AsyncResource('bound-anonymous-fn')
-      return innerResource.runInAsyncScope(() => {
-        const context = createContextFromChildProcessInfo(childProcessInfo)
-        const abortController = new AbortController()
-
-        childProcessChannel.start.publish({ ...context, abortController })
-
+      const context = createContextFromChildProcessInfo(childProcessInfo)
+      return childProcessChannel.start.runStores(context, () => {
         let childProcess
-        if (abortController.signal.aborted) {
+        if (context.abortController.signal.aborted) {
           childProcess = new ChildProcess()
           childProcess.on('error', () => {}) // Original method does not crash when non subscribers
 
           process.nextTick(() => {
-            const error = abortController.signal.reason || new Error('Aborted')
+            const error = context.abortController.signal.reason || new Error('Aborted')
             childProcess.emit('error', error)
 
             const cb = arguments[arguments.length - 1]
@@ -230,17 +210,16 @@ function wrapChildProcessAsyncMethod (ChildProcess, shell = false) {
 
           childProcess.on(errorMonitor, (e) => {
             errorExecuted = true
-            childProcessChannel.error.publish(e)
+            context.error = e
+            childProcessChannel.error.publish(context)
           })
 
           childProcess.on('close', (code = 0) => {
             if (!errorExecuted && code !== 0) {
-              childProcessChannel.error.publish()
+              childProcessChannel.error.publish(context)
             }
-            childProcessChannel.asyncEnd.publish({
-              ...context,
-              result: code
-            })
+            context.result = code
+            childProcessChannel.asyncEnd.publish(context)
           })
         }
 

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

@@ -43,6 +43,7 @@ const {
   CUCUMBER_WORKER_TRACE_PAYLOAD_CODE,
   getIsFaultyEarlyFlakeDetection
 } = require('../../dd-trace/src/plugins/util/test')
+const satisfies = require('semifies')
 
 const isMarkedAsUnskippable = (pickle) => {
   return pickle.tags.some(tag => tag.name === '@datadog:unskippable')
@@ -224,7 +225,7 @@ function getPickleByFile (runtimeOrCoodinator) {
   }, {})
 }
 
-function wrapRun (pl, isLatestVersion) {
+function wrapRun (pl, isLatestVersion, version) {
   if (patched.has(pl)) return
 
   patched.add(pl)
@@ -398,9 +399,10 @@ function wrapRun (pl, isLatestVersion) {
         const promise = runStep.apply(this, arguments)
 
         promise.then((result) => {
-          const { status, skipReason, errorMessage } = isLatestVersion
-            ? getStatusFromResultLatest(result)
-            : getStatusFromResult(result)
+          const finalResult = satisfies(version, '>=12.0.0') ? result.result : result
+          const getStatus = satisfies(version, '>=7.3.0') ? getStatusFromResultLatest : getStatusFromResult
+
+          const { status, skipReason, errorMessage } = getStatus(finalResult)
 
           testFinishCh.publish({ isStep: true, status, skipReason, errorMessage, ...ctx.currentStore })
         })
@@ -415,18 +417,18 @@ function wrapRun (pl, isLatestVersion) {
   })
 }
 
-function pickleHook (PickleRunner) {
+function pickleHook (PickleRunner, version) {
   const pl = PickleRunner.default
 
-  wrapRun(pl, false)
+  wrapRun(pl, false, version)
 
   return PickleRunner
 }
 
-function testCaseHook (TestCaseRunner) {
+function testCaseHook (TestCaseRunner, version) {
   const pl = TestCaseRunner.default
 
-  wrapRun(pl, true)
+  wrapRun(pl, true, version)
 
   return TestCaseRunner
 }

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

@@ -1,3 +1,5 @@
+'use strict'
+
 const { addHook } = require('./helpers/instrument')
 const { DD_MAJOR } = require('../../../version')
 

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

@@ -14,6 +14,7 @@ const pathParamsReadCh = channel('datadog:fastify:path-params:finish')
 
 const parsingResources = new WeakMap()
 const cookiesPublished = new WeakSet()
+const bodyPublished = new WeakSet()
 
 function wrapFastify (fastify, hasParsingEvents) {
   if (typeof fastify !== 'function') return fastify
@@ -124,6 +125,20 @@ function preHandler (request, reply, done) {
   if (!reply || typeof reply.send !== 'function') return done()
 
   const req = getReq(request)
+  const res = getRes(reply)
+
+  const hasBody = request.body && Object.keys(request.body).length > 0
+
+  // For multipart/form-data, the body is not available until after preValidation hook
+  if (bodyParserReadCh.hasSubscribers && hasBody && !bodyPublished.has(req)) {
+    const abortController = new AbortController()
+
+    bodyParserReadCh.publish({ req, res, body: request.body, abortController })
+
+    bodyPublished.add(req)
+
+    if (abortController.signal.aborted) return
+  }
 
   reply.send = wrapSend(reply.send, req)
 
@@ -151,11 +166,14 @@ function preValidation (request, reply, done) {
       if (abortController.signal.aborted) return
     }
 
-    if (bodyParserReadCh.hasSubscribers && request.body) {
+    // Analyze body before schema validation
+    if (bodyParserReadCh.hasSubscribers && request.body && !bodyPublished.has(req)) {
       abortController ??= new AbortController()
 
       bodyParserReadCh.publish({ req, res, body: request.body, abortController })
 
+      bodyPublished.add(req)
+
       if (abortController.signal.aborted) return
     }
 

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

@@ -359,6 +359,15 @@ function finishResolvers ({ fields }) {
   })
 }
 
+addHook({ name: '@graphql-tools/executor', versions: ['>=0.0.14'] }, executor => {
+  // graphql-yoga uses the normalizedExecutor function, so we need to wrap both. There is no risk in wrapping both
+  // since the functions are closely related, and our wrappedExecute function prevents double calls with the
+  // contexts.has(contextValue) check.
+  shimmer.wrap(executor, 'execute', wrapExecute(executor))
+  shimmer.wrap(executor, 'normalizedExecutor', wrapExecute(executor))
+  return executor
+})
+
 addHook({ name: '@graphql-tools/executor', file: 'cjs/execution/execute.js', versions: ['>=0.0.14'] }, execute => {
   shimmer.wrap(execute, 'execute', wrapExecute(execute))
   return execute

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

@@ -58,6 +58,7 @@ module.exports = {
   grpc: () => require('../grpc'),
   handlebars: () => require('../handlebars'),
   hapi: () => require('../hapi'),
+  hono: { esmFirst: true, fn: () => require('../hono') },
   http: () => require('../http'),
   http2: () => require('../http2'),
   https: () => require('../http'),

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

@@ -72,7 +72,7 @@ for (const packageName of names) {
 
   let hook = hooks[packageName]
 
-  if (typeof hook === 'object') {
+  if (hook !== null && typeof hook === 'object') {
     if (hook.serverless === false && isInServerlessEnvironment()) continue
 
     // some integrations are disabled by default, but can be enabled by setting
@@ -207,7 +207,7 @@ function filename (name, file) {
 // This function captures the instrumentation file name for a given package by parsing the hook require
 // function given the module name. It is used to ensure that instrumentations such as redis
 // that have several different modules being hooked, ie: 'redis' main package, and @redis/client submodule
-// return a consistent instrumentation name. This is used later to ensure that atleast some portion of
+// return a consistent instrumentation name. This is used later to ensure that at least some portion of
 // the integration was successfully instrumented. Prevents incorrect `Found incompatible integration version: ` messages
 // Example:
 //                  redis -> "() => require('../redis')" -> redis