dd-trace 5.80.0 → 5.82.0

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

@@ -9,6 +9,10 @@ const {
 const routeChannel = channel('apm:hono:request:route')
 const handleChannel = channel('apm:hono:request:handle')
 const errorChannel = channel('apm:hono:request:error')
+const nextChannel = channel('apm:hono:middleware:next')
+const enterChannel = channel('apm:hono:middleware:enter')
+const exitChannel = channel('apm:hono:middleware:exit')
+const finishChannel = channel('apm:hono:middleware:finish')
 
 function wrapFetch (fetch) {
   return function (request, env, executionCtx) {
@@ -34,21 +38,62 @@ function wrapCompose (compose) {
 
     const instrumentedMiddlewares = middlewares.map(h => {
       const [[fn, meta], params] = h
-
-      const instrumentedFn = (...args) => {
-        const context = args[0]
-        routeChannel.publish({
-          req: context.env.incoming,
-          route: meta?.path
-        })
-        return fn(...args)
-      }
-      return [[instrumentedFn, meta], params]
+      return [[wrapMiddleware(fn, meta?.path), meta], params]
     })
     return compose.call(this, instrumentedMiddlewares, instrumentedOnError, onNotFound)
   }
 }
 
+function wrapNext (req, route, next) {
+  return shimmer.wrapFunction(
+    next,
+    (next) =>
+      function () {
+        nextChannel.publish({ req, route })
+
+        return next.apply(this, arguments)
+      }
+  )
+}
+
+function wrapMiddleware (middleware, route) {
+  const name = middleware.name
+  return shimmer.wrapFunction(
+    middleware,
+    (middleware) =>
+      function (context, next) {
+        const req = context.env.incoming
+        routeChannel.publish({ req, route })
+        enterChannel.publish({ req, name, route })
+        if (typeof next === 'function') {
+          arguments[1] = wrapNext(req, route, next)
+        }
+        try {
+          const result = middleware.apply(this, arguments)
+          if (result && typeof result.then === 'function') {
+            return result.then(
+              (result) => {
+                finishChannel.publish({ req })
+                return result
+              },
+              (error) => {
+                errorChannel.publish({ req, error })
+                throw error
+              }
+            )
+          }
+          finishChannel.publish({ req })
+          return result
+        } catch (error) {
+          errorChannel.publish({ req, error })
+          throw error
+        } finally {
+          exitChannel.publish({ req, route })
+        }
+      }
+  )
+}
+
 addHook({
   name: 'hono',
   versions: ['>=4'],

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

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

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/langchain.js

@@ -1,113 +1,7 @@
 'use strict'
-const { addHook } = require('./helpers/instrument')
 
-const shimmer = require('../../datadog-shimmer')
+const { addHook, getHooks } = require('./helpers/instrument')
 
-const tracingChannel = require('dc-polyfill').tracingChannel
-
-function wrap (obj, name, channelName, namespace) {
-  const channel = tracingChannel(channelName)
-  shimmer.wrap(obj, name, function (original) {
-    return function () {
-      if (!channel.start.hasSubscribers) {
-        return original.apply(this, arguments)
-      }
-      const ctx = { self: this, arguments }
-      if (namespace) {
-        ctx.namespace = namespace
-      }
-      return channel.tracePromise(original, ctx, this, ...arguments)
-    }
-  })
-}
-
-// langchain compiles into ESM and CommonJS, with ESM being the default and landing in the `.js` files
-// however, CommonJS ends up in `cjs` files, and are required under the hood with `.cjs` files
-// we patch each separately and explicitly to match against exports only once, and not rely on file regex matching
-const extensions = ['js', 'cjs']
-
-for (const extension of extensions) {
-  addHook({ name: '@langchain/core', file: `dist/runnables/base.${extension}`, versions: ['>=0.1'] }, exports => {
-    if (extension === 'cjs') {
-      wrap(exports.RunnableSequence.prototype, 'invoke', 'orchestrion:@langchain/core:RunnableSequence_invoke')
-      wrap(exports.RunnableSequence.prototype, 'batch', 'orchestrion:@langchain/core:RunnableSequence_batch')
-    }
-    return exports
-  })
-
-  addHook({
-    name: '@langchain/core',
-    file: `dist/language_models/chat_models.${extension}`,
-    versions: ['>=0.1']
-  }, exports => {
-    if (extension === 'cjs') {
-      wrap(exports.BaseChatModel.prototype, 'generate', 'orchestrion:@langchain/core:BaseChatModel_generate')
-    }
-    return exports
-  })
-
-  addHook({ name: '@langchain/core', file: `dist/language_models/llms.${extension}`, versions: ['>=0.1'] }, exports => {
-    if (extension === 'cjs') {
-      wrap(exports.BaseLLM.prototype, 'generate', 'orchestrion:@langchain/core:BaseLLM_generate')
-    }
-    return exports
-  })
-
-  addHook({ name: '@langchain/core', file: `dist/tools/index.${extension}`, versions: ['>=0.1'] }, exports => {
-    if (extension === 'cjs') {
-      wrap(exports.StructuredTool.prototype, 'invoke', 'orchestrion:@langchain/core:Tool_invoke')
-    }
-    return exports
-  })
-
-  addHook({ name: '@langchain/core', file: `dist/vectorstores.${extension}`, versions: ['>=0.1'] }, exports => {
-    if (extension === 'cjs') {
-      wrap(
-        exports.VectorStore.prototype, 'similaritySearch', 'orchestrion:@langchain/core:VectorStore_similaritySearch'
-      )
-      wrap(
-        exports.VectorStore.prototype, 'similaritySearchWithScore',
-        'orchestrion:@langchain/core:VectorStore_similaritySearchWithScore'
-      )
-    }
-
-    return exports
-  })
-
-  addHook({ name: '@langchain/core', file: `dist/embeddings.${extension}`, versions: ['>=0.1'] }, exports => {
-    if (extension === 'cjs') {
-      shimmer.wrap(exports, 'Embeddings', Embeddings => {
-        return class extends Embeddings {
-          constructor (...args) {
-            super(...args)
-
-            const namespace = ['langchain', 'embeddings']
-
-            if (this.constructor.name === 'OpenAIEmbeddings') {
-              namespace.push('openai')
-            }
-
-            wrap(this, 'embedQuery', 'apm:@langchain/core:Embeddings_embedQuery', namespace)
-            wrap(this, 'embedDocuments', 'apm:@langchain/core:Embeddings_embedDocuments', namespace)
-          }
-        }
-      })
-    } else {
-      const channel = tracingChannel('orchestrion:@langchain/core:Embeddings_constructor')
-      channel.subscribe({
-        end (ctx) {
-          const { self } = ctx
-          const namespace = ['langchain', 'embeddings']
-
-          if (self.constructor.name === 'OpenAIEmbeddings') {
-            namespace.push('openai')
-          }
-
-          wrap(self, 'embedQuery', 'apm:@langchain/core:Embeddings_embedQuery', namespace)
-          wrap(self, 'embedDocuments', 'apm:@langchain/core:Embeddings_embedDocuments', namespace)
-        }
-      })
-    }
-    return exports
-  })
+for (const hook of getHooks('@langchain/core')) {
+  addHook(hook, exports => exports)
 }

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/mocha/main.js

@@ -1,6 +1,6 @@
 'use strict'
 
-const { createCoverageMap } = require('istanbul-lib-coverage')
+const { createCoverageMap } = require('../../../../vendor/dist/istanbul-lib-coverage')
 const { addHook, channel } = require('../helpers/instrument')
 const shimmer = require('../../../datadog-shimmer')
 const { isMarkedAsUnskippable } = require('../../../datadog-plugin-jest/src/util')

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('semifies')
+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 () {