dd-trace 5.51.0 → 5.52.0

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

@@ -1,10 +1,6 @@
 'use strict'
 
-const {
-  channel,
-  addHook,
-  AsyncResource
-} = require('./helpers/instrument')
+const { channel, addHook } = require('./helpers/instrument')
 const shimmer = require('../../datadog-shimmer')
 
 const startChannel = channel('apm:fs:operation:start')
@@ -191,25 +187,23 @@ function wrapCreateStream (original) {
   return function (path, options) {
     if (!startChannel.hasSubscribers) return original.apply(this, arguments)
 
-    const innerResource = new AsyncResource('bound-anonymous-fn')
-    const message = getMessage(name, ['path', 'options'], arguments)
-
-    return innerResource.runInAsyncScope(() => {
-      startChannel.publish(message)
+    const ctx = getMessage(name, ['path', 'options'], arguments)
 
+    return startChannel.runStores(ctx, () => {
       try {
         const stream = original.apply(this, arguments)
-        const onError = innerResource.bind(error => {
-          errorChannel.publish(error)
+        const onError = error => {
+          ctx.error = error
+          errorChannel.publish(ctx)
           onFinish()
-        })
-        const onFinish = innerResource.bind(() => {
-          finishChannel.publish()
+        }
+        const onFinish = () => {
+          finishChannel.runStores(ctx, () => {})
           stream.off('close', onFinish)
           stream.off('end', onFinish)
           stream.off('finish', onFinish)
           stream.off('error', onError)
-        })
+        }
 
         stream.once('close', onFinish)
         stream.once('end', onFinish)
@@ -218,8 +212,9 @@ function wrapCreateStream (original) {
 
         return stream
       } catch (error) {
-        errorChannel.publish(error)
-        finishChannel.publish()
+        ctx.error = error
+        errorChannel.publish(ctx)
+        finishChannel.runStores(ctx, () => {})
       }
     })
   }
@@ -239,17 +234,16 @@ function createWatchWrapFunction (override = '') {
     const operation = name
     return function () {
       if (!startChannel.hasSubscribers) return original.apply(this, arguments)
-      const message = getMessage(method, watchMethods[operation], arguments, this)
-      const innerResource = new AsyncResource('bound-anonymous-fn')
-      return innerResource.runInAsyncScope(() => {
-        startChannel.publish(message)
+      const ctx = getMessage(method, watchMethods[operation], arguments, this)
+      return startChannel.runStores(ctx, () => {
         try {
           const result = original.apply(this, arguments)
-          finishChannel.publish()
+          finishChannel.runStores(ctx, () => {})
           return result
         } catch (error) {
-          errorChannel.publish(error)
-          finishChannel.publish()
+          ctx.error = error
+          errorChannel.publish(ctx)
+          finishChannel.runStores(ctx, () => {})
           throw error
         }
       })
@@ -268,30 +262,25 @@ function createWrapFunction (prefix = '', override = '') {
 
       const lastIndex = arguments.length - 1
       const cb = typeof arguments[lastIndex] === 'function' && arguments[lastIndex]
-      const innerResource = new AsyncResource('bound-anonymous-fn')
       const params = getMethodParamsRelationByPrefix(prefix)[operation]
       const abortController = new AbortController()
-      const message = { ...getMessage(method, params, arguments, this), abortController }
+      const ctx = { ...getMessage(method, params, arguments, this), abortController }
 
-      const finish = innerResource.bind(function (error) {
+      const finish = function (error, cb = () => {}) {
         if (error !== null && typeof error === 'object') { // fs.exists receives a boolean
-          errorChannel.publish(error)
+          ctx.error = error
+          errorChannel.publish(ctx)
         }
-        finishChannel.publish()
-      })
+        return finishChannel.runStores(ctx, cb)
+      }
 
       if (cb) {
-        const outerResource = new AsyncResource('bound-anonymous-fn')
-
-        arguments[lastIndex] = shimmer.wrapFunction(cb, cb => innerResource.bind(function (e) {
-          finish(e)
-          return outerResource.runInAsyncScope(() => cb.apply(this, arguments))
-        }))
+        arguments[lastIndex] = shimmer.wrapFunction(cb, cb => function (e) {
+          return finish(e, () => cb.apply(this, arguments))
+        })
       }
 
-      return innerResource.runInAsyncScope(() => {
-        startChannel.publish(message)
-
+      return startChannel.runStores(ctx, () => {
         if (abortController.signal.aborted) {
           const error = abortController.signal.reason || new Error('Aborted')
 
@@ -318,23 +307,25 @@ function createWrapFunction (prefix = '', override = '') {
                 if (isFirstMethodReturningFileHandle(original)) {
                   wrapFileHandle(value)
                 }
-                finishChannel.publish()
+                finishChannel.runStores(ctx, () => {})
                 return value
               },
               error => {
-                errorChannel.publish(error)
-                finishChannel.publish()
+                ctx.error = error
+                errorChannel.publish(ctx)
+                finishChannel.runStores(ctx, () => {})
                 throw error
               }
             )
           }
 
-          finishChannel.publish()
+          finishChannel.runStores(ctx, () => {})
 
           return result
         } catch (error) {
-          errorChannel.publish(error)
-          finishChannel.publish()
+          ctx.error = error
+          errorChannel.publish(ctx)
+          finishChannel.runStores(ctx, () => {})
           throw error
         }
       })

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

@@ -70,6 +70,7 @@ module.exports = {
   knex: () => require('../knex'),
   koa: () => require('../koa'),
   'koa-router': () => require('../koa'),
+  '@confluentinc/kafka-javascript': () => require('../confluentinc-kafka-javascript'),
   kafkajs: () => require('../kafkajs'),
   langchain: () => require('../langchain'),
   ldapjs: () => require('../ldapjs'),

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

@@ -408,6 +408,7 @@ function getWrappedEnvironment (BaseEnvironment, jestVersion) {
         event.test.fn = originalTestFns.get(event.test)
 
         let attemptToFixPassed = false
+        let attemptToFixFailed = false
         let failedAllTests = false
         let isAttemptToFix = false
         if (this.isTestManagementTestsEnabled) {
@@ -425,6 +426,9 @@ function getWrappedEnvironment (BaseEnvironment, jestVersion) {
             // If it is, we'll set the failedAllTests flag to true if all the tests failed
             // If all tests passed, we'll set the attemptToFixPassed flag to true
             if (testStatuses.length === testManagementAttemptToFixRetries + 1) {
+              if (testStatuses.some(status => status === 'fail')) {
+                attemptToFixFailed = true
+              }
               if (testStatuses.every(status => status === 'fail')) {
                 failedAllTests = true
               } else if (testStatuses.every(status => status === 'pass')) {
@@ -490,6 +494,7 @@ function getWrappedEnvironment (BaseEnvironment, jestVersion) {
             testStartLine: getTestLineStart(event.test.asyncError, this.testSuite),
             attemptToFixPassed,
             failedAllTests,
+            attemptToFixFailed,
             isAtrRetry
           })
         })

package/packages/datadog-instrumentations/src/mocha/utils.js

@@ -265,6 +265,7 @@ function getOnTestEndHandler (config) {
 
     let hasFailedAllRetries = false
     let attemptToFixPassed = false
+    let attemptToFixFailed = false
 
     const testName = getTestFullName(test)
 
@@ -278,6 +279,9 @@ function getOnTestEndHandler (config) {
     const isLastAttempt = testStatuses.length === config.testManagementAttemptToFixRetries + 1
 
     if (test._ddIsAttemptToFix && isLastAttempt) {
+      if (testStatuses.some(status => status === 'fail')) {
+        attemptToFixFailed = true
+      }
       if (testStatuses.every(status => status === 'fail')) {
         hasFailedAllRetries = true
       } else if (testStatuses.every(status => status === 'pass')) {
@@ -299,6 +303,7 @@ function getOnTestEndHandler (config) {
           isLastRetry: getIsLastRetry(test),
           hasFailedAllRetries,
           attemptToFixPassed,
+          attemptToFixFailed,
           isAttemptToFixRetry,
           isAtrRetry
         })

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

@@ -1,10 +1,6 @@
 'use strict'
 
-const {
-  channel,
-  addHook,
-  AsyncResource
-} = require('./helpers/instrument')
+const { channel, addHook } = require('./helpers/instrument')
 const shimmer = require('../../datadog-shimmer')
 
 const startICPCh = channel('apm:net:ipc:start')
@@ -15,6 +11,7 @@ const startTCPCh = channel('apm:net:tcp:start')
 const finishTCPCh = channel('apm:net:tcp:finish')
 const errorTCPCh = channel('apm:net:tcp:error')
 
+const readyCh = channel('apm:net:tcp:ready')
 const connectionCh = channel('apm:net:tcp:connection')
 
 const names = ['net', 'node:net']
@@ -39,30 +36,27 @@ addHook({ name: names }, (net, version, name) => {
 
     if (!options) return connect.apply(this, arguments)
 
-    const callbackResource = new AsyncResource('bound-anonymous-fn')
-    const asyncResource = new AsyncResource('bound-anonymous-fn')
+    const protocol = options.path ? 'ipc' : 'tcp'
+    const startCh = protocol === 'ipc' ? startICPCh : startTCPCh
+    const finishCh = protocol === 'ipc' ? finishICPCh : finishTCPCh
+    const errorCh = protocol === 'ipc' ? errorICPCh : errorTCPCh
+    const ctx = { options }
 
     if (typeof callback === 'function') {
-      arguments[lastIndex] = callbackResource.bind(callback)
+      arguments[lastIndex] = function (...args) {
+        return finishCh.runStores(ctx, callback, this, ...args)
+      }
     }
 
-    const protocol = options.path ? 'ipc' : 'tcp'
-
-    return asyncResource.runInAsyncScope(() => {
-      if (protocol === 'ipc') {
-        startICPCh.publish({ options })
-        setupListeners(this, 'ipc', asyncResource)
-      } else {
-        startTCPCh.publish({ options })
-        setupListeners(this, 'tcp', asyncResource)
-      }
+    return startCh.runStores(ctx, () => {
+      setupListeners(this, protocol, ctx, finishCh, errorCh)
 
       const emit = this.emit
       this.emit = shimmer.wrapFunction(emit, emit => function (eventName) {
         switch (eventName) {
           case 'ready':
           case 'connect':
-            return callbackResource.runInAsyncScope(() => {
+            return readyCh.runStores(ctx, () => {
               return emit.apply(this, arguments)
             })
           default:
@@ -73,7 +67,7 @@ addHook({ name: names }, (net, version, name) => {
       try {
         return connect.apply(this, arguments)
       } catch (err) {
-        protocol === 'ipc' ? errorICPCh.publish(err) : errorTCPCh.publish(err)
+        errorCh.publish(err)
 
         throw err
       }
@@ -104,19 +98,21 @@ function getOptions (args) {
   }
 }
 
-function setupListeners (socket, protocol, asyncResource) {
+function setupListeners (socket, protocol, ctx, finishCh, errorCh) {
   const events = ['connect', 'error', 'close', 'timeout']
 
-  const wrapListener = asyncResource.bind(function (error) {
+  const wrapListener = function (error) {
     if (error) {
-      protocol === 'ipc' ? errorICPCh.publish(error) : errorTCPCh.publish(error)
+      ctx.error = error
+      errorCh.publish(ctx)
     }
-    protocol === 'ipc' ? finishICPCh.publish(undefined) : finishTCPCh.publish(undefined)
-  })
+    finishCh.runStores(ctx, () => {})
+  }
 
-  const localListener = asyncResource.bind(function () {
-    connectionCh.publish({ socket })
-  })
+  const localListener = function () {
+    ctx.socket = socket
+    connectionCh.publish(ctx)
+  }
 
   const cleanupListener = function () {
     socket.removeListener('connect', localListener)

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

@@ -14,6 +14,8 @@ const errorCh = channel('apm:pg:query:error')
 const startPoolQueryCh = channel('datadog:pg:pool:query:start')
 const finishPoolQueryCh = channel('datadog:pg:pool:query:finish')
 
+const { errorMonitor } = require('node:events')
+
 addHook({ name: 'pg', versions: ['>=8.0.3'] }, pg => {
   shimmer.wrap(pg.Client.prototype, 'query', query => wrapQuery(query))
   shimmer.wrap(pg.Pool.prototype, 'query', query => wrapPoolQuery(query))
@@ -39,13 +41,15 @@ function wrapQuery (query) {
       ? arguments[0]
       : { text: arguments[0] }
 
-    const textProp = Object.getOwnPropertyDescriptor(pgQuery, 'text')
+    const textPropObj = pgQuery.cursor ?? pgQuery
+    const textProp = Object.getOwnPropertyDescriptor(textPropObj, 'text')
+    const stream = typeof textPropObj.read === 'function'
 
     // Only alter `text` property if safe to do so.
     if (!textProp || textProp.configurable) {
-      const originalText = pgQuery.text
+      const originalText = textPropObj.text
 
-      Object.defineProperty(pgQuery, 'text', {
+      Object.defineProperty(textPropObj, 'text', {
         get () {
           return this?.__ddInjectableQuery || originalText
         }
@@ -57,9 +61,10 @@ function wrapQuery (query) {
 
       startCh.publish({
         params: this.connectionParameters,
-        query: pgQuery,
+        query: textPropObj,
         processId,
-        abortController
+        abortController,
+        stream
       })
 
       const finish = asyncResource.bind(function (error, res) {
@@ -130,6 +135,15 @@ function wrapQuery (query) {
         newQuery.then((res) => finish(null, res), finish)
       }
 
+      if (stream) {
+        newQuery.on('end', () => {
+          finish(null, [])
+        })
+        newQuery.on(errorMonitor, (err) => {
+          finish(err)
+        })
+      }
+
       try {
         return retval
       } catch (err) {

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

@@ -337,6 +337,9 @@ function testEndHandler (test, annotations, testStatus, error, isTimeout, isMain
   }
 
   if (testStatuses.length === testManagementAttemptToFixRetries + 1) {
+    if (testStatuses.some(status => status === 'fail')) {
+      test._ddHasFailedAttemptToFixRetries = true
+    }
     if (testStatuses.every(status => status === 'fail')) {
       test._ddHasFailedAllRetries = true
     } else if (testStatuses.every(status => status === 'pass')) {
@@ -366,6 +369,7 @@ function testEndHandler (test, annotations, testStatus, error, isTimeout, isMain
         isEfdRetry: test._ddIsEfdRetry,
         hasFailedAllRetries: test._ddHasFailedAllRetries,
         hasPassedAttemptToFixRetries: test._ddHasPassedAttemptToFixRetries,
+        hasFailedAttemptToFixRetries: test._ddHasFailedAttemptToFixRetries,
         isAtrRetry
       })
     })
@@ -492,6 +496,7 @@ function dispatcherHookNew (dispatcherExport, runWrapper) {
           _ddIsEfdRetry: test._ddIsEfdRetry,
           _ddHasFailedAllRetries: test._ddHasFailedAllRetries,
           _ddHasPassedAttemptToFixRetries: test._ddHasPassedAttemptToFixRetries,
+          _ddHasFailedAttemptToFixRetries: test._ddHasFailedAttemptToFixRetries,
           _ddIsAtrRetry: isAtrRetry
         }
       })
@@ -986,6 +991,7 @@ addHook({
         isAttemptToFixRetry: test._ddIsAttemptToFixRetry,
         hasFailedAllRetries: test._ddHasFailedAllRetries,
         hasPassedAttemptToFixRetries: test._ddHasPassedAttemptToFixRetries,
+        hasFailedAttemptToFixRetries: test._ddHasFailedAttemptToFixRetries,
         isAtrRetry: test._ddIsAtrRetry,
         onDone
       })

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

@@ -614,17 +614,22 @@ addHook({
       }
 
       let attemptToFixPassed = false
+      let attemptToFixFailed = false
       if (attemptToFixTasks.has(task)) {
         const statuses = taskToStatuses.get(task)
-        if (statuses.length === testManagementAttemptToFixRetries && statuses.every(status => status === 'pass')) {
-          attemptToFixPassed = true
+        if (statuses.length === testManagementAttemptToFixRetries) {
+          if (statuses.every(status => status === 'pass')) {
+            attemptToFixPassed = true
+          } else if (statuses.some(status => status === 'fail')) {
+            attemptToFixFailed = true
+          }
         }
       }
 
       if (asyncResource) {
         // We don't finish here because the test might fail in a later hook (afterEach)
         asyncResource.runInAsyncScope(() => {
-          testFinishTimeCh.publish({ status, task, attemptToFixPassed })
+          testFinishTimeCh.publish({ status, task, attemptToFixPassed, attemptToFixFailed })
         })
       }
 
@@ -776,8 +781,12 @@ addHook({
           }
 
           let hasFailedAllRetries = false
+          let attemptToFixFailed = false
           if (attemptToFixTasks.has(task)) {
             const statuses = taskToStatuses.get(task)
+            if (statuses.some(status => status === 'fail')) {
+              attemptToFixFailed = true
+            }
             if (statuses.every(status => status === 'fail')) {
               hasFailedAllRetries = true
             }
@@ -787,7 +796,12 @@ addHook({
             const isRetry = task.result?.retryCount > 0
             // `duration` is the duration of all the retries, so it can't be used if there are retries
             testAsyncResource.runInAsyncScope(() => {
-              testErrorCh.publish({ duration: !isRetry ? duration : undefined, error: testError, hasFailedAllRetries })
+              testErrorCh.publish({
+                duration: !isRetry ? duration : undefined,
+                error: testError,
+                hasFailedAllRetries,
+                attemptToFixFailed
+              })
             })
           }
           if (errors?.length) {

package/packages/datadog-plugin-confluentinc-kafka-javascript/src/batch-consumer.js

@@ -0,0 +1,11 @@
+'use strict'
+
+const KafkajsBatchConsumerPlugin = require('../../datadog-plugin-kafkajs/src/batch-consumer')
+
+class ConfluentKafkaJsBatchConsumerPlugin extends KafkajsBatchConsumerPlugin {
+  static get id () {
+    return '@confluentinc/kafka-javascript'
+  }
+}
+
+module.exports = ConfluentKafkaJsBatchConsumerPlugin

package/packages/datadog-plugin-confluentinc-kafka-javascript/src/consumer.js

@@ -0,0 +1,11 @@
+'use strict'
+
+const KafkajsConsumerPlugin = require('../../datadog-plugin-kafkajs/src/consumer')
+
+class ConfluentKafkaJsConsumerPlugin extends KafkajsConsumerPlugin {
+  static get id () {
+    return '@confluentinc/kafka-javascript'
+  }
+}
+
+module.exports = ConfluentKafkaJsConsumerPlugin

package/packages/datadog-plugin-confluentinc-kafka-javascript/src/index.js

@@ -0,0 +1,19 @@
+'use strict'
+
+const ProducerPlugin = require('./producer')
+const ConsumerPlugin = require('./consumer')
+const BatchConsumerPlugin = require('./batch-consumer')
+const KafkajsPlugin = require('../../datadog-plugin-kafkajs/src/index')
+
+class ConfluentKafkaJsPlugin extends KafkajsPlugin {
+  static get id () { return '@confluentinc/kafka-javascript' }
+  static get plugins () {
+    return {
+      producer: ProducerPlugin,
+      consumer: ConsumerPlugin,
+      batchConsumer: BatchConsumerPlugin
+    }
+  }
+}
+
+module.exports = ConfluentKafkaJsPlugin

package/packages/datadog-plugin-confluentinc-kafka-javascript/src/producer.js

@@ -0,0 +1,11 @@
+'use strict'
+
+const KafkajsProducerPlugin = require('../../datadog-plugin-kafkajs/src/producer')
+
+class ConfluentKafkaJsProducerPlugin extends KafkajsProducerPlugin {
+  static get id () {
+    return '@confluentinc/kafka-javascript'
+  }
+}
+
+module.exports = ConfluentKafkaJsProducerPlugin

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

@@ -341,6 +341,7 @@ class CucumberPlugin extends CiPlugin {
       isAttemptToFixRetry,
       hasFailedAllRetries,
       hasPassedAllRetries,
+      hasFailedAttemptToFix,
       isDisabled,
       isQuarantined
     }) => {
@@ -385,6 +386,8 @@ class CucumberPlugin extends CiPlugin {
         span.setTag(TEST_RETRY_REASON, TEST_RETRY_REASON_TYPES.atf)
         if (hasPassedAllRetries) {
           span.setTag(TEST_MANAGEMENT_ATTEMPT_TO_FIX_PASSED, 'true')
+        } else if (hasFailedAttemptToFix) {
+          span.setTag(TEST_MANAGEMENT_ATTEMPT_TO_FIX_PASSED, 'false')
         }
       }
 

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

@@ -838,6 +838,9 @@ class CypressPlugin {
           }
           const isLastAttempt = testStatuses.length === this.testManagementAttemptToFixRetries + 1
           if (isLastAttempt) {
+            if (testStatuses.some(status => status === 'fail')) {
+              this.activeTestSpan.setTag(TEST_MANAGEMENT_ATTEMPT_TO_FIX_PASSED, 'false')
+            }
             if (testStatuses.every(status => status === 'fail')) {
               this.activeTestSpan.setTag(TEST_HAS_FAILED_ALL_RETRIES, 'true')
             } else if (testStatuses.every(status => status === 'pass')) {

package/packages/datadog-plugin-dns/src/lookup.js

@@ -6,7 +6,9 @@ class DNSLookupPlugin extends ClientPlugin {
   static get id () { return 'dns' }
   static get operation () { return 'lookup' }
 
-  start ([hostname]) {
+  bindStart (ctx) {
+    const [hostname] = ctx.args
+
     this.startSpan('dns.lookup', {
       service: this.config.service,
       resource: hostname,
@@ -16,11 +18,14 @@ class DNSLookupPlugin extends ClientPlugin {
         'dns.address': '',
         'dns.addresses': ''
       }
-    })
+    }, ctx)
+
+    return ctx.currentStore
   }
 
-  finish (result) {
-    const span = this.activeSpan
+  bindFinish (ctx) {
+    const span = ctx.currentStore.span
+    const result = ctx.result
 
     if (Array.isArray(result)) {
       const addresses = Array.isArray(result)
@@ -33,7 +38,7 @@ class DNSLookupPlugin extends ClientPlugin {
       span.setTag('dns.address', result)
     }
 
-    super.finish()
+    return ctx.parentStore
   }
 }
 

package/packages/datadog-plugin-dns/src/lookup_service.js

@@ -6,7 +6,9 @@ class DNSLookupServicePlugin extends ClientPlugin {
   static get id () { return 'dns' }
   static get operation () { return 'lookup_service' }
 
-  start ([address, port]) {
+  bindStart (ctx) {
+    const [address, port] = ctx.args
+
     this.startSpan('dns.lookup_service', {
       service: this.config.service,
       resource: `${address}:${port}`,
@@ -17,7 +19,9 @@ class DNSLookupServicePlugin extends ClientPlugin {
       metrics: {
         'dns.port': port
       }
-    })
+    }, ctx)
+
+    return ctx.currentStore
   }
 }
 

package/packages/datadog-plugin-dns/src/resolve.js

@@ -6,7 +6,8 @@ class DNSResolvePlugin extends ClientPlugin {
   static get id () { return 'dns' }
   static get operation () { return 'resolve' }
 
-  start ([hostname, maybeType]) {
+  bindStart (ctx) {
+    const [hostname, maybeType] = ctx.args
     const rrtype = typeof maybeType === 'string' ? maybeType : 'A'
 
     this.startSpan('dns.resolve', {
@@ -17,7 +18,9 @@ class DNSResolvePlugin extends ClientPlugin {
         'dns.hostname': hostname,
         'dns.rrtype': rrtype
       }
-    })
+    }, ctx)
+
+    return ctx.currentStore
   }
 }
 

package/packages/datadog-plugin-dns/src/reverse.js

@@ -6,7 +6,9 @@ class DNSReversePlugin extends ClientPlugin {
   static get id () { return 'dns' }
   static get operation () { return 'reverse' }
 
-  start ([ip]) {
+  bindStart (ctx) {
+    const [ip] = ctx.args
+
     this.startSpan('dns.reverse', {
       service: this.config.service,
       resource: ip,
@@ -14,7 +16,9 @@ class DNSReversePlugin extends ClientPlugin {
       meta: {
         'dns.ip': ip
       }
-    })
+    }, ctx)
+
+    return ctx.currentStore
   }
 }