dd-trace 5.80.0 → 5.82.0

package/packages/datadog-esbuild/index.js

@@ -2,13 +2,18 @@
 
 /* eslint-disable no-console */
 
+const { execSync } = require('child_process')
+const fs = require('fs')
+const RAW_BUILTINS = require('module').builtinModules
+const path = require('path')
+const { pathToFileURL, fileURLToPath } = require('url')
+
 const instrumentations = require('../datadog-instrumentations/src/helpers/instrumentations.js')
-const hooks = require('../datadog-instrumentations/src/helpers/hooks.js')
+
 const extractPackageAndModulePath = require(
   '../datadog-instrumentations/src/helpers/extract-package-and-module-path.js'
 )
-
-const { pathToFileURL, fileURLToPath } = require('url')
+const hooks = require('../datadog-instrumentations/src/helpers/hooks.js')
 const { processModule, isESMFile } = require('./src/utils.js')
 
 const ESM_INTERCEPTED_SUFFIX = '._dd_esbuild_intercepted'
@@ -36,11 +41,7 @@ for (const instrumentation of Object.values(instrumentations)) {
   }
 }
 
-const RAW_BUILTINS = require('module').builtinModules
 const CHANNEL = 'dd-trace:bundler:load'
-const path = require('path')
-const fs = require('fs')
-const { execSync } = require('child_process')
 
 const builtins = new Set()
 
@@ -245,28 +246,45 @@ ${build.initialOptions.banner.js}`
         }
       }
 
-      const packageJson = JSON.parse(fs.readFileSync(pathToPackageJson).toString())
+      try {
+        const packageJson = JSON.parse(fs.readFileSync(pathToPackageJson).toString())
 
-      const isESM = isESMFile(fullPathToModule, pathToPackageJson, packageJson)
-      if (isESM && !interceptedESMModules.has(fullPathToModule)) {
-        fullPathToModule += ESM_INTERCEPTED_SUFFIX
-      }
+        const isESM = isESMFile(fullPathToModule, pathToPackageJson, packageJson)
+        if (isESM && !interceptedESMModules.has(fullPathToModule)) {
+          fullPathToModule += ESM_INTERCEPTED_SUFFIX
+        }
 
-      if (DEBUG) console.log(`RESOLVE: ${args.path}@${packageJson.version}`)
+        if (DEBUG) console.log(`RESOLVE: ${args.path}@${packageJson.version}`)
 
-      // https://esbuild.github.io/plugins/#on-resolve-arguments
-      return {
-        path: fullPathToModule,
-        pluginData: {
-          version: packageJson.version,
-          pkg: extracted.pkg,
-          path: extracted.path,
-          full: fullPathToModule,
-          raw: args.path,
-          pkgOfInterest: true,
-          kind: args.kind,
-          internal,
-          isESM
+        // https://esbuild.github.io/plugins/#on-resolve-arguments
+        return {
+          path: fullPathToModule,
+          pluginData: {
+            version: packageJson.version,
+            pkg: extracted.pkg,
+            path: extracted.path,
+            full: fullPathToModule,
+            raw: args.path,
+            pkgOfInterest: true,
+            kind: args.kind,
+            internal,
+            isESM
+          }
+        }
+      } catch (e) {
+        // Skip vendored dependencies which never have a `package.json`. This
+        // will use the default resolve logic of ESBuild which is what we want
+        // since those files should be treated as regular files and not modules
+        // even though they are in a `node_modules` folder.
+        if (e.code === 'ENOENT') {
+          if (DEBUG) {
+            console.log([
+              'Skipping `package.json` lookup.',
+              'This usually means the package was vendored but could indicate an issue otherwise.'
+            ].join(' '))
+          }
+        } else {
+          throw e
         }
       }
     }

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

@@ -7,8 +7,20 @@ const path = require('node:path')
 const { NODE_MAJOR, NODE_MINOR } = require('../../../version.js')
 
 const getExportsImporting = (url) => import(url).then(Object.keys)
+let getExportsModulePromise
+
+const loadGetExportsModule = () => {
+  if (!getExportsModulePromise) {
+    getExportsModulePromise = import('import-in-the-middle/lib/get-exports.mjs')
+  }
+  return getExportsModulePromise
+}
+
 const getExports = NODE_MAJOR >= 20 || (NODE_MAJOR === 18 && NODE_MINOR >= 19)
-  ? require('import-in-the-middle/lib/get-exports.js')
+  ? async (srcUrl, context, getSource) => {
+    const mod = await loadGetExportsModule()
+    return mod.getExports(srcUrl, context, getSource)
+  }
   : getExportsImporting
 
 function isStarExportLine (line) {
@@ -168,7 +180,7 @@ async function processModule ({ path, internal, context, excludeDefault }) {
  *
  * @param {string} fullPathToModule File to analize
  * @param {string} [modulePackageJsonPath] Path of the package.json
- * @param {Object} [packageJson] The content of the module package.json
+ * @param {object} [packageJson] The content of the module package.json
  * @returns {boolean}
  */
 function isESMFile (fullPathToModule, modulePackageJsonPath, packageJson = {}) {

package/packages/datadog-instrumentations/index.js

@@ -2,3 +2,4 @@
 
 require('./src/helpers/bundler-register')
 require('./src/helpers/register')
+require('./src/helpers/rewriter/loader')

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

@@ -1,11 +1,12 @@
 'use strict'
 
+const tracingChannel = require('dc-polyfill').tracingChannel
+
+const shimmer = require('../../datadog-shimmer')
 const {
   addHook
 } = require('./helpers/instrument')
-const shimmer = require('../../datadog-shimmer')
 
-const tracingChannel = require('dc-polyfill').tracingChannel
 const ch = tracingChannel('apm:aerospike:command')
 
 function wrapCreateCommand (createCommand) {

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

@@ -1,9 +1,9 @@
 'use strict'
 
-const { addHook } = require('./helpers/instrument')
+const { channel, tracingChannel } = require('dc-polyfill')
 const shimmer = require('../../datadog-shimmer')
+const { addHook } = require('./helpers/instrument')
 
-const { channel, tracingChannel } = require('dc-polyfill')
 const toolCreationChannel = channel('dd-trace:vercel-ai:tool')
 
 const TRACED_FUNCTIONS = {

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

@@ -1,10 +1,10 @@
 'use strict'
 
+const shimmer = require('../../datadog-shimmer')
 const {
   channel,
   addHook
 } = require('./helpers/instrument')
-const shimmer = require('../../datadog-shimmer')
 
 addHook({ name: 'amqp10', file: 'lib/sender_link.js', versions: ['>=3'] }, SenderLink => {
   const startCh = channel('apm:amqp10:send:start')

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

@@ -1,13 +1,13 @@
 'use strict'
 
-const {
-  channel,
-  addHook
-} = require('./helpers/instrument')
 const kebabCase = require('../../datadog-core/src/utils/src/kebabcase')
 const shimmer = require('../../datadog-shimmer')
 
 const { NODE_MAJOR, NODE_MINOR } = require('../../../version')
+const {
+  channel,
+  addHook
+} = require('./helpers/instrument')
 const MIN_VERSION = ((NODE_MAJOR > 22) || (NODE_MAJOR === 22 && NODE_MINOR >= 2)) ? '>=0.5.3' : '>=0.5.0'
 
 const commandStartCh = channel('apm:amqplib:command:start')

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

@@ -1,8 +1,8 @@
 'use strict'
 
-const { addHook } = require('./helpers/instrument')
-const shimmer = require('../../datadog-shimmer')
 const { channel, tracingChannel } = require('dc-polyfill')
+const shimmer = require('../../datadog-shimmer')
+const { addHook } = require('./helpers/instrument')
 
 const anthropicTracingChannel = tracingChannel('apm:anthropic:request')
 const onStreamedChunkCh = channel('apm:anthropic:request:chunk')
@@ -112,4 +112,16 @@ for (const extension of extensions) {
 
     return exports
   })
+
+  addHook({
+    name: '@anthropic-ai/sdk',
+    file: `resources/beta/messages/messages.${extension}`,
+    versions: ['>=0.33.0']
+  }, exports => {
+    const Messages = exports.Messages
+
+    shimmer.wrap(Messages.prototype, 'create', wrapCreate)
+
+    return exports
+  })
 }

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

@@ -1,8 +1,8 @@
 'use strict'
 
-const { addHook } = require('./helpers/instrument')
-const shimmer = require('../../datadog-shimmer')
 const dc = require('dc-polyfill')
+const shimmer = require('../../datadog-shimmer')
+const { addHook } = require('./helpers/instrument')
 
 const requestChannel = dc.tracingChannel('datadog:apollo-server-core:request')
 

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

@@ -2,8 +2,8 @@
 
 const dc = require('dc-polyfill')
 
-const { addHook } = require('./helpers/instrument')
 const shimmer = require('../../datadog-shimmer')
+const { addHook } = require('./helpers/instrument')
 
 const graphqlMiddlewareChannel = dc.tracingChannel('datadog:apollo:middleware')
 const apolloHttpServerChannel = dc.tracingChannel('datadog:apollo:httpserver')

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

@@ -1,11 +1,12 @@
 'use strict'
 
+const tracingChannel = require('dc-polyfill').tracingChannel
+
+const shimmer = require('../../datadog-shimmer')
 const {
   addHook,
   channel
 } = require('./helpers/instrument')
-const shimmer = require('../../datadog-shimmer')
-const tracingChannel = require('dc-polyfill').tracingChannel
 
 const CHANNELS = {
   'gateway.request': tracingChannel('apm:apollo:gateway:request'),

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

@@ -1,9 +1,9 @@
 'use strict'
 
+const dc = require('dc-polyfill')
 const shimmer = require('../../datadog-shimmer')
 const { addHook } = require('./helpers/instrument')
 
-const dc = require('dc-polyfill')
 const serializeChannel = dc.channel('apm:avsc:serialize-start')
 const deserializeChannel = dc.channel('apm:avsc:deserialize-end')
 

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

@@ -1,7 +1,9 @@
 'use strict'
 
-const { channel, addHook } = require('./helpers/instrument')
 const shimmer = require('../../datadog-shimmer')
+const { channel, addHook } = require('./helpers/instrument')
+
+const patchedClientConfigProtocols = new WeakSet()
 
 function wrapRequest (send) {
   return function wrappedRequest (cb) {
@@ -67,12 +69,14 @@ function wrapSmithySend (send) {
 
     if (typeof command.deserialize === 'function') {
       shimmer.wrap(command, 'deserialize', deserialize => wrapDeserialize(deserialize, channelSuffix))
-    } else if (this.config?.protocol?.deserializeResponse) {
+    } else if (this.config?.protocol?.deserializeResponse && !patchedClientConfigProtocols.has(this.config.protocol)) {
       shimmer.wrap(
         this.config.protocol,
         'deserializeResponse',
         deserializeResponse => wrapDeserialize(deserializeResponse, channelSuffix, 2)
       )
+
+      patchedClientConfigProtocols.add(this.config.protocol)
     }
 
     const ctx = {

package/packages/datadog-instrumentations/src/azure-event-hubs.js

@@ -1,10 +1,10 @@
 'use strict'
 
+const dc = require('dc-polyfill')
+const shimmer = require('../../datadog-shimmer')
 const {
   addHook
 } = require('./helpers/instrument')
-const shimmer = require('../../datadog-shimmer')
-const dc = require('dc-polyfill')
 
 const producerCh = dc.tracingChannel('apm:azure-event-hubs:send')
 
@@ -13,6 +13,7 @@ addHook({
   versions: ['>=6.0.0']
 }, obj => {
   const EventHubProducerClient = obj.EventHubProducerClient
+
   shimmer.wrap(EventHubProducerClient.prototype, 'createBatch',
     createBatch => async function () {
       const batch = await createBatch.apply(this, arguments)
@@ -20,7 +21,7 @@ addHook({
         tryAdd => function (eventData) {
           const config = this._context.config
           const functionName = tryAdd.name
-          return producerCh.tracePromise(
+          return producerCh.traceSync(
             tryAdd,
             { functionName, eventData, batch: this, config },
             this, ...arguments)

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

@@ -1,10 +1,10 @@
 'use strict'
 
+const dc = require('dc-polyfill')
+const shimmer = require('../../datadog-shimmer')
 const {
   addHook
 } = require('./helpers/instrument')
-const shimmer = require('../../datadog-shimmer')
-const dc = require('dc-polyfill')
 
 const azureFunctionsChannel = dc.tracingChannel('datadog:azure:functions:invoke')
 

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

@@ -1,12 +1,11 @@
 'use strict'
 
+const dc = require('dc-polyfill')
+const shimmer = require('../../datadog-shimmer')
 const {
   addHook
 } = require('./helpers/instrument')
 
-const shimmer = require('../../datadog-shimmer')
-const dc = require('dc-polyfill')
-
 const producerCh = dc.tracingChannel('apm:azure-service-bus:send')
 const isItDefault = new WeakSet()
 
@@ -38,7 +37,7 @@ addHook({ name: '@azure/service-bus', versions: ['>=7.9.2'] }, (obj) => {
           shimmer.wrap(batch, 'tryAddMessage', tryAddMessage => function (msg) {
             const functionName = tryAddMessage.name
             const config = this._context.config
-            return producerCh.tracePromise(
+            return producerCh.traceSync(
               tryAddMessage, { config, functionName, batch, msg }, this, ...arguments)
           })
           return batch

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

@@ -1,8 +1,8 @@
 'use strict'
 
+const shimmer = require('../../datadog-shimmer')
 const { addHook } = require('./helpers/instrument')
 const { wrapThen } = require('./helpers/promise')
-const shimmer = require('../../datadog-shimmer')
 
 function createGetNewLibraryCopyWrap (originalLib) {
   return function wrapGetNewLibraryCopy (getNewLibraryCopy) {

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

@@ -0,0 +1,11 @@
+// AUTO-GENERATED by dd-compile
+// Orchestrion rewriter handles the actual instrumentation via JSON config.
+// This file registers the module hooks for the rewriter to process.
+
+'use strict'
+
+const { addHook, getHooks } = require('./helpers/instrument')
+
+for (const hook of getHooks('bullmq')) {
+  addHook(hook, exports => exports)
+}

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

@@ -1,10 +1,10 @@
 'use strict'
 
+const shimmer = require('../../datadog-shimmer')
 const {
   channel,
   addHook
 } = require('./helpers/instrument')
-const shimmer = require('../../datadog-shimmer')
 
 addHook({ name: 'bunyan', versions: ['>=1'] }, Logger => {
   const logCh = channel('apm:bunyan:log')

package/packages/datadog-instrumentations/src/cassandra-driver.js

@@ -1,10 +1,10 @@
 'use strict'
 
+const shimmer = require('../../datadog-shimmer')
 const {
   channel,
   addHook
 } = require('./helpers/instrument')
-const shimmer = require('../../datadog-shimmer')
 
 const startCh = channel('apm:cassandra-driver:query:start')
 const finishCh = channel('apm:cassandra-driver:query:finish')

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

@@ -3,11 +3,11 @@
 const { errorMonitor } = require('events')
 const util = require('util')
 
+const dc = require('dc-polyfill')
+const shimmer = require('../../datadog-shimmer')
 const {
   addHook
 } = require('./helpers/instrument')
-const shimmer = require('../../datadog-shimmer')
-const dc = require('dc-polyfill')
 
 const childProcessChannel = dc.tracingChannel('datadog:child_process:execution')
 

package/packages/datadog-instrumentations/src/confluentinc-kafka-javascript.js

@@ -1,12 +1,12 @@
 'use strict'
 
+const shimmer = require('../../datadog-shimmer')
+
+const log = require('../../dd-trace/src/log')
 const {
   addHook,
   channel
 } = require('./helpers/instrument')
-const shimmer = require('../../datadog-shimmer')
-
-const log = require('../../dd-trace/src/log')
 
 // Create channels for Confluent Kafka JavaScript
 const channels = {

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

@@ -1,11 +1,11 @@
 'use strict'
 
 const { errorMonitor } = require('events')
+const shimmer = require('../../datadog-shimmer')
 const {
   channel,
   addHook
 } = require('./helpers/instrument')
-const shimmer = require('../../datadog-shimmer')
 
 function findCallbackIndex (args, lowerbound = 2) {
   for (let i = args.length - 1; i >= lowerbound; i--) {

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

@@ -1,10 +1,10 @@
 'use strict'
 
+const shimmer = require('../../datadog-shimmer')
 const {
   channel,
   addHook
 } = require('./helpers/instrument')
-const shimmer = require('../../datadog-shimmer')
 
 const cryptoHashCh = channel('datadog:crypto:hashing:start')
 const cryptoCipherCh = channel('datadog:crypto:cipher:start')

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

@@ -1,10 +1,20 @@
 'use strict'
-const { createCoverageMap } = require('istanbul-lib-coverage')
 
-const { addHook, channel } = require('./helpers/instrument')
+const { createCoverageMap } = require('../../../vendor/dist/istanbul-lib-coverage')
 const shimmer = require('../../datadog-shimmer')
 const log = require('../../dd-trace/src/log')
 const { getEnvironmentVariable } = require('../../dd-trace/src/config-helper')
+const {
+  getCoveredFilenamesFromCoverage,
+  resetCoverage,
+  mergeCoverage,
+  fromCoverageMapToCoverage,
+  getTestSuitePath,
+  CUCUMBER_WORKER_TRACE_PAYLOAD_CODE,
+  getIsFaultyEarlyFlakeDetection
+} = require('../../dd-trace/src/plugins/util/test')
+const satisfies = require('../../../vendor/dist/semifies')
+const { addHook, channel } = require('./helpers/instrument')
 
 const testStartCh = channel('ci:cucumber:test:start')
 const testRetryCh = channel('ci:cucumber:test:retry')
@@ -34,17 +44,6 @@ const itrSkippedSuitesCh = channel('ci:cucumber:itr:skipped-suites')
 
 const getCodeCoverageCh = channel('ci:nyc:get-coverage')
 
-const {
-  getCoveredFilenamesFromCoverage,
-  resetCoverage,
-  mergeCoverage,
-  fromCoverageMapToCoverage,
-  getTestSuitePath,
-  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')
 }

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

@@ -1,7 +1,7 @@
 'use strict'
 
-const { addHook } = require('./helpers/instrument')
 const { DD_MAJOR } = require('../../../version')
+const { addHook } = require('./helpers/instrument')
 
 // No handler because this is only useful for testing.
 // Cypress plugin does not patch any library.

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

@@ -1,7 +1,7 @@
 'use strict'
 
-const { channel, addHook } = require('./helpers/instrument')
 const shimmer = require('../../datadog-shimmer')
+const { channel, addHook } = require('./helpers/instrument')
 
 const rrtypes = {
   resolveAny: 'ANY',

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

@@ -1,10 +1,10 @@
 'use strict'
 
+const shimmer = require('../../datadog-shimmer')
 const {
   channel,
   addHook
 } = require('./helpers/instrument')
-const shimmer = require('../../datadog-shimmer')
 
 addHook({ name: '@elastic/transport', file: 'lib/Transport.js', versions: ['>=8'] }, (exports) => {
   shimmer.wrap(exports.default.prototype, 'request', createWrapRequest('elasticsearch'))

package/packages/datadog-instrumentations/src/express-mongo-sanitize.js

@@ -1,10 +1,10 @@
 'use strict'
 
+const shimmer = require('../../datadog-shimmer')
 const {
   channel,
   addHook
 } = require('./helpers/instrument')
-const shimmer = require('../../datadog-shimmer')
 
 const sanitizeMethodFinished = channel('datadog:express-mongo-sanitize:sanitize:finish')
 const sanitizeMiddlewareFinished = channel('datadog:express-mongo-sanitize:filter:finish')

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

@@ -1,7 +1,7 @@
 'use strict'
 
-const { createWrapRouterMethod } = require('./router')
 const shimmer = require('../../datadog-shimmer')
+const { createWrapRouterMethod } = require('./router')
 const { addHook, channel, tracingChannel } = require('./helpers/instrument')
 const {
   setRouterMountPath,

package/packages/datadog-instrumentations/src/find-my-way.js

@@ -9,13 +9,13 @@ function wrapOn (on) {
   return function onWithTrace (method, path, opts) {
     const index = typeof opts === 'function' ? 2 : 3
     const handler = arguments[index]
-    const wrapper = shimmer.wrapFunction(handler, handler => function (req) {
-      routeChannel.publish({ req, route: path })
-
-      return handler.apply(this, arguments)
-    })
 
     if (typeof handler === 'function') {
+      const wrapper = shimmer.wrapFunction(handler, handler => function (req) {
+        routeChannel.publish({ req, route: path })
+
+        return handler.apply(this, arguments)
+      })
       arguments[index] = wrapper
     }
 
@@ -24,6 +24,7 @@ function wrapOn (on) {
 }
 
 addHook({ name: 'find-my-way', versions: ['>=1'] }, Router => {
+  // No need to wrap the off method as it would not contain the handler function.
   shimmer.wrap(Router.prototype, 'on', wrapOn)
 
   return Router

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

@@ -1,8 +1,8 @@
 'use strict'
 
 const { errorMonitor } = require('events')
-const { channel, addHook } = require('./helpers/instrument')
 const shimmer = require('../../datadog-shimmer')
+const { channel, addHook } = require('./helpers/instrument')
 
 const startChannel = channel('apm:fs:operation:start')
 const finishChannel = channel('apm:fs:operation:finish')

package/packages/datadog-instrumentations/src/generic-pool.js

@@ -1,7 +1,7 @@
 'use strict'
 
-const { addHook, AsyncResource } = require('./helpers/instrument')
 const shimmer = require('../../datadog-shimmer')
+const { addHook, AsyncResource } = require('./helpers/instrument')
 
 function createWrapAcquire () {
   return function wrapAcquire (acquire) {