dd-trace 5.53.0 → 5.54.0

package/LICENSE-3rdparty.csv

@@ -37,7 +37,7 @@ dev,@types/node,MIT,Copyright Authors
 dev,@eslint/eslintrc,MIT,Copyright OpenJS Foundation and other contributors, <www.openjsf.org>
 dev,@eslint/js,MIT,Copyright OpenJS Foundation and other contributors, <www.openjsf.org>
 dev,@msgpack/msgpack,ISC,Copyright 2019 The MessagePack Community
-dev,@stylistic/eslint-plugin-js,MIT,Copyright OpenJS Foundation and other contributors, <www.openjsf.org>
+dev,@stylistic/eslint-plugin,MIT,Copyright OpenJS Foundation and other contributors, <www.openjsf.org>
 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
@@ -67,6 +67,7 @@ dev,sinon-chai,WTFPL and BSD-2-Clause,Copyright 2004 Sam Hocevar 2012–2017 Dom
 dev,tap,ISC,Copyright 2011-2022 Isaac Z. Schlueter and Contributors
 dev,tiktoken,MIT,Copyright (c) 2022 OpenAI, Shantanu Jain
 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.
 file,profile.proto,Apache license 2.0,Copyright 2016 Google Inc.
 file,is-git-url,MIT,Copyright (c) 2017 Jon Schlinkert.

package/index.d.ts

@@ -209,7 +209,6 @@ interface Plugins {
   "openai": tracer.plugins.openai;
   "opensearch": tracer.plugins.opensearch;
   "oracledb": tracer.plugins.oracledb;
-  "paperplane": tracer.plugins.paperplane;
   "playwright": tracer.plugins.playwright;
   "pg": tracer.plugins.pg;
   "pino": tracer.plugins.pino;
@@ -457,7 +456,7 @@ declare namespace tracer {
     rateLimit?: number,
 
     /**
-     * Sampling rules to apply to priority samplin. Each rule is a JSON,
+     * Sampling rules to apply to priority sampling. Each rule is a JSON,
      * consisting of `service` and `name`, which are regexes to match against
      * a trace's `service` and `name`, and a corresponding `sampleRate`. If not
      * specified, will defer to global sampling rate for all spans.
@@ -714,7 +713,12 @@ declare namespace tracer {
         /** Whether to enable RASP.
          * @default false
          */
-        enabled?: boolean
+        enabled?: boolean,
+
+        /** Whether to enable request body collection on RASP event
+         * @default false
+         */
+        bodyCollection?: boolean
       },
       /**
        * Configuration for stack trace reporting
@@ -734,6 +738,25 @@ declare namespace tracer {
          * @default 32
          */
         maxDepth?: number,
+      },
+      /**
+       * Configuration for extended headers collection tied to security events
+       */
+      extendedHeadersCollection?: {
+        /** Whether to enable extended headers collection
+         * @default false
+         */
+        enabled: boolean,
+
+        /** Whether to redact collected headers
+         * @default true
+         */
+        redaction: boolean,
+
+        /** Specifies the maximum number of headers collected.
+         * @default 50
+         */
+        maxHeaders: number,
       }
     }
 
@@ -801,7 +824,7 @@ declare namespace tracer {
     }
 
     /**
-     * Configuration enabling LLM Observability. Enablement is superceded by the DD_LLMOBS_ENABLED environment variable.
+     * Configuration enabling LLM Observability. Enablement is superseded by the DD_LLMOBS_ENABLED environment variable.
      */
     llmobs?: llmobs.LLMObsEnableOptions
   }
@@ -1498,7 +1521,7 @@ declare namespace tracer {
 
       /**
        * Whether to include the source of the operation within the query as a tag
-       * on every span. This may contain sensitive information and sould only be
+       * on every span. This may contain sensitive information and should only be
        * enabled if sensitive data is always sent as variables and not in the
        * query text.
        *
@@ -1876,12 +1899,6 @@ declare namespace tracer {
       service?: string | ((params: any) => string);
     }
 
-    /**
-     * This plugin automatically instruments the
-     * [paperplane](https://github.com/articulate/paperplane) module.
-     */
-    interface paperplane extends HttpServer {}
-
     /**
     * This plugin automatically instruments the
     * [playwright](https://github.com/microsoft/playwright) module.
@@ -2485,7 +2502,7 @@ declare namespace tracer {
       annotate (span: tracer.Span | undefined, options: llmobs.AnnotationOptions): void
 
       /**
-       * Submits a custom evalutation metric for a given span ID and trace ID.
+       * Submits a custom evaluation metric for a given span ID and trace ID.
        * @param spanContext The span context of the span to submit the evaluation metric for.
        * @param options An object containing the label, metric type, value, and tags of the evaluation metric.
        */
@@ -2499,7 +2516,7 @@ declare namespace tracer {
 
     interface EvaluationOptions {
       /**
-       * The name of the evalutation metric
+       * The name of the evaluation metric
        */
       label: string,
 
@@ -2623,7 +2640,7 @@ declare namespace tracer {
       metadata?: { [key: string]: any },
 
       /**
-       * Object of JSON seraliazable key-value metrics (number) pairs, such as `{input,output,total}Tokens`
+       * Object of JSON serializable key-value metrics (number) pairs, such as `{input,output,total}Tokens`
        */
       metrics?: { [key: string]: number },
 
@@ -2661,7 +2678,7 @@ declare namespace tracer {
 
       /**
        * The name of the ML application that the agent is orchestrating.
-       * If not provided, the default value will be set to mlApp provided during initalization, or `DD_LLMOBS_ML_APP`.
+       * If not provided, the default value will be set to mlApp provided during initialization, or `DD_LLMOBS_ML_APP`.
        */
       mlApp?: string,
 
@@ -2701,7 +2718,7 @@ declare namespace tracer {
       mlApp?: string,
 
       /**
-       * Set to `true` to disbale sending data that requires a Datadog Agent.
+       * Set to `true` to disable sending data that requires a Datadog Agent.
        */
       agentlessEnabled?: boolean,
     }

package/initialize.mjs

@@ -17,7 +17,6 @@ import { fileURLToPath } from 'node:url'
 import {
   load as origLoad,
   resolve as origResolve,
-  getFormat as origGetFormat,
   getSource as origGetSource
 } from 'import-in-the-middle/hook.mjs'
 
@@ -26,7 +25,7 @@ function insertInit (result) {
   if (!hasInsertedInit) {
     hasInsertedInit = true
     result.source = `
-import '${fileURLToPath(new URL('./init.js', import.meta.url))}';
+import '${fileURLToPath(new URL('init.js', import.meta.url))}';
 ${result.source}`
   }
   return result
@@ -45,8 +44,6 @@ export async function load (url, context, nextLoad) {
 
 export const resolve = brokenLoaders ? undefined : origResolve
 
-export const getFormat = origGetFormat
-
 export async function getSource (...args) {
   return insertInit(await origGetSource(...args))
 }
@@ -60,3 +57,5 @@ if (isMainThread) {
     })
   }
 }
+
+export { getFormat } from 'import-in-the-middle/hook.mjs'

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dd-trace",
-  "version": "5.53.0",
+  "version": "5.54.0",
   "description": "Datadog APM tracing client for JavaScript",
   "main": "index.js",
   "typings": "index.d.ts",
@@ -9,6 +9,7 @@
     "preinstall": "node scripts/preinstall.js",
     "bench": "node benchmark/index.js",
     "bench:e2e:ci-visibility": "node benchmark/e2e-ci/benchmark-run.js",
+    "dependencies:dedupe": "yarn-deduplicate yarn.lock",
     "type:doc": "cd docs && yarn && yarn build",
     "type:test": "cd docs && yarn && yarn test",
     "lint": "node scripts/check_licenses.js && eslint . --max-warnings 0 && yarn audit",
@@ -83,75 +84,76 @@
     "node": ">=18"
   },
   "dependencies": {
-    "@datadog/libdatadog": "^0.5.1",
+    "@datadog/libdatadog": "^0.6.0",
     "@datadog/native-appsec": "8.5.2",
     "@datadog/native-iast-taint-tracking": "4.0.0",
     "@datadog/native-metrics": "^3.1.1",
     "@datadog/pprof": "5.8.0",
-    "@datadog/sketches-js": "^2.1.0",
+    "@datadog/sketches-js": "^2.1.1",
     "@datadog/wasm-js-rewriter": "4.0.1",
     "@isaacs/ttlcache": "^1.4.1",
     "@opentelemetry/api": ">=1.0.0 <1.9.0",
     "@opentelemetry/core": "^1.14.0",
     "crypto-randomuuid": "^1.0.0",
-    "dc-polyfill": "0.1.8",
+    "dc-polyfill": "0.1.9",
     "ignore": "^5.2.4",
-    "import-in-the-middle": "1.13.1",
-    "istanbul-lib-coverage": "3.2.0",
+    "import-in-the-middle": "1.14.0",
+    "istanbul-lib-coverage": "3.2.2",
     "jest-docblock": "^29.7.0",
     "koalas": "^1.0.2",
     "limiter": "1.1.5",
     "lodash.sortby": "^4.7.0",
-    "lru-cache": "^7.14.0",
-    "module-details-from-path": "^1.0.3",
+    "lru-cache": "^7.18.3",
+    "module-details-from-path": "^1.0.4",
     "mutexify": "^1.4.0",
     "opentracing": ">=0.12.1",
     "path-to-regexp": "^0.1.12",
     "pprof-format": "^2.1.0",
-    "protobufjs": "^7.2.5",
+    "protobufjs": "^7.5.3",
     "retry": "^0.13.1",
-    "rfdc": "^1.3.1",
+    "rfdc": "^1.4.1",
     "semifies": "^1.0.0",
-    "shell-quote": "^1.8.1",
+    "shell-quote": "^1.8.2",
     "source-map": "^0.7.4",
     "tlhunter-sorted-set": "^0.1.0",
     "ttl-set": "^1.0.0"
   },
   "devDependencies": {
-    "@babel/helpers": "^7.26.10",
-    "@eslint/eslintrc": "^3.2.0",
-    "@eslint/js": "^9.19.0",
-    "@msgpack/msgpack": "^3.0.0-beta3",
-    "@stylistic/eslint-plugin-js": "^3.0.1",
-    "@types/node": "^16.0.0",
-    "axios": "^1.8.2",
+    "@babel/helpers": "^7.27.3",
+    "@eslint/eslintrc": "^3.3.1",
+    "@eslint/js": "^9.27.0",
+    "@msgpack/msgpack": "^3.1.2",
+    "@stylistic/eslint-plugin": "^4.4.0",
+    "@types/node": "^18.19.106",
+    "axios": "^1.9.0",
     "benchmark": "^2.1.4",
-    "body-parser": "^1.20.3",
-    "chai": "^4.3.7",
-    "eslint": "^9.19.0",
+    "body-parser": "^2.2.0",
+    "chai": "^4.5.0",
+    "eslint": "^9.27.0",
     "eslint-config-standard": "^17.1.0",
     "eslint-plugin-import": "^2.31.0",
     "eslint-plugin-mocha": "^10.5.0",
-    "eslint-plugin-n": "^17.15.1",
+    "eslint-plugin-n": "^17.18.0",
     "eslint-plugin-promise": "^7.2.1",
     "eslint-plugin-unicorn": "^57.0.0",
     "express": "^4.21.2",
     "get-port": "^5.1.1",
-    "glob": "^7.1.6",
-    "globals": "^15.10.0",
+    "glob": "^7.2.3",
+    "globals": "^15.15.0",
     "graphql": "0.13.2",
-    "jszip": "^3.5.0",
-    "mocha": "^10",
-    "multer": "^1.4.5-lts.1",
-    "nock": "^11.3.3",
+    "jszip": "^3.10.1",
+    "mocha": "^10.8.2",
+    "multer": "^2.0.0",
+    "nock": "^11.9.1",
     "nyc": "^15.1.0",
     "proxyquire": "^1.8.0",
-    "rimraf": "^3.0.0",
-    "semver": "^7.5.4",
-    "sinon": "^16.1.3",
+    "rimraf": "^3.0.2",
+    "semver": "^7.7.2",
+    "sinon": "^18.0.1",
     "sinon-chai": "^3.7.0",
-    "tap": "^16.3.7",
-    "tiktoken": "^1.0.15",
-    "yaml": "^2.5.0"
+    "tap": "^16.3.10",
+    "tiktoken": "^1.0.21",
+    "yaml": "^2.8.0",
+    "yarn-deduplicate": "^6.0.2"
   }
 }

package/packages/datadog-core/src/utils/src/get.js

@@ -1,6 +1,6 @@
 'use strict'
 
-module.exports = (object, path) => {
+module.exports = function get (object, path) {
   const pathArr = path.split('.')
   let val = object
   for (const p of pathArr) {

package/packages/datadog-core/src/utils/src/has.js

@@ -1,6 +1,6 @@
 'use strict'
 
-module.exports = (object, path) => {
+module.exports = function has (object, path) {
   const pathArr = path.split('.')
   let property = object
   for (const n of pathArr) {

package/packages/datadog-core/src/utils/src/kebabcase.js

@@ -1,16 +1,14 @@
 'use strict'
 
-module.exports = str => {
+module.exports = function kebabcase (str) {
   if (typeof str !== 'string') {
     throw new TypeError('Expected a string')
   }
 
   return str
     .trim()
-    .replace(/([a-z])([A-Z])/g, '$1-$2')
-    .replace(/\s+/g, '-')
-    .replace(/^-+|-+$/g, '')
-    .replace(/_/g, '-')
-    .replace(/-{2,}/g, '-')
+    .replace(/([a-z])([A-Z])/g, '$1-$2') // Convert camelCase to kebab-case
+    .replace(/[\s_]+/g, '-') // Replace spaces and underscores with a single dash
+    .replace(/^-+|-+$/g, '') // Trim leading and trailing dashes
     .toLowerCase()
 }

package/packages/datadog-core/src/utils/src/parse-tags.js

@@ -11,7 +11,7 @@ const digitRegex = /^\d+$/
  * @param {Object} tags - Key/value pairs of tags
  * @returns Object - Parsed tags
  */
-module.exports = tags => {
+module.exports = function parseTags (tags) {
   const parsedTags = {}
   for (const [tag, value] of Object.entries(tags)) {
     const keys = tag.split('.')

package/packages/datadog-core/src/utils/src/pick.js

@@ -1,9 +1,9 @@
 'use strict'
 
-module.exports = (object, props) => {
+module.exports = function pick (object, props) {
   const result = {}
   props.forEach(prop => {
-    if (prop in object) {
+    if (Object.hasOwn(object, prop)) {
       result[prop] = object[prop]
     }
   })

package/packages/datadog-core/src/utils/src/set.js

@@ -1,6 +1,6 @@
 'use strict'
 
-module.exports = (object, path, value) => {
+module.exports = function set (object, path, value) {
   const pathArr = path.split('.')
   let property = object
   let i

package/packages/datadog-core/src/utils/src/uniq.js

@@ -1,5 +1,5 @@
 'use strict'
 
-module.exports = function (arr) {
+module.exports = function uniq (arr) {
   return [...new Set(arr)]
 }

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

@@ -2,8 +2,7 @@
 
 const {
   channel,
-  addHook,
-  AsyncResource
+  addHook
 } = require('./helpers/instrument')
 const shimmer = require('../../datadog-shimmer')
 
@@ -15,9 +14,9 @@ addHook({ name: 'amqp10', file: 'lib/sender_link.js', versions: ['>=3'] }, Sende
     if (!startCh.hasSubscribers) {
       return send.apply(this, arguments)
     }
-    const asyncResource = new AsyncResource('bound-anonymous-fn')
-    return asyncResource.runInAsyncScope(() => {
-      startCh.publish({ link: this })
+    const ctx = { link: this }
+
+    return startCh.runStores(ctx, () => {
       try {
         const promise = send.apply(this, arguments)
 
@@ -26,12 +25,13 @@ addHook({ name: 'amqp10', file: 'lib/sender_link.js', versions: ['>=3'] }, Sende
           return promise
         }
 
-        promise.then(asyncResource.bind(() => finish(finishCh, errorCh)),
-          asyncResource.bind(e => finish(finishCh, errorCh, e)))
-
+        promise.then(
+          () => finish(finishCh, errorCh, null, ctx),
+          e => finish(finishCh, errorCh, e, ctx)
+        )
         return promise
       } catch (err) {
-        finish(finishCh, errorCh, err)
+        finish(finishCh, errorCh, err, ctx)
         throw err
       }
     })
@@ -47,25 +47,27 @@ addHook({ name: 'amqp10', file: 'lib/receiver_link.js', versions: ['>=3'] }, Rec
     if (!transferFrame || transferFrame.aborted || transferFrame.more) {
       return messageReceived.apply(this, arguments)
     }
-    const asyncResource = new AsyncResource('bound-anonymous-fn')
-    return asyncResource.runInAsyncScope(() => {
-      startCh.publish({ link: this })
+    const ctx = { link: this }
+
+    return startCh.runStores(ctx, () => {
       try {
         return messageReceived.apply(this, arguments)
       } catch (err) {
-        errorCh.publish(err)
+        ctx.error = err
+        errorCh.publish(ctx)
         throw err
       } finally {
-        finishCh.publish()
+        finishCh.publish(ctx)
       }
     })
   })
   return ReceiverLink
 })
 
-function finish (finishCh, errorCh, error) {
+function finish (finishCh, errorCh, error, ctx) {
   if (error) {
-    errorCh.publish(error)
+    ctx.error = error
+    errorCh.publish(ctx)
   }
-  finishCh.publish()
+  finishCh.publish(ctx)
 }

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

@@ -2,8 +2,7 @@
 
 const {
   channel,
-  addHook,
-  AsyncResource
+  addHook
 } = require('./helpers/instrument')
 const kebabCase = require('../../datadog-core/src/utils/src/kebabcase')
 const shimmer = require('../../datadog-shimmer')
@@ -11,18 +10,23 @@ const shimmer = require('../../datadog-shimmer')
 const { NODE_MAJOR, NODE_MINOR } = require('../../../version')
 const MIN_VERSION = ((NODE_MAJOR > 22) || (NODE_MAJOR === 22 && NODE_MINOR >= 2)) ? '>=0.5.3' : '>=0.5.0'
 
-const startCh = channel('apm:amqplib:command:start')
-const finishCh = channel('apm:amqplib:command:finish')
-const errorCh = channel('apm:amqplib:command:error')
+const commandStartCh = channel('apm:amqplib:command:start')
+const commandFinishCh = channel('apm:amqplib:command:finish')
+const commandErrorCh = channel('apm:amqplib:command:error')
+
+const consumeStartCh = channel('apm:amqplib:consume:start')
+const consumeFinishCh = channel('apm:amqplib:consume:finish')
+
+const publishStartCh = channel('apm:amqplib:publish:start')
+const publishFinishCh = channel('apm:amqplib:publish:finish')
+const publishErrorCh = channel('apm:amqplib:publish:error')
 
 const methods = {}
 
 addHook({ name: 'amqplib', file: 'lib/defs.js', versions: [MIN_VERSION] }, defs => {
   for (const [key, value] of Object.entries(defs)) {
     if (Number.isInteger(value) && isCamelCase(key)) {
-      // TODO(BridgeAR): It should replace all `-` with `.`, so it has to be replaceAll or use a regex.
-      // Example method that is not renamed properly: BasicGetEmpty = 3932232
-      methods[value] = kebabCase(key).replace('-', '.')
+      methods[value] = kebabCase(key).replaceAll('-', '.')
     }
   }
   return defs
@@ -34,24 +38,29 @@ addHook({ name: 'amqplib', file: 'lib/channel_model.js', versions: [MIN_VERSION]
       if (message === null) {
         return message
       }
-      startCh.publish({ method: 'basic.get', message, fields: message.fields, queue })
-      // finish right away
-      finishCh.publish()
+      const ctx = { method: 'basic.get', message, fields: message.fields, queue }
+      consumeStartCh.runStores(ctx, () => {
+        // finish right away
+        consumeFinishCh.publish(ctx)
+      })
       return message
     })
   })
   shimmer.wrap(x.Channel.prototype, 'consume', consume => function (queue, callback, options) {
-    if (!startCh.hasSubscribers) {
+    if (!consumeStartCh.hasSubscribers) {
       return consume.apply(this, arguments)
     }
     arguments[1] = (message, ...args) => {
       if (message === null) {
         return callback(message, ...args)
       }
-      startCh.publish({ method: 'basic.deliver', message, fields: message.fields, queue })
-      const result = callback(message, ...args)
-      finishCh.publish()
-      return result
+      const ctx = { method: 'basic.deliver', message, fields: message.fields, queue }
+      return consumeStartCh.runStores(ctx, () => {
+        // finish right away
+        const result = callback(message, ...args)
+        consumeFinishCh.publish(ctx)
+        return result
+      })
     }
     return consume.apply(this, arguments)
   })
@@ -60,32 +69,36 @@ addHook({ name: 'amqplib', file: 'lib/channel_model.js', versions: [MIN_VERSION]
 
 addHook({ name: 'amqplib', file: 'lib/callback_model.js', versions: [MIN_VERSION] }, channel => {
   shimmer.wrap(channel.Channel.prototype, 'get', getMessage => function (queue, options, callback) {
-    if (!startCh.hasSubscribers) {
+    if (!commandStartCh.hasSubscribers) {
       return getMessage.apply(this, arguments)
     }
     arguments[2] = (error, message, ...args) => {
       if (error !== null || message === null) {
         return callback(error, message, ...args)
       }
-      startCh.publish({ method: 'basic.get', message, fields: message.fields, queue })
-      const result = callback(error, message, ...args)
-      finishCh.publish()
-      return result
+      const ctx = { method: 'basic.get', message, fields: message.fields, queue }
+      return consumeStartCh.runStores(ctx, () => {
+        const result = callback(error, message, ...args)
+        consumeFinishCh.publish(ctx)
+        return result
+      })
     }
     return getMessage.apply(this, arguments)
   })
   shimmer.wrap(channel.Channel.prototype, 'consume', consume => function (queue, callback) {
-    if (!startCh.hasSubscribers) {
+    if (!consumeStartCh.hasSubscribers) {
       return consume.apply(this, arguments)
     }
     arguments[1] = (message, ...args) => {
       if (message === null) {
         return callback(message, ...args)
       }
-      startCh.publish({ method: 'basic.deliver', message, fields: message.fields, queue })
-      const result = callback(message, ...args)
-      finishCh.publish()
-      return result
+      const ctx = { method: 'basic.deliver', message, fields: message.fields, queue }
+      return consumeStartCh.runStores(ctx, () => {
+        const result = callback(message, ...args)
+        consumeFinishCh.publish(ctx)
+        return result
+      })
     }
     return consume.apply(this, arguments)
   })
@@ -94,32 +107,36 @@ addHook({ name: 'amqplib', file: 'lib/callback_model.js', versions: [MIN_VERSION
 
 addHook({ name: 'amqplib', file: 'lib/channel.js', versions: [MIN_VERSION] }, channel => {
   shimmer.wrap(channel.Channel.prototype, 'sendImmediately', sendImmediately => function (method, fields) {
-    return instrument(sendImmediately, this, arguments, methods[method], fields)
+    return instrument(
+      sendImmediately, this, arguments, methods[method], fields, null, commandStartCh, commandFinishCh, commandErrorCh
+    )
   })
 
   shimmer.wrap(channel.Channel.prototype, 'sendMessage', sendMessage => function (fields) {
-    return instrument(sendMessage, this, arguments, 'basic.publish', fields, arguments[2])
+    return instrument(
+      sendMessage, this, arguments, 'basic.publish', fields, arguments[2],
+      publishStartCh, publishFinishCh, publishErrorCh
+    )
   })
   return channel
 })
 
-function instrument (send, channel, args, method, fields, message) {
+function instrument (send, channel, args, method, fields, message, startCh, finishCh, errorCh) {
   if (!startCh.hasSubscribers || method === 'basic.get') {
     return send.apply(channel, args)
   }
 
-  const asyncResource = new AsyncResource('bound-anonymous-fn')
-  return asyncResource.runInAsyncScope(() => {
-    startCh.publish({ channel, method, fields, message })
-
+  const ctx = { channel, method, fields, message }
+  return startCh.runStores(ctx, () => {
     try {
       return send.apply(channel, args)
     } catch (err) {
-      errorCh.publish(err)
+      ctx.error = err
+      errorCh.publish(ctx)
 
       throw err
     } finally {
-      finishCh.publish()
+      finishCh.publish(ctx)
     }
   })
 }

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

@@ -42,7 +42,7 @@ function wrapRecordExceptions (recordExceptions) {
     // this is mimicking apollo-gateways internal instrumentation
     // TODO: should we consider a mechanism to report all exceptions? since this method aggregates all exceptions
     // where as a span can only have one exception set on it at a time
-    generalErrorCh.publish({ error: errors[errors.length - 1] })
+    generalErrorCh.publish({ error: errors.at(-1) })
     return recordExceptions.apply(this, args)
   }
 }
@@ -50,7 +50,7 @@ function wrapRecordExceptions (recordExceptions) {
 function wrapStartActiveSpan (startActiveSpan) {
   return function (...args) {
     const firstArg = args[0]
-    const cb = args[args.length - 1]
+    const cb = args.at(-1)
     if (typeof firstArg !== 'string' || typeof cb !== 'function') return startActiveSpan.apply(this, args)
 
     const method = CHANNELS[firstArg]

package/packages/datadog-instrumentations/src/aws-sdk.js

@@ -54,7 +54,7 @@ function wrapDeserialize (deserialize, channelSuffix) {
 
 function wrapSmithySend (send) {
   return function (command, ...args) {
-    const cb = args[args.length - 1]
+    const cb = args.at(-1)
     const innerAr = new AsyncResource('apm:aws:request:inner')
     const outerAr = new AsyncResource('apm:aws:request:outer')
     const serviceIdentifier = this.config.serviceId.toLowerCase()