dd-trace 5.94.0 → 5.96.0

package/packages/dd-trace/src/llmobs/constants/text.js

@@ -1,6 +1,9 @@
 'use strict'
 
 module.exports = {
-  DROPPED_VALUE_TEXT: "[This value has been dropped because this span's size exceeds the 1MB size limit.]",
+  DROPPED_VALUE_TEXT: "[This value has been dropped because this span's size exceeds the 5MB size limit.]",
   UNSERIALIZABLE_VALUE_TEXT: 'Unserializable value',
+  INCOMPATIBLE_INITIALIZATION:
+    'Cannot send LLM Observability data without a running agent or without both a Datadog API key and site. ' +
+    'Ensure these configurations are set before running your application.',
 }

package/packages/dd-trace/src/llmobs/constants/writers.js

@@ -13,5 +13,5 @@ module.exports = {
   EVALUATIONS_ENDPOINT: '/api/intake/llm-obs/v2/eval-metric',
 
   EVP_PAYLOAD_SIZE_LIMIT: 5 << 20, // 5MB (actual limit is 5.1MB)
-  EVP_EVENT_SIZE_LIMIT: (1 << 20) - 1024, // 999KB (actual limit is 1MB)
+  EVP_EVENT_SIZE_LIMIT: 5 << 20, // 5MB (actual backend limit is 10MB; Python SDK defaults to 5MB)
 }

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

@@ -3,6 +3,8 @@
 const { channel } = require('dc-polyfill')
 
 const log = require('../log')
+const { DD_MAJOR } = require('../../../../version')
+const startupLogs = require('../startup-log')
 const {
   ML_APP,
   PROPAGATED_ML_APP_KEY,
@@ -15,6 +17,7 @@ const LLMObsEvalMetricsWriter = require('./writers/evaluations')
 const LLMObsTagger = require('./tagger')
 const LLMObsSpanWriter = require('./writers/spans')
 const { setAgentStrategy } = require('./writers/util')
+const { INCOMPATIBLE_INITIALIZATION } = require('./constants/text')
 
 const spanFinishCh = channel('dd-trace:span:finish')
 const evalMetricAppendCh = channel('llmobs:eval-metric:append')
@@ -66,10 +69,12 @@ function enable (config) {
 
   setAgentStrategy(config, useAgentless => {
     if (useAgentless && !(config.apiKey && config.site)) {
-      throw new Error(
-        'Cannot send LLM Observability data without a running agent or without both a Datadog API key and site.\n' +
-        'Ensure these configurations are set before running your application.'
-      )
+      if (DD_MAJOR < 6 || !config?.startupLogs) {
+        // eslint-disable-next-line no-console
+        console.error(INCOMPATIBLE_INITIALIZATION)
+      } else {
+        startupLogs.logGenericError(INCOMPATIBLE_INITIALIZATION)
+      }
     }
 
     evalWriter?.setAgentless(useAgentless)

package/packages/dd-trace/src/llmobs/plugins/anthropic.js

@@ -1,5 +1,6 @@
 'use strict'
 
+const { UNKNOWN_MODEL_PROVIDER } = require('../constants/tags')
 const LLMObsPlugin = require('./base')
 
 const ALLOWED_METADATA_KEYS = new Set([
@@ -108,16 +109,24 @@ class AnthropicLLMObsPlugin extends LLMObsPlugin {
   }
 
   getLLMObsSpanRegisterOptions (ctx) {
-    const { options } = ctx
+    const { options, baseUrl } = ctx
     const { model } = options
+    const modelProvider = this._getModelProvider(baseUrl)
 
     return {
       kind: 'llm',
       modelName: model,
-      modelProvider: 'anthropic',
+      modelProvider,
     }
   }
 
+  _getModelProvider (baseUrl = '') {
+    if (baseUrl.includes('anthropic')) {
+      return 'anthropic'
+    }
+    return UNKNOWN_MODEL_PROVIDER
+  }
+
   setLLMObsTags (ctx) {
     const span = ctx.currentStore?.span
     if (!span) return

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

@@ -5,6 +5,7 @@ const {
   PROMPT_TRACKING_INSTRUMENTATION_METHOD,
   PROMPT_MULTIMODAL,
   INSTRUMENTATION_METHOD_AUTO,
+  UNKNOWN_MODEL_PROVIDER,
 } = require('../../constants/tags')
 const {
   extractChatTemplateFromInstructions,
@@ -90,10 +91,12 @@ class OpenAiLLMObsPlugin extends LLMObsPlugin {
   _getModelProviderAndClient (baseUrl = '') {
     if (baseUrl.includes('azure')) {
       return { modelProvider: 'azure_openai', client: 'AzureOpenAI' }
+    } else if (baseUrl.includes('openai')) {
+      return { modelProvider: 'openai', client: 'OpenAI' }
     } else if (baseUrl.includes('deepseek')) {
       return { modelProvider: 'deepseek', client: 'DeepSeek' }
     }
-    return { modelProvider: 'openai', client: 'OpenAI' }
+    return { modelProvider: UNKNOWN_MODEL_PROVIDER, client: 'OpenAI' }
   }
 
   _extractMetrics (response) {

package/packages/dd-trace/src/llmobs/writers/spans.js

@@ -32,7 +32,7 @@ class LLMObsSpanWriter extends BaseWriter {
     let processedEventSizeBytes = eventSizeBytes
 
     if (shouldTruncate) {
-      logger.warn(`Dropping event input/output because its size (${eventSizeBytes}) exceeds the 1MB event size limit`)
+      logger.warn(`Dropping event input/output because its size (${eventSizeBytes}) exceeds the 5MB event size limit`)
       event = this._truncateSpanEvent(event)
       processedEventSizeBytes = Buffer.byteLength(JSON.stringify(event))
     }

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

@@ -3,6 +3,7 @@
 const path = require('path')
 const fs = require('fs')
 const { URL } = require('url')
+const { getLageTestSessionName } = require('../../ci-visibility/lage')
 const log = require('../../log')
 const { getEnvironmentVariable } = require('../../config/helper')
 const satisfies = require('../../../../../vendor/dist/semifies')
@@ -934,6 +935,10 @@ function getTestSessionName (config, trimmedCommand, envTags) {
   if (config.ciVisibilityTestSessionName) {
     return config.ciVisibilityTestSessionName
   }
+  const lageTestSessionName = getLageTestSessionName()
+  if (lageTestSessionName) {
+    return lageTestSessionName
+  }
   if (envTags[CI_JOB_NAME]) {
     return `${envTags[CI_JOB_NAME]}-${trimmedCommand}`
   }

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

@@ -249,7 +249,7 @@ class PrioritySampler {
     }
     const rawPriority = tags[SAMPLING_PRIORITY]
     if (rawPriority !== undefined) {
-      const priority = Number.parseInt(String(rawPriority), 10)
+      const priority = Math.trunc(rawPriority)
 
       if (priority === 1 || priority === 2) {
         return USER_KEEP

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

@@ -85,6 +85,7 @@ class Tracer extends NoopProxy {
     // these requires must work with esm bundler
     this._modules = {
       appsec: new LazyModule(() => require('./appsec')),
+      aiguard: new LazyModule(() => require('./aiguard')),
       iast: new LazyModule(() => require('./appsec/iast')),
       llmobs: new LazyModule(() => require('./llmobs')),
       rewriter: new LazyModule(() => require('./appsec/iast/taint-tracking/rewriter')),
@@ -272,7 +273,9 @@ class Tracer extends NoopProxy {
         this.dataStreamsCheckpointer = this._tracer.dataStreamsCheckpointer
         lazyProxy(this, 'appsec', () => require('./appsec/sdk'), this._tracer, config)
         lazyProxy(this, 'llmobs', () => require('./llmobs/sdk'), this._tracer, this._modules.llmobs, config)
+
         if (config.experimental?.aiguard?.enabled) {
+          this._modules.aiguard.enable(this._tracer, config)
           lazyProxy(this, 'aiguard', () => require('./aiguard/sdk'), this._tracer, config)
         }
         this._tracingInitialized = true
@@ -287,6 +290,7 @@ class Tracer extends NoopProxy {
       // This needs to be after the IAST module is enabled
     } else if (this._tracingInitialized) {
       this._modules.appsec.disable()
+      this._modules.aiguard.disable()
       this._modules.iast.disable()
       this._modules.llmobs.disable()
       this._modules.openfeature.disable()

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

@@ -8,7 +8,8 @@ class RateLimiter {
    * @param {'second'|'minute'|'hour'|'day'} [interval='second'] - Time window for the limiter.
    */
   constructor (rateLimit, interval = 'second') {
-    this._rateLimit = Number.parseInt(String(rateLimit))
+    // TODO: Change rateLimit to integers. Right now these are sometimes strings, sometimes numbers.
+    this._rateLimit = Math.trunc(rateLimit)
     // The limiter constructor accepts a token count number and an interval string
     this._limiter = new limiter.RateLimiter(this._rateLimit, interval)
     this._tokensRequested = 0

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

@@ -63,6 +63,14 @@ function logAgentError (agentError) {
   }
 }
 
+function logGenericError (message) {
+  if (!config?.startupLogs) {
+    return
+  }
+
+  warn('DATADOG TRACER DIAGNOSTIC - Generic Error: ' + message)
+}
+
 /**
  * Returns config info without integrations (used by startupLog).
  * @returns {Record<string, unknown>}
@@ -143,4 +151,5 @@ module.exports = {
   setSamplingRules,
   tracerInfo,
   errors,
+  logGenericError,
 }

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

@@ -1,6 +1,6 @@
 'use strict'
 
-const log = require('./log')
+// TODO: Rename and move file. This is a general purpose helper for adding tags to a carrier.
 
 function addNonEmpty (carrier, key, value) {
   if (key !== '') {
@@ -11,47 +11,43 @@ function addNonEmpty (carrier, key, value) {
 function add (carrier, keyValuePairs) {
   if (!carrier) return
 
-  try {
-    if (typeof keyValuePairs === 'string') {
-      let valueStart = 0
-      let keyStart = 0
-
-      for (let i = 0; i < keyValuePairs.length; i++) {
-        const char = keyValuePairs[i]
-
-        if (char === ':') {
-          if (valueStart === 0) {
-            valueStart = i
-          }
-        } else if (char === ',') {
-          valueStart ||= i
-          addNonEmpty(
-            carrier,
-            keyValuePairs.slice(keyStart, valueStart).trim(),
-            keyValuePairs.slice(valueStart + 1, i).trim()
-          )
-          keyStart = i + 1
-          valueStart = 0
-        }
-      }
+  if (typeof keyValuePairs === 'string') {
+    let valueStart = 0
+    let keyStart = 0
 
-      if (keyValuePairs.at(-1) !== ',') {
-        valueStart ||= keyValuePairs.length
+    for (let i = 0; i < keyValuePairs.length; i++) {
+      const char = keyValuePairs[i]
+
+      if (char === ':') {
+        if (valueStart === 0) {
+          valueStart = i
+        }
+      } else if (char === ',') {
+        valueStart ||= i
         addNonEmpty(
           carrier,
           keyValuePairs.slice(keyStart, valueStart).trim(),
-          keyValuePairs.slice(valueStart + 1).trim()
+          keyValuePairs.slice(valueStart + 1, i).trim()
         )
+        keyStart = i + 1
+        valueStart = 0
       }
-    } else if (Array.isArray(keyValuePairs)) {
-      for (const tags of keyValuePairs) {
-        add(carrier, tags)
-      }
-    } else {
-      Object.assign(carrier, keyValuePairs)
     }
-  } catch (error) {
-    log.error('Error adding tags', error)
+
+    if (keyValuePairs.at(-1) !== ',') {
+      valueStart ||= keyValuePairs.length
+      addNonEmpty(
+        carrier,
+        keyValuePairs.slice(keyStart, valueStart).trim(),
+        keyValuePairs.slice(valueStart + 1).trim()
+      )
+    }
+  } else if (Array.isArray(keyValuePairs)) {
+    for (const tags of keyValuePairs) {
+      add(carrier, tags)
+    }
+  } else {
+    Object.assign(carrier, keyValuePairs)
   }
 }
 

package/vendor/dist/@apm-js-collab/code-transformer/LICENSE

@@ -0,0 +1,28 @@
+
+Copyright (c) 2009-2011, Mozilla Foundation and contributors
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+* Redistributions of source code must retain the above copyright notice, this
+  list of conditions and the following disclaimer.
+
+* Redistributions in binary form must reproduce the above copyright notice,
+  this list of conditions and the following disclaimer in the documentation
+  and/or other materials provided with the distribution.
+
+* Neither the names of the Mozilla Foundation nor the names of project
+  contributors may be used to endorse or promote products derived from this
+  software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.