dd-trace 5.57.1 → 5.59.0

package/packages/dd-trace/src/llmobs/plugins/langchain/index.js

@@ -14,11 +14,15 @@ const LLM_SPAN_TYPES = new Set(['llm', 'chat_model', 'embedding'])
 const LLM = 'llm'
 const WORKFLOW = 'workflow'
 const EMBEDDING = 'embedding'
+const TOOL = 'tool'
+const RETRIEVAL = 'retrieval'
 
 const ChainHandler = require('./handlers/chain')
 const ChatModelHandler = require('./handlers/chat_model')
 const LlmHandler = require('./handlers/llm')
 const EmbeddingHandler = require('./handlers/embedding')
+const ToolHandler = require('./handlers/tool')
+const VectorStoreHandler = require('./handlers/vectorstore')
 
 class BaseLangChainLLMObsPlugin extends LLMObsPlugin {
   static get integration () { return 'langchain' }
@@ -34,7 +38,9 @@ class BaseLangChainLLMObsPlugin extends LLMObsPlugin {
       chain: new ChainHandler(this._tagger),
       chat_model: new ChatModelHandler(this._tagger),
       llm: new LlmHandler(this._tagger),
-      embedding: new EmbeddingHandler(this._tagger)
+      embedding: new EmbeddingHandler(this._tagger),
+      tool: new ToolHandler(this._tagger),
+      similarity_search: new VectorStoreHandler(this._tagger)
     }
   }
 
@@ -45,7 +51,10 @@ class BaseLangChainLLMObsPlugin extends LLMObsPlugin {
     const modelProvider = tags['langchain.request.provider'] // could be undefined
     const modelName = tags['langchain.request.model'] // could be undefined
     const kind = this.getKind(ctx.type, modelProvider)
-    const name = tags['resource.name']
+
+    const instance = ctx.instance || ctx.self
+    const handler = this._handlers[ctx.type]
+    const name = handler?.getName({ span, instance })
 
     return {
       modelProvider,
@@ -113,7 +122,14 @@ class BaseLangChainLLMObsPlugin extends LLMObsPlugin {
       }
     }
 
-    return WORKFLOW
+    switch (type) {
+      case 'tool':
+        return TOOL
+      case 'similarity_search':
+        return RETRIEVAL
+      default:
+        return WORKFLOW
+    }
   }
 
   getIntegrationName (type, provider = 'custom') {
@@ -181,11 +197,38 @@ class EmbeddingsEmbedDocumentsPlugin extends BaseLangChainLLMObsPlugin {
   }
 }
 
+class ToolInvokePlugin extends BaseLangChainLLMObsPlugin {
+  static get id () { return 'llmobs_langchain_tool_invoke' }
+  static get lcType () { return 'tool' }
+  static get prefix () {
+    return 'tracing:orchestrion:@langchain/core:Tool_invoke'
+  }
+}
+
+class VectorStoreSimilaritySearchPlugin extends BaseLangChainLLMObsPlugin {
+  static get id () { return 'llmobs_langchain_vectorstore_similarity_search' }
+  static get lcType () { return 'similarity_search' }
+  static get prefix () {
+    return 'tracing:orchestrion:@langchain/core:VectorStore_similaritySearch'
+  }
+}
+
+class VectorStoreSimilaritySearchWithScorePlugin extends BaseLangChainLLMObsPlugin {
+  static get id () { return 'llmobs_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/dd-trace/src/llmobs/span_processor.js

@@ -165,7 +165,7 @@ class LLMObsSpanProcessor {
           carrier[key] = UNSERIALIZABLE_VALUE_TEXT
           continue
         }
-        if (typeof value === 'object') {
+        if (value !== null && typeof value === 'object') {
           add(value, carrier[key] = {})
         } else {
           carrier[key] = value

package/packages/dd-trace/src/llmobs/tagger.js

@@ -281,6 +281,7 @@ class LLMObsTagger {
 
       const { content = '', role } = message
       const toolCalls = message.toolCalls
+      const toolId = message.toolId
       const messageObj = { content }
 
       const valid = typeof content === 'string'
@@ -288,7 +289,7 @@ class LLMObsTagger {
         this.#handleFailure('Message content must be a string.', 'invalid_io_messages')
       }
 
-      const condition = this.#tagConditionalString(role, 'Message role', messageObj, 'role')
+      let condition = this.#tagConditionalString(role, 'Message role', messageObj, 'role')
 
       if (toolCalls) {
         const filteredToolCalls = this.#filterToolCalls(toolCalls)
@@ -298,6 +299,14 @@ class LLMObsTagger {
         }
       }
 
+      if (toolId) {
+        if (role === 'tool') {
+          condition = this.#tagConditionalString(toolId, 'Tool ID', messageObj, 'tool_id')
+        } else {
+          log.warn(`Tool ID for tool message not associated with a "tool" role, instead got "${role}"`)
+        }
+      }
+
       if (valid && condition) {
         messages.push(messageObj)
       }

package/packages/dd-trace/src/log/log.js

@@ -32,7 +32,7 @@ class Log {
     if (firstArg) {
       if (typeof firstArg === 'string') {
         message = firstArg
-      } else if (typeof firstArg === 'object') {
+      } else if (typeof firstArg === 'object') { // eslint-disable-line eslint-rules/eslint-safe-typeof-object
         message = String(firstArg.message || firstArg)
       } else if (typeof firstArg === 'function') {
         delegate = firstArg

package/packages/dd-trace/src/noop/dogstatsd.js

@@ -1,3 +1,5 @@
+'use strict'
+
 /**
  * @import { DogStatsD } from "../../../../index.d.ts"
  * @implements {DogStatsD}

package/packages/dd-trace/src/opentracing/propagation/text_map_dsm.js

@@ -1,3 +1,5 @@
+'use strict'
+
 const pick = require('../../../../datadog-core/src/utils/src/pick')
 const log = require('../../log')
 

package/packages/dd-trace/src/opentracing/span.js

@@ -220,7 +220,7 @@ class DatadogSpan {
   addEvent (name, attributesOrStartTime, startTime) {
     const event = { name }
     if (attributesOrStartTime) {
-      if (typeof attributesOrStartTime === 'object') {
+      if (typeof attributesOrStartTime === 'object') { // eslint-disable-line eslint-rules/eslint-safe-typeof-object
         event.attributes = this._sanitizeEventAttributes(attributesOrStartTime)
       } else {
         startTime = attributesOrStartTime

package/packages/dd-trace/src/payload-tagging/config/index.js

@@ -1,3 +1,5 @@
+'use strict'
+
 const aws = require('./aws.json')
 const sdks = { aws }
 

package/packages/dd-trace/src/payload-tagging/index.js

@@ -1,3 +1,5 @@
+'use strict'
+
 const rfdc = require('rfdc')({ proto: false, circles: false })
 
 const {
@@ -5,7 +7,7 @@ const {
   PAYLOAD_TAG_RESPONSE_PREFIX
 } = require('../constants')
 
-const jsonpath = require('./jsonpath-plus.js').JSONPath
+const jsonpath = require('jsonpath-plus').JSONPath
 
 const { tagsFromObject } = require('./tagging')
 

package/packages/dd-trace/src/payload-tagging/tagging.js

@@ -1,3 +1,5 @@
+'use strict'
+
 const { PAYLOAD_TAGGING_MAX_TAGS } = require('../constants')
 
 const redactedKeys = new Set([
@@ -36,7 +38,7 @@ function tagsFromObject (object, opts) {
       return
     }
 
-    if (depth >= maxDepth && typeof object === 'object') {
+    if (depth >= maxDepth && object !== null && typeof object === 'object') {
       tagCount += 1
       result[prefix] = truncated
       return
@@ -65,7 +67,7 @@ function tagsFromObject (object, opts) {
       result[prefix] = object.slice(0, 5000)
     }
 
-    if (typeof object === 'object') {
+    if (typeof object === 'object') { // eslint-disable-line eslint-rules/eslint-safe-typeof-object
       for (const [key, value] of Object.entries(object)) {
         if (redactedKeys.has(key.toLowerCase())) {
           tagCount += 1

package/packages/dd-trace/src/plugins/apollo.js

@@ -1,3 +1,5 @@
+'use strict'
+
 const TracingPlugin = require('./tracing')
 const { storage } = require('../../../datadog-core')
 

package/packages/dd-trace/src/plugins/ci_plugin.js

@@ -1,3 +1,5 @@
+'use strict'
+
 const { storage } = require('../../../datadog-core')
 const {
   getTestEnvironmentMetadata,
@@ -53,7 +55,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('./util/tags')
 const { OS_VERSION, OS_PLATFORM, OS_ARCHITECTURE, RUNTIME_NAME, RUNTIME_VERSION } = require('./util/env')
 const getDiClient = require('../ci-visibility/dynamic-instrumentation')
@@ -311,7 +314,8 @@ module.exports = class CiPlugin extends Plugin {
       [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()
@@ -333,7 +337,8 @@ module.exports = class CiPlugin extends Plugin {
       commitMessage,
       tag,
       pullRequestBaseSha,
-      commitHeadSha
+      commitHeadSha,
+      commitHeadMessage
     }
   }
 

package/packages/dd-trace/src/plugins/index.js

@@ -45,6 +45,7 @@ module.exports = {
   get graphql () { return require('../../../datadog-plugin-graphql/src') },
   get grpc () { return require('../../../datadog-plugin-grpc/src') },
   get hapi () { return require('../../../datadog-plugin-hapi/src') },
+  get hono () { return require('../../../datadog-plugin-hono/src') },
   get http () { return require('../../../datadog-plugin-http/src') },
   get http2 () { return require('../../../datadog-plugin-http2/src') },
   get https () { return require('../../../datadog-plugin-http/src') },

package/packages/dd-trace/src/plugins/outbound.js

@@ -8,6 +8,7 @@ const {
 } = require('../constants')
 const TracingPlugin = require('./tracing')
 const { exitTags } = require('../../../datadog-code-origin')
+const { storage } = require('../../../datadog-core')
 
 const COMMON_PEER_SVC_SOURCE_TAGS = [
   'net.peer.name',
@@ -93,6 +94,12 @@ class OutboundPlugin extends TracingPlugin {
   finish (ctx) {
     const span = ctx?.currentStore?.span || this.activeSpan
     this.tagPeerService(span)
+
+    if (this._tracerConfig?._isInServerlessEnvironment()) {
+      const peerHostname = storage('peerServerless').getStore()?.peerHostname
+      if (peerHostname) span.setTag('peer.service', peerHostname)
+    }
+
     super.finish(...arguments)
   }
 

package/packages/dd-trace/src/plugins/util/ci.js

@@ -1,3 +1,5 @@
+'use strict'
+
 const { readFileSync } = require('fs')
 const {
   GIT_BRANCH,

package/packages/dd-trace/src/plugins/util/env.js

@@ -1,3 +1,5 @@
+'use strict'
+
 const os = require('os')
 
 const OS_PLATFORM = 'os.platform'

package/packages/dd-trace/src/plugins/util/git.js

@@ -1,3 +1,5 @@
+'use strict'
+
 const cp = require('child_process')
 const os = require('os')
 const path = require('path')
@@ -16,7 +18,14 @@ const {
   GIT_COMMIT_AUTHOR_DATE,
   GIT_COMMIT_AUTHOR_EMAIL,
   GIT_COMMIT_AUTHOR_NAME,
-  CI_WORKSPACE_PATH
+  CI_WORKSPACE_PATH,
+  GIT_COMMIT_HEAD_AUTHOR_DATE,
+  GIT_COMMIT_HEAD_AUTHOR_EMAIL,
+  GIT_COMMIT_HEAD_AUTHOR_NAME,
+  GIT_COMMIT_HEAD_COMMITER_DATE,
+  GIT_COMMIT_HEAD_COMMITER_EMAIL,
+  GIT_COMMIT_HEAD_COMMITER_NAME,
+  GIT_COMMIT_HEAD_MESSAGE
 } = require('./tags')
 const {
   incrementCountMetric,
@@ -117,7 +126,7 @@ function getGitVersion () {
   }
 }
 
-function unshallowRepository () {
+function unshallowRepository (parentOnly = false) {
   const gitVersion = getGitVersion()
   if (!gitVersion) {
     log.warn('Git version could not be extracted, so git unshallow will not proceed')
@@ -132,7 +141,7 @@ function unshallowRepository () {
 
   const baseGitOptions = [
     'fetch',
-    '--shallow-since="1 month ago"',
+    parentOnly ? '--deepen=1' : '--shallow-since="1 month ago"',
     '--update-shallow',
     '--filter=blob:none',
     '--recurse-submodules=no',
@@ -451,7 +460,8 @@ function getGitMetadata (ciMetadata) {
     commitMessage,
     authorName: ciAuthorName,
     authorEmail: ciAuthorEmail,
-    ciWorkspacePath
+    ciWorkspacePath,
+    headCommitSha
   } = ciMetadata
 
   // With stdio: 'pipe', errors in this command will not be output to the parent process,
@@ -470,7 +480,32 @@ function getGitMetadata (ciMetadata) {
       commitMessage || sanitizedExec('git', ['show', '-s', '--format=%B'], null, null, null, false),
     [GIT_BRANCH]: branch || sanitizedExec('git', ['rev-parse', '--abbrev-ref', 'HEAD']),
     [GIT_COMMIT_SHA]: commitSHA || sanitizedExec('git', ['rev-parse', 'HEAD']),
-    [CI_WORKSPACE_PATH]: ciWorkspacePath || sanitizedExec('git', ['rev-parse', '--show-toplevel'])
+    [CI_WORKSPACE_PATH]: ciWorkspacePath || sanitizedExec('git', ['rev-parse', '--show-toplevel']),
+  }
+
+  if (headCommitSha) {
+    if (isShallowRepository()) {
+      unshallowRepository(true)
+    }
+
+    tags[GIT_COMMIT_HEAD_MESSAGE] =
+      sanitizedExec('git', ['show', '-s', '--format=%B', headCommitSha], null, null, null, false)
+
+    const [
+      headAuthorName,
+      headAuthorEmail,
+      headAuthorDate,
+      headCommitterName,
+      headCommitterEmail,
+      headCommitterDate
+    ] = sanitizedExec('git', ['show', '-s', '--format=%an,%ae,%aI,%cn,%ce,%cI', headCommitSha]).split(',')
+
+    tags[GIT_COMMIT_HEAD_AUTHOR_DATE] = headAuthorDate
+    tags[GIT_COMMIT_HEAD_AUTHOR_EMAIL] = headAuthorEmail
+    tags[GIT_COMMIT_HEAD_AUTHOR_NAME] = headAuthorName
+    tags[GIT_COMMIT_HEAD_COMMITER_DATE] = headCommitterDate
+    tags[GIT_COMMIT_HEAD_COMMITER_EMAIL] = headCommitterEmail
+    tags[GIT_COMMIT_HEAD_COMMITER_NAME] = headCommitterName
   }
 
   const entries = [

package/packages/dd-trace/src/plugins/util/inferred_proxy.js

@@ -1,3 +1,5 @@
+'use strict'
+
 const log = require('../../log')
 const tags = require('../../../../../ext/tags')
 

package/packages/dd-trace/src/plugins/util/llm.js

@@ -1,3 +1,5 @@
+'use strict'
+
 const Sampler = require('../../sampler')
 
 const RE_NEWLINE = /\n/g

package/packages/dd-trace/src/plugins/util/serverless.js

@@ -1,3 +1,5 @@
+'use strict'
+
 const types = require('../../../../../ext/types')
 const web = require('./web')