dd-trace 5.58.0 → 5.60.0

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

@@ -5,6 +5,7 @@ const shimmer = require('../../datadog-shimmer')
 
 const dc = require('dc-polyfill')
 const ch = dc.tracingChannel('apm:openai:request')
+const onStreamedChunkCh = dc.channel('apm:openai:request:chunk')
 
 const V4_PACKAGE_SHIMS = [
   {
@@ -160,79 +161,12 @@ addHook({ name: 'openai', file: 'dist/api.js', versions: ['>=3.0.0 <4'] }, expor
   return exports
 })
 
-function addStreamedChunk (content, chunk) {
-  content.usage = chunk.usage // add usage if it was specified to be returned
-  for (const choice of chunk.choices) {
-    const choiceIdx = choice.index
-    const oldChoice = content.choices.find(choice => choice?.index === choiceIdx)
-    if (oldChoice) {
-      if (!oldChoice.finish_reason) {
-        oldChoice.finish_reason = choice.finish_reason
-      }
-
-      // delta exists on chat completions
-      const delta = choice.delta
-
-      if (delta) {
-        const content = delta.content
-        if (content) {
-          if (oldChoice.delta.content) { // we don't want to append to undefined
-            oldChoice.delta.content += content
-          } else {
-            oldChoice.delta.content = content
-          }
-        }
-      } else {
-        const text = choice.text
-        if (text) {
-          if (oldChoice.text) {
-            oldChoice.text += text
-          } else {
-            oldChoice.text = text
-          }
-        }
-      }
-
-      // tools only exist on chat completions
-      const tools = delta && choice.delta.tool_calls
-
-      if (tools) {
-        oldChoice.delta.tool_calls = tools.map((newTool, toolIdx) => {
-          const oldTool = oldChoice.delta.tool_calls?.[toolIdx]
-
-          if (oldTool) {
-            oldTool.function.arguments += newTool.function.arguments
-            return oldTool
-          }
-
-          return newTool
-        })
-      }
-    } else {
-      // we don't know which choices arrive in which order
-      content.choices[choiceIdx] = choice
-    }
-  }
-}
-
-function convertBufferstoObjects (chunks) {
-  return Buffer
-    .concat(chunks) // combine the buffers
-    .toString() // stringify
-    .split(/(?=data:)/) // split on "data:"
-    .map(chunk => chunk.replaceAll('\n', '').slice(6)) // remove newlines and 'data: ' from the front
-    .slice(0, -1) // remove the last [DONE] message
-    .map(JSON.parse) // parse all of the returned objects
-}
-
 /**
  * For streamed responses, we need to accumulate all of the content in
  * the chunks, and let the combined content be the final response.
  * This way, spans look the same as when not streamed.
  */
-function wrapStreamIterator (response, options, n, ctx) {
-  let processChunksAsBuffers = false
-  let chunks = []
+function wrapStreamIterator (response, options, ctx) {
   return function (itr) {
     return function () {
       const iterator = itr.apply(this, arguments)
@@ -240,39 +174,11 @@ function wrapStreamIterator (response, options, n, ctx) {
         return next.apply(this, arguments)
           .then(res => {
             const { done, value: chunk } = res
-
-            if (chunk) {
-              chunks.push(chunk)
-              // TODO(BridgeAR): It likely depends on the options being passed
-              // through if the stream returns buffers or not. By reading that,
-              // we don't have to do the instanceof check anymore, which is
-              // relatively expensive.
-              if (chunk instanceof Buffer) {
-                // this operation should be safe
-                // if one chunk is a buffer (versus a plain object), the rest should be as well
-                processChunksAsBuffers = true
-              }
-            }
+            onStreamedChunkCh.publish({ ctx, chunk, done })
 
             if (done) {
-              let body = {}
-              if (processChunksAsBuffers) {
-                chunks = convertBufferstoObjects(chunks)
-              }
-
-              if (chunks.length) {
-                // Define the initial body having all the content outside of choices from the first chunk
-                // this will include import data like created, id, model, etc.
-                body = { ...chunks[0], choices: Array.from({ length: n }) }
-                // Start from the first chunk, and add its choices into the body
-                for (const chunk_ of chunks) {
-                  addStreamedChunk(body, chunk_)
-                }
-              }
-
               finish(ctx, {
                 headers: response.headers,
-                data: body,
                 request: {
                   path: response.url,
                   method: options.method
@@ -312,17 +218,6 @@ for (const extension of extensions) {
           // chat.completions and completions
           const stream = streamedResponse && getOption(arguments, 'stream', false)
 
-          // we need to compute how many prompts we are sending in streamed cases for completions
-          // not applicable for chat completiond
-          let n
-          if (stream) {
-            n = getOption(arguments, 'n', 1)
-            const prompt = getOption(arguments, 'prompt')
-            if (Array.isArray(prompt) && typeof prompt[0] !== 'number') {
-              n *= prompt.length
-            }
-          }
-
           const client = this._client || this.client
 
           const ctx = {
@@ -348,7 +243,7 @@ for (const extension of extensions) {
                   const parsedPromise = origApiPromParse.apply(this, arguments)
                     .then(body => Promise.all([this.responsePromise, body]))
 
-                  return handleUnwrappedAPIPromise(parsedPromise, ctx, stream, n)
+                  return handleUnwrappedAPIPromise(parsedPromise, ctx, stream)
                 })
 
                 return unwrappedPromise
@@ -361,7 +256,7 @@ for (const extension of extensions) {
               const parsedPromise = origApiPromParse.apply(this, arguments)
                 .then(body => Promise.all([this.responsePromise, body]))
 
-              return handleUnwrappedAPIPromise(parsedPromise, ctx, stream, n)
+              return handleUnwrappedAPIPromise(parsedPromise, ctx, stream)
             })
 
             ch.end.publish(ctx)
@@ -375,15 +270,15 @@ for (const extension of extensions) {
   }
 }
 
-function handleUnwrappedAPIPromise (apiProm, ctx, stream, n) {
+function handleUnwrappedAPIPromise (apiProm, ctx, stream) {
   return apiProm
     .then(([{ response, options }, body]) => {
       if (stream) {
         if (body.iterator) {
-          shimmer.wrap(body, 'iterator', wrapStreamIterator(response, options, n, ctx))
+          shimmer.wrap(body, 'iterator', wrapStreamIterator(response, options, ctx))
         } else {
           shimmer.wrap(
-            body.response.body, Symbol.asyncIterator, wrapStreamIterator(response, options, n, ctx)
+            body.response.body, Symbol.asyncIterator, wrapStreamIterator(response, options, ctx)
           )
         }
       } else {
@@ -412,7 +307,11 @@ function finish (ctx, response, error) {
     ch.error.publish(ctx)
   }
 
-  ctx.result = response
+  // for successful streamed responses, we've already set the result on ctx.body,
+  // so we don't want to override it here
+  ctx.result ??= {}
+  Object.assign(ctx.result, response)
+
   ch.asyncEnd.publish(ctx)
 }
 

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

@@ -7,7 +7,6 @@ const makeUtilities = require('../../dd-trace/src/plugins/util/llm')
 
 const {
   extractModel,
-  extractSystemInstructions
 } = require('./utils')
 
 class GoogleCloudVertexAITracingPlugin extends TracingPlugin {
@@ -23,20 +22,18 @@ class GoogleCloudVertexAITracingPlugin extends TracingPlugin {
   }
 
   bindStart (ctx) {
-    const { instance, request, resource, stream } = ctx
+    const { instance, resource } = ctx
 
     const span = this.startSpan('vertexai.request', {
       service: this.config.service,
       resource,
       kind: 'client',
       meta: {
-        [MEASURED]: 1
+        [MEASURED]: 1,
+        'vertexai.request.model': extractModel(instance)
       }
     }, false)
 
-    const tags = this.tagRequest(request, instance, stream, span)
-    span.addTags(tags)
-
     const store = storage('legacy').getStore() || {}
     ctx.currentStore = { ...store, span }
 
@@ -47,157 +44,8 @@ class GoogleCloudVertexAITracingPlugin extends TracingPlugin {
     const span = ctx.currentStore?.span
     if (!span) return
 
-    const { result } = ctx
-
-    const response = result?.response
-    if (response) {
-      const tags = this.tagResponse(response, span)
-      span.addTags(tags)
-    }
-
     span.finish()
   }
-
-  /**
-   * Generate the request tags.
-   *
-   * @param {Object} request
-   * @param {Object} instance
-   * @param {boolean} stream
-   * @param {Span} span
-   * @returns {Object}
-   */
-  tagRequest (request, instance, stream, span) {
-    const model = extractModel(instance)
-    const tags = {
-      'vertexai.request.model': model
-    }
-
-    const history = instance.historyInternal
-
-    let contents = typeof request === 'string' || Array.isArray(request) ? request : request.contents
-    if (history) {
-      contents = [...history, ...(Array.isArray(contents) ? contents : [contents])]
-    }
-
-    const generationConfig = instance.generationConfig || {}
-    for (const key of Object.keys(generationConfig)) {
-      const transformedKey = key.replaceAll(/([a-z0-9])([A-Z])/g, '$1_$2').toLowerCase()
-      tags[`vertexai.request.generation_config.${transformedKey}`] = JSON.stringify(generationConfig[key])
-    }
-
-    if (stream) {
-      tags['vertexai.request.stream'] = true
-    }
-
-    if (!this.isPromptCompletionSampled(span)) return tags
-
-    const systemInstructions = extractSystemInstructions(instance)
-
-    for (const [idx, systemInstruction] of systemInstructions.entries()) {
-      tags[`vertexai.request.system_instruction.${idx}.text`] = systemInstruction
-    }
-
-    if (typeof contents === 'string') {
-      tags['vertexai.request.contents.0.text'] = contents
-      return tags
-    }
-
-    for (const [contentIdx, content] of contents.entries()) {
-      this.tagRequestContent(tags, content, contentIdx)
-    }
-
-    return tags
-  }
-
-  tagRequestPart (part, tags, partIdx, contentIdx) {
-    tags[`vertexai.request.contents.${contentIdx}.parts.${partIdx}.text`] = this.normalize(part.text)
-
-    const functionCall = part.functionCall
-    const functionResponse = part.functionResponse
-
-    if (functionCall) {
-      tags[`vertexai.request.contents.${contentIdx}.parts.${partIdx}.function_call.name`] = functionCall.name
-      tags[`vertexai.request.contents.${contentIdx}.parts.${partIdx}.function_call.args`] =
-              this.normalize(JSON.stringify(functionCall.args))
-    }
-    if (functionResponse) {
-      tags[`vertexai.request.contents.${contentIdx}.parts.${partIdx}.function_response.name`] =
-              functionResponse.name
-      tags[`vertexai.request.contents.${contentIdx}.parts.${partIdx}.function_response.response`] =
-              this.normalize(JSON.stringify(functionResponse.response))
-    }
-  }
-
-  tagRequestContent (tags, content, contentIdx) {
-    if (typeof content === 'string') {
-      tags[`vertexai.request.contents.${contentIdx}.text`] = this.normalize(content)
-      return
-    }
-
-    if (content.text || content.functionCall || content.functionResponse) {
-      this.tagRequestPart(content, tags, 0, contentIdx)
-      return
-    }
-
-    const { role, parts } = content
-    if (role) {
-      tags[`vertexai.request.contents.${contentIdx}.role`] = role
-    }
-
-    for (const [partIdx, part] of parts.entries()) {
-      this.tagRequestPart(part, tags, partIdx, contentIdx)
-    }
-  }
-
-  /**
-   * Generate the response tags.
-   *
-   * @param {Object} response
-   * @param {Span} span
-   * @returns {Object}
-   */
-  tagResponse (response, span) {
-    const tags = {}
-    const isSampled = this.isPromptCompletionSampled(span)
-
-    const candidates = response.candidates
-    for (const [candidateIdx, candidate] of candidates.entries()) {
-      const finishReason = candidate.finishReason
-      if (finishReason) {
-        tags[`vertexai.response.candidates.${candidateIdx}.finish_reason`] = finishReason
-      }
-      const candidateContent = candidate.content
-      const role = candidateContent.role
-      tags[`vertexai.response.candidates.${candidateIdx}.content.role`] = role
-
-      if (!isSampled) continue
-
-      const parts = candidateContent.parts
-      for (const [partIdx, part] of parts.entries()) {
-        const text = part.text
-        tags[`vertexai.response.candidates.${candidateIdx}.content.parts.${partIdx}.text`] =
-          this.normalize(String(text))
-
-        const functionCall = part.functionCall
-        if (!functionCall) continue
-
-        tags[`vertexai.response.candidates.${candidateIdx}.content.parts.${partIdx}.function_call.name`] =
-          functionCall.name
-        tags[`vertexai.response.candidates.${candidateIdx}.content.parts.${partIdx}.function_call.args`] =
-          this.normalize(JSON.stringify(functionCall.args))
-      }
-    }
-
-    const tokenCounts = response.usageMetadata
-    if (tokenCounts) {
-      tags['vertexai.response.usage.prompt_tokens'] = tokenCounts.promptTokenCount
-      tags['vertexai.response.usage.completion_tokens'] = tokenCounts.candidatesTokenCount
-      tags['vertexai.response.usage.total_tokens'] = tokenCounts.totalTokenCount
-    }
-
-    return tags
-  }
 }
 
 module.exports = GoogleCloudVertexAITracingPlugin