dd-trace 5.60.0 → 5.61.0

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

@@ -485,27 +485,41 @@ function getGitMetadata (ciMetadata) {
 
   if (headCommitSha) {
     if (isShallowRepository()) {
-      unshallowRepository(true)
+      fetchHeadCommitSha(headCommitSha)
     }
 
-    tags[GIT_COMMIT_HEAD_MESSAGE] =
-      sanitizedExec('git', ['show', '-s', '--format=%B', headCommitSha], null, null, null, false)
-
     const [
+      gitHeadCommitSha,
+      headAuthorDate,
       headAuthorName,
       headAuthorEmail,
-      headAuthorDate,
+      headCommitterDate,
       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_COMMITTER_DATE] = headCommitterDate
-    tags[GIT_COMMIT_HEAD_COMMITTER_EMAIL] = headCommitterEmail
-    tags[GIT_COMMIT_HEAD_COMMITTER_NAME] = headCommitterName
+      headCommitMessage
+    ] = sanitizedExec(
+      'git',
+      [
+        'show',
+        '-s',
+        '--format=\'%H","%aI","%an","%ae","%cI","%cn","%ce","%B\'',
+        headCommitSha
+      ],
+      null,
+      null,
+      null,
+      false
+    ).split('","')
+
+    if (gitHeadCommitSha) {
+      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_COMMITTER_DATE] = headCommitterDate
+      tags[GIT_COMMIT_HEAD_COMMITTER_EMAIL] = headCommitterEmail
+      tags[GIT_COMMIT_HEAD_COMMITTER_NAME] = headCommitterName
+      tags[GIT_COMMIT_HEAD_MESSAGE] = headCommitMessage
+    }
   }
 
   const entries = [
@@ -544,6 +558,26 @@ function getGitInformationDiscrepancy () {
   return { gitRepositoryUrl, gitCommitSHA }
 }
 
+function fetchHeadCommitSha (headSha) {
+  const remoteName = getGitRemoteName()
+
+  sanitizedExec(
+    'git',
+    [
+      'fetch',
+      '--update-shallow',
+      '--filter=blob:none',
+      '--recurse-submodules=no',
+      '--no-write-fetch-head',
+      remoteName,
+      headSha
+    ],
+    { name: TELEMETRY_GIT_COMMAND, tags: { command: 'fetch_head_commit_sha' } },
+    { name: TELEMETRY_GIT_COMMAND_MS, tags: { command: 'fetch_head_commit_sha' } },
+    { name: TELEMETRY_GIT_COMMAND_ERRORS, tags: { command: 'fetch_head_commit_sha' } }
+  )
+}
+
 module.exports = {
   getGitMetadata,
   getLatestCommits,
@@ -561,5 +595,6 @@ module.exports = {
   checkAndFetchBranch,
   getLocalBranches,
   getMergeBase,
-  getCounts
+  getCounts,
+  fetchHeadCommitSha
 }

package/packages/dd-trace/src/profiling/profilers/events.js

@@ -375,10 +375,10 @@ function createPossionProcessSamplingFilter (samplingIntervalMillis) {
  * source with a sampling event filter and an event serializer.
  */
 class EventsProfiler {
-  constructor (options = {}) {
-    this.type = 'events'
-    this.eventSerializer = new EventSerializer()
+  type = 'events'
+  eventSerializer = new EventSerializer()
 
+  constructor (options = {}) {
     const eventHandler = event => this.eventSerializer.addEvent(event)
     const eventFilter = options.timelineSamplingEnabled
       // options.samplingInterval comes in microseconds, we need millis

package/packages/dd-trace/src/profiling/profilers/space.js

@@ -8,13 +8,14 @@ function strategiesToCallbackMode (strategies, callbackMode) {
 }
 
 class NativeSpaceProfiler {
+  type = 'space'
+  _pprof
+  _started = false
+
   constructor (options = {}) {
-    this.type = 'space'
     this._samplingInterval = options.heapSamplingInterval || 512 * 1024
     this._stackDepth = options.stackDepth || 64
-    this._pprof = undefined
     this._oomMonitoring = options.oomMonitoring || {}
-    this._started = false
   }
 
   start ({ mapper, nearOOMCallback } = {}) {

package/packages/dd-trace/src/profiling/profilers/wall.js

@@ -69,8 +69,12 @@ function ensureChannelsActivated () {
 }
 
 class NativeWallProfiler {
+  type = 'wall'
+  _mapper
+  _pprof
+  _started = false
+
   constructor (options = {}) {
-    this.type = 'wall'
     this._samplingIntervalMicros = options.samplingInterval || 1e6 / 99 // 99hz
     this._flushIntervalMillis = options.flushInterval || 60 * 1e3 // 60 seconds
     this._codeHotspotsEnabled = !!options.codeHotspotsEnabled
@@ -86,8 +90,6 @@ class NativeWallProfiler {
     // cpu profiling is enabled.
     this._withContexts = this._captureSpanData || this._timelineEnabled || this._cpuProfilingEnabled
     this._v8ProfilerBugWorkaroundEnabled = !!options.v8ProfilerBugWorkaroundEnabled
-    this._mapper = undefined
-    this._pprof = undefined
 
     // Bind these to this so they can be used as callbacks
     if (this._withContexts && this._captureSpanData) {
@@ -97,7 +99,6 @@ class NativeWallProfiler {
     this._generateLabels = this._generateLabels.bind(this)
 
     this._logger = options.logger
-    this._started = false
   }
 
   codeHotspotsEnabled () {

package/packages/dd-trace/src/remote_config/scheduler.js

@@ -1,8 +1,9 @@
 'use strict'
 
 class Scheduler {
+  _timer = null
+
   constructor (callback, interval) {
-    this._timer = null
     this._callback = callback
     this._interval = interval
   }

package/packages/dd-trace/src/service-naming/schemas/v0/messaging.js

@@ -16,6 +16,10 @@ const messaging = {
       opName: () => 'amqp.send',
       serviceName: amqpServiceName
     },
+    'azure-service-bus': {
+      opName: () => 'azure.servicebus.send',
+      serviceName: ({ tracerService }) => `${tracerService}-azure-service-bus`
+    },
     'google-cloud-pubsub': {
       opName: () => 'pubsub.request',
       serviceName: ({ tracerService }) => `${tracerService}-pubsub`

package/packages/dd-trace/src/supported-configurations.json

@@ -209,6 +209,7 @@
     "DD_TRACE_AWS_SDK_STEPFUNCTIONS_ENABLED": ["A"],
     "DD_TRACE_AXIOS_ENABLED": ["A"],
     "DD_TRACE_AZURE_FUNCTIONS_ENABLED": ["A"],
+    "DD_TRACE_AZURE_SERVICE_BUS_ENABLED": ["A"],
     "DD_TRACE_BAGGAGE_MAX_BYTES": ["A"],
     "DD_TRACE_BAGGAGE_MAX_ITEMS": ["A"],
     "DD_TRACE_BAGGAGE_TAG_KEYS": ["A"],

package/packages/datadog-plugin-langchain/src/handlers/chain.js

@@ -1,50 +0,0 @@
-'use strict'
-
-const LangChainHandler = require('./default')
-
-class LangChainChainHandler extends LangChainHandler {
-  getSpanStartTags (ctx, provider, span) {
-    const tags = {}
-
-    if (!this.isPromptCompletionSampled(span)) return tags
-
-    let inputs = ctx.args?.[0]
-    inputs = Array.isArray(inputs) ? inputs : [inputs]
-
-    for (const idx in inputs) {
-      const input = inputs[idx]
-      if (input !== null && typeof input === 'object') {
-        for (const [key, value] of Object.entries(input)) {
-        // these are mappings to the python client names, ie lc_kwargs
-        // only present on BaseMessage types
-          if (key.includes('lc_')) continue
-          tags[`langchain.request.inputs.${idx}.${key}`] = this.normalize(value)
-        }
-      } else {
-        tags[`langchain.request.inputs.${idx}`] = this.normalize(input)
-      }
-    }
-
-    return tags
-  }
-
-  getSpanEndTags (ctx, span) {
-    const tags = {}
-
-    if (!this.isPromptCompletionSampled(span)) return tags
-
-    let outputs = ctx.result
-    outputs = Array.isArray(outputs) ? outputs : [outputs]
-
-    for (const idx in outputs) {
-      const output = outputs[idx]
-      tags[`langchain.response.outputs.${idx}`] = this.normalize(
-        typeof output === 'string' ? output : JSON.stringify(output)
-      )
-    }
-
-    return tags
-  }
-}
-
-module.exports = LangChainChainHandler

package/packages/datadog-plugin-langchain/src/handlers/language_models/chat_model.js

@@ -1,101 +0,0 @@
-'use strict'
-
-const LangChainLanguageModelHandler = require('.')
-
-const COMPLETIONS = 'langchain.response.completions'
-
-class LangChainChatModelHandler extends LangChainLanguageModelHandler {
-  getSpanStartTags (ctx, provider, span) {
-    const tags = {}
-
-    const inputs = ctx.args?.[0]
-
-    for (const messageSetIndex in inputs) {
-      const messageSet = inputs[messageSetIndex]
-
-      for (const messageIndex in messageSet) {
-        const message = messageSet[messageIndex]
-        if (this.isPromptCompletionSampled(span)) {
-          tags[`langchain.request.messages.${messageSetIndex}.${messageIndex}.content`] =
-            this.normalize(message.content) || ''
-        }
-        tags[`langchain.request.messages.${messageSetIndex}.${messageIndex}.message_type`] = message.constructor.name
-      }
-    }
-
-    const instance = ctx.instance
-    const identifyingParams = (typeof instance._identifyingParams === 'function' && instance._identifyingParams()) || {}
-    for (const [param, val] of Object.entries(identifyingParams)) {
-      if (param.toLowerCase().includes('apikey') || param.toLowerCase().includes('apitoken')) continue
-      if (val !== null && typeof val === 'object') {
-        for (const [key, value] of Object.entries(val)) {
-          tags[`langchain.request.${provider}.parameters.${param}.${key}`] = value
-        }
-      } else {
-        tags[`langchain.request.${provider}.parameters.${param}`] = val
-      }
-    }
-
-    return tags
-  }
-
-  getSpanEndTags (ctx, span) {
-    const { result } = ctx
-
-    const tags = {}
-
-    const sampled = this.isPromptCompletionSampled(span)
-
-    this.extractTokenMetrics(ctx.currentStore?.span, result)
-
-    for (const messageSetIdx in result?.generations) {
-      const messageSet = result.generations[messageSetIdx]
-
-      for (const chatCompletionIdx in messageSet) {
-        const chatCompletion = messageSet[chatCompletionIdx]
-
-        const text = chatCompletion.text
-        const message = chatCompletion.message
-        let toolCalls = message.tool_calls
-
-        if (text && sampled) {
-          tags[
-          `${COMPLETIONS}.${messageSetIdx}.${chatCompletionIdx}.content`
-          ] = this.normalize(text)
-        }
-
-        tags[
-        `${COMPLETIONS}.${messageSetIdx}.${chatCompletionIdx}.message_type`
-        ] = message.constructor.name
-
-        if (toolCalls) {
-          if (!Array.isArray(toolCalls)) {
-            toolCalls = [toolCalls]
-          }
-
-          for (const toolCallIndex in toolCalls) {
-            const toolCall = toolCalls[toolCallIndex]
-
-            tags[
-            `${COMPLETIONS}.${messageSetIdx}.${chatCompletionIdx}.tool_calls.${toolCallIndex}.id`
-            ] = toolCall.id
-            tags[
-            `${COMPLETIONS}.${messageSetIdx}.${chatCompletionIdx}.tool_calls.${toolCallIndex}.name`
-            ] = toolCall.name
-
-            const args = toolCall.args || {}
-            for (const [name, value] of Object.entries(args)) {
-              tags[
-              `${COMPLETIONS}.${messageSetIdx}.${chatCompletionIdx}.tool_calls.${toolCallIndex}.args.${name}`
-              ] = this.normalize(value)
-            }
-          }
-        }
-      }
-    }
-
-    return tags
-  }
-}
-
-module.exports = LangChainChatModelHandler

package/packages/datadog-plugin-langchain/src/handlers/language_models/index.js

@@ -1,48 +0,0 @@
-'use strict'
-
-const { getTokensFromLlmOutput } = require('../../tokens')
-const LangChainHandler = require('../default')
-
-class LangChainLanguageModelHandler extends LangChainHandler {
-  extractApiKey (instance) {
-    const key = Object.keys(instance)
-      .find(key => {
-        const lower = key.toLowerCase()
-        return lower.includes('apikey') || lower.includes('apitoken')
-      })
-
-    let apiKey = instance[key]
-    if (apiKey?.secretValue && typeof apiKey.secretValue === 'function') {
-      apiKey = apiKey.secretValue()
-    }
-    if (!apiKey || apiKey.length < 4) return ''
-    return `...${apiKey.slice(-4)}`
-  }
-
-  extractProvider (instance) {
-    return typeof instance._llmType === 'function' && instance._llmType().split('-')[0]
-  }
-
-  extractModel (instance) {
-    for (const attr of ['model', 'modelName', 'modelId', 'modelKey', 'repoId']) {
-      const modelName = instance[attr]
-      if (modelName) return modelName
-    }
-  }
-
-  extractTokenMetrics (span, result) {
-    if (!span || !result) return
-
-    // we do not tag token metrics for non-openai providers
-    const provider = span.context()._tags['langchain.request.provider']
-    if (provider !== 'openai') return
-
-    const tokens = getTokensFromLlmOutput(result)
-
-    for (const [tokenKey, tokenCount] of Object.entries(tokens)) {
-      span.setTag(`langchain.tokens.${tokenKey}_tokens`, tokenCount)
-    }
-  }
-}
-
-module.exports = LangChainLanguageModelHandler

package/packages/datadog-plugin-langchain/src/handlers/language_models/llm.js

@@ -1,58 +0,0 @@
-'use strict'
-
-const LangChainLanguageModelHandler = require('.')
-
-class LangChainLLMHandler extends LangChainLanguageModelHandler {
-  getSpanStartTags (ctx, provider, span) {
-    const tags = {}
-
-    const prompts = ctx.args?.[0]
-    for (const promptIdx in prompts) {
-      if (!this.isPromptCompletionSampled(span)) continue
-
-      const prompt = prompts[promptIdx]
-      tags[`langchain.request.prompts.${promptIdx}.content`] = this.normalize(prompt) || ''
-    }
-
-    const instance = ctx.instance
-    const identifyingParams = (typeof instance._identifyingParams === 'function' && instance._identifyingParams()) || {}
-    for (const [param, val] of Object.entries(identifyingParams)) {
-      if (param.toLowerCase().includes('apikey') || param.toLowerCase().includes('apitoken')) continue
-      if (val !== null && typeof val === 'object') {
-        for (const [key, value] of Object.entries(val)) {
-          tags[`langchain.request.${provider}.parameters.${param}.${key}`] = value
-        }
-      } else {
-        tags[`langchain.request.${provider}.parameters.${param}`] = val
-      }
-    }
-
-    return tags
-  }
-
-  getSpanEndTags (ctx, span) {
-    const { result } = ctx
-
-    const tags = {}
-    const sampled = this.isPromptCompletionSampled(span)
-
-    this.extractTokenMetrics(ctx.currentStore?.span, result)
-
-    for (const completionIdx in result?.generations) {
-      const completion = result.generations[completionIdx]
-      if (sampled) {
-        tags[`langchain.response.completions.${completionIdx}.text`] = this.normalize(completion[0].text) || ''
-      }
-
-      if (completion && completion[0].generationInfo) {
-        const generationInfo = completion[0].generationInfo
-        tags[`langchain.response.completions.${completionIdx}.finish_reason`] = generationInfo.finishReason
-        tags[`langchain.response.completions.${completionIdx}.logprobs`] = generationInfo.logprobs
-      }
-    }
-
-    return tags
-  }
-}
-
-module.exports = LangChainLLMHandler