dd-trace 6.0.0-pre-0bb1f17 → 6.1.0

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

@@ -1,15 +1,43 @@
 'use strict'
 
+const shimmer = require('../../datadog-shimmer')
 const {
   channel,
-  addHook
+  addHook,
+  AsyncResource,
 } = require('./helpers/instrument')
-const shimmer = require('../../datadog-shimmer')
+
+// Listeners added to the BulkLoad row stream (`bulkLoad.getRowStream()`) by the caller would
+// otherwise run in whatever async context emits the stream event, losing the span that was active
+// when the listener was registered. Bind each registered listener to its registration context so
+// `'finish'`/`'error'`/`'data'` handlers run in the caller's span, as they did before the tracer
+// moved to AsyncLocalStorage. tedious' own internal listeners are attached before `getRowStream`
+// returns, so only caller listeners are bound.
+const ROW_STREAM_LISTENER_METHODS = ['addListener', 'on', 'once', 'prependListener', 'prependOnceListener']
+
+function bindRowStreamListeners (rowStream) {
+  for (const method of ROW_STREAM_LISTENER_METHODS) {
+    shimmer.wrap(rowStream, method, register => function (eventName, listener) {
+      if (typeof listener !== 'function') {
+        return register.apply(this, arguments)
+      }
+      return register.call(this, eventName, AsyncResource.bind(listener))
+    })
+  }
+  return rowStream
+}
 
 addHook({ name: 'tedious', versions: ['>=1.0.0'] }, tedious => {
   const startCh = channel('apm:tedious:request:start')
   const finishCh = channel('apm:tedious:request:finish')
   const errorCh = channel('apm:tedious:request:error')
+
+  if (typeof tedious.BulkLoad?.prototype?.getRowStream === 'function') {
+    shimmer.wrap(tedious.BulkLoad.prototype, 'getRowStream', getRowStream => function () {
+      return bindRowStreamListeners(getRowStream.apply(this, arguments))
+    })
+  }
+
   shimmer.wrap(tedious.Connection.prototype, 'makeRequest', makeRequest => function (request) {
     if (!startCh.hasSubscribers) {
       return makeRequest.apply(this, arguments)

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

@@ -1,18 +1,29 @@
 'use strict'
 
+const tracingChannel = require('dc-polyfill').tracingChannel
+
+const shimmer = require('../../datadog-shimmer')
+const satisfies = require('../../../vendor/dist/semifies')
 const {
-  addHook
+  addHook,
 } = require('./helpers/instrument')
-const shimmer = require('../../datadog-shimmer')
+const { createWrapFetch } = require('./helpers/fetch')
 
-const tracingChannel = require('dc-polyfill').tracingChannel
 const ch = tracingChannel('apm:undici:fetch')
 
-const { createWrapFetch } = require('./helpers/fetch')
+// Undici 5.0.x has a bug where fetch doesn't preserve AggregateError in the error cause chain
+// Use native DC only for versions where error handling works correctly
+const NATIVE_DC_VERSION = '>=4.7.0 <5.0.0 || >=5.1.0'
 
 addHook({
   name: 'undici',
-  versions: ['^4.4.1', '5', '>=6.0.0']
-}, undici => {
+  versions: ['^4.4.1', '5', '>=6.0.0'],
+}, (undici, version) => {
+  // For versions with working native DC, let the plugin subscribe directly
+  if (satisfies(version, NATIVE_DC_VERSION)) {
+    return undici
+  }
+
+  // For older versions or those with buggy error handling, wrap fetch
   return shimmer.wrap(undici, 'fetch', createWrapFetch(undici.Request, ch))
 })

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

@@ -1,14 +1,12 @@
 'use strict'
 
-const { addHook, channel } = require('./helpers/instrument')
 const shimmer = require('../../datadog-shimmer')
-const names = ['url', 'node:url']
-
+const { addHook, channel } = require('./helpers/instrument')
 const parseFinishedChannel = channel('datadog:url:parse:finish')
 const urlGetterChannel = channel('datadog:url:getter:finish')
 const instrumentedGetters = ['host', 'origin', 'hostname']
 
-addHook({ name: names }, function (url) {
+addHook({ name: 'url' }, function (url) {
   shimmer.wrap(url, 'parse', (parse) => {
     return function wrappedParse (input) {
       const parsedValue = parse.apply(this, arguments)
@@ -17,7 +15,7 @@ addHook({ name: names }, function (url) {
       parseFinishedChannel.publish({
         input,
         parsed: parsedValue,
-        isURL: false
+        isURL: false,
       })
 
       return parsedValue
@@ -25,7 +23,7 @@ addHook({ name: names }, function (url) {
   })
 
   const URLPrototype = url.URL.prototype.constructor.prototype
-  instrumentedGetters.forEach(property => {
+  for (const property of instrumentedGetters) {
     shimmer.wrap(URLPrototype, property, function (originalGet) {
       return function get () {
         const result = originalGet.call(this)
@@ -37,7 +35,7 @@ addHook({ name: names }, function (url) {
         return context.result
       }
     })
-  })
+  }
 
   shimmer.wrap(url, 'URL', (URL) => {
     return class extends URL {
@@ -50,7 +48,7 @@ addHook({ name: names }, function (url) {
           input,
           base,
           parsed: this,
-          isURL: true
+          isURL: true,
         })
       }
 
@@ -70,7 +68,7 @@ addHook({ name: names }, function (url) {
           input,
           base,
           parsed: parsedValue,
-          isURL: true
+          isURL: true,
         })
 
         return parsedValue