dd-trace 5.84.0 → 5.86.0

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

@@ -1,10 +1,11 @@
 'use strict'
+const path = require('node:path')
 
 const shimmer = require('../../datadog-shimmer')
 const log = require('../../dd-trace/src/log')
 const {
   VITEST_WORKER_TRACE_PAYLOAD_CODE,
-  VITEST_WORKER_LOGS_PAYLOAD_CODE
+  VITEST_WORKER_LOGS_PAYLOAD_CODE,
 } = require('../../dd-trace/src/plugins/util/test')
 const { addHook, channel } = require('./helpers/instrument')
 
@@ -36,6 +37,7 @@ const modifiedFilesCh = channel('ci:vitest:modified-files')
 
 const workerReportTraceCh = channel('ci:vitest:worker-report:trace')
 const workerReportLogsCh = channel('ci:vitest:worker-report:logs')
+const codeCoverageReportCh = channel('ci:vitest:coverage-report')
 
 const taskToCtx = new WeakMap()
 const taskToStatuses = new WeakMap()
@@ -59,6 +61,7 @@ let isImpactedTestsEnabled = false
 let testManagementAttemptToFixRetries = 0
 let isDiEnabled = false
 let testCodeCoverageLinesTotal
+let coverageRootDir
 let isSessionStarted = false
 let vitestPool = null
 
@@ -93,7 +96,7 @@ function getProvidedContext () {
       _ddTestManagementTests: testManagementTests,
       _ddIsFlakyTestRetriesEnabled: isFlakyTestRetriesEnabled,
       _ddIsImpactedTestsEnabled: isImpactedTestsEnabled,
-      _ddModifiedFiles: modifiedFiles
+      _ddModifiedFiles: modifiedFiles,
     } = globalThis.__vitest_worker__.providedContext
 
     return {
@@ -107,7 +110,7 @@ function getProvidedContext () {
       testManagementTests,
       isFlakyTestRetriesEnabled,
       isImpactedTestsEnabled,
-      modifiedFiles
+      modifiedFiles,
     }
   } catch {
     log.error('Vitest workers could not parse provided context, so some features will not work.')
@@ -122,7 +125,7 @@ function getProvidedContext () {
       testManagementTests: {},
       isFlakyTestRetriesEnabled: false,
       isImpactedTestsEnabled: false,
-      modifiedFiles: {}
+      modifiedFiles: {},
     }
   }
 }
@@ -278,7 +281,7 @@ function getSortWrapper (sort, frameworkVersion) {
             testFilepaths,
             onDone: (isFaulty) => {
               isEarlyFlakeDetectionFaulty = isFaulty
-            }
+            },
           })
           if (isEarlyFlakeDetectionFaulty) {
             isEarlyFlakeDetectionEnabled = false
@@ -354,6 +357,17 @@ function getSortWrapper (sort, frameworkVersion) {
     }
 
     if (this.ctx.coverageProvider?.generateCoverage) {
+      // Capture coverage root directory from config (default is 'coverage' in cwd)
+      try {
+        const coverageConfig = this.ctx.config?.coverage
+        const reportsDirectory = coverageConfig?.reportsDirectory || 'coverage'
+        const rootDir = this.ctx.config?.root || process.cwd()
+        coverageRootDir = path.isAbsolute(reportsDirectory) ? reportsDirectory : path.join(rootDir, reportsDirectory)
+      } catch {
+        // Fallback to cwd if we can't get config
+        coverageRootDir = process.cwd()
+      }
+
       shimmer.wrap(this.ctx.coverageProvider, 'generateCoverage', generateCoverage => async function () {
         const totalCodeCoverage = await generateCoverage.apply(this, arguments)
 
@@ -399,11 +413,18 @@ function getFinishWrapper (exitOrClose) {
       isEarlyFlakeDetectionFaulty,
       isTestManagementTestsEnabled,
       vitestPool,
-      onFinish
+      onFinish,
     })
 
     await flushPromise
 
+    // If coverage was generated, publish coverage report channel for upload
+    if (coverageRootDir && codeCoverageReportCh.hasSubscribers) {
+      await new Promise((resolve) => {
+        codeCoverageReportCh.publish({ rootDir: coverageRootDir, onDone: resolve })
+      })
+    }
+
     return exitOrClose.apply(this, arguments)
   }
 }
@@ -462,8 +483,10 @@ function threadHandler (thread) {
 function wrapTinyPoolRun (TinyPool) {
   shimmer.wrap(TinyPool.prototype, 'run', run => async function () {
     // We have to do this before and after because the threads list gets recycled, that is, the processes are re-created
+    // eslint-disable-next-line unicorn/no-array-for-each
     this.threads.forEach(threadHandler)
     const runResult = await run.apply(this, arguments)
+    // eslint-disable-next-line unicorn/no-array-for-each
     this.threads.forEach(threadHandler)
     return runResult
   })
@@ -472,20 +495,9 @@ function wrapTinyPoolRun (TinyPool) {
 addHook({
   name: 'tinypool',
   // version from tinypool@0.8 was used in vitest@1.6.0
-  versions: ['>=0.8.0 <1.0.0'],
-  file: 'dist/esm/index.js'
-}, (TinyPool) => {
-  wrapTinyPoolRun(TinyPool)
-  return TinyPool
-})
-
-addHook({
-  name: 'tinypool',
-  versions: ['>=1.0.0'],
-  file: 'dist/index.js'
+  versions: ['>=0.8.0'],
 }, (TinyPool) => {
   wrapTinyPoolRun(TinyPool)
-
   return TinyPool
 })
 
@@ -558,7 +570,7 @@ function wrapVitestTestRunner (VitestTestRunner) {
       testManagementAttemptToFixRetries,
       testManagementTests,
       isImpactedTestsEnabled,
-      modifiedFiles
+      modifiedFiles,
     } = getProvidedContext()
 
     if (isTestManagementTestsEnabled) {
@@ -573,7 +585,7 @@ function wrapVitestTestRunner (VitestTestRunner) {
             attemptToFixTasks.add(task)
             taskToStatuses.set(task, [])
           }
-        }
+        },
       })
       isDisabledCh.publish({
         testManagementTests,
@@ -587,7 +599,7 @@ function wrapVitestTestRunner (VitestTestRunner) {
               task.mode = 'skip'
             }
           }
-        }
+        },
       })
     }
 
@@ -604,7 +616,7 @@ function wrapVitestTestRunner (VitestTestRunner) {
             modifiedTasks.add(task)
             taskToStatuses.set(task, [])
           }
-        }
+        },
       })
     }
 
@@ -622,7 +634,7 @@ function wrapVitestTestRunner (VitestTestRunner) {
             newTasks.add(task)
             taskToStatuses.set(task, [])
           }
-        }
+        },
       })
     }
 
@@ -679,7 +691,7 @@ function wrapVitestTestRunner (VitestTestRunner) {
       isDiEnabled,
       isTestManagementTestsEnabled,
       testManagementTests,
-      isFlakyTestRetriesEnabled
+      isFlakyTestRetriesEnabled,
     } = getProvidedContext()
 
     if (isKnownTestsEnabled) {
@@ -696,7 +708,7 @@ function wrapVitestTestRunner (VitestTestRunner) {
           if (isTestQuarantined) {
             quarantinedTasks.add(task)
           }
-        }
+        },
       })
     }
 
@@ -718,7 +730,7 @@ function wrapVitestTestRunner (VitestTestRunner) {
           error: testError,
           shouldSetProbe,
           promises,
-          ...ctx.currentStore
+          ...ctx.currentStore,
         })
         // We wait for the probe to be set
         if (promises.setProbePromise) {
@@ -787,7 +799,7 @@ function wrapVitestTestRunner (VitestTestRunner) {
       isDisabled: disabledTasks.has(task),
       isQuarantined,
       isRetryReasonAtr,
-      isModified: modifiedTasks.has(task)
+      isModified: modifiedTasks.has(task),
     }
     taskToCtx.set(task, ctx)
 
@@ -843,7 +855,7 @@ function wrapVitestTestRunner (VitestTestRunner) {
 addHook({
   name: 'vitest',
   versions: ['>=4.0.0'],
-  filePattern: 'dist/chunks/test.*'
+  filePattern: 'dist/chunks/test.*',
 }, (testPackage) => {
   if (!isTestPackage(testPackage)) {
     return testPackage
@@ -857,7 +869,7 @@ addHook({
 addHook({
   name: 'vitest',
   versions: ['>=1.6.0 <4.0.0'],
-  file: 'dist/runners.js'
+  file: 'dist/runners.js',
 }, (vitestPackage) => {
   const { VitestTestRunner } = vitestPackage
 
@@ -871,7 +883,7 @@ addHook({
 addHook({
   name: 'vitest',
   versions: ['>=1.6.0 <2.0.0'],
-  filePattern: 'dist/vendor/index.*'
+  filePattern: 'dist/vendor/index.*',
 }, (vitestPackage) => {
   if (isReporterPackage(vitestPackage)) {
     shimmer.wrap(vitestPackage.B.prototype, 'sort', getSortWrapper)
@@ -883,7 +895,7 @@ addHook({
 addHook({
   name: 'vitest',
   versions: ['>=2.0.0 <2.0.5'],
-  filePattern: 'dist/vendor/index.*'
+  filePattern: 'dist/vendor/index.*',
 }, (vitestPackage) => {
   if (isReporterPackageNew(vitestPackage)) {
     shimmer.wrap(vitestPackage.e.prototype, 'sort', getSortWrapper)
@@ -895,7 +907,7 @@ addHook({
 addHook({
   name: 'vitest',
   versions: ['>=2.0.5 <2.1.0'],
-  filePattern: 'dist/chunks/index.*'
+  filePattern: 'dist/chunks/index.*',
 }, (vitestPackage) => {
   if (isReporterPackageNewest(vitestPackage)) {
     shimmer.wrap(vitestPackage.h.prototype, 'sort', getSortWrapper)
@@ -907,7 +919,7 @@ addHook({
 addHook({
   name: 'vitest',
   versions: ['>=2.1.0 <3.0.0'],
-  filePattern: 'dist/chunks/RandomSequencer.*'
+  filePattern: 'dist/chunks/RandomSequencer.*',
 }, (randomSequencerPackage) => {
   shimmer.wrap(randomSequencerPackage.B.prototype, 'sort', getSortWrapper)
   return randomSequencerPackage
@@ -916,7 +928,7 @@ addHook({
 addHook({
   name: 'vitest',
   versions: ['>=3.0.9'],
-  filePattern: 'dist/chunks/coverage.*'
+  filePattern: 'dist/chunks/coverage.*',
 }, (coveragePackage) => {
   if (isBaseSequencer(coveragePackage)) {
     shimmer.wrap(coveragePackage.b.prototype, 'sort', getSortWrapper)
@@ -927,7 +939,7 @@ addHook({
 addHook({
   name: 'vitest',
   versions: ['>=3.0.0 <3.0.9'],
-  filePattern: 'dist/chunks/resolveConfig.*'
+  filePattern: 'dist/chunks/resolveConfig.*',
 }, (resolveConfigPackage) => {
   shimmer.wrap(resolveConfigPackage.B.prototype, 'sort', getSortWrapper)
   return resolveConfigPackage
@@ -938,25 +950,25 @@ addHook({
 addHook({
   name: 'vitest',
   versions: ['>=1.6.0 <2.0.5'],
-  filePattern: 'dist/vendor/cac.*'
+  filePattern: 'dist/vendor/cac.*',
 }, getCreateCliWrapper)
 
 addHook({
   name: 'vitest',
   versions: ['>=2.0.5'],
-  filePattern: 'dist/chunks/cac.*'
+  filePattern: 'dist/chunks/cac.*',
 }, getCreateCliWrapper)
 
 addHook({
   name: 'vitest',
   versions: ['>=1.6.0 <2.0.5'],
-  filePattern: 'dist/vendor/cli-api.*'
+  filePattern: 'dist/vendor/cli-api.*',
 }, getStartVitestWrapper)
 
 addHook({
   name: 'vitest',
   versions: ['>=2.0.5'],
-  filePattern: 'dist/chunks/cli-api.*'
+  filePattern: 'dist/chunks/cli-api.*',
 }, getStartVitestWrapper)
 
 // test suite start and finish
@@ -964,7 +976,6 @@ addHook({
 addHook({
   name: '@vitest/runner',
   versions: ['>=1.6.0'],
-  file: 'dist/index.js'
 }, (vitestPackage, frameworkVersion) => {
   shimmer.wrap(vitestPackage, 'startTests', startTests => async function (testPaths) {
     let testSuiteError = null
@@ -986,7 +997,7 @@ addHook({
     const testTasks = getTypeTasks(startTestsResponse[0].tasks)
 
     // Only one test task per test, even if there are retries
-    testTasks.forEach(task => {
+    for (const task of testTasks) {
       const testCtx = taskToCtx.get(task)
       const { result } = task
       // We have to trick vitest into thinking that the test has passed
@@ -1000,7 +1011,7 @@ addHook({
             testName: getTestName(task),
             testSuiteAbsolutePath: task.file.filepath,
             isNew: newTasks.has(task),
-            isDisabled: disabledTasks.has(task)
+            isDisabled: disabledTasks.has(task),
           })
         } else if (state === 'pass' && !isSwitchedStatus) {
           if (testCtx) {
@@ -1033,7 +1044,7 @@ addHook({
               error: testError,
               hasFailedAllRetries,
               attemptToFixFailed,
-              ...testCtx.currentStore
+              ...testCtx.currentStore,
             })
           }
           if (errors?.length) {
@@ -1045,10 +1056,10 @@ addHook({
           testName: getTestName(task),
           testSuiteAbsolutePath: task.file.filepath,
           isNew: newTasks.has(task),
-          isDisabled: disabledTasks.has(task)
+          isDisabled: disabledTasks.has(task),
         })
       }
-    })
+    }
 
     const testSuiteResult = startTestsResponse[0].result
 

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

@@ -7,7 +7,7 @@ const { wrapThen } = require('./helpers/promise')
 addHook({
   name: 'when',
   file: 'lib/Promise.js',
-  versions: ['>=3']
+  versions: ['>=3'],
 }, Promise => {
   shimmer.wrap(Promise.prototype, 'then', wrapThen)
   return Promise

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

@@ -3,7 +3,7 @@
 const shimmer = require('../../datadog-shimmer')
 const {
   channel,
-  addHook
+  addHook,
 } = require('./helpers/instrument')
 
 const patched = new WeakSet()

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

@@ -1,11 +1,11 @@
 'use strict'
 
-const tracingChannel = require('dc-polyfill').tracingChannel
+const { tracingChannel } = /** @type {import('node:diagnostics_channel')} */ (require('dc-polyfill'))
 
 const shimmer = require('../../datadog-shimmer')
 const {
   addHook,
-  channel
+  channel,
 } = require('./helpers/instrument')
 
 const serverCh = tracingChannel('ws:server:connect')
@@ -13,9 +13,53 @@ const producerCh = tracingChannel('ws:send')
 const receiverCh = tracingChannel('ws:receive')
 const closeCh = tracingChannel('ws:close')
 const emitCh = channel('tracing:ws:server:connect:emit')
+const setSocketCh = channel('tracing:ws:server:connect:setSocket')
 // TODO: Add a error channel / handle error events properly.
 
-const eventHandlerMap = new WeakMap()
+/**
+ * @typedef {object} WebSocketServerPrototype
+ * @property {(...args: unknown[]) => unknown} handleUpgrade
+ * @property {(...args: unknown[]) => unknown} emit
+ */
+
+/**
+ * @typedef {{ prototype: WebSocketServerPrototype }} WebSocketServerClass
+ */
+
+/**
+ * @typedef {object} WebSocketPrototype
+ * @property {(...args: unknown[]) => unknown} send
+ * @property {(...args: unknown[]) => unknown} close
+ * @property {(...args: unknown[]) => unknown} setSocket
+ */
+
+/**
+ * @typedef {{ prototype: WebSocketPrototype }} WebSocketClass
+ */
+
+/**
+ * @typedef {object} ReceiverPrototype
+ * @property {(eventName: string, listener: (...args: unknown[]) => unknown) => unknown} on
+ * @property {(eventName: string, listener: (...args: unknown[]) => unknown) => unknown} addListener
+ */
+
+/**
+ * @typedef {{ prototype: ReceiverPrototype }} ReceiverClass
+ */
+
+/**
+ * @typedef {string | Buffer | ArrayBuffer | ArrayBufferView | Blob | Buffer[]} WebSocketMessageData
+ */
+
+/**
+ * @typedef {object} WebSocketInstance
+ * @property {(...args: unknown[]) => unknown} emit
+ * @property {(eventName: string) => number} [listenerCount]
+ * @property {{ _socket?: unknown } | undefined} [_sender]
+ * @property {unknown} [_receiver]
+ */
+
+let kWebSocketSymbol
 
 function wrapHandleUpgrade (handleUpgrade) {
   return function () {
@@ -41,7 +85,9 @@ function wrapHandleUpgrade (handleUpgrade) {
 
 function wrapSend (send) {
   return function wrappedSend (...args) {
-    if (!producerCh.start.hasSubscribers) return send.apply(this, arguments)
+    if (!producerCh.start.hasSubscribers) {
+      return send.apply(this, arguments)
+    }
 
     const [data, options, cb] = arguments
 
@@ -55,7 +101,9 @@ function wrapSend (send) {
 
 function createWrapEmit (emit) {
   return function (title, headers, req) {
-    if (!serverCh.start.hasSubscribers || title !== 'headers') return emit.apply(this, arguments)
+    if (!serverCh.start.hasSubscribers || title !== 'headers') {
+      return emit.apply(this, arguments)
+    }
 
     const ctx = { req }
     ctx.req.resStatus = headers[0].split(' ')[1]
@@ -70,35 +118,42 @@ function createWrapEmit (emit) {
   }
 }
 
-function createWrappedHandler (handler) {
-  return shimmer.wrapFunction(handler, originalHandler => function (data, binary) {
-    const byteLength = dataLength(data)
+/**
+ * @param {Function} setSocket
+ * @returns {(...args: unknown[]) => unknown}
+ */
+/**
+ * @param {Function} on
+ * @returns {(...args: unknown[]) => unknown}
+ */
+function wrapReceiverOn (on) {
+  return function wrappedOn (eventName, handler) {
+    if (eventName !== 'message' || typeof handler !== 'function') {
+      return on.apply(this, arguments)
+    }
 
-    const ctx = { data, binary, socket: this._sender?._socket, byteLength }
+    const wrappedHandler = function (data, isBinary) {
+      if (!receiverCh.start.hasSubscribers || !kWebSocketSymbol) {
+        return handler.call(this, data, isBinary)
+      }
 
-    return receiverCh.traceSync(originalHandler, ctx, this, data, binary)
-  })
-}
+      const websocket = /** @type {WebSocketInstance | undefined} */ (this[kWebSocketSymbol])
+      // Avoid receive spans when no one listens to messages.
+      if (websocket && typeof websocket.listenerCount === 'function' && websocket.listenerCount('message') === 0) {
+        return handler.call(this, data, isBinary)
+      }
+      const socket = websocket?._sender?._socket
+      if (!socket) {
+        return handler.call(this, data, isBinary)
+      }
 
-function wrapListener (originalOn) {
-  return function (eventName, handler) {
-    if (eventName === 'message') {
-      // Prevent multiple wrapping of the same handler in case the user adds the listener multiple times
-      const wrappedHandler = eventHandlerMap.get(handler) ?? createWrappedHandler(handler)
-      eventHandlerMap.set(handler, wrappedHandler)
-      return originalOn.call(this, eventName, wrappedHandler)
-    }
-    return originalOn.apply(this, arguments)
-  }
-}
+      const byteLength = dataLength(/** @type {WebSocketMessageData} */ (data))
+      const ctx = { data, binary: isBinary, socket, byteLength }
 
-function removeListener (originalOff) {
-  return function (eventName, handler) {
-    if (eventName === 'message') {
-      const wrappedHandler = eventHandlerMap.get(handler)
-      return originalOff.call(this, eventName, wrappedHandler)
+      return receiverCh.traceSync(handler, ctx, this, data, isBinary)
     }
-    return originalOff.apply(this, arguments)
+
+    return on.call(this, eventName, wrappedHandler)
   }
 }
 
@@ -119,31 +174,72 @@ function wrapClose (close) {
 addHook({
   name: 'ws',
   file: 'lib/websocket-server.js',
-  versions: ['>=8.0.0']
-}, ws => {
+  versions: ['>=8.0.0'],
+}, moduleExports => {
+  const ws = /** @type {WebSocketServerClass} */ (moduleExports)
   shimmer.wrap(ws.prototype, 'handleUpgrade', wrapHandleUpgrade)
   shimmer.wrap(ws.prototype, 'emit', createWrapEmit)
   return ws
 })
 
+/**
+ * Prevent internal event handlers (data, close, etc.) registered by the ws library to
+ * capture the connection span in their async context. Otherwise, the
+ * finished connection span is retained for the entire lifetime of the WebSocket
+ * (via ACF -> handle -> WeakMap).
+ *
+ * @param {Function} setSocket
+ * @returns {(...args: unknown[]) => unknown}
+ */
+function wrapSetSocket (setSocket) {
+  return function wrappedSetSocket (...args) {
+    if (!setSocketCh.hasSubscribers) {
+      return setSocket.apply(this, args)
+    }
+    return setSocketCh.runStores({}, () => {
+      return setSocket.apply(this, args)
+    })
+  }
+}
+
 addHook({
   name: 'ws',
   file: 'lib/websocket.js',
-  versions: ['>=8.0.0']
-}, ws => {
+  versions: ['>=8.0.0'],
+}, moduleExports => {
+  const ws = /** @type {WebSocketClass} */ (moduleExports)
+  shimmer.wrap(ws.prototype, 'setSocket', wrapSetSocket)
   shimmer.wrap(ws.prototype, 'send', wrapSend)
   shimmer.wrap(ws.prototype, 'close', wrapClose)
 
-  // TODO: Do not wrap these methods. Instead, add a listener to the websocket instance when one is created.
-  // That way it avoids producing too many spans for the same websocket instance and less user code is impacted.
-  shimmer.wrap(ws.prototype, 'on', wrapListener)
-  shimmer.wrap(ws.prototype, 'addListener', wrapListener)
-  shimmer.wrap(ws.prototype, 'off', removeListener)
-  shimmer.wrap(ws.prototype, 'removeListener', removeListener)
-
   return ws
 })
 
+addHook({
+  name: 'ws',
+  file: 'lib/constants.js',
+  versions: ['>=8.0.0'],
+}, moduleExports => {
+  const constants = /** @type {{ kWebSocket?: symbol }} */ (moduleExports)
+  kWebSocketSymbol = constants.kWebSocket
+  return constants
+})
+
+addHook({
+  name: 'ws',
+  file: 'lib/receiver.js',
+  versions: ['>=8.0.0'],
+}, moduleExports => {
+  const Receiver = /** @type {ReceiverClass} */ (moduleExports)
+  shimmer.wrap(Receiver.prototype, 'on', wrapReceiverOn)
+  shimmer.wrap(Receiver.prototype, 'addListener', wrapReceiverOn)
+  return Receiver
+})
+
+/**
+ * @param {WebSocketMessageData} data
+ * @returns {number}
+ */
 function dataLength (data) {
   if (typeof data === 'string') {
     return Buffer.byteLength(data)
@@ -151,5 +247,18 @@ function dataLength (data) {
   if (data instanceof Blob) {
     return data.size
   }
-  return data?.length ?? 0
+  if (ArrayBuffer.isView(data)) {
+    return data.byteLength
+  }
+  if (data instanceof ArrayBuffer) {
+    return data.byteLength
+  }
+  let total = 0
+  if (Array.isArray(data)) {
+    const chunks = /** @type {Buffer[]} */ (data)
+    for (const chunk of chunks) {
+      total += chunk.length
+    }
+  }
+  return total
 }

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

@@ -26,7 +26,7 @@ class AerospikePlugin extends DatabasePlugin {
       type: 'aerospike',
       kind: 'client',
       resource: resourceName,
-      meta
+      meta,
     }, false)
 
     ctx.parentStore = store
@@ -85,7 +85,7 @@ function getMetaForIndex (ns, set, bin, index) {
     [AEROSPIKE_PEER_SERVICE]: ns,
     'aerospike.setname': set,
     'aerospike.bin': bin,
-    'aerospike.index': index
+    'aerospike.index': index,
   }
 }
 
@@ -94,7 +94,7 @@ function getMetaForKey (ns, set, key) {
     'aerospike.key': `${ns}:${set}:${key}`,
     [AEROSPIKE_PEER_SERVICE]: ns,
     'aerospike.setname': set,
-    'aerospike.userkey': key
+    'aerospike.userkey': key,
   }
 }
 
@@ -102,7 +102,7 @@ function getMetaForQuery (queryObj) {
   const { ns, set } = queryObj
   return {
     [AEROSPIKE_PEER_SERVICE]: ns,
-    'aerospike.setname': set
+    'aerospike.setname': set,
   }
 }
 

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

@@ -9,7 +9,7 @@ class VercelAIPlugin extends CompositePlugin {
   static get plugins () {
     return {
       llmobs: VercelAILLMObsPlugin,
-      tracing: VercelAITracingPlugin
+      tracing: VercelAITracingPlugin,
     }
   }
 }

package/packages/datadog-plugin-ai/src/tracing.js

@@ -17,8 +17,8 @@ class VercelAITracingPlugin extends TracingPlugin {
       meta: {
         'resource.name': attributes['resource.name'] ?? name,
         'ai.request.model': model,
-        'ai.request.model_provider': modelProvider
-      }
+        'ai.request.model_provider': modelProvider,
+      },
     }, ctx)
 
     return ctx.currentStore