dd-trace 5.101.0 → 5.103.0

package/ext/exporters.js

@@ -10,4 +10,5 @@ module.exports = {
   MOCHA_WORKER: 'mocha_worker',
   PLAYWRIGHT_WORKER: 'playwright_worker',
   VITEST_WORKER: 'vitest_worker',
+  ELECTRON: 'electron',
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dd-trace",
-  "version": "5.101.0",
+  "version": "5.103.0",
   "description": "Datadog APM tracing client for JavaScript",
   "main": "index.js",
   "typings": "index.d.ts",
@@ -8,6 +8,7 @@
     "env": "bash ./plugin-env",
     "prepare": "cd vendor && npm ci --include=dev",
     "preinstall": "node scripts/preinstall.js",
+    "prepack": "node scripts/release/swap-v5-types.js",
     "bench": "node benchmark/index.js",
     "bench:e2e:test-optimization": "node benchmark/e2e-test-optimization/benchmark-run.js",
     "dependencies:dedupe": "yarn-deduplicate yarn.lock",
@@ -18,8 +19,8 @@
     "type:check": "tsc --noEmit -p tsconfig.dev.json",
     "type:doc:build": "cd docs && yarn && yarn build",
     "type:doc:test": "cd docs && yarn && yarn test",
-    "lint": "node scripts/check_licenses.js && node scripts/check-no-coverage-artifacts.js && node scripts/check-no-mcr-images.js && eslint . --concurrency=auto --max-warnings 0",
-    "lint:fix": "node scripts/check_licenses.js && node scripts/check-no-coverage-artifacts.js && node scripts/check-no-mcr-images.js && eslint . --concurrency=auto --max-warnings 0 --fix",
+    "lint": "node scripts/check_licenses.js && node scripts/check-no-coverage-artifacts.js && node scripts/check-no-mcr-images.js && node scripts/check-docker-image-shas.js && eslint . --concurrency=auto --max-warnings 0",
+    "lint:fix": "node scripts/check_licenses.js && node scripts/check-no-coverage-artifacts.js && node scripts/check-no-mcr-images.js && node scripts/check-docker-image-shas.js && eslint . --concurrency=auto --max-warnings 0 --fix",
     "lint:inspect": "npx @eslint/config-inspector@latest",
     "lint:codeowners": "codeowners-audit",
     "lint:codeowners:ci": "codeowners-audit --glob='**/*.spec.js' --glob='benchmark/sirun/**'",
@@ -78,21 +79,22 @@
     "test:integration:cypress:coverage": "node ./integration-tests/coverage/run-suite.js --timeout 60000 \"integration-tests/cypress/${SPEC:-cypress-*}.spec.js\"",
     "test:integration:debugger": "mocha --timeout 60000 \"integration-tests/debugger/*.spec.js\"",
     "test:integration:debugger:coverage": "node ./integration-tests/coverage/run-suite.js --timeout 60000 \"integration-tests/debugger/*.spec.js\"",
+    "test:integration:electron": "mocha \"integration-tests/electron/*.spec.js\"",
     "test:integration:esbuild": "mocha --timeout 60000 \"integration-tests/esbuild/*.spec.js\"",
     "test:integration:esbuild:coverage": "node ./integration-tests/coverage/run-suite.js --timeout 60000 \"integration-tests/esbuild/*.spec.js\"",
     "test:integration:webpack": "mocha --timeout 60000 \"integration-tests/webpack/*.spec.js\"",
     "test:integration:openfeature": "mocha --timeout 60000 \"integration-tests/openfeature/*.spec.js\"",
     "test:integration:openfeature:coverage": "node ./integration-tests/coverage/run-suite.js --timeout 60000 \"integration-tests/openfeature/*.spec.js\"",
-    "test:integration:jest": "mocha --timeout 60000 \"integration-tests/jest/*.spec.js\"",
-    "test:integration:jest:coverage": "node ./integration-tests/coverage/run-suite.js --timeout 60000 \"integration-tests/jest/*.spec.js\"",
+    "test:integration:jest": "mocha --timeout 60000 \"integration-tests/jest/${SPEC:-jest*}.spec.js\"",
+    "test:integration:jest:coverage": "node ./integration-tests/coverage/run-suite.js --timeout 60000 \"integration-tests/jest/${SPEC:-jest*}.spec.js\"",
     "test:integration:mocha": "mocha --timeout 60000 \"integration-tests/mocha/*.spec.js\"",
     "test:integration:mocha:coverage": "node ./integration-tests/coverage/run-suite.js --timeout 60000 \"integration-tests/mocha/*.spec.js\"",
     "test:integration:playwright": "mocha --timeout 60000 \"integration-tests/playwright/${SPEC:-playwright-*}.spec.js\"",
     "test:integration:playwright:coverage": "node ./integration-tests/coverage/run-suite.js --timeout 60000 \"integration-tests/playwright/${SPEC:-playwright-*}.spec.js\"",
     "test:integration:selenium": "mocha --timeout 60000 \"integration-tests/selenium/*.spec.js\"",
     "test:integration:selenium:coverage": "node ./integration-tests/coverage/run-suite.js --timeout 60000 \"integration-tests/selenium/*.spec.js\"",
-    "test:integration:vitest": "mocha --timeout 60000 \"integration-tests/vitest/*.spec.js\"",
-    "test:integration:vitest:coverage": "node ./integration-tests/coverage/run-suite.js --timeout 60000 \"integration-tests/vitest/*.spec.js\"",
+    "test:integration:vitest": "mocha --timeout 60000 \"integration-tests/vitest/${SPEC:-vitest*}.spec.js\"",
+    "test:integration:vitest:coverage": "node ./integration-tests/coverage/run-suite.js --timeout 60000 \"integration-tests/vitest/${SPEC:-vitest*}.spec.js\"",
     "test:integration:testopt": "mocha --timeout 120000 \"integration-tests/ci-visibility/*.spec.js\"",
     "test:integration:testopt:coverage": "node ./integration-tests/coverage/run-suite.js --timeout 120000 \"integration-tests/ci-visibility/*.spec.js\"",
     "test:integration:profiler": "mocha --timeout 180000 \"integration-tests/profiler/*.spec.js\"",
@@ -158,20 +160,20 @@
     "version.js"
   ],
   "dependencies": {
-    "dc-polyfill": "^0.1.10",
+    "dc-polyfill": "^0.1.11",
     "import-in-the-middle": "^3.0.1"
   },
   "optionalDependencies": {
     "@datadog/libdatadog": "0.9.3",
     "@datadog/native-appsec": "11.0.1",
     "@datadog/native-iast-taint-tracking": "4.1.0",
-    "@datadog/native-metrics": "3.1.1",
-    "@datadog/openfeature-node-server": "^1.1.2",
+    "@datadog/native-metrics": "3.1.2",
+    "@datadog/openfeature-node-server": "1.1.2",
     "@datadog/pprof": "5.14.1",
     "@datadog/wasm-js-rewriter": "5.0.1",
     "@opentelemetry/api": ">=1.0.0 <1.10.0",
     "@opentelemetry/api-logs": "<1.0.0",
-    "oxc-parser": "^0.128.0"
+    "oxc-parser": "^0.129.0"
   },
   "devDependencies": {
     "@actions/core": "^3.0.1",
@@ -186,18 +188,19 @@
     "@types/mocha": "^10.0.10",
     "@types/node": "^18.19.106",
     "@types/sinon": "^21.0.1",
-    "axios": "^1.15.2",
+    "axios": "^1.16.0",
     "benchmark": "^2.1.4",
     "body-parser": "^2.2.2",
     "bun": "1.3.13",
     "codeowners-audit": "^2.9.0",
     "eslint": "^9.39.2",
-    "eslint-plugin-cypress": "^6.4.0",
+    "eslint-plugin-cypress": "^6.4.1",
     "eslint-plugin-import": "^2.32.0",
     "eslint-plugin-jsdoc": "^62.9.0",
     "eslint-plugin-mocha": "^11.2.0",
-    "eslint-plugin-n": "^17.23.2",
+    "eslint-plugin-n": "^18.0.1",
     "eslint-plugin-promise": "^7.3.0",
+    "eslint-plugin-sonarjs": "^4.0.3",
     "eslint-plugin-unicorn": "^64.0.0",
     "express": "^5.1.0",
     "glob": "^10.4.5",
@@ -211,7 +214,7 @@
     "mocha-junit-reporter": "^2.2.1",
     "mocha-multi-reporters": "^1.5.1",
     "multer": "^2.1.1",
-    "nock": "^13.5.6",
+    "nock": "^14.0.15",
     "node-preload": "^0.2.1",
     "nyc": "^18.0.0",
     "octokit": "^5.0.3",
@@ -221,11 +224,11 @@
     "retry": "^0.13.1",
     "semifies": "^1.0.0",
     "semver": "^7.7.2",
-    "sinon": "^21.1.2",
+    "sinon": "^22.0.0",
     "tiktoken": "^1.0.21",
     "typescript": "^6.0.3",
     "workerpool": "^10.0.2",
-    "yaml": "^2.8.3",
+    "yaml": "^2.8.4",
     "yarn-deduplicate": "^6.0.2"
   }
 }

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

@@ -83,9 +83,9 @@ function getSource (url, { format }) {
  *
  * @param {object} moduleData
  * @param {string} moduleData.path
- * @param {boolean} [moduleData.internal = false]
+ * @param {boolean} [moduleData.internal]
  * @param {object} moduleData.context
- * @param {boolean} [moduleData.excludeDefault = false]
+ * @param {boolean} [moduleData.excludeDefault]
  * @returns {Promise<Map>}
  */
 async function processModule ({ path, internal = false, context, excludeDefault = false }) {

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

@@ -12,8 +12,8 @@ const ch = tracingChannel('apm:aerospike:command')
 function wrapCreateCommand (createCommand) {
   if (typeof createCommand !== 'function') return createCommand
 
-  return function commandWithTrace () {
-    const CommandClass = createCommand.apply(this, arguments)
+  return function commandWithTrace (...args) {
+    const CommandClass = createCommand.apply(this, args)
 
     if (!CommandClass) return CommandClass
 

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

@@ -20,7 +20,7 @@ const wrappedModels = new WeakSet()
  */
 function publishToAIGuard (messages) {
   return new Promise((resolve, reject) => {
-    aiguardChannel.publish({ messages, resolve, reject })
+    aiguardChannel.publish({ messages, integration: 'ai', resolve, reject })
   })
 }
 
@@ -119,17 +119,17 @@ function wrapTracer (tracer) {
   tracers.add(tracer)
 
   shimmer.wrap(tracer, 'startActiveSpan', function (startActiveSpan) {
-    return function () {
-      const name = arguments[0]
-      const options = arguments.length > 2 ? (arguments[1] ?? {}) : {} // startActiveSpan(name, fn)
-      const cb = arguments[arguments.length - 1]
+    return function (...args) {
+      const name = args[0]
+      const options = args.length > 2 ? (args[1] ?? {}) : {} // startActiveSpan(name, fn)
+      const cb = args[args.length - 1]
 
       const ctx = {
         name,
         attributes: options.attributes ?? {},
       }
 
-      arguments[arguments.length - 1] = shimmer.wrapFunction(cb, function (originalCb) {
+      args[args.length - 1] = shimmer.wrapFunction(cb, function (originalCb) {
         return function (span) {
           // the below is necessary in the case that the span is vercel ai's noopSpan.
           // while we don't want to patch the noopSpan more than once, we do want to treat each as a
@@ -138,9 +138,9 @@ function wrapTracer (tracer) {
           const freshSpan = Object.create(span) // TODO: does this cause memory leaks?
 
           shimmer.wrap(freshSpan, 'end', function (spanEnd) {
-            return function () {
+            return function (...args) {
               vercelAiTracingChannel.asyncEnd.publish(ctx)
-              return spanEnd.apply(this, arguments)
+              return spanEnd.apply(this, args)
             }
           })
 
@@ -164,7 +164,7 @@ function wrapTracer (tracer) {
       })
 
       return vercelAiTracingChannel.start.runStores(ctx, () => {
-        const result = startActiveSpan.apply(this, arguments)
+        const result = startActiveSpan.apply(this, args)
         vercelAiTracingChannel.end.publish(ctx)
         return result
       })

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

@@ -35,14 +35,13 @@ addHook({ name: 'amqplib', file: 'lib/defs.js', versions: [MIN_VERSION] }, defs
 addHook({ name: 'amqplib', file: 'lib/channel_model.js', versions: [MIN_VERSION] }, x => {
   shimmer.wrap(x.Channel.prototype, 'get', getMessage => function (queue, options) {
     return getMessage.apply(this, arguments).then(message => {
-      if (message === null) {
-        return message
+      if (message !== null) {
+        const ctx = { method: 'basic.get', message, fields: message.fields, queue }
+        consumeStartCh.runStores(ctx, () => {
+          // finish right away
+          consumeFinishCh.publish(ctx)
+        })
       }
-      const ctx = { method: 'basic.get', message, fields: message.fields, queue }
-      consumeStartCh.runStores(ctx, () => {
-        // finish right away
-        consumeFinishCh.publish(ctx)
-      })
       return message
     })
   })

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

@@ -8,10 +8,10 @@ const anthropicTracingChannel = tracingChannel('apm:anthropic:request')
 const onStreamedChunkCh = channel('apm:anthropic:request:chunk')
 
 function wrapStreamIterator (iterator, ctx) {
-  return function () {
-    const itr = iterator.apply(this, arguments)
-    shimmer.wrap(itr, 'next', next => function () {
-      return next.apply(this, arguments)
+  return function (...args) {
+    const itr = iterator.apply(this, args)
+    shimmer.wrap(itr, 'next', next => function (...args) {
+      return next.apply(this, args)
         .then(res => {
           const { done, value: chunk } = res
           onStreamedChunkCh.publish({ ctx, chunk, done })
@@ -33,12 +33,12 @@ function wrapStreamIterator (iterator, ctx) {
 }
 
 function wrapCreate (create) {
-  return function () {
+  return function (...args) {
     if (!anthropicTracingChannel.start.hasSubscribers) {
-      return create.apply(this, arguments)
+      return create.apply(this, args)
     }
 
-    const options = arguments[0]
+    const options = args[0]
     const stream = options.stream
 
     const ctx = { options, resource: 'create', baseUrl: this._client?.baseURL }
@@ -46,14 +46,14 @@ function wrapCreate (create) {
     return anthropicTracingChannel.start.runStores(ctx, () => {
       let apiPromise
       try {
-        apiPromise = create.apply(this, arguments)
+        apiPromise = create.apply(this, args)
       } catch (error) {
         finish(ctx, null, error)
         throw error
       }
 
-      shimmer.wrap(apiPromise, 'parse', parse => function () {
-        return parse.apply(this, arguments)
+      shimmer.wrap(apiPromise, 'parse', parse => function (...args) {
+        return parse.apply(this, args)
           .then(response => {
             if (stream) {
               shimmer.wrap(response, Symbol.asyncIterator, iterator => wrapStreamIterator(iterator, ctx))

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

@@ -10,9 +10,9 @@ addHook({ name: 'apollo-server-core', file: 'dist/runHttpQuery.js', versions: ['
   const HttpQueryError = runHttpQueryModule.HttpQueryError
 
   shimmer.wrap(runHttpQueryModule, 'runHttpQuery', function wrapRunHttpQuery (originalRunHttpQuery) {
-    return function runHttpQuery () {
+    return function runHttpQuery (...args) {
       if (!requestChannel.start.hasSubscribers) {
-        return originalRunHttpQuery.apply(this, arguments)
+        return originalRunHttpQuery.apply(this, args)
       }
 
       const abortController = new AbortController()
@@ -22,7 +22,7 @@ addHook({ name: 'apollo-server-core', file: 'dist/runHttpQuery.js', versions: ['
         originalRunHttpQuery,
         { abortController, abortData },
         this,
-        ...arguments)
+        ...args)
 
       const abortPromise = new Promise((resolve, reject) => {
         abortController.signal.addEventListener('abort', (event) => {

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

@@ -13,9 +13,9 @@ const requestChannel = dc.tracingChannel('datadog:apollo:request')
 let HeaderMap
 
 function wrapExecuteHTTPGraphQLRequest (originalExecuteHTTPGraphQLRequest) {
-  return function executeHTTPGraphQLRequest () {
+  return function executeHTTPGraphQLRequest (...args) {
     if (!HeaderMap || !requestChannel.start.hasSubscribers) {
-      return originalExecuteHTTPGraphQLRequest.apply(this, arguments)
+      return originalExecuteHTTPGraphQLRequest.apply(this, args)
     }
 
     const abortController = new AbortController()
@@ -25,7 +25,7 @@ function wrapExecuteHTTPGraphQLRequest (originalExecuteHTTPGraphQLRequest) {
       originalExecuteHTTPGraphQLRequest,
       { abortController, abortData },
       this,
-      ...arguments)
+      ...args)
 
     const abortPromise = new Promise((resolve, reject) => {
       abortController.signal.addEventListener('abort', (event) => {
@@ -89,10 +89,10 @@ function wrapEmit (emit) {
 }
 
 function wrapListen (originalListen) {
-  return function wrappedListen () {
+  return function wrappedListen (...args) {
     shimmer.wrap(this, 'emit', wrapEmit)
 
-    return originalListen.apply(this, arguments)
+    return originalListen.apply(this, args)
   }
 }
 

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

@@ -8,21 +8,21 @@ const serializeChannel = dc.channel('apm:avsc:serialize-start')
 const deserializeChannel = dc.channel('apm:avsc:deserialize-end')
 
 function wrapSerialization (Type) {
-  shimmer.wrap(Type.prototype, 'toBuffer', original => function () {
+  shimmer.wrap(Type.prototype, 'toBuffer', original => function (...args) {
     if (!serializeChannel.hasSubscribers) {
-      return original.apply(this, arguments)
+      return original.apply(this, args)
     }
     serializeChannel.publish({ messageClass: this })
-    return original.apply(this, arguments)
+    return original.apply(this, args)
   })
 }
 
 function wrapDeserialization (Type) {
-  shimmer.wrap(Type.prototype, 'fromBuffer', original => function () {
+  shimmer.wrap(Type.prototype, 'fromBuffer', original => function (...args) {
     if (!deserializeChannel.hasSubscribers) {
-      return original.apply(this, arguments)
+      return original.apply(this, args)
     }
-    const result = original.apply(this, arguments)
+    const result = original.apply(this, args)
     deserializeChannel.publish({ messageClass: result })
     return result
   })