dd-trace 5.72.0 → 5.73.0

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

@@ -50,6 +50,7 @@ const {
   TELEMETRY_CODE_COVERAGE_NUM_FILES,
   TELEMETRY_TEST_SESSION
 } = require('../../dd-trace/src/ci-visibility/telemetry')
+const log = require('../../dd-trace/src/log')
 
 const isJestWorker = !!getEnvironmentVariable('JEST_WORKER_ID')
 
@@ -102,6 +103,7 @@ class JestPlugin extends CiPlugin {
       }
       process.on('message', handler)
     }
+    this.testSuiteSpanPerTestSuiteAbsolutePath = new Map()
 
     this.addSub('ci:jest:session:finish', ({
       status,
@@ -196,7 +198,8 @@ class JestPlugin extends CiPlugin {
       testSourceFile,
       testEnvironmentOptions,
       frameworkVersion,
-      displayName
+      displayName,
+      testSuiteAbsolutePath
     }) => {
       const {
         _ddTestSessionId: testSessionId,
@@ -259,6 +262,7 @@ class JestPlugin extends CiPlugin {
       if (_ddTestCodeCoverageEnabled) {
         this.telemetry.ciVisEvent(TELEMETRY_CODE_COVERAGE_STARTED, 'suite', { library: 'istanbul' })
       }
+      this.testSuiteSpanPerTestSuiteAbsolutePath.set(testSuiteAbsolutePath, this.testSuiteSpan)
     })
 
     this.addSub('ci:jest:worker-report:coverage', data => {
@@ -272,25 +276,54 @@ class JestPlugin extends CiPlugin {
       })
     })
 
-    this.addSub('ci:jest:test-suite:finish', ({ status, errorMessage, error }) => {
-      this.testSuiteSpan.setTag(TEST_STATUS, status)
+    this.addSub('ci:jest:test-suite:finish', ({ status, errorMessage, error, testSuiteAbsolutePath }) => {
+      const testSuiteSpan = this.testSuiteSpanPerTestSuiteAbsolutePath.get(testSuiteAbsolutePath)
+      if (!testSuiteSpan) {
+        log.warn('"ci:jest:test-suite:finish": no span found for test suite absolute path %s', testSuiteAbsolutePath)
+        return
+      }
+      const hasStatus = testSuiteSpan.context()._tags[TEST_STATUS]
+      if (!hasStatus) {
+        // The status may have been set in 'ci:jest:test-suite:error'
+        testSuiteSpan.setTag(TEST_STATUS, status)
+      }
       if (error) {
-        this.testSuiteSpan.setTag('error', error)
+        testSuiteSpan.setTag('error', error)
+        testSuiteSpan.setTag(TEST_STATUS, 'fail')
       } else if (errorMessage) {
-        this.testSuiteSpan.setTag('error', new Error(errorMessage))
+        testSuiteSpan.setTag('error', new Error(errorMessage))
+        testSuiteSpan.setTag(TEST_STATUS, 'fail')
       }
-      this.testSuiteSpan.finish()
-      this.telemetry.ciVisEvent(TELEMETRY_EVENT_FINISHED, 'suite')
-      // Suites potentially run in a different process than the session,
-      // so calling finishAllTraceSpans on the session span is not enough
-      finishAllTraceSpans(this.testSuiteSpan)
-      // Flushing within jest workers is cheap, as it's just interprocess communication
-      // We do not want to flush after every suite if jest is running tests serially,
-      // as every flush is an HTTP request.
-      if (isJestWorker) {
-        this.tracer._exporter.flush()
+      // We need to give the potential error in 'ci:jest:test-suite:error' time to be published
+      process.nextTick(() => {
+        testSuiteSpan.finish()
+        this.telemetry.ciVisEvent(TELEMETRY_EVENT_FINISHED, 'suite')
+        // Suites potentially run in a different process than the session,
+        // so calling finishAllTraceSpans on the session span is not enough
+        finishAllTraceSpans(testSuiteSpan)
+        // Flushing within jest workers is cheap, as it's just interprocess communication
+        // We do not want to flush after every suite if jest is running tests serially,
+        // as every flush is an HTTP request.
+        if (isJestWorker) {
+          this.tracer._exporter.flush()
+        }
+        this.removeAllDiProbes()
+        this.testSuiteSpanPerTestSuiteAbsolutePath.delete(testSuiteAbsolutePath)
+      })
+    })
+
+    this.addSub('ci:jest:test-suite:error', ({ error, errorMessage, testSuiteAbsolutePath }) => {
+      const runningTestSuiteSpan = this.testSuiteSpanPerTestSuiteAbsolutePath.get(testSuiteAbsolutePath)
+      if (!runningTestSuiteSpan) {
+        log.warn('"ci:jest:test-suite:error": no span found for test suite absolute path %s', testSuiteAbsolutePath)
+        return
+      }
+      if (error) {
+        runningTestSuiteSpan.setTag('error', error)
+      } else if (errorMessage) {
+        runningTestSuiteSpan.setTag('error', new Error(errorMessage))
       }
-      this.removeAllDiProbes()
+      runningTestSuiteSpan.setTag(TEST_STATUS, 'fail')
     })
 
     /**
@@ -420,7 +453,8 @@ class JestPlugin extends CiPlugin {
       isJestRetry,
       isDisabled,
       isQuarantined,
-      isModified
+      isModified,
+      testSuiteAbsolutePath
     } = test
 
     const extraTags = {
@@ -468,8 +502,9 @@ class JestPlugin extends CiPlugin {
     if (isNew) {
       extraTags[TEST_IS_NEW] = 'true'
     }
+    const testSuiteSpan = this.testSuiteSpanPerTestSuiteAbsolutePath.get(testSuiteAbsolutePath) || this.testSuiteSpan
 
-    return super.startTestSpan(name, suite, this.testSuiteSpan, extraTags)
+    return super.startTestSpan(name, suite, testSuiteSpan, extraTags)
   }
 }
 

package/packages/datadog-plugin-ws/src/close.js

@@ -58,7 +58,7 @@ class WSClosePlugin extends TracingPlugin {
   }
 
   end (ctx) {
-    if (!Object.hasOwn(ctx, 'result')) return
+    if (!Object.hasOwn(ctx, 'result') || !ctx.span) return
 
     if (ctx.socket.spanContext) ctx.span.addLink({ context: ctx.socket.spanContext })
 

package/packages/datadog-plugin-ws/src/producer.js

@@ -48,7 +48,7 @@ class WSProducerPlugin extends TracingPlugin {
   }
 
   end (ctx) {
-    if (!Object.hasOwn(ctx, 'result')) return
+    if (!Object.hasOwn(ctx, 'result') || !ctx.span) return
 
     if (ctx.socket.spanContext) {
       ctx.span.addLink({

package/packages/datadog-plugin-ws/src/receiver.js

@@ -58,7 +58,7 @@ class WSReceiverPlugin extends TracingPlugin {
   }
 
   end (ctx) {
-    if (!Object.hasOwn(ctx, 'result')) return
+    if (!Object.hasOwn(ctx, 'result') || !ctx.span) return
 
     if (ctx.socket.spanContext) {
       ctx.span.addLink({

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

@@ -43,6 +43,7 @@ const { isInServerlessEnvironment } = require('../serverless')
 
 const responseAnalyzedSet = new WeakSet()
 const storedResponseHeaders = new WeakMap()
+const storedBodies = new WeakMap()
 
 let isEnabled = false
 let config
@@ -114,6 +115,11 @@ function onRequestBodyParsed ({ req, res, body, abortController }) {
   const rootSpan = web.root(req)
   if (!rootSpan) return
 
+  if (!req.body) {
+    // do not store body if it is in req.body
+    storedBodies.set(req, body)
+  }
+
   const results = waf.run({
     persistent: {
       [addresses.HTTP_INCOMING_BODY]: body
@@ -200,11 +206,13 @@ function incomingHttpEndTranslator ({ req, res }) {
 
   const storedHeaders = storedResponseHeaders.get(req) || {}
 
-  Reporter.finishRequest(req, res, storedHeaders)
+  const body = req.body || storedBodies.get(req)
+  Reporter.finishRequest(req, res, storedHeaders, body)
 
   if (storedHeaders) {
     storedResponseHeaders.delete(req)
   }
+  storedBodies.delete(req)
 }
 
 function onPassportVerify ({ framework, login, user, success, abortController }) {

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

@@ -483,7 +483,7 @@ function reportAttributes (attributes) {
   rootSpan.addTags(tags)
 }
 
-function finishRequest (req, res, storedResponseHeaders) {
+function finishRequest (req, res, storedResponseHeaders, requestBody) {
   const rootSpan = web.root(req)
   if (!rootSpan) return
 
@@ -543,8 +543,7 @@ function finishRequest (req, res, storedResponseHeaders) {
   )
 
   if (extendedDataCollection) {
-    // TODO add support for fastify, req.body is not available in fastify
-    reportRequestBody(rootSpan, req.body)
+    reportRequestBody(rootSpan, requestBody)
   }
 
   if (tags['appsec.event'] === 'true' && typeof req.route?.path === 'string') {

package/packages/dd-trace/src/ci-visibility/test-management/get-test-management-tests.js

@@ -3,6 +3,7 @@
 const request = require('../../exporters/common/request')
 const id = require('../../id')
 const { getEnvironmentVariable } = require('../../config-helper')
+const log = require('../../log')
 
 function getTestManagementTests ({
   url,
@@ -53,6 +54,8 @@ function getTestManagementTests ({
     }
   })
 
+  log.debug('Requesting test management tests: %s', data)
+
   request(data, options, (err, res) => {
     if (err) {
       done(err)
@@ -60,6 +63,8 @@ function getTestManagementTests ({
       try {
         const { data: { attributes: { modules: testManagementTests } } } = JSON.parse(res)
 
+        log.debug('Test management tests received: %j', testManagementTests)
+
         done(null, testManagementTests)
       } catch (err) {
         done(err)

package/packages/dd-trace/src/llmobs/plugins/ai/util.js

@@ -45,19 +45,24 @@ function getOperation (span) {
 
 /**
  * Get the LLM token usage from the span tags
+ * Supports both AI SDK v4 (promptTokens/completionTokens) and v5 (inputTokens/outputTokens)
  * @template T extends {inputTokens: number, outputTokens: number, totalTokens: number}
  * @param {T} tags
  * @returns {Pick<T, 'inputTokens' | 'outputTokens' | 'totalTokens'>}
  */
 function getUsage (tags) {
   const usage = {}
-  const inputTokens = tags['ai.usage.promptTokens']
-  const outputTokens = tags['ai.usage.completionTokens']
+
+  // AI SDK v5 uses inputTokens/outputTokens, v4 uses promptTokens/completionTokens
+  // Check v5 properties first, fall back to v4
+  const inputTokens = tags['ai.usage.inputTokens'] ?? tags['ai.usage.promptTokens']
+  const outputTokens = tags['ai.usage.outputTokens'] ?? tags['ai.usage.completionTokens']
 
   if (inputTokens != null) usage.inputTokens = inputTokens
   if (outputTokens != null) usage.outputTokens = outputTokens
 
-  const totalTokens = inputTokens + outputTokens
+  // v5 provides totalTokens directly, v4 requires computation
+  const totalTokens = tags['ai.usage.totalTokens'] ?? (inputTokens + outputTokens)
   if (!Number.isNaN(totalTokens)) usage.totalTokens = totalTokens
 
   return usage

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

@@ -28,7 +28,7 @@ class LLMObsPlugin extends TracingPlugin {
     const enabled = this._tracerConfig.llmobs.enabled
     if (!enabled) return
 
-    const parent = this.getLLMObsParent(ctx)
+    const parentStore = llmobsStorage.getStore()
     const apmStore = ctx.currentStore
     const span = apmStore?.span
 
@@ -40,10 +40,14 @@ class LLMObsPlugin extends TracingPlugin {
       telemetry.incrementLLMObsSpanStartCount({ autoinstrumented: true, integration: this.constructor.integration })
 
       ctx.llmobs = {} // initialize context-based namespace
-      llmobsStorage.enterWith({ span })
-      ctx.llmobs.parent = parent
-
-      this._tagger.registerLLMObsSpan(span, { parent, integration: this.constructor.integration, ...registerOptions })
+      llmobsStorage.enterWith({ ...parentStore, span })
+      ctx.llmobs.parent = parentStore
+
+      this._tagger.registerLLMObsSpan(span, {
+        parent: parentStore?.span,
+        integration: this.constructor.integration,
+        ...registerOptions
+      })
     }
   }
 
@@ -56,8 +60,8 @@ class LLMObsPlugin extends TracingPlugin {
     const span = apmStore?.span
     if (!LLMObsTagger.tagMap.has(span)) return
 
-    const parent = ctx.llmobs.parent
-    llmobsStorage.enterWith({ span: parent })
+    const parentStore = ctx.llmobs.parent
+    llmobsStorage.enterWith(parentStore)
   }
 
   asyncEnd (ctx) {
@@ -87,11 +91,6 @@ class LLMObsPlugin extends TracingPlugin {
     }
     super.configure(config)
   }
-
-  getLLMObsParent () {
-    const store = llmobsStorage.getStore()
-    return store?.span
-  }
 }
 
 module.exports = LLMObsPlugin

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

@@ -422,6 +422,22 @@ class LLMObs extends NoopLLMObs {
     }
   }
 
+  annotationContext (options, fn) {
+    if (!this.enabled) return fn()
+
+    const currentStore = storage.getStore()
+
+    const store = {
+      ...currentStore,
+      annotationContext: {
+        ...currentStore?.annotationContext,
+        ...options
+      }
+    }
+
+    return storage.run(store, fn)
+  }
+
   flush () {
     if (!this.enabled) return
 
@@ -447,20 +463,20 @@ class LLMObs extends NoopLLMObs {
   }
 
   _activate (span, options, fn) {
-    const parent = this._active()
-    if (this.enabled) storage.enterWith({ span })
+    const parentStore = storage.getStore()
+    if (this.enabled) storage.enterWith({ ...parentStore, span })
 
     if (options) {
       this._tagger.registerLLMObsSpan(span, {
         ...options,
-        parent
+        parent: parentStore?.span
       })
     }
 
     try {
       return fn()
     } finally {
-      if (this.enabled) storage.enterWith({ span: parent })
+      if (this.enabled) storage.enterWith(parentStore)
     }
   }
 

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

@@ -29,6 +29,7 @@ const {
   DECORATOR,
   PROPAGATED_ML_APP_KEY
 } = require('./constants/tags')
+const { storage } = require('./storage')
 
 // global registry of LLMObs spans
 // maps LLMObs spans to their annotations
@@ -97,6 +98,17 @@ class LLMObsTagger {
       span.context()._trace.tags[PROPAGATED_PARENT_ID_KEY] ??
       ROOT_PARENT_ID
     this._setTag(span, PARENT_ID_KEY, parentId)
+
+    // apply annotation context
+    const annotationContext = storage.getStore()?.annotationContext
+
+    // apply annotation context tags
+    const tags = annotationContext?.tags
+    if (tags) this.tagSpanTags(span, tags)
+
+    // apply annotation context name
+    const annotationContextName = annotationContext?.name
+    if (annotationContextName) this._setTag(span, NAME, annotationContextName)
   }
 
   // TODO: similarly for the following `tag` methods,

package/packages/dd-trace/src/opentelemetry/logs/otlp_http_log_exporter.js

@@ -1,18 +1,12 @@
 'use strict'
 
-const http = require('http')
-const { URL } = require('url')
-const log = require('../../log')
+const OtlpHttpExporterBase = require('../otlp/otlp_http_exporter_base')
 const OtlpTransformer = require('./otlp_transformer')
-const telemetryMetrics = require('../../telemetry/metrics')
 
 /**
  * @typedef {import('@opentelemetry/resources').Resource} Resource
  * @typedef {import('@opentelemetry/api-logs').LogRecord} LogRecord
- *
-*/
-
-const tracerMetrics = telemetryMetrics.manager.namespace('tracers')
+ */
 
 /**
  * OtlpHttpLogExporter exports log records via OTLP over HTTP.
@@ -21,12 +15,9 @@ const tracerMetrics = telemetryMetrics.manager.namespace('tracers')
  * https://opentelemetry.io/docs/specs/otlp/#otlphttp
  *
  * @class OtlpHttpLogExporter
+ * @extends OtlpHttpExporterBase
  */
-class OtlpHttpLogExporter {
-  #telemetryTags
-
-  DEFAULT_LOGS_PATH = '/v1/logs'
-
+class OtlpHttpLogExporter extends OtlpHttpExporterBase {
   /**
    * Creates a new OtlpHttpLogExporter instance.
    *
@@ -37,28 +28,8 @@ class OtlpHttpLogExporter {
    * @param {Resource} resource - Resource attributes
    */
   constructor (url, headers, timeout, protocol, resource) {
-    const parsedUrl = new URL(url)
-
-    this.protocol = protocol
+    super(url, headers, timeout, protocol, '/v1/logs', 'logs')
     this.transformer = new OtlpTransformer(resource, protocol)
-    // If no path is provided, use default path
-    const path = parsedUrl.pathname === '/' ? this.DEFAULT_LOGS_PATH : parsedUrl.pathname
-    const isJson = protocol === 'http/json'
-    this.options = {
-      hostname: parsedUrl.hostname,
-      port: parsedUrl.port,
-      path: path + parsedUrl.search,
-      method: 'POST',
-      timeout,
-      headers: {
-        'Content-Type': isJson ? 'application/json' : 'application/x-protobuf',
-        ...this.#parseAdditionalHeaders(headers)
-      }
-    }
-    this.#telemetryTags = [
-      'protocol:http',
-      `encoding:${isJson ? 'json' : 'protobuf'}`
-    ]
   }
 
   /**
@@ -74,99 +45,8 @@ class OtlpHttpLogExporter {
     }
 
     const payload = this.transformer.transformLogRecords(logRecords)
-    this.#sendPayload(payload, resultCallback)
-    tracerMetrics.count('otel.log_records', this.#telemetryTags).inc(logRecords.length)
-  }
-
-  /**
-   * Sends the payload via HTTP request.
-   * @param {Buffer|string} payload - The payload to send
-   * @param {Function} resultCallback - Callback for the result
-   * @private
-   */
-  #sendPayload (payload, resultCallback) {
-    const options = {
-      ...this.options,
-      headers: {
-        ...this.options.headers,
-        'Content-Length': payload.length
-      }
-    }
-
-    const req = http.request(options, (res) => {
-      let data = ''
-
-      res.on('data', (chunk) => {
-        data += chunk
-      })
-
-      res.on('end', () => {
-        if (res.statusCode >= 200 && res.statusCode < 300) {
-          resultCallback({ code: 0 })
-        } else {
-          const error = new Error(`HTTP ${res.statusCode}: ${data}`)
-          resultCallback({ code: 1, error })
-        }
-      })
-    })
-
-    req.on('error', (error) => {
-      log.error('Error sending OTLP logs:', error)
-      resultCallback({ code: 1, error })
-    })
-
-    req.on('timeout', () => {
-      req.destroy()
-      const error = new Error('Request timeout')
-      resultCallback({ code: 1, error })
-    })
-
-    req.write(payload)
-    req.end()
-  }
-
-  /**
-   * Parses additional HTTP headers from a comma-separated string.
-   * @param {string} headersString - Comma-separated key=value pairs
-   * @returns {Record<string, string>} Parsed headers object
-   * @private
-   */
-  #parseAdditionalHeaders (headersString) {
-    const headers = {}
-    let key = ''
-    let value = ''
-    let readingKey = true
-
-    for (const char of headersString) {
-      if (readingKey) {
-        if (char === '=') {
-          readingKey = false
-          key = key.trim()
-        } else {
-          key += char
-        }
-      } else if (char === ',') {
-        value = value.trim()
-        if (key && value) {
-          headers[key] = value
-        }
-        key = ''
-        value = ''
-        readingKey = true
-      } else {
-        value += char
-      }
-    }
-
-    // Add the last pair if present
-    if (!readingKey) {
-      value = value.trim()
-      if (value) {
-        headers[key] = value
-      }
-    }
-
-    return headers
+    this._sendPayload(payload, resultCallback)
+    this._recordTelemetry('otel.log_records', logRecords.length)
   }
 }