dd-trace 5.78.0 → 5.80.0

package/LICENSE-3rdparty.csv

@@ -56,6 +56,7 @@ dev,chai,MIT,Copyright 2017 Chai.js Assertion Library
 dev,eslint,MIT,Copyright JS Foundation and other contributors https://js.foundation
 dev,eslint-plugin-cypress,MIT,Copyright (c) 2019 Cypress.io
 dev,eslint-plugin-import,MIT,Copyright 2015 Ben Mosher
+dev,eslint-plugin-jsdoc,BSD-3-Clause,Copyright Gajus Kuizinas
 dev,eslint-plugin-mocha,MIT,Copyright 2014 Mathias Schreck
 dev,eslint-plugin-n,MIT,Copyright 2015 Toru Nagashima
 dev,eslint-plugin-promise,ISC,jden and other contributors

package/index.d.ts

@@ -654,6 +654,13 @@ declare namespace tracer {
          * @default false
          */
         enabled?: boolean
+        /**
+         * Timeout in milliseconds for OpenFeature provider initialization.
+         * If configuration is not received within this time, initialization fails.
+         *
+         * @default 30000
+         */
+        initializationTimeoutMs?: number
       }
     };
 
@@ -3011,15 +3018,15 @@ declare namespace tracer {
       label: string,
 
       /**
-       * The type of evaluation metric, one of 'categorical' or 'score'
+       * The type of evaluation metric, one of 'categorical', 'score', or 'boolean'
        */
-      metricType: 'categorical' | 'score',
+      metricType: 'categorical' | 'score' | 'boolean',
 
       /**
        * The value of the evaluation metric.
-       * Must be string for 'categorical' metrics and number for 'score' metrics.
+       * Must be string for 'categorical' metrics, number for 'score' metrics, and boolean for 'boolean' metrics.
        */
-      value: string | number,
+      value: string | number | boolean,
 
       /**
        * An object of string key-value pairs to tag the evaluation metric with.

package/initialize.mjs

@@ -1,14 +1,14 @@
 /**
-  * This file serves one of two purposes, depending on how it's used.
-  *
-  * If used with --import, it will import init.js and register the loader hook.
-  * If used with --loader, it will act as the loader hook, except that it will
-  * also import init.js inside the source code of the entrypoint file.
-  *
-  * The result is that no matter how this file is used, so long as it's with
-  * one of the two flags, the tracer will always be initialized, and the loader
-  * hook will always be active for ESM support.
-  */
+ * This file serves one of two purposes, depending on how it's used.
+ *
+ * If used with --import, it will import init.js and register the loader hook.
+ * If used with --loader, it will act as the loader hook, except that it will
+ * also import init.js inside the source code of the entrypoint file.
+ *
+ * The result is that no matter how this file is used, so long as it's with
+ * one of the two flags, the tracer will always be initialized, and the loader
+ * hook will always be active for ESM support.
+ */
 
 /* eslint n/no-unsupported-features/node-builtins: ['error', { ignores: ['module.register'] }] */
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dd-trace",
-  "version": "5.78.0",
+  "version": "5.80.0",
   "description": "Datadog APM tracing client for JavaScript",
   "main": "index.js",
   "typings": "index.d.ts",
@@ -46,6 +46,8 @@
     "test:llmobs:sdk:ci": "nyc --no-clean --include \"packages/dd-trace/src/llmobs/**/*.js\" -- npm run test:llmobs:sdk",
     "test:llmobs:plugins": "mocha -r \"packages/dd-trace/test/setup/mocha.js\" \"packages/dd-trace/test/llmobs/plugins/@($(echo $PLUGINS))/*.spec.js\"",
     "test:llmobs:plugins:ci": "yarn services && nyc --no-clean --include \"packages/dd-trace/src/llmobs/**/*.js\" -- npm run test:llmobs:plugins",
+    "test:openfeature": "mocha -r \"packages/dd-trace/test/setup/mocha.js\" \"packages/dd-trace/test/openfeature/*.spec.js\"",
+    "test:openfeature:ci": "nyc --no-clean --include \"packages/dd-trace/src/openfeature/**/*.js\" -- npm run test:openfeature",
     "test:plugins": "mocha -r \"packages/dd-trace/test/setup/mocha.js\" \"packages/datadog-plugin-@($(echo $PLUGINS))/test/**/@($(echo ${SPEC:-'*'})).spec.js\"",
     "test:plugins:ci": "yarn services && nyc --no-clean --include \"packages/datadog-plugin-@($(echo $PLUGINS))/src/**/*.js\" -- npm run test:plugins",
     "test:plugins:ci:flaky": "yarn services && nyc --no-clean --include \"packages/datadog-plugin-@($(echo $PLUGINS))/src/**/*.js\" -- npm run test:plugins -- --bail --retries 2",
@@ -125,7 +127,7 @@
     "@datadog/native-appsec": "10.3.0",
     "@datadog/native-iast-taint-tracking": "4.0.0",
     "@datadog/native-metrics": "3.1.1",
-    "@datadog/openfeature-node-server": "0.1.0-preview.15",
+    "@datadog/openfeature-node-server": "^0.2.0",
     "@datadog/pprof": "5.12.0",
     "@datadog/sketches-js": "2.1.1",
     "@datadog/wasm-js-rewriter": "5.0.1",
@@ -165,7 +167,7 @@
     "@eslint/js": "^9.39.0",
     "@msgpack/msgpack": "^3.1.2",
     "@openfeature/core": "^1.9.0",
-    "@openfeature/server-sdk": "^1.20.0",
+    "@openfeature/server-sdk": "~1.20.0",
     "@stylistic/eslint-plugin": "^5.5.0",
     "@types/chai": "^4.3.16",
     "@types/mocha": "^10.0.10",
@@ -180,6 +182,7 @@
     "eslint": "^9.39.0",
     "eslint-plugin-cypress": "^5.2.0",
     "eslint-plugin-import": "^2.32.0",
+    "eslint-plugin-jsdoc": "^61.1.12",
     "eslint-plugin-mocha": "^11.2.0",
     "eslint-plugin-n": "^17.23.1",
     "eslint-plugin-promise": "^7.2.1",

package/packages/datadog-core/src/storage.js

@@ -15,7 +15,7 @@ const { AsyncLocalStorage } = require('async_hooks')
 class DatadogStorage extends AsyncLocalStorage {
   /**
    *
-   * @param store {Store}
+   * @param {Store} [store]
    * @override
    */
   enterWith (store) {
@@ -47,7 +47,7 @@ class DatadogStorage extends AsyncLocalStorage {
    * retrieved through `getHandle()` can also be passed in to be used as the
    * key. This is useful if you've stashed a handle somewhere and want to
    * retrieve the store with it.
-   * @param {{}} [handle]
+   * @param {object} [handle]
    * @returns {Store | undefined}
    * @override
    */
@@ -87,7 +87,7 @@ class DatadogStorage extends AsyncLocalStorage {
 
 /**
  * This is the map from handles to real stores, used in the class above.
- * @type {WeakMap<WeakKey, Store>}
+ * @type {WeakMap<WeakKey, Store|undefined>}
  */
 const stores = new WeakMap()
 
@@ -101,7 +101,7 @@ const storages = Object.create(null)
 
 /**
  *
- * @param namespace {string} the namespace to use
+ * @param {string} namespace The namespace to use
  * @returns {DatadogStorage}
  */
 function storage (namespace) {

package/packages/datadog-esbuild/src/utils.js

@@ -65,7 +65,11 @@ function getSource (url, { format }) {
 /**
  * Generates the pieces of code for the proxy module before the path
  *
- * @param {Object} moduleData { path, internal, context, excludeDefault }
+ * @param {object} moduleData
+ * @param {string} moduleData.path
+ * @param {boolean} moduleData.internal
+ * @param {object} moduleData.context
+ * @param {boolean} moduleData.excludeDefault
  * @returns {Promise<Map>}
  */
 async function processModule ({ path, internal, context, excludeDefault }) {

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

@@ -34,10 +34,11 @@ function wrapRequest (send) {
   }
 }
 
-function wrapDeserialize (deserialize, channelSuffix) {
+function wrapDeserialize (deserialize, channelSuffix, responseIndex = 0) {
   const headersCh = channel(`apm:aws:response:deserialize:${channelSuffix}`)
 
-  return function (response) {
+  return function () {
+    const response = arguments[responseIndex]
     if (headersCh.hasSubscribers) {
       headersCh.publish({ headers: response.headers })
     }
@@ -66,6 +67,12 @@ function wrapSmithySend (send) {
 
     if (typeof command.deserialize === 'function') {
       shimmer.wrap(command, 'deserialize', deserialize => wrapDeserialize(deserialize, channelSuffix))
+    } else if (this.config?.protocol?.deserializeResponse) {
+      shimmer.wrap(
+        this.config.protocol,
+        'deserializeResponse',
+        deserializeResponse => wrapDeserialize(deserializeResponse, channelSuffix, 2)
+      )
     }
 
     const ctx = {

package/packages/datadog-instrumentations/src/azure-service-bus.js

@@ -8,57 +8,64 @@ const shimmer = require('../../datadog-shimmer')
 const dc = require('dc-polyfill')
 
 const producerCh = dc.tracingChannel('apm:azure-service-bus:send')
+const isItDefault = new WeakSet()
 
-addHook({ name: '@azure/service-bus', versions: ['>=7.9.2'], patchDefault: false }, (obj) => {
+addHook({ name: '@azure/service-bus', versions: ['>=7.9.2'] }, (obj) => {
   const ServiceBusClient = obj.ServiceBusClient
-  let didItShim = false
   shimmer.wrap(ServiceBusClient.prototype, 'createSender',
     createSender => function (queueOrTopicName) {
       const sender = createSender.apply(this, arguments)
-      if (didItShim) return sender
       const senderPrototype = sender.constructor.prototype
       const senderSenderPrototype = sender._sender.constructor.prototype
-      shimmer.wrap(senderPrototype, 'scheduleMessages', scheduleMessages =>
-        function (msg, scheduledEnqueueTimeUtc) {
-          const functionName = scheduleMessages.name
+
+      if (!isItDefault.has(senderPrototype)) {
+        isItDefault.add(senderPrototype)
+
+        shimmer.wrap(senderPrototype, 'scheduleMessages', scheduleMessages =>
+          function (msg, scheduledEnqueueTimeUtc) {
+            const functionName = scheduleMessages.name
+            const config = this._context.config
+            const entityPath = this._entityPath
+            return producerCh.tracePromise(
+              scheduleMessages,
+              { config, entityPath, functionName, msg, scheduledEnqueueTimeUtc },
+              this, ...arguments
+            )
+          })
+
+        shimmer.wrap(senderPrototype, 'createMessageBatch', createMessageBatch => async function () {
+          const batch = await createMessageBatch.apply(this, arguments)
+          shimmer.wrap(batch, 'tryAddMessage', tryAddMessage => function (msg) {
+            const functionName = tryAddMessage.name
+            const config = this._context.config
+            return producerCh.tracePromise(
+              tryAddMessage, { config, functionName, batch, msg }, this, ...arguments)
+          })
+          return batch
+        })
+      }
+
+      if (!isItDefault.has(senderSenderPrototype)) {
+        isItDefault.add(senderSenderPrototype)
+
+        shimmer.wrap(senderSenderPrototype, 'send', send => function (msg) {
+          const functionName = send.name
           const config = this._context.config
-          const entityPath = this._entityPath
+          const entityPath = this.entityPath
           return producerCh.tracePromise(
-            scheduleMessages,
-            { config, entityPath, functionName, msg, scheduledEnqueueTimeUtc },
-            this, ...arguments
+            send, { config, entityPath, functionName, msg }, this, ...arguments
           )
         })
 
-      shimmer.wrap(senderPrototype, 'createMessageBatch', createMessageBatch => async function () {
-        const batch = await createMessageBatch.apply(this, arguments)
-        shimmer.wrap(batch.constructor.prototype, 'tryAddMessage', tryAddMessage => function (msg) {
-          const functionName = tryAddMessage.name
+        shimmer.wrap(senderSenderPrototype, 'sendBatch', sendBatch => function (msg) {
+          const functionName = sendBatch.name
           const config = this._context.config
+          const entityPath = this.entityPath
           return producerCh.tracePromise(
-            tryAddMessage, { config, functionName, batch, msg }, this, ...arguments)
+            sendBatch, { config, entityPath, functionName, msg }, this, ...arguments
+          )
         })
-        return batch
-      })
-
-      shimmer.wrap(senderSenderPrototype, 'send', send => function (msg) {
-        const functionName = send.name
-        const config = this._context.config
-        const entityPath = this.entityPath
-        return producerCh.tracePromise(
-          send, { config, entityPath, functionName, msg }, this, ...arguments
-        )
-      })
-
-      shimmer.wrap(senderSenderPrototype, 'sendBatch', sendBatch => function (msg) {
-        const functionName = sendBatch.name
-        const config = this._context.config
-        const entityPath = this.entityPath
-        return producerCh.tracePromise(
-          sendBatch, { config, entityPath, functionName, msg }, this, ...arguments
-        )
-      })
-      didItShim = true
+      }
       return sender
     })
   return obj

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

@@ -8,6 +8,7 @@ const ritm = require('../../../dd-trace/src/ritm')
  * In practice, `modules` is always an array with a single entry.
  *
  * @param {string[]} modules list of modules to hook into
+ * @param {object} hookOptions hook options
  * @param {Function} onrequire callback to be executed upon encountering module
  */
 function Hook (modules, hookOptions, onrequire) {

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

@@ -28,7 +28,8 @@ exports.tracingChannel = function (name) {
  * @param {string[]} args.versions array of semver range strings
  * @param {string} [args.file='index.js'] path to file within package to instrument
  * @param {string} [args.filePattern] pattern to match files within package to instrument
- * @param Function hook
+ * @param {boolean} [args.patchDefault] whether to patch the default export
+ * @param {(moduleExports: unknown, version: string) => unknown} hook
  */
 exports.addHook = function addHook ({ name, versions, file, filePattern, patchDefault }, hook) {
   if (typeof name === 'string') {

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

@@ -1110,7 +1110,7 @@ function jestAdapterWrapper (jestAdapter, jestVersion) {
        * Child processes do not each request ITR configuration, so the jest's parent process
        * needs to pass them the configuration. This is done via _ddTestCodeCoverageEnabled, which
        * controls whether coverage is reported.
-      */
+       */
       if (environment.testEnvironmentOptions?._ddTestCodeCoverageEnabled) {
         const root = environment.repositoryRoot || environment.rootDir
 

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

@@ -481,6 +481,15 @@ function dispatcherRunWrapper (run) {
 
 function dispatcherRunWrapperNew (run) {
   return function (testGroups) {
+    // Filter out disabled tests from testGroups before they get scheduled
+    if (isTestManagementTestsEnabled) {
+      testGroups.forEach(group => {
+        group.tests = group.tests.filter(test => !test._ddIsDisabled)
+      })
+      // Remove empty groups
+      testGroups = testGroups.filter(group => group.tests.length > 0)
+    }
+
     if (!this._allTests) {
       // Removed in https://github.com/microsoft/playwright/commit/1e52c37b254a441cccf332520f60225a5acc14c7
       // Not available from >=1.44.0
@@ -893,6 +902,9 @@ addHook({
         if (testProperties.disabled) {
           test._ddIsDisabled = true
           test.expectedStatus = 'skipped'
+          // setting test.expectedStatus to 'skipped' does not work for every case,
+          // so we need to filter out disabled tests in dispatcherRunWrapperNew,
+          // so they don't get to the workers
           continue
         }
         if (testProperties.quarantined) {
@@ -1270,6 +1282,10 @@ function generateSummaryWrapper (generateSummary) {
         const {
           _requireFile: testSuiteAbsolutePath,
           location: { line: testSourceLine },
+          _ddIsNew: isNew,
+          _ddIsDisabled: isDisabled,
+          _ddIsModified: isModified,
+          _ddIsQuarantined: isQuarantined
         } = test
         const browserName = getBrowserNameFromProjects(sessionProjects, test)
 
@@ -1278,6 +1294,10 @@ function generateSummaryWrapper (generateSummary) {
           testSuiteAbsolutePath,
           testSourceLine,
           browserName,
+          isNew,
+          isDisabled,
+          isModified,
+          isQuarantined
         })
       }
     }

package/packages/datadog-plugin-aws-sdk/src/services/bedrockruntime/utils.js

@@ -27,8 +27,9 @@ const PROVIDER = {
  * Coerce the chunks into a single response body.
  *
  * @param {Array<{ chunk: { bytes: Buffer } }>} chunks
- * @param {string} provider
- * @returns {Object}
+ * @param {string} modelProvider
+ * @param {string} modelName
+ * @returns {Generation | Record<never, never>}
  */
 function extractTextAndResponseReasonFromStream (chunks, modelProvider, modelName) {
   const modelProviderUpper = modelProvider.toUpperCase()

package/packages/datadog-plugin-azure-service-bus/src/producer.js

@@ -2,6 +2,7 @@
 
 const { getEnvironmentVariable } = require('../../dd-trace/src/config-helper')
 const ProducerPlugin = require('../../dd-trace/src/plugins/producer')
+const spanContexts = new WeakMap()
 
 class AzureServiceBusProducerPlugin extends ProducerPlugin {
   static get id () { return 'azure-service-bus' }
@@ -36,7 +37,12 @@ class AzureServiceBusProducerPlugin extends ProducerPlugin {
       }
 
       if (batchLinksAreEnabled()) {
-        ctx.batch._spanContexts.push(span.context())
+        const spanContext = spanContexts.get(ctx.batch)
+        if (spanContext) {
+          spanContext.push(span.context())
+        } else {
+          spanContexts.set(ctx.batch, [span.context()])
+        }
         injectTraceContext(this.tracer, span, ctx.msg)
       }
     }
@@ -47,9 +53,12 @@ class AzureServiceBusProducerPlugin extends ProducerPlugin {
       if (isBatch) {
         span.setTag('messaging.batch.message_count', messages.count)
         if (batchLinksAreEnabled()) {
-          messages._spanContexts.forEach(spanContext => {
-            span.addLink(spanContext)
-          })
+          const contexts = spanContexts.get(messages)
+          if (contexts) {
+            for (const spanContext of contexts) {
+              span.addLink(spanContext)
+            }
+          }
         }
       } else if (Array.isArray(messages)) {
         span.setTag('messaging.batch.message_count', messages.length)
@@ -64,7 +73,7 @@ class AzureServiceBusProducerPlugin extends ProducerPlugin {
   }
 
   asyncEnd (ctx) {
-    super.finish()
+    super.finish(ctx)
   }
 }
 

package/packages/datadog-plugin-jest/src/index.js

@@ -282,11 +282,7 @@ class JestPlugin extends CiPlugin {
         log.warn('"ci:jest:test-suite:finish": no span found for test suite absolute path %s', testSuiteAbsolutePath)
         return
       }
-      const hasStatus = testSuiteSpan.context()._tags[TEST_STATUS]
-      if (!hasStatus) {
-        // The status may have been set in 'ci:jest:test-suite:error'
-        testSuiteSpan.setTag(TEST_STATUS, status)
-      }
+      testSuiteSpan.setTag(TEST_STATUS, status)
       if (error) {
         testSuiteSpan.setTag('error', error)
         testSuiteSpan.setTag(TEST_STATUS, 'fail')
@@ -323,7 +319,6 @@ class JestPlugin extends CiPlugin {
       } else if (errorMessage) {
         runningTestSuiteSpan.setTag('error', new Error(errorMessage))
       }
-      runningTestSuiteSpan.setTag(TEST_STATUS, 'fail')
     })
 
     /**

package/packages/datadog-plugin-jest/src/util.js

@@ -1,7 +1,7 @@
 'use strict'
 
 const { readFileSync } = require('fs')
-const { parse, extract } = require('jest-docblock')
+const { parse } = require('jest-docblock')
 
 const { getTestSuitePath } = require('../../dd-trace/src/plugins/util/test')
 const log = require('../../dd-trace/src/log')
@@ -61,29 +61,60 @@ function getJestTestName (test, shouldStripSeed = false) {
   return testName
 }
 
+const globalDocblockRegExp = /^\s*(\/\*\*?(.|\r?\n)*?\*\/)/
+const MAX_COMMENTS_CHECKED = 10
+
 function isMarkedAsUnskippable (test) {
-  let docblocks
+  let testSource
 
   try {
-    const testSource = readFileSync(test.path, 'utf8')
-    docblocks = parse(extract(testSource))
+    testSource = readFileSync(test.path, 'utf8')
   } catch {
-    // If we have issues parsing the file, we'll assume no unskippable was passed
     return false
   }
 
-  // docblocks were correctly parsed but it does not include a @datadog block
-  if (!docblocks?.datadog) {
-    return false
-  }
+  const re = globalDocblockRegExp
+  re.lastIndex = 0
+  let commentsChecked = 0
+
+  while (testSource.length) {
+    const match = re.exec(testSource)
+    if (!match) break
+    const comment = match[1]
+
+    let docblocks
+    try {
+      docblocks = parse(comment)
+    } catch {
+      // Skip unparsable comment and continue scanning
+      if (commentsChecked++ >= MAX_COMMENTS_CHECKED) {
+        return false
+      }
+      continue
+    }
 
-  try {
-    return JSON.parse(docblocks.datadog).unskippable
-  } catch {
-    // If the @datadog block comment is present but malformed, we'll run the suite
-    log.warn('@datadog block comment is malformed.')
-    return true
+    if (docblocks?.datadog) {
+      try {
+        // @ts-expect-error The datadog type is defined by us and may only be a string.
+        return JSON.parse(docblocks.datadog).unskippable
+      } catch {
+        // If the @datadog block comment is present but malformed, we'll run the suite
+        log.warn('@datadog block comment is malformed.')
+        return true
+      }
+    }
+
+    if (commentsChecked++ >= MAX_COMMENTS_CHECKED) {
+      return false
+    }
+
+    // To stop as soon as no doc blocks are found, slice the source. That way the
+    // regexp works by using the `^` anchor. Without it, it would continue
+    // scanning the rest of the file.
+    testSource = testSource.slice(match[0].length)
   }
+
+  return false
 }
 
 function getJestSuitesToRun (skippableSuites, originalTests, rootDir) {

package/packages/datadog-plugin-kafkajs/src/consumer.js

@@ -28,7 +28,8 @@ class KafkajsConsumerPlugin extends ConsumerPlugin {
    * @property {string} topic
    * @property {number} partition
    * @property {number} offset
-   *
+   */
+  /**
    * @typedef {object} CommitEventItem
    * @property {string} groupId
    * @property {string} topic

package/packages/datadog-plugin-kafkajs/src/producer.js

@@ -25,6 +25,8 @@ class KafkajsProducerPlugin extends ProducerPlugin {
    * @property {string} topic
    * @property {number} partition
    * @property {number} offset
+   */
+  /**
    *
    * @typedef {object} ProducerResponseItem
    * @property {string} topic
@@ -49,7 +51,7 @@ class KafkajsProducerPlugin extends ProducerPlugin {
 
   /**
    *
-   * @param {ProducerResponseItem[]} commitList
+   * @param {{ result: ProducerResponseItem[] }} ctx
    * @returns {void}
    */
   commit (ctx) {

package/packages/datadog-plugin-openai/src/stream-helpers.js

@@ -111,7 +111,7 @@ function constructChatCompletionResponseFromStreamedChunks (chunks, n) {
  * Constructs the entire response from a stream of OpenAI responses chunks.
  * The responses API uses event-based streaming with delta chunks.
  * @param {Array<Record<string, any>>} chunks
- * @returns {Record<string, any>}
+ * @returns {Record<string, any>|undefined}
  */
 function constructResponseResponseFromStreamedChunks (chunks) {
   // The responses API streams events with different types:

package/packages/datadog-shimmer/src/shimmer.js

@@ -91,7 +91,7 @@ function wrapFunction (original, wrapper) {
  * @param {Record<string | symbol, unknown> | Function | undefined} target - The target
  * object.
  * @param {string | symbol} name - The property key of the method to wrap.
- * @param {(original: Function) => (...args) => any} wrapper - The wrapper function.
+ * @param {(original: Function) => (...args: unknown[]) => any} wrapper - The wrapper function.
  * @param {{ replaceGetter?: boolean }} [options] - If `replaceGetter` is set to
  * true, the getter is accessed and the getter is replaced with one that just
  * returns the earlier retrieved value. Use with care! This may only be done in
@@ -214,7 +214,7 @@ function wrap (target, name, wrapper, options) {
  *         Record<string | symbol, unknown> |
  *         Function} targets - The target objects.
  * @param {Array<string | symbol> | string | symbol} names - The property keys of the methods to wrap.
- * @param {(original: Function) => (...args) => any} wrapper - The wrapper function.
+ * @param {(original: Function) => (...args: unknown[]) => any} wrapper - The wrapper function.
  */
 function massWrap (targets, names, wrapper) {
   targets = toArray(targets)

package/packages/dd-trace/src/aiguard/sdk.js

@@ -138,10 +138,11 @@ class AIGuard extends NoopAIGuard {
           span.setTag(AI_GUARD_TOOL_NAME_TAG_KEY, name)
         }
       }
+      const metaStruct = {
+        messages: this.#truncate(messages)
+      }
       span.meta_struct = {
-        [AI_GUARD_META_STRUCT_KEY]: {
-          messages: this.#truncate(messages)
-        }
+        [AI_GUARD_META_STRUCT_KEY]: metaStruct
       }
       let response
       try {
@@ -166,7 +167,7 @@ class AIGuard extends NoopAIGuard {
           `AI Guard service call failed, status ${response.status}`,
           { errors: response.body?.errors })
       }
-      let action, reason, blockingEnabled
+      let action, reason, tags, blockingEnabled
       try {
         const attr = response.body.data.attributes
         if (!attr.action) {
@@ -174,6 +175,7 @@ class AIGuard extends NoopAIGuard {
         }
         action = attr.action
         reason = attr.reason
+        tags = attr.tags
         blockingEnabled = attr.is_blocking_enabled ?? false
       } catch (e) {
         appsecMetrics.count(AI_GUARD_TELEMETRY_REQUESTS, { error: true }).inc(1)
@@ -182,7 +184,12 @@ class AIGuard extends NoopAIGuard {
       const shouldBlock = block && blockingEnabled && action !== ALLOW
       appsecMetrics.count(AI_GUARD_TELEMETRY_REQUESTS, { action, error: false, block: shouldBlock }).inc(1)
       span.setTag(AI_GUARD_ACTION_TAG_KEY, action)
-      span.setTag(AI_GUARD_REASON_TAG_KEY, reason)
+      if (reason) {
+        span.setTag(AI_GUARD_REASON_TAG_KEY, reason)
+      }
+      if (tags?.length > 0) {
+        metaStruct.attack_categories = tags
+      }
       if (shouldBlock) {
         span.setTag(AI_GUARD_BLOCKED_TAG_KEY, 'true')
         throw new AIGuardAbortError(reason)