dd-trace 5.58.0 → 5.59.0

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

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

@@ -1,3 +1,5 @@
+'use strict'
+
 let isEarlyFlakeDetectionEnabled = false
 let isKnownTestsEnabled = false
 let knownTestsForSuite = []
@@ -28,8 +30,8 @@ function isNewTest (test) {
 }
 
 function getTestProperties (testName) {
-  // We neeed to do it in this way because of compatibility with older versions as '?' is not supported in older
-  // versions of Cypress
+  // TODO: Use optional chaining when we drop support for older Cypress versions, which will happen when dd-trace@5 is
+  // EoL. Until then, this files needs to support Node.js 16.
   const properties = testManagementTests[testName] && testManagementTests[testName].properties || {}
 
   const { attempt_to_fix: isAttemptToFix, disabled: isDisabled, quarantined: isQuarantined } = properties

package/packages/datadog-plugin-google-cloud-vertexai/src/utils.js

@@ -1,3 +1,5 @@
+'use strict'
+
 function extractModel (instance) {
   const model = instance.model || instance.resourcePath || instance.publisherModelEndpoint
   return model?.split('/').pop()

package/packages/datadog-plugin-graphql/src/utils.js

@@ -1,3 +1,5 @@
+'use strict'
+
 function extractErrorIntoSpanEvent (config, span, exc) {
   const attributes = {}
 

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

@@ -0,0 +1,28 @@
+'use strict'
+
+const RouterPlugin = require('../../datadog-plugin-router/src')
+const web = require('../../dd-trace/src/plugins/util/web')
+
+class HonoPlugin extends RouterPlugin {
+  static get id () {
+    return 'hono'
+  }
+
+  constructor (...args) {
+    super(...args)
+
+    this.addSub('apm:hono:request:handle', ({ req }) => {
+      this.setFramework(req, 'hono', this.config)
+    })
+
+    this.addSub('apm:hono:request:route', ({ req, route }) => {
+      web.setRoute(req, route)
+    })
+
+    this.addSub('apm:hono:request:error', ({ req, error }) => {
+      web.addError(req, error)
+    })
+  }
+}
+
+module.exports = HonoPlugin

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

@@ -1,3 +1,5 @@
+'use strict'
+
 const CiPlugin = require('../../dd-trace/src/plugins/ci_plugin')
 const { storage } = require('../../datadog-core')
 const { getEnvironmentVariable } = require('../../dd-trace/src/config-helper')

package/packages/datadog-plugin-jest/src/util.js

@@ -1,3 +1,5 @@
+'use strict'
+
 const { readFileSync } = require('fs')
 const { parse, extract } = require('jest-docblock')
 

package/packages/datadog-plugin-kafkajs/src/batch-consumer.js

@@ -1,3 +1,5 @@
+'use strict'
+
 const ConsumerPlugin = require('../../dd-trace/src/plugins/consumer')
 const { getMessageSize } = require('../../dd-trace/src/datastreams')
 const { convertToTextMap } = require('./utils')

package/packages/datadog-plugin-langchain/src/tracing.js

@@ -40,9 +40,14 @@ class BaseLangChainTracingPlugin extends TracingPlugin {
 
     // Runnable interfaces have an `lc_namespace` property
     const ns = ctx.self.lc_namespace || ctx.namespace
-    const resource = ctx.resource = [...ns, ctx.self.constructor.name].join('.')
 
-    const handler = this.handlers[type]
+    const resourceParts = [...ns, ctx.self.constructor.name]
+    if (type === 'tool') {
+      resourceParts.push(ctx.instance.name)
+    }
+    const resource = ctx.resource = resourceParts.join('.')
+
+    const handler = this.handlers[type] || this.handlers.default
 
     const instance = ctx.instance
     const apiKey = handler.extractApiKey(instance)
@@ -78,7 +83,7 @@ class BaseLangChainTracingPlugin extends TracingPlugin {
 
     const { type } = ctx
 
-    const handler = this.handlers[type]
+    const handler = this.handlers[type] || this.handlers.default
     const tags = handler.getSpanEndTags(ctx, span) || {}
 
     span.addTags(tags)
@@ -139,11 +144,38 @@ class EmbeddingsEmbedDocumentsPlugin extends BaseLangChainTracingPlugin {
   }
 }
 
+class ToolInvokePlugin extends BaseLangChainTracingPlugin {
+  static get id () { return 'langchain_tool_invoke' }
+  static get lcType () { return 'tool' }
+  static get prefix () {
+    return 'tracing:orchestrion:@langchain/core:Tool_invoke'
+  }
+}
+
+class VectorStoreSimilaritySearchPlugin extends BaseLangChainTracingPlugin {
+  static get id () { return 'langchain_vectorstore_similarity_search' }
+  static get lcType () { return 'similarity_search' }
+  static get prefix () {
+    return 'tracing:orchestrion:@langchain/core:VectorStore_similaritySearch'
+  }
+}
+
+class VectorStoreSimilaritySearchWithScorePlugin extends BaseLangChainTracingPlugin {
+  static get id () { return 'langchain_vectorstore_similarity_search_with_score' }
+  static get lcType () { return 'similarity_search' }
+  static get prefix () {
+    return 'tracing:orchestrion:@langchain/core:VectorStore_similaritySearchWithScore'
+  }
+}
+
 module.exports = [
   RunnableSequenceInvokePlugin,
   RunnableSequenceBatchPlugin,
   BaseChatModelGeneratePlugin,
   BaseLLMGeneratePlugin,
   EmbeddingsEmbedQueryPlugin,
-  EmbeddingsEmbedDocumentsPlugin
+  EmbeddingsEmbedDocumentsPlugin,
+  ToolInvokePlugin,
+  VectorStoreSimilaritySearchPlugin,
+  VectorStoreSimilaritySearchWithScorePlugin
 ]

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

@@ -1,3 +1,5 @@
+'use strict'
+
 const CiPlugin = require('../../dd-trace/src/plugins/ci_plugin')
 
 class NycPlugin extends CiPlugin {

package/packages/datadog-plugin-oracledb/src/connection-parser.js

@@ -1,3 +1,5 @@
+'use strict'
+
 const { URL } = require('url')
 const log = require('../../dd-trace/src/log')
 

package/packages/datadog-plugin-protobufjs/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-protobufjs/src/schema_iterator.js

@@ -1,3 +1,5 @@
+'use strict'
+
 const PROTOBUF = 'protobuf'
 const {
   SCHEMA_DEFINITION,

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

@@ -1,3 +1,5 @@
+'use strict'
+
 const CiPlugin = require('../../dd-trace/src/plugins/ci_plugin')
 const { storage } = require('../../datadog-core')
 

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

@@ -1,3 +1,5 @@
+'use strict'
+
 const CiPlugin = require('../../dd-trace/src/plugins/ci_plugin')
 const { storage } = require('../../datadog-core')
 const { getEnvironmentVariable } = require('../../dd-trace/src/config-helper')

package/packages/dd-trace/src/appsec/iast/iast-context.js

@@ -1,3 +1,5 @@
+'use strict'
+
 const IAST_CONTEXT_KEY = Symbol('_dd.iast.context')
 const IAST_TRANSACTION_ID = Symbol('_dd.iast.transactionId')
 
@@ -52,7 +54,9 @@ function cleanIastContext (store, context, iastContext) {
     context[IAST_CONTEXT_KEY] = null
   }
   if (iastContext) {
-    Object.keys(iastContext).forEach(key => delete iastContext[key])
+    if (typeof iastContext === 'object') { // eslint-disable-line eslint-rules/eslint-safe-typeof-object
+      Object.keys(iastContext).forEach(key => delete iastContext[key])
+    }
     return true
   }
   return false

package/packages/dd-trace/src/appsec/iast/index.js

@@ -1,3 +1,5 @@
+'use strict'
+
 const vulnerabilityReporter = require('./vulnerability-reporter')
 const { enableAllAnalyzers, disableAllAnalyzers } = require('./analyzers')
 const web = require('../../plugins/util/web')

package/packages/dd-trace/src/appsec/iast/overhead-controller.js

@@ -1,6 +1,6 @@
 'use strict'
 
-const LRUCache = require('lru-cache')
+const { LRUCache } = require('lru-cache')
 const web = require('../../plugins/util/web')
 const vulnerabilities = require('./vulnerabilities')
 

package/packages/dd-trace/src/appsec/iast/taint-tracking/rewriter-esm.mjs

@@ -1,5 +1,3 @@
-'use strict'
-
 import path from 'path'
 import { URL } from 'url'
 import { getName } from '../telemetry/verbosity.js'

package/packages/dd-trace/src/appsec/iast/taint-tracking/rewriter.js

@@ -1,5 +1,7 @@
 'use strict'
 
+/* eslint n/no-unsupported-features/node-builtins: ['error', { ignores: ['module.register'] }] */
+
 const Module = require('module')
 const { pathToFileURL } = require('url')
 const { MessageChannel } = require('worker_threads')

package/packages/dd-trace/src/appsec/iast/vulnerabilities-formatter/evidence-redaction/sensitive-regex.js

@@ -1,3 +1,5 @@
+'use strict'
+
 // eslint-disable-next-line @stylistic/max-len
 const DEFAULT_IAST_REDACTION_NAME_PATTERN = '(?:p(?:ass)?w(?:or)?d|pass(?:_?phrase)?|secret|(?:api_?|private_?|public_?|access_?|secret_?)key(?:_?id)?|token|consumer_?(?:id|key|secret)|sign(?:ed|ature)?|auth(?:entication|orization)?|(?:sur|last)name|user(?:name)?|address|e?mail)'
 // eslint-disable-next-line @stylistic/max-len

package/packages/dd-trace/src/appsec/iast/vulnerabilities.js

@@ -1,3 +1,5 @@
+'use strict'
+
 module.exports = {
   COMMAND_INJECTION: 'COMMAND_INJECTION',
   CODE_INJECTION: 'CODE_INJECTION',

package/packages/dd-trace/src/appsec/iast/vulnerability-reporter.js

@@ -1,6 +1,6 @@
 'use strict'
 
-const LRU = require('lru-cache')
+const { LRUCache } = require('lru-cache')
 const vulnerabilitiesFormatter = require('./vulnerabilities-formatter')
 const { IAST_ENABLED_TAG_KEY, IAST_JSON_TAG_KEY } = require('./tags')
 const { keepTrace } = require('../../priority_sampler')
@@ -10,7 +10,7 @@ const { ASM } = require('../../standalone/product')
 
 const VULNERABILITIES_KEY = 'vulnerabilities'
 const VULNERABILITY_HASHES_MAX_SIZE = 1000
-const VULNERABILITY_HASHES = new LRU({ max: VULNERABILITY_HASHES_MAX_SIZE })
+const VULNERABILITY_HASHES = new LRUCache({ max: VULNERABILITY_HASHES_MAX_SIZE })
 const RESET_VULNERABILITY_CACHE_INTERVAL = 60 * 60 * 1000 // 1 hour
 
 let tracer
@@ -114,7 +114,7 @@ function isDuplicatedVulnerability (vulnerability) {
 }
 
 function getVulnerabilityCallSiteFrames () {
-  return getCallsiteFrames(stackTraceMaxDepth)
+  return getCallsiteFrames(stackTraceMaxDepth, getVulnerabilityCallSiteFrames)
 }
 
 function replaceCallSiteFromSourceMap (callsite) {

package/packages/dd-trace/src/appsec/rasp/fs-plugin.js

@@ -14,25 +14,31 @@ const enabledFor = {
 
 let fsPlugin
 
-function enterWith (fsProps, store = storage('legacy').getStore()) {
+function getStoreToStart (fsProps, store = storage('legacy').getStore()) {
   if (store && !store.fs?.opExcluded) {
-    storage('legacy').enterWith({
+    return {
       ...store,
       fs: {
         ...store.fs,
         ...fsProps,
         parentStore: store
       }
-    })
+    }
   }
+
+  return store
 }
 
 class AppsecFsPlugin extends Plugin {
   enable () {
-    this.addSub('apm:fs:operation:start', this._onFsOperationStart)
-    this.addSub('apm:fs:operation:finish', this._onFsOperationFinishOrRenderEnd)
-    this.addSub('tracing:datadog:express:response:render:start', this._onResponseRenderStart)
-    this.addSub('tracing:datadog:express:response:render:end', this._onFsOperationFinishOrRenderEnd)
+    this.addBind('apm:fs:operation:start', this._onFsOperationStart)
+    this.addBind('apm:fs:operation:finish', this._onFsOperationFinishOrRenderEnd)
+    this.addBind('tracing:datadog:express:response:render:start', this._onResponseRenderStart)
+    this.addBind('tracing:datadog:express:response:render:end', this._onFsOperationFinishOrRenderEnd)
+    // TODO Remove this when dc-polyfill is fixed&updated
+    //  hack to node 18 and early 20.x
+    //  with dc-polyfill addBind is not enough to force a channel.hasSubscribers === true
+    this.addSub('tracing:datadog:express:response:render:start', () => {})
 
     super.configure(true)
   }
@@ -44,19 +50,20 @@ class AppsecFsPlugin extends Plugin {
   _onFsOperationStart () {
     const store = storage('legacy').getStore()
     if (store) {
-      enterWith({ root: store.fs?.root === undefined }, store)
+      return getStoreToStart({ root: store.fs?.root === undefined }, store)
     }
   }
 
   _onResponseRenderStart () {
-    enterWith({ opExcluded: true })
+    return getStoreToStart({ opExcluded: true })
   }
 
   _onFsOperationFinishOrRenderEnd () {
     const store = storage('legacy').getStore()
-    if (store?.fs?.parentStore) {
-      storage('legacy').enterWith(store.fs.parentStore)
+    if (store?.fs) {
+      return store.fs.parentStore
     }
+    return store
   }
 }
 

package/packages/dd-trace/src/appsec/rasp/utils.js

@@ -41,7 +41,7 @@ function handleResult (result, req, res, abortController, config, raspRule) {
   const ruleTriggered = !!result?.events?.length
 
   if (generateStackTraceAction && enabled && canReportStackTrace(rootSpan, maxStackTraces)) {
-    const frames = getCallsiteFrames(maxDepth)
+    const frames = getCallsiteFrames(maxDepth, handleResult)
 
     reportStackTrace(
       rootSpan,