dd-trace 5.81.0 → 5.83.0

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

@@ -2,9 +2,9 @@
 
 const { errorMonitor } = require('node:events')
 
-const { channel, addHook } = require('./helpers/instrument')
 const shimmer = require('../../datadog-shimmer')
 const satisfies = require('../../../vendor/dist/semifies')
+const { channel, addHook } = require('./helpers/instrument')
 
 function wrapConnection (Connection, version) {
   const startCh = channel('apm:mysql2:query:start')
@@ -141,11 +141,11 @@ function wrapConnection (Connection, version) {
             finishCh.runStores(ctx, onResult, this, ...arguments)
           })
         } else {
-          this.on(errorMonitor, error => {
+          this.once(errorMonitor, error => {
             ctx.error = error
             errorCh.publish(ctx)
           })
-          this.on('end', () => finishCh.publish(ctx))
+          this.once('end', () => finishCh.publish(ctx))
         }
 
         this.execute = execute

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

@@ -2,8 +2,8 @@
 
 const { errorMonitor } = require('events')
 
-const { channel, addHook } = require('./helpers/instrument')
 const shimmer = require('../../datadog-shimmer')
+const { channel, addHook } = require('./helpers/instrument')
 
 const startICPCh = channel('apm:net:ipc:start')
 const finishICPCh = channel('apm:net:ipc:finish')
@@ -101,7 +101,7 @@ function getOptions (args) {
 }
 
 function setupListeners (socket, protocol, ctx, finishCh, errorCh) {
-  const events = ['connect', errorMonitor, 'close', 'timeout']
+  const events = [errorMonitor, 'close', 'timeout']
 
   const wrapListener = function (error) {
     if (error) {
@@ -109,27 +109,35 @@ function setupListeners (socket, protocol, ctx, finishCh, errorCh) {
       errorCh.publish(ctx)
     }
     finishCh.runStores(ctx, () => {})
+    cleanupOtherListeners()
   }
 
-  const localListener = function () {
+  const localListener = function (error) {
     ctx.socket = socket
     connectionCh.publish(ctx)
+    if (error) {
+      ctx.error = error
+      errorCh.publish(ctx)
+    }
+    finishCh.runStores(ctx, () => {})
+    cleanupOtherListeners()
   }
 
-  const cleanupListener = function () {
+  const cleanupOtherListeners = function () {
     socket.removeListener('connect', localListener)
     events.forEach(event => {
       socket.removeListener(event, wrapListener)
-      socket.removeListener(event, cleanupListener)
     })
   }
 
+  // TODO: Identify why the connect listener should remove the other listeners.
   if (protocol === 'tcp') {
     socket.once('connect', localListener)
+  } else {
+    events.push('connect')
   }
 
   events.forEach(event => {
     socket.once(event, wrapListener)
-    socket.once(event, cleanupListener)
   })
 }

package/packages/datadog-instrumentations/src/next.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 startChannel = channel('apm:next:request:start')
 const finishChannel = channel('apm:next:request:finish')

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

@@ -1,8 +1,8 @@
 'use strict'
 
-const { addHook, channel } = require('./helpers/instrument')
 const shimmer = require('../../datadog-shimmer')
-const { getEnvironmentVariable } = require('../../dd-trace/src/config-helper')
+const { getEnvironmentVariable } = require('../../dd-trace/src/config/helper')
+const { addHook, channel } = require('./helpers/instrument')
 
 const codeCoverageWrapCh = channel('ci:nyc:wrap')
 

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

@@ -1,9 +1,9 @@
 'use strict'
 
-const { addHook } = require('./helpers/instrument')
+const dc = require('dc-polyfill')
 const shimmer = require('../../datadog-shimmer')
+const { addHook } = require('./helpers/instrument')
 
-const dc = require('dc-polyfill')
 const ch = dc.tracingChannel('apm:openai:request')
 const onStreamedChunkCh = dc.channel('apm:openai:request:chunk')
 

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

@@ -1,7 +1,7 @@
 'use strict'
 
-const { addHook } = require('./helpers/instrument')
 const shimmer = require('../../datadog-shimmer')
+const { addHook } = require('./helpers/instrument')
 const { createWrapRequest, createWrapGetConnection } = require('./elasticsearch')
 
 addHook({ name: '@opensearch-project/opensearch', file: 'lib/Transport.js', versions: ['>=1'] }, Transport => {

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

@@ -1,10 +1,10 @@
 'use strict'
 
+const shimmer = require('../../datadog-shimmer')
 const {
   channel,
   addHook
 } = require('./helpers/instrument')
-const shimmer = require('../../datadog-shimmer')
 
 const connectionAttributes = new WeakMap()
 const poolAttributes = new WeakMap()

package/packages/datadog-instrumentations/src/otel-sdk-trace.js

@@ -1,13 +1,13 @@
 'use strict'
 
-const { addHook } = require('./helpers/instrument')
 const shimmer = require('../../datadog-shimmer')
 const tracer = require('../../dd-trace')
-const { getEnvironmentVariable } = require('../../dd-trace/src/config-helper')
+const { getValueFromEnvSources } = require('../../dd-trace/src/config/helper')
+const { addHook } = require('./helpers/instrument')
 
-const otelSdkEnabled = getEnvironmentVariable('DD_TRACE_OTEL_ENABLED') ||
-getEnvironmentVariable('OTEL_SDK_DISABLED')
-  ? !getEnvironmentVariable('OTEL_SDK_DISABLED')
+const otelSdkEnabled = getValueFromEnvSources('DD_TRACE_OTEL_ENABLED') ||
+getValueFromEnvSources('OTEL_SDK_DISABLED')
+  ? !getValueFromEnvSources('OTEL_SDK_DISABLED')
   : undefined
 
 if (otelSdkEnabled) {

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

@@ -1,10 +1,12 @@
 'use strict'
 
+const { errorMonitor } = require('node:events')
+
+const shimmer = require('../../datadog-shimmer')
 const {
   channel,
   addHook
 } = require('./helpers/instrument')
-const shimmer = require('../../datadog-shimmer')
 
 const startCh = channel('apm:pg:query:start')
 const finishCh = channel('apm:pg:query:finish')
@@ -13,8 +15,6 @@ 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'], file: 'lib/native/client.js' }, Client => {
   shimmer.wrap(Client.prototype, 'query', query => wrapQuery(query))
   return Client
@@ -112,8 +112,10 @@ function wrapQuery (query) {
       arguments[0] = pgQuery
 
       const retval = query.apply(this, arguments)
-      const queryQueue = this.queryQueue || this._queryQueue
-      const activeQuery = this.activeQuery || this._activeQuery
+
+      const deperecated = Object.hasOwn(this, '_activeQuery')
+      const queryQueue = deperecated ? this._queryQueue : this.queryQueue
+      const activeQuery = deperecated ? this._activeQuery : this.activeQuery
 
       const newQuery = queryQueue.at(-1) || activeQuery
 

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

@@ -1,10 +1,10 @@
 'use strict'
 
+const shimmer = require('../../datadog-shimmer')
 const {
   channel,
   addHook
 } = require('./helpers/instrument')
-const shimmer = require('../../datadog-shimmer')
 
 function wrapPino (symbol, wrapper, pino) {
   return function pinoWithTrace () {

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

@@ -2,7 +2,6 @@
 
 const satisfies = require('../../../vendor/dist/semifies')
 
-const { addHook, channel } = require('./helpers/instrument')
 const shimmer = require('../../datadog-shimmer')
 const {
   parseAnnotations,
@@ -12,9 +11,10 @@ const {
 } = require('../../dd-trace/src/plugins/util/test')
 const log = require('../../dd-trace/src/log')
 const {
-  getEnvironmentVariable
-} = require('../../dd-trace/src/config-helper')
+  getValueFromEnvSources
+} = require('../../dd-trace/src/config/helper')
 const { DD_MAJOR } = require('../../../version')
+const { addHook, channel } = require('./helpers/instrument')
 
 const testStartCh = channel('ci:playwright:test:start')
 const testFinishCh = channel('ci:playwright:test:finish')
@@ -41,7 +41,7 @@ const testSuiteToTestStatuses = new Map()
 const testSuiteToErrors = new Map()
 const testsToTestStatuses = new Map()
 
-const RUM_FLUSH_WAIT_TIME = Number(getEnvironmentVariable('DD_CIVISIBILITY_RUM_FLUSH_WAIT_MILLIS')) || 1000
+const RUM_FLUSH_WAIT_TIME = Number(getValueFromEnvSources('DD_CIVISIBILITY_RUM_FLUSH_WAIT_MILLIS')) || 1000
 
 let applyRepeatEachIndex = null
 

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

@@ -1,12 +1,9 @@
 'use strict'
 
-const {
-  channel,
-  addHook
-} = require('./helpers/instrument')
+const tracingChannel = require('dc-polyfill').tracingChannel
 
+const { channel, addHook } = require('./helpers/instrument')
 const prismaEngineStart = channel('apm:prisma:engine:start')
-const tracingChannel = require('dc-polyfill').tracingChannel
 const clientCH = tracingChannel('apm:prisma:client')
 
 const allowedClientSpanOperations = new Set([
@@ -15,14 +12,20 @@ const allowedClientSpanOperations = new Set([
   'transaction'
 ])
 
-class TracingHelper {
+class DatadogTracingHelper {
   dbConfig = null
+
+  constructor (dbConfig = null) {
+    this.dbConfig = dbConfig
+  }
+
   isEnabled () {
     return true
   }
 
   // needs a sampled tracecontext to generate engine spans
   getTraceParent (context) {
+    // TODO: Fix the id
     return '00-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-bbbbbbbbbbbbbbbb-01' // valid sampled traceparent
   }
 
@@ -34,7 +37,9 @@ class TracingHelper {
     }
   }
 
-  getActiveContext () {}
+  getActiveContext () {
+    // TODO: Fix context
+  }
 
   runInChildSpan (options, callback) {
     if (typeof options === 'string') {
@@ -63,42 +68,52 @@ class TracingHelper {
   }
 }
 
-addHook({ name: '@prisma/client', versions: ['>=6.1.0'] }, (prisma, version) => {
-  const tracingHelper = new TracingHelper()
-
-  // we need to patch the prototype to get db config since this works for ESM and CJS alike.
-  const originalRequest = prisma.PrismaClient.prototype._request
-  prisma.PrismaClient.prototype._request = function () {
-    if (!tracingHelper.dbConfig) {
-      const inlineDatasources = this._engine?.config.inlineDatasources
-      const overrideDatasources = this._engine?.config.overrideDatasources
-      const datasources = inlineDatasources?.db.url?.value ?? overrideDatasources?.db?.url
-      if (datasources) {
-        const result = parseDBString(datasources)
-        tracingHelper.setDbString(result)
+const prismaHook = (runtime, versions, name, isIitm) => {
+  const originalGetPrismaClient = runtime.getPrismaClient
+
+  if (!originalGetPrismaClient) return runtime
+  const datadogTracingHelper = new DatadogTracingHelper()
+
+  const wrappedGetPrismaClient = function (config) {
+    const datasources = config.inlineDatasources?.db.url?.value
+    if (datasources) {
+      const dbConfig = parseDBString(datasources)
+      datadogTracingHelper.setDbString(dbConfig)
+    }
+
+    const PrismaClient = originalGetPrismaClient.call(this, config)
+    return class WrappedPrismaClientClass extends PrismaClient {
+      constructor (clientConfig) {
+        super(clientConfig)
+        this._tracingHelper = datadogTracingHelper
+        this._engine.tracingHelper = datadogTracingHelper
       }
     }
-    return originalRequest.apply(this, arguments)
   }
 
-  /*
-    * This is taking advantage of the built in tracing support from Prisma.
-    * The below variable is setting a global tracing helper that Prisma uses
-    * to enable OpenTelemetry.
-  */
-  // https://github.com/prisma/prisma/blob/478293bbfce91e41ceff02f2a0b03bb8acbca03e/packages/instrumentation/src/PrismaInstrumentation.ts#L42
-  const versions = version.split('.')
-  if (versions[0] === '6' && versions[1] < 4) {
-    global.PRISMA_INSTRUMENTATION = {
-      helper: tracingHelper
-    }
-  } else {
-    global[`V${versions[0]}_PRISMA_INSTRUMENTATION`] = {
-      helper: tracingHelper
-    }
+  if (isIitm) {
+    runtime.getPrismaClient = wrappedGetPrismaClient
+    return runtime
   }
 
-  return prisma
+  return new Proxy(runtime, {
+    get (target, prop) {
+      if (prop === 'getPrismaClient') {
+        return wrappedGetPrismaClient
+      }
+      return target[prop]
+    }
+  })
+}
+
+const prismaConfigs = [
+  { name: '@prisma/client', versions: ['>=6.1.0 <7.0.0'], filePattern: 'runtime/library.*' },
+  { name: './runtime/library.js', versions: ['>=6.1.0 <7.0.0'], file: 'runtime/library.js' },
+  { name: '@prisma/client', versions: ['>=7.0.0'], filePattern: 'runtime/client.*' }
+]
+
+prismaConfigs.forEach(config => {
+  addHook(config, prismaHook)
 })
 
 function parseDBString (dbString) {

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

@@ -1,7 +1,7 @@
 'use strict'
 
-const shimmer = require('../../datadog-shimmer')
 const { channel } = require('dc-polyfill')
+const shimmer = require('../../datadog-shimmer')
 
 const startSetUncaughtExceptionCaptureCallback = channel('datadog:process:setUncaughtExceptionCaptureCallback:start')
 

package/packages/datadog-instrumentations/src/promise-js.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')
 
 addHook({
   name: 'promise-js',

package/packages/datadog-instrumentations/src/promise.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')
 
 addHook({
   name: 'promise',

package/packages/datadog-instrumentations/src/protobufjs.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:protobufjs:serialize-start')
 const deserializeChannel = dc.channel('apm:protobufjs:deserialize-end')
 

package/packages/datadog-instrumentations/src/q.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')
 
 addHook({
   name: 'q',

package/packages/datadog-instrumentations/src/redis.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:redis:command:start')
 const finishCh = channel('apm:redis:command:finish')

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

@@ -1,10 +1,10 @@
 'use strict'
 
+const shimmer = require('../../datadog-shimmer')
 const {
   channel,
   addHook
 } = require('./helpers/instrument')
-const shimmer = require('../../datadog-shimmer')
 
 const circularBufferConstructor = Symbol('circularBufferConstructor')
 const inFlightDeliveries = Symbol('inFlightDeliveries')

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

@@ -1,8 +1,8 @@
 'use strict'
 
-const { addHook, channel } = require('./helpers/instrument')
 const shimmer = require('../../datadog-shimmer')
-const { getEnvironmentVariable } = require('../../dd-trace/src/config-helper')
+const { getValueFromEnvSources } = require('../../dd-trace/src/config/helper')
+const { addHook, channel } = require('./helpers/instrument')
 
 const ciSeleniumDriverGetStartCh = channel('ci:selenium:driver:get')
 
@@ -17,7 +17,7 @@ if (window.DD_RUM && window.DD_RUM.stopSession) {
 const IS_RUM_ACTIVE_SCRIPT = 'return !!window.DD_RUM'
 
 const DD_CIVISIBILITY_RUM_FLUSH_WAIT_MILLIS =
-Number(getEnvironmentVariable('DD_CIVISIBILITY_RUM_FLUSH_WAIT_MILLIS')) || 500
+Number(getValueFromEnvSources('DD_CIVISIBILITY_RUM_FLUSH_WAIT_MILLIS')) || 500
 const DD_CIVISIBILITY_TEST_EXECUTION_ID_COOKIE_NAME = 'datadog-ci-visibility-test-execution-id'
 
 // TODO: can we increase the supported version range?

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

@@ -1,12 +1,11 @@
 'use strict'
 
+const shimmer = require('../../datadog-shimmer')
 const {
   channel,
   addHook
 } = require('./helpers/instrument')
 
-const shimmer = require('../../datadog-shimmer')
-
 addHook({ name: 'sequelize', versions: ['>=4'], file: ['lib/sequelize.js'] }, Sequelize => {
   const startCh = channel('datadog:sequelize:query:start')
   const finishCh = channel('datadog:sequelize:query:finish')

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

@@ -1,10 +1,10 @@
 'use strict'
 
+const shimmer = require('../../datadog-shimmer')
 const {
   channel,
   addHook
 } = require('./helpers/instrument')
-const shimmer = require('../../datadog-shimmer')
 
 /**
  * @description The enum values in this map are not exposed from ShareDB, so the keys are hard-coded here.

package/packages/datadog-instrumentations/src/tedious.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: 'tedious', versions: ['>=1.0.0'] }, tedious => {
   const startCh = channel('apm:tedious:request:start')

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
 } = 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 => {
+}, (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,7 +1,7 @@
 'use strict'
 
-const { addHook, channel } = require('./helpers/instrument')
 const shimmer = require('../../datadog-shimmer')
+const { addHook, channel } = require('./helpers/instrument')
 const names = ['url', 'node:url']
 
 const parseFinishedChannel = channel('datadog:url:parse:finish')

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

@@ -1,12 +1,12 @@
 'use strict'
 
-const { addHook, channel } = require('./helpers/instrument')
 const shimmer = require('../../datadog-shimmer')
 const log = require('../../dd-trace/src/log')
 const {
   VITEST_WORKER_TRACE_PAYLOAD_CODE,
   VITEST_WORKER_LOGS_PAYLOAD_CODE
 } = require('../../dd-trace/src/plugins/util/test')
+const { addHook, channel } = require('./helpers/instrument')
 
 // test hooks
 const testStartCh = channel('ci:vitest:test:start')

package/packages/datadog-instrumentations/src/vm.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 names = ['vm', 'node:vm']
 
 const runScriptStartChannel = channel('datadog:vm:run-script:start')

package/packages/datadog-instrumentations/src/when.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')
 
 addHook({
   name: 'when',

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

@@ -1,10 +1,10 @@
 'use strict'
 
+const shimmer = require('../../datadog-shimmer')
 const {
   channel,
   addHook
 } = require('./helpers/instrument')
-const shimmer = require('../../datadog-shimmer')
 
 const patched = new WeakSet()
 

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

@@ -1,12 +1,13 @@
 '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 serverCh = tracingChannel('ws:server:connect')
 const producerCh = tracingChannel('ws:send')
 const receiverCh = tracingChannel('ws:receive')

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

@@ -1,8 +1,8 @@
 'use strict'
 
+const CompositePlugin = require('../../dd-trace/src/plugins/composite')
 const ProducerPlugin = require('./producer')
 const ConsumerPlugin = require('./consumer')
-const CompositePlugin = require('../../dd-trace/src/plugins/composite')
 
 class Amqp10Plugin extends CompositePlugin {
   static id = 'amqp10'

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

@@ -1,9 +1,9 @@
 'use strict'
 
+const CompositePlugin = require('../../dd-trace/src/plugins/composite')
 const ProducerPlugin = require('./producer')
 const ConsumerPlugin = require('./consumer')
 const ClientPlugin = require('./client')
-const CompositePlugin = require('../../dd-trace/src/plugins/composite')
 
 // TODO: Consider splitting channels for publish/receive in the instrumentation.
 class AmqplibPlugin extends CompositePlugin {