dd-trace 5.81.0 → 5.82.0

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

@@ -1,9 +1,8 @@
 'use strict'
 
-const { addHook, channel } = require('./helpers/instrument')
+const path = require('path')
 const shimmer = require('../../datadog-shimmer')
 const log = require('../../dd-trace/src/log')
-const path = require('path')
 const {
   getCoveredFilenamesFromCoverage,
   JEST_WORKER_TRACE_PAYLOAD_CODE,
@@ -21,6 +20,7 @@ const {
   getJestTestName,
   getJestSuitesToRun
 } = require('../../datadog-plugin-jest/src/util')
+const { addHook, channel } = require('./helpers/instrument')
 
 const testSessionStartCh = channel('ci:jest:session:start')
 const testSessionFinishCh = channel('ci:jest:session:finish')

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

@@ -1,12 +1,12 @@
 'use strict'
 
+const shimmer = require('../../datadog-shimmer')
+
+const log = require('../../dd-trace/src/log')
 const {
   channel,
   addHook
 } = require('./helpers/instrument')
-const shimmer = require('../../datadog-shimmer')
-
-const log = require('../../dd-trace/src/log')
 
 const producerStartCh = channel('apm:kafkajs:produce:start')
 const producerCommitCh = channel('apm:kafkajs:produce:commit')

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

@@ -1,8 +1,8 @@
 'use strict'
 
+const shimmer = require('../../datadog-shimmer')
 const { addHook, channel } = require('./helpers/instrument')
 const { wrapThen } = require('./helpers/promise')
-const shimmer = require('../../datadog-shimmer')
 
 const startRawQueryCh = channel('datadog:knex:raw:start')
 const rawQuerySubscribes = channel('datadog:knex:raw:subscribes')

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

@@ -1,11 +1,11 @@
 'use strict'
 
+const shimmer = require('../../datadog-shimmer')
 const {
   channel,
   addHook,
   AsyncResource
 } = require('./helpers/instrument')
-const shimmer = require('../../datadog-shimmer')
 
 function isString (value) {
   // eslint-disable-next-line unicorn/no-instanceof-builtins

package/packages/datadog-instrumentations/src/light-my-request.js

@@ -0,0 +1,93 @@
+'use strict'
+
+/**
+ * light-my-request instrumentation
+ *
+ * This instrumentation enables dd-trace to capture spans for Fastify inject() calls
+ * which use light-my-request internally. Without this, inject() bypasses the HTTP
+ * server instrumentation since it doesn't go through http.Server.emit('request').
+ *
+ * This is critical for platforms like Platformatic that use undici-thread-interceptor
+ * to route requests between worker threads using Fastify inject().
+ */
+
+const shimmer = require('../../datadog-shimmer')
+const {
+  channel,
+  addHook
+} = require('./helpers/instrument')
+
+// Reuse the same channels as HTTP server instrumentation
+const startServerCh = channel('apm:http:server:request:start')
+const exitServerCh = channel('apm:http:server:request:exit')
+const errorServerCh = channel('apm:http:server:request:error')
+const finishServerCh = channel('apm:http:server:request:finish')
+
+addHook({ name: 'light-my-request', versions: ['>=3'] }, (lightMyRequest) => {
+  // Wrap the inject function
+  return shimmer.wrapFunction(lightMyRequest, lightMyRequest => {
+    return function wrappedInject (dispatchFunc, options, callback) {
+      // If no subscribers, use original behavior
+      if (!startServerCh.hasSubscribers) {
+        return lightMyRequest.apply(this, arguments)
+      }
+
+      // Wrap the dispatch function to add tracing
+      const wrappedDispatch = wrapDispatchFunc(dispatchFunc)
+
+      // Call original with wrapped dispatch
+      return lightMyRequest.call(this, wrappedDispatch, options, callback)
+    }
+  })
+})
+
+function wrapDispatchFunc (dispatchFunc) {
+  return function tracedDispatch (req, res) {
+    const abortController = new AbortController()
+
+    // Link res.req like HTTP instrumentation does
+    res.req = req
+
+    // Publish start event (same as HTTP server)
+    startServerCh.publish({ req, res, abortController })
+
+    // Track when response finishes via 'finish' event (like HTTP instrumentation)
+    let finishCalled = false
+    const onFinish = () => {
+      if (!finishCalled) {
+        finishCalled = true
+        finishServerCh.publish({ req })
+      }
+    }
+
+    // light-my-request Response emits 'finish' when done
+    if (res.on && typeof res.on === 'function') {
+      res.on('finish', onFinish)
+      res.on('close', onFinish)
+    }
+
+    // Also wrap end() as fallback
+    const originalEnd = res.end
+    if (originalEnd) {
+      res.end = function wrappedEnd () {
+        const result = originalEnd.apply(this, arguments)
+        // Trigger finish if events don't fire
+        setImmediate(onFinish)
+        return result
+      }
+    }
+
+    try {
+      if (abortController.signal.aborted) {
+        return
+      }
+
+      return dispatchFunc.call(this, req, res)
+    } catch (err) {
+      errorServerCh.publish(err)
+      throw err
+    } finally {
+      exitServerCh.publish({ req })
+    }
+  }
+}

package/packages/datadog-instrumentations/src/limitd-client.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 wrapRequest (original) {
   return function () {

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

@@ -1,8 +1,7 @@
 'use strict'
 
-const { channel, addHook } = require('./helpers/instrument')
-
 const shimmer = require('../../datadog-shimmer')
+const { channel, addHook } = require('./helpers/instrument')
 
 addHook({ name: 'lodash', versions: ['>=4'] }, lodash => {
   const lodashOperationCh = channel('datadog:lodash:operation')

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

@@ -1,8 +1,7 @@
 'use strict'
 
-const { channel, addHook } = require('./helpers/instrument')
-
 const shimmer = require('../../datadog-shimmer')
+const { channel, addHook } = require('./helpers/instrument')
 
 const commandAddCh = channel('apm:mariadb:command:add')
 const connectionStartCh = channel('apm:mariadb:connection:start')

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

package/packages/datadog-instrumentations/src/mongodb-core.js

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

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

@@ -2,11 +2,11 @@
 
 require('./mongodb-core')
 
+const shimmer = require('../../datadog-shimmer')
 const {
   channel,
   addHook
 } = require('./helpers/instrument')
-const shimmer = require('../../datadog-shimmer')
 
 // collection methods with filter
 const collectionMethodsWithFilter = [

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

@@ -1,8 +1,8 @@
 'use strict'
 
+const shimmer = require('../../datadog-shimmer')
 const { addHook, channel } = require('./helpers/instrument')
 const { wrapThen } = require('./helpers/promise')
-const shimmer = require('../../datadog-shimmer')
 
 const startCh = channel('datadog:mongoose:model:filter:start')
 const finishCh = channel('datadog:mongoose:model:filter:finish')

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

@@ -1,11 +1,11 @@
 'use strict'
 
 const dc = require('dc-polyfill')
+const shimmer = require('../../datadog-shimmer')
 const {
   channel,
   addHook
 } = require('./helpers/instrument')
-const shimmer = require('../../datadog-shimmer')
 
 const prepareCh = channel('datadog:mquery:filter:prepare')
 const tracingCh = dc.tracingChannel('datadog:mquery:filter')

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

@@ -1,7 +1,7 @@
 'use strict'
 
-const { channel, addHook } = require('./helpers/instrument')
 const shimmer = require('../../datadog-shimmer')
+const { channel, addHook } = require('./helpers/instrument')
 
 addHook({ name: 'mysql', file: 'lib/Connection.js', versions: ['>=2'] }, Connection => {
   const startCh = channel('apm:mysql:query:start')

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')

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')

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 { 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,9 +1,9 @@
 '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 { addHook } = require('./helpers/instrument')
 
 const otelSdkEnabled = getEnvironmentVariable('DD_TRACE_OTEL_ENABLED') ||
 getEnvironmentVariable('OTEL_SDK_DISABLED')

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

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,
@@ -15,6 +14,7 @@ const {
   getEnvironmentVariable
 } = 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')

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 { addHook, channel } = require('./helpers/instrument')
 
 const ciSeleniumDriverGetStartCh = channel('ci:selenium:driver:get')
 

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.