dd-trace 5.57.1 → 5.59.0

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

@@ -0,0 +1,102 @@
+'use strict'
+
+const shimmer = require('../../datadog-shimmer')
+const {
+  addHook,
+  channel
+} = require('./helpers/instrument')
+
+const routeChannel = channel('apm:hono:request:route')
+const handleChannel = channel('apm:hono:request:handle')
+const errorChannel = channel('apm:hono:request:error')
+
+function wrapFetch (fetch) {
+  return function (request, env, executionCtx) {
+    handleChannel.publish({ req: env.incoming })
+    return fetch.apply(this, arguments)
+  }
+}
+
+function wrapCompose (compose) {
+  return function (middleware, onError, onNotFound) {
+    const instrumentedOnError = (...args) => {
+      const [error, context] = args
+      const req = context.env.incoming
+      errorChannel.publish({ req, error })
+      return onError(...args)
+    }
+
+    const instrumentedMiddlewares = middleware.map(h => {
+      const [[fn, meta], params] = h
+
+      // TODO: handle middleware instrumentation
+      const instrumentedFn = (...args) => {
+        const context = args[0]
+        const req = context.env.incoming
+        const route = meta.path
+        routeChannel.publish({
+          req,
+          route
+        })
+        return fn(...args)
+      }
+      return [[instrumentedFn, meta], params]
+    })
+    return compose.apply(this, [instrumentedMiddlewares, instrumentedOnError, onNotFound])
+  }
+}
+
+addHook({
+  name: 'hono',
+  versions: ['>=4'],
+  file: 'dist/hono.js'
+}, hono => {
+  class Hono extends hono.Hono {
+    constructor (...args) {
+      super(...args)
+      shimmer.wrap(this, 'fetch', wrapFetch)
+    }
+  }
+
+  hono.Hono = Hono
+
+  return hono
+})
+
+addHook({
+  name: 'hono',
+  versions: ['>=4'],
+  file: 'dist/cjs/hono.js'
+}, hono => {
+  class Hono extends hono.Hono {
+    constructor (...args) {
+      super(...args)
+      shimmer.wrap(this, 'fetch', wrapFetch)
+    }
+  }
+
+  return Object.create(hono, {
+    Hono: {
+      get () {
+        return Hono
+      },
+      enumerable: true,
+    }
+  })
+})
+
+addHook({
+  name: 'hono',
+  versions: ['>=4'],
+  file: 'dist/cjs/compose.js'
+}, Compose => {
+  return shimmer.wrap(Compose, 'compose', wrapCompose, { replaceGetter: true })
+})
+
+addHook({
+  name: 'hono',
+  versions: ['>=4'],
+  file: 'dist/compose.js'
+}, Compose => {
+  return shimmer.wrap(Compose, 'compose', wrapCompose)
+})

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

@@ -1071,7 +1071,7 @@ function jestAdapterWrapper (jestAdapter, jestVersion) {
   const adapter = jestAdapter.default ?? jestAdapter
   const newAdapter = shimmer.wrapFunction(adapter, adapter => function () {
     const environment = arguments[2]
-    if (!environment) {
+    if (!environment || !environment.testEnvironmentOptions) {
       return adapter.apply(this, arguments)
     }
     testSuiteStartCh.publish({

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

@@ -53,6 +53,27 @@ for (const extension of extensions) {
     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 => {

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

@@ -1,3 +1,5 @@
+'use strict'
+
 const { addHook, channel } = require('../helpers/instrument')
 const shimmer = require('../../../datadog-shimmer')
 const { getCallSites } = require('../../../dd-trace/src/plugins/util/stacktrace')

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

@@ -1,3 +1,5 @@
+'use strict'
+
 const { getEnvironmentVariable } = require('../../dd-trace/src/config-helper')
 
 if (getEnvironmentVariable('MOCHA_WORKER_ID')) {

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

@@ -35,7 +35,7 @@ function wrapConnection (Connection, version) {
   shimmer.wrap(Connection.prototype, 'query', query => function (sql, values, cb) {
     if (!startOuterQueryCh.hasSubscribers) return query.apply(this, arguments)
 
-    if (typeof sql === 'object') sql = sql?.sql
+    if (sql !== null && typeof sql === 'object') sql = sql.sql
 
     if (!sql) return query.apply(this, arguments)
 
@@ -76,7 +76,7 @@ function wrapConnection (Connection, version) {
   shimmer.wrap(Connection.prototype, 'execute', execute => function (sql, values, cb) {
     if (!startOuterQueryCh.hasSubscribers) return execute.apply(this, arguments)
 
-    if (typeof sql === 'object') sql = sql?.sql
+    if (sql !== null && typeof sql === 'object') sql = sql.sql
 
     if (!sql) return execute.apply(this, arguments)
 
@@ -167,7 +167,7 @@ function wrapPool (Pool, version) {
   shimmer.wrap(Pool.prototype, 'query', query => function (sql, values, cb) {
     if (!startOuterQueryCh.hasSubscribers) return query.apply(this, arguments)
 
-    if (typeof sql === 'object') sql = sql?.sql
+    if (sql !== null && typeof sql === 'object') sql = sql.sql
 
     if (!sql) return query.apply(this, arguments)
 
@@ -206,7 +206,7 @@ function wrapPool (Pool, version) {
   shimmer.wrap(Pool.prototype, 'execute', execute => function (sql, values, cb) {
     if (!startOuterQueryCh.hasSubscribers) return execute.apply(this, arguments)
 
-    if (typeof sql === 'object') sql = sql?.sql
+    if (sql !== null && typeof sql === 'object') sql = sql.sql
 
     if (!sql) return execute.apply(this, arguments)
 
@@ -239,7 +239,7 @@ function wrapPoolCluster (PoolCluster) {
 
     if (startOuterQueryCh.hasSubscribers && !wrappedPoolNamespaces.has(poolNamespace)) {
       shimmer.wrap(poolNamespace, 'query', query => function (sql, values, cb) {
-        if (typeof sql === 'object') sql = sql?.sql
+        if (sql !== null && typeof sql === 'object') sql = sql.sql
 
         if (!sql) return query.apply(this, arguments)
 
@@ -274,7 +274,7 @@ function wrapPoolCluster (PoolCluster) {
       })
 
       shimmer.wrap(poolNamespace, 'execute', execute => function (sql, values, cb) {
-        if (typeof sql === 'object') sql = sql?.sql
+        if (sql !== null && typeof sql === 'object') sql = sql.sql
 
         if (!sql) return execute.apply(this, arguments)
 

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

@@ -51,7 +51,9 @@ function wrapHandleApiRequest (handleApiRequest) {
 function wrapHandleApiRequestWithMatch (handleApiRequest) {
   return function (req, res, query, match) {
     return instrument(req, res, () => {
-      const page = (match !== null && typeof match === 'object' && typeof match.definition === 'object')
+      const page = (
+        match !== null && typeof match === 'object' && match.definition !== null && typeof match.definition === 'object'
+      )
         ? match.definition.pathname
         : undefined
 

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

@@ -1,3 +1,5 @@
+'use strict'
+
 const { addHook, channel } = require('./helpers/instrument')
 const shimmer = require('../../datadog-shimmer')
 const { getEnvironmentVariable } = require('../../dd-trace/src/config-helper')

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

@@ -38,12 +38,34 @@ addHook({ name: 'oracledb', versions: ['>=5'] }, oracledb => {
       }
 
       return new AsyncResource('apm:oracledb:inner-scope').runInAsyncScope(() => {
+        // The connAttrs are used to pass through the argument to the potential
+        // serviceName method a user might have passed through as well as parsing
+        // the connection string in v5.
         const connAttrs = connectionAttributes.get(this)
-        startChannel.publish({ query: dbQuery, connAttrs })
+
+        const details = typeof this.hostName === 'string' ? this : this._impl
+
+        let hostname
+        let port
+        let dbInstance
+
+        if (details) {
+          dbInstance = details.serviceName
+          hostname = details.hostName ?? details.nscon?.ntAdapter?.hostName
+          port = String(details.port ?? details.nscon?.ntAdapter?.port ?? '')
+        }
+
+        startChannel.publish({
+          query: dbQuery,
+          connAttrs,
+          dbInstance,
+          port,
+          hostname,
+        })
         try {
           let result = execute.apply(this, arguments)
 
-          if (result && typeof result.then === 'function') {
+          if (typeof result?.then === 'function') {
             result = result.then(
               x => {
                 finish()

package/packages/datadog-instrumentations/src/orchestrion-config/index.js

@@ -1,3 +1,5 @@
+'use strict'
+
 module.exports = `
 version: 1
 dc_module: dc-polyfill
@@ -51,4 +53,34 @@ instrumentations:
       class: Embeddings
     operator: traceSync
     channel_name: "Embeddings_constructor"
+  - module_name: "@langchain/core"
+    version_range: ">=0.1.0"
+    file_path: dist/tools/index.js
+    function_query:
+      name: invoke
+      type: method
+      kind: async
+      class: StructuredTool
+    operator: tracePromise
+    channel_name: "Tool_invoke"
+  - module_name: "@langchain/core"
+    version_range: ">=0.1.0"
+    file_path: dist/vectorstores.js
+    function_query:
+      name: similaritySearch
+      type: method
+      kind: async
+      class: VectorStore
+    operator: tracePromise
+    channel_name: "VectorStore_similaritySearch"
+  - module_name: "@langchain/core"
+    version_range: ">=0.1.0"
+    file_path: dist/vectorstores.js
+    function_query:
+      name: similaritySearchWithScore
+      type: method
+      kind: async
+      class: VectorStore
+    operator: tracePromise
+    channel_name: "VectorStore_similaritySearchWithScore"
 `

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

@@ -1,3 +1,5 @@
+'use strict'
+
 const satisfies = require('semifies')
 
 const { addHook, channel } = require('./helpers/instrument')
@@ -335,7 +337,9 @@ function testEndHandler (test, annotations, testStatus, error, isTimeout, isMain
     testStatuses.push(testStatus)
   }
 
-  if (testStatuses.length === testManagementAttemptToFixRetries + 1) {
+  const testProperties = getTestProperties(test)
+
+  if (testStatuses.length === testManagementAttemptToFixRetries + 1 && testProperties.attemptToFix) {
     if (testStatuses.includes('fail')) {
       test._ddHasFailedAttemptToFixRetries = true
     }

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

@@ -1,3 +1,5 @@
+'use strict'
+
 const shimmer = require('../../datadog-shimmer')
 const { addHook } = require('./helpers/instrument')
 

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

@@ -1,3 +1,5 @@
+'use strict'
+
 const { addHook, channel } = require('./helpers/instrument')
 const shimmer = require('../../datadog-shimmer')
 

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

@@ -2,8 +2,7 @@
 
 const {
   channel,
-  addHook,
-  AsyncResource
+  addHook
 } = require('./helpers/instrument')
 const shimmer = require('../../datadog-shimmer')
 
@@ -22,30 +21,26 @@ addHook({ name: 'tedious', versions: ['>=1.0.0'] }, tedious => {
       return makeRequest.apply(this, arguments)
     }
 
-    const callbackResource = new AsyncResource('bound-anonymous-fn')
-    const asyncResource = new AsyncResource('bound-anonymous-fn')
-
     const connectionConfig = this.config
+    const ctx = { queryOrProcedure, connectionConfig }
 
-    return asyncResource.runInAsyncScope(() => {
-      const payload = { queryOrProcedure, connectionConfig }
-      startCh.publish(payload)
-      queryParent[queryField] = payload.sql
+    return startCh.runStores(ctx, () => {
+      queryParent[queryField] = ctx.sql
 
-      const cb = callbackResource.bind(request.callback, request)
-      request.callback = asyncResource.bind(function (error) {
+      const cb = request.callback
+      request.callback = function (error, ...args) {
         if (error) {
-          errorCh.publish(error)
+          ctx.error = error
+          errorCh.publish(ctx)
         }
-        finishCh.publish()
-
-        return cb.apply(this, arguments)
-      }, null, request)
+        return finishCh.runStores(ctx, cb, this, error, ...args)
+      }
 
       try {
         return makeRequest.apply(this, arguments)
       } catch (error) {
-        errorCh.publish(error)
+        ctx.error = error
+        errorCh.publish(ctx)
 
         throw error
       }

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

@@ -1,3 +1,5 @@
+'use strict'
+
 const { addHook, channel } = require('./helpers/instrument')
 const shimmer = require('../../datadog-shimmer')
 const log = require('../../dd-trace/src/log')

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

@@ -1,3 +1,5 @@
+'use strict'
+
 const SchemaPlugin = require('../../dd-trace/src/plugins/schema')
 const SchemaExtractor = require('./schema_iterator')
 

package/packages/datadog-plugin-avsc/src/schema_iterator.js

@@ -1,3 +1,5 @@
+'use strict'
+
 const AVRO = 'avro'
 const {
   SCHEMA_DEFINITION,

package/packages/datadog-plugin-aws-sdk/src/base.js

@@ -73,9 +73,25 @@ class BaseAwsSdkPlugin extends ClientPlugin {
         span.addTags(requestTags)
       }
 
+      this.enter(span)
       const store = storage('legacy').getStore()
 
-      this.enter(span, store)
+      const peerServerlessStorage = storage('peerServerless')
+      if (!this._tracerConfig?._isInServerlessEnvironment()) return
+
+      // Try to resolve the hostname immediately; if not possible, keep enough
+      // information so the region callback can resolve it later.
+      const hostname = getHostname({ awsParams: request.params, awsService }, awsRegion)
+      const peerServerlessStore = {}
+      peerServerlessStorage.enterWith(peerServerlessStore)
+
+      if (hostname) {
+        span.setTag('peer.service', hostname)
+        peerServerlessStore.peerHostname = hostname
+      } else {
+        store.awsParams = request.params
+        store.awsService = awsService
+      }
     })
 
     this.addSub(`apm:aws:request:region:${this.serviceIdentifier}`, region => {
@@ -85,6 +101,17 @@ class BaseAwsSdkPlugin extends ClientPlugin {
       if (!span) return
       span.setTag('aws.region', region)
       span.setTag('region', region)
+
+      if (!this._tracerConfig?._isInServerlessEnvironment()) return
+
+      const hostname = getHostname(store, region)
+      if (!hostname) return
+
+      span.setTag('peer.service', hostname)
+      const peerServerlessStore = storage('peerServerless').getStore()
+      if (peerServerlessStore) {
+        peerServerlessStore.peerHostname = hostname
+      }
     })
 
     this.addSub(`apm:aws:request:complete:${this.serviceIdentifier}`, ({ response, cbExists = false }) => {
@@ -243,4 +270,27 @@ function getHooks (config) {
   return { request }
 }
 
+function getHostname (store, region) {
+  if (!store) return
+  if (!region) return
+  const { awsParams, awsService } = store
+  switch (awsService) {
+    case 'EventBridge':
+      return `events.${region}.amazonaws.com`
+    case 'SQS':
+      return `sqs.${region}.amazonaws.com`
+    case 'SNS':
+      return `sns.${region}.amazonaws.com`
+    case 'Kinesis':
+      return `kinesis.${region}.amazonaws.com`
+    case 'DynamoDBDocument':
+    case 'DynamoDB':
+      return `dynamodb.${region}.amazonaws.com`
+    case 'S3':
+      return awsParams?.Bucket
+        ? `${awsParams.Bucket}.s3.${region}.amazonaws.com`
+        : `s3.${region}.amazonaws.com`
+  }
+}
+
 module.exports = BaseAwsSdkPlugin

package/packages/datadog-plugin-aws-sdk/src/services/bedrockruntime/index.js

@@ -1,3 +1,5 @@
+'use strict'
+
 const CompositePlugin = require('../../../../dd-trace/src/plugins/composite')
 const BedrockRuntimeTracing = require('./tracing')
 const BedrockRuntimeLLMObsPlugin = require('../../../../dd-trace/src/llmobs/plugins/bedrockruntime')

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

@@ -35,7 +35,9 @@ class ChildProcessPlugin extends TracingPlugin {
     return this._tracer
   }
 
-  start ({ command, shell }) {
+  start (ctx) {
+    const { command, shell } = ctx
+
     if (typeof command !== 'string') {
       return
     }
@@ -58,10 +60,13 @@ class ChildProcessPlugin extends TracingPlugin {
       resource: (shell === true) ? 'sh' : cmdFields[0],
       type: 'system',
       meta
-    })
+    }, ctx)
+
+    return ctx.currentStore
   }
 
-  end ({ result, error }) {
+  end (ctx) {
+    const { result, error } = ctx
     let exitCode
 
     if (result !== undefined) {
@@ -74,17 +79,32 @@ class ChildProcessPlugin extends TracingPlugin {
       exitCode = error?.status || error?.code || 0
     }
 
-    this.activeSpan?.setTag('cmd.exit_code', `${exitCode}`)
-    this.activeSpan?.finish()
+    const span = ctx.currentStore?.span || this.activeSpan
+
+    span?.setTag('cmd.exit_code', `${exitCode}`)
+    span?.finish()
+
+    return ctx.parentStore
   }
 
-  error (error) {
-    this.addError(error)
+  error (ctx) {
+    const { error } = ctx
+
+    const span = ctx.currentStore?.span || this.activeSpan
+    this.addError(error, span)
+
+    return ctx.parentStore
   }
 
-  asyncEnd ({ result }) {
-    this.activeSpan?.setTag('cmd.exit_code', `${result}`)
-    this.activeSpan?.finish()
+  asyncEnd (ctx) {
+    const { result } = ctx
+
+    const span = ctx.currentStore?.span || this.activeSpan
+
+    span?.setTag('cmd.exit_code', `${result}`)
+    span?.finish()
+
+    return ctx.parentStore
   }
 }
 

package/packages/datadog-plugin-child_process/src/scrub-cmd-params.js

@@ -63,7 +63,7 @@ function scrubChildProcessCmd (expression) {
 
       if (token === null) {
         continue
-      } else if (typeof token === 'object') {
+      } else if (typeof token === 'object') { // eslint-disable-line eslint-rules/eslint-safe-typeof-object
         if (token.pattern) {
           result.push(token.pattern)
         } else if (token.op) {

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

@@ -1,3 +1,5 @@
+'use strict'
+
 const cypressPlugin = require('./cypress-plugin')
 
 module.exports = cypressPlugin.afterRun.bind(cypressPlugin)

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

@@ -1,3 +1,5 @@
+'use strict'
+
 const cypressPlugin = require('./cypress-plugin')
 
 module.exports = cypressPlugin.afterSpec.bind(cypressPlugin)

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

@@ -1,3 +1,5 @@
+'use strict'
+
 const {
   TEST_STATUS,
   TEST_IS_RUM_ACTIVE,
@@ -76,7 +78,8 @@ const {
   GIT_TAG,
   GIT_PULL_REQUEST_BASE_BRANCH_SHA,
   GIT_COMMIT_HEAD_SHA,
-  GIT_PULL_REQUEST_BASE_BRANCH
+  GIT_PULL_REQUEST_BASE_BRANCH,
+  GIT_COMMIT_HEAD_MESSAGE
 } = require('../../dd-trace/src/plugins/util/tags')
 const {
   OS_VERSION,
@@ -238,7 +241,8 @@ class CypressPlugin {
       [GIT_COMMIT_MESSAGE]: commitMessage,
       [GIT_TAG]: tag,
       [GIT_PULL_REQUEST_BASE_BRANCH_SHA]: pullRequestBaseSha,
-      [GIT_COMMIT_HEAD_SHA]: commitHeadSha
+      [GIT_COMMIT_HEAD_SHA]: commitHeadSha,
+      [GIT_COMMIT_HEAD_MESSAGE]: commitHeadMessage
     } = this.testEnvironmentMetadata
 
     this.repositoryRoot = repositoryRoot || process.cwd()
@@ -258,7 +262,8 @@ class CypressPlugin {
       commitMessage,
       tag,
       pullRequestBaseSha,
-      commitHeadSha
+      commitHeadSha,
+      commitHeadMessage
     }
     this.finishedTestsByFile = {}
     this.testStatuses = {}

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

@@ -1,3 +1,5 @@
+'use strict'
+
 const Plugin = require('../../dd-trace/src/plugins/plugin')
 
 // Cypress plugin does not patch any library. This is just a placeholder to

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

@@ -1,3 +1,5 @@
+'use strict'
+
 const NoopTracer = require('../../dd-trace/src/noop/tracer')
 const cypressPlugin = require('./cypress-plugin')
 const satisfies = require('semifies')