dd-trace 5.79.0 → 5.81.0

package/packages/datadog-plugin-google-genai/src/tracing.js

@@ -0,0 +1,41 @@
+'use strict'
+
+const TracingPlugin = require('../../dd-trace/src/plugins/tracing.js')
+
+class GenAiTracingPlugin extends TracingPlugin {
+  static id = 'google-genai'
+  static operation = 'request'
+  static prefix = 'tracing:apm:google:genai:request'
+
+  static get type () { return 'web' }
+  static get kind () { return 'client' }
+
+  bindStart (ctx) {
+    const { args, methodName } = ctx
+
+    const inputs = args[0]
+    const model = inputs?.model || 'unknown'
+
+    this.startSpan('google_genai.request', {
+      meta: {
+        'resource.name': methodName,
+        'google_genai.request.model': model,
+        'google_genai.request.provider': 'google'
+      }
+    }, ctx)
+
+    return ctx.currentStore
+  }
+
+  asyncEnd (ctx) {
+    const { span } = ctx.currentStore
+    if (!span) return
+
+    if (ctx.result) {
+      span.setTag('google_genai.response.model', ctx.result.modelVersion || ctx.inputs?.model)
+    }
+    span.finish()
+  }
+}
+
+module.exports = GenAiTracingPlugin

package/packages/datadog-plugin-graphql/src/tools/transforms.js

@@ -5,10 +5,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const visitor_1 = require("graphql/language/visitor");
-const printer_1 = require("graphql/language/printer");
-const utilities_1 = require("graphql/utilities");
-const lodash_sortby_1 = __importDefault(require("lodash.sortby"));
+const ddGlobal = globalThis[Symbol.for('dd-trace')];
+const visitor_1 = ddGlobal.graphql_visitor;
+const printer_1 = ddGlobal.graphql_printer;
+const utilities_1 = ddGlobal.graphql_utilities;
+const lodash_sortby_1 = __importDefault(require("../../../../vendor/dist/lodash.sortby"));
 function hideLiterals(ast) {
     return visitor_1.visit(ast, {
         IntValue(node) {

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

@@ -1,7 +1,7 @@
 'use strict'
 
 const { readFileSync } = require('fs')
-const { parse } = require('jest-docblock')
+const { parse } = require('../../../vendor/dist/jest-docblock')
 
 const { getTestSuitePath } = require('../../dd-trace/src/plugins/util/test')
 const log = require('../../dd-trace/src/log')
@@ -62,6 +62,7 @@ function getJestTestName (test, shouldStripSeed = false) {
 }
 
 const globalDocblockRegExp = /^\s*(\/\*\*?(.|\r?\n)*?\*\/)/
+const MAX_COMMENTS_CHECKED = 10
 
 function isMarkedAsUnskippable (test) {
   let testSource
@@ -86,7 +87,7 @@ function isMarkedAsUnskippable (test) {
       docblocks = parse(comment)
     } catch {
       // Skip unparsable comment and continue scanning
-      if (commentsChecked++ >= 10) {
+      if (commentsChecked++ >= MAX_COMMENTS_CHECKED) {
         return false
       }
       continue
@@ -103,7 +104,7 @@ function isMarkedAsUnskippable (test) {
       }
     }
 
-    if (commentsChecked++ >= 10) {
+    if (commentsChecked++ >= MAX_COMMENTS_CHECKED) {
       return false
     }
 

package/packages/datadog-plugin-kafkajs/src/consumer.js

@@ -28,7 +28,8 @@ class KafkajsConsumerPlugin extends ConsumerPlugin {
    * @property {string} topic
    * @property {number} partition
    * @property {number} offset
-   *
+   */
+  /**
    * @typedef {object} CommitEventItem
    * @property {string} groupId
    * @property {string} topic

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

@@ -25,6 +25,8 @@ class KafkajsProducerPlugin extends ProducerPlugin {
    * @property {string} topic
    * @property {number} partition
    * @property {number} offset
+   */
+  /**
    *
    * @typedef {object} ProducerResponseItem
    * @property {string} topic
@@ -49,7 +51,7 @@ class KafkajsProducerPlugin extends ProducerPlugin {
 
   /**
    *
-   * @param {ProducerResponseItem[]} commitList
+   * @param {{ result: ProducerResponseItem[] }} ctx
    * @returns {void}
    */
   commit (ctx) {

package/packages/datadog-plugin-langchain/src/tracing.js

@@ -12,6 +12,8 @@ const LangChainHandler = require('./handlers/default')
 const LangChainLanguageModelHandler = require('./handlers/language_models')
 const LangChainEmbeddingHandler = require('./handlers/embedding')
 
+const defaultNs = ['langchain', 'embeddings']
+
 class BaseLangChainTracingPlugin extends TracingPlugin {
   static id = 'langchain'
   static operation = 'invoke'
@@ -36,7 +38,9 @@ class BaseLangChainTracingPlugin extends TracingPlugin {
     const type = ctx.type = this.constructor.lcType
 
     // Runnable interfaces have an `lc_namespace` property
-    const ns = ctx.self.lc_namespace || ctx.namespace
+    const ns = ctx.self.lc_namespace || (
+      ctx.self.constructor.name === 'OpenAIEmbeddings' ? [...defaultNs, 'openai'] : defaultNs
+    )
 
     const resourceParts = [...ns, ctx.self.constructor.name]
     if (type === 'tool') {
@@ -111,13 +115,13 @@ class BaseLLMGeneratePlugin extends BaseLangChainTracingPlugin {
 class EmbeddingsEmbedQueryPlugin extends BaseLangChainTracingPlugin {
   static id = 'langchain_embeddings_embed_query'
   static lcType = 'embedding'
-  static prefix = 'tracing:apm:@langchain/core:Embeddings_embedQuery'
+  static prefix = 'tracing:orchestrion:@langchain/core:Embeddings_embedQuery'
 }
 
 class EmbeddingsEmbedDocumentsPlugin extends BaseLangChainTracingPlugin {
   static id = 'langchain_embeddings_embed_documents'
   static lcType = 'embedding'
-  static prefix = 'tracing:apm:@langchain/core:Embeddings_embedDocuments'
+  static prefix = 'tracing:orchestrion:@langchain/core:Embeddings_embedDocuments'
 }
 
 class ToolInvokePlugin extends BaseLangChainTracingPlugin {

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

@@ -10,10 +10,10 @@ const errorPages = new Set(['/404', '/500', '/_error', '/_not-found', '/_not-fou
 
 class NextPlugin extends ServerPlugin {
   static id = 'next'
+  #requestsBySpanId = new WeakMap()
 
   constructor (...args) {
     super(...args)
-    this._requests = new WeakMap()
     this.addSub('apm:next:page:load', message => this.pageLoad(message))
   }
 
@@ -35,7 +35,9 @@ class NextPlugin extends ServerPlugin {
 
     analyticsSampler.sample(span, this.config.measured, true)
 
-    this._requests.set(span, req)
+    // Store request by span ID to handle cases where child spans are activated
+    const spanId = span.context()._spanId
+    this.#requestsBySpanId.set(spanId, req)
 
     return { ...store, span }
   }
@@ -89,7 +91,13 @@ class NextPlugin extends ServerPlugin {
     if (!store) return
 
     const span = store.span
-    const req = this._requests.get(span)
+
+    const spanId = span.context()._spanId
+    const parentSpanId = span.context()._parentId
+
+    // Try current span first, then parent span.
+    // This handles cases where pageLoad runs in a child span context
+    const req = this.#requestsBySpanId.get(spanId) ?? this.#requestsBySpanId.get(parentSpanId)
 
     // safeguard against missing req in complicated timeout scenarios
     if (!req) return

package/packages/datadog-plugin-openai/src/stream-helpers.js

@@ -111,7 +111,7 @@ function constructChatCompletionResponseFromStreamedChunks (chunks, n) {
  * Constructs the entire response from a stream of OpenAI responses chunks.
  * The responses API uses event-based streaming with delta chunks.
  * @param {Array<Record<string, any>>} chunks
- * @returns {Record<string, any>}
+ * @returns {Record<string, any>|undefined}
  */
 function constructResponseResponseFromStreamedChunks (chunks) {
   // The responses API streams events with different types:

package/packages/datadog-shimmer/src/shimmer.js

@@ -91,7 +91,7 @@ function wrapFunction (original, wrapper) {
  * @param {Record<string | symbol, unknown> | Function | undefined} target - The target
  * object.
  * @param {string | symbol} name - The property key of the method to wrap.
- * @param {(original: Function) => (...args) => any} wrapper - The wrapper function.
+ * @param {(original: Function) => (...args: unknown[]) => any} wrapper - The wrapper function.
  * @param {{ replaceGetter?: boolean }} [options] - If `replaceGetter` is set to
  * true, the getter is accessed and the getter is replaced with one that just
  * returns the earlier retrieved value. Use with care! This may only be done in
@@ -214,7 +214,7 @@ function wrap (target, name, wrapper, options) {
  *         Record<string | symbol, unknown> |
  *         Function} targets - The target objects.
  * @param {Array<string | symbol> | string | symbol} names - The property keys of the methods to wrap.
- * @param {(original: Function) => (...args) => any} wrapper - The wrapper function.
+ * @param {(original: Function) => (...args: unknown[]) => any} wrapper - The wrapper function.
  */
 function massWrap (targets, names, wrapper) {
   targets = toArray(targets)

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

@@ -1,5 +1,6 @@
 'use strict'
 
+const rfdc = require('../../../../vendor/dist/rfdc')({ proto: false, circles: false })
 const NoopAIGuard = require('./noop')
 const executeRequest = require('./client')
 const {
@@ -22,10 +23,11 @@ const appsecMetrics = telemetryMetrics.manager.namespace('appsec')
 const ALLOW = 'ALLOW'
 
 class AIGuardAbortError extends Error {
-  constructor (reason) {
+  constructor (reason, tags) {
     super(reason)
     this.name = 'AIGuardAbortError'
     this.reason = reason
+    this.tags = tags
   }
 }
 
@@ -77,20 +79,26 @@ class AIGuard extends NoopAIGuard {
     this.#initialized = true
   }
 
-  #truncate (messages) {
+  /**
+   * Returns a safe copy of the messages to be serialized into the meta struct.
+   *
+   * - Clones each message so callers cannot mutate the data set in the meta struct.
+   * - Truncates the list of messages and `content` fields emitting metrics accordingly.
+   */
+  #buildMessagesForMetaStruct (messages) {
     const size = Math.min(messages.length, this.#maxMessagesLength)
     if (messages.length > size) {
       appsecMetrics.count(AI_GUARD_TELEMETRY_TRUNCATED, { type: 'messages' }).inc(1)
     }
-    const result = messages.slice(-size)
-
+    const result = []
     let contentTruncated = false
-    for (let i = 0; i < size; i++) {
-      const message = result[i]
+    for (let i = messages.length - size; i < messages.length; i++) {
+      const message = rfdc(messages[i])
       if (message.content?.length > this.#maxContentSize) {
         contentTruncated = true
-        result[i] = { ...message, content: message.content.slice(0, this.#maxContentSize) }
+        message.content = message.content.slice(0, this.#maxContentSize)
       }
+      result.push(message)
     }
     if (contentTruncated) {
       appsecMetrics.count(AI_GUARD_TELEMETRY_TRUNCATED, { type: 'content' }).inc(1)
@@ -138,10 +146,11 @@ class AIGuard extends NoopAIGuard {
           span.setTag(AI_GUARD_TOOL_NAME_TAG_KEY, name)
         }
       }
+      const metaStruct = {
+        messages: this.#buildMessagesForMetaStruct(messages)
+      }
       span.meta_struct = {
-        [AI_GUARD_META_STRUCT_KEY]: {
-          messages: this.#truncate(messages)
-        }
+        [AI_GUARD_META_STRUCT_KEY]: metaStruct
       }
       let response
       try {
@@ -166,7 +175,7 @@ class AIGuard extends NoopAIGuard {
           `AI Guard service call failed, status ${response.status}`,
           { errors: response.body?.errors })
       }
-      let action, reason, blockingEnabled
+      let action, reason, tags, blockingEnabled
       try {
         const attr = response.body.data.attributes
         if (!attr.action) {
@@ -174,6 +183,7 @@ class AIGuard extends NoopAIGuard {
         }
         action = attr.action
         reason = attr.reason
+        tags = attr.tags
         blockingEnabled = attr.is_blocking_enabled ?? false
       } catch (e) {
         appsecMetrics.count(AI_GUARD_TELEMETRY_REQUESTS, { error: true }).inc(1)
@@ -182,12 +192,17 @@ class AIGuard extends NoopAIGuard {
       const shouldBlock = block && blockingEnabled && action !== ALLOW
       appsecMetrics.count(AI_GUARD_TELEMETRY_REQUESTS, { action, error: false, block: shouldBlock }).inc(1)
       span.setTag(AI_GUARD_ACTION_TAG_KEY, action)
-      span.setTag(AI_GUARD_REASON_TAG_KEY, reason)
+      if (reason) {
+        span.setTag(AI_GUARD_REASON_TAG_KEY, reason)
+      }
+      if (tags?.length > 0) {
+        metaStruct.attack_categories = tags
+      }
       if (shouldBlock) {
         span.setTag(AI_GUARD_BLOCKED_TAG_KEY, 'true')
-        throw new AIGuardAbortError(reason)
+        throw new AIGuardAbortError(reason, tags)
       }
-      return { action, reason }
+      return { action, reason, tags }
     })
   }
 }

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

@@ -1,6 +1,6 @@
 'use strict'
 
-const { TTLCache } = require('@isaacs/ttlcache')
+const { TTLCache } = require('../../../../vendor/dist/@isaacs/ttlcache')
 const web = require('../plugins/util/web')
 const log = require('../log')
 const { AUTO_REJECT, USER_REJECT } = require('../../../../ext/priority')

package/packages/dd-trace/src/appsec/iast/overhead-controller.js

@@ -1,6 +1,6 @@
 'use strict'
 
-const { LRUCache } = require('lru-cache')
+const { LRUCache } = require('../../../../../vendor/dist/lru-cache')
 const web = require('../../plugins/util/web')
 const vulnerabilities = require('./vulnerabilities')
 

package/packages/dd-trace/src/appsec/iast/taint-tracking/rewriter-esm.mjs

@@ -47,7 +47,7 @@ export async function load (url, context, nextLoad) {
         passes.push('iast')
       }
     } else {
-      passes = ['orchestrion']
+      passes = [] // TODO: Re-enable Orchestrion when viable.
     }
     const rewritten = rewriter.rewrite(result.source.toString(), url, passes)
 

package/packages/dd-trace/src/appsec/iast/taint-tracking/rewriter.js

@@ -175,9 +175,8 @@ function enableRewriter (telemetryVerbosity) {
           shimmer.wrap(Module.prototype, '_compile', compileMethod => getCompileMethodFn(compileMethod))
         }
       }
+      enableEsmRewriter(telemetryVerbosity)
     }
-
-    enableEsmRewriter(telemetryVerbosity)
   } catch (e) {
     log.error('Error enabling Rewriter', e)
   }

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

@@ -1,6 +1,6 @@
 'use strict'
 
-const { LRUCache } = require('lru-cache')
+const { LRUCache } = require('../../../../../vendor/dist/lru-cache')
 const vulnerabilitiesFormatter = require('./vulnerabilities-formatter')
 const { IAST_ENABLED_TAG_KEY, IAST_JSON_TAG_KEY } = require('./tags')
 const { keepTrace } = require('../../priority_sampler')

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

@@ -546,10 +546,6 @@ function finishRequest (req, res, storedResponseHeaders, requestBody) {
     reportRequestBody(rootSpan, requestBody)
   }
 
-  if (tags['appsec.event'] === 'true' && typeof req.route?.path === 'string') {
-    newTags['http.endpoint'] = req.route.path
-  }
-
   rootSpan.addTags(newTags)
 }
 

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

@@ -3,11 +3,18 @@
 const { storage } = require('../../datadog-core')
 const baggageStorage = storage('baggage')
 
+/**
+ * @param {string} key
+ * @param {string} value
+ */
 function setBaggageItem (key, value) {
   storage('baggage').enterWith({ ...baggageStorage.getStore(), [key]: value })
   return storage('baggage').getStore()
 }
 
+/**
+ * @param {string} key
+ */
 function getBaggageItem (key) {
   return storage('baggage').getStore()?.[key]
 }
@@ -16,6 +23,10 @@ function getAllBaggageItems () {
   return storage('baggage').getStore() ?? {}
 }
 
+/**
+ * @param {string} keyToRemove
+ * @returns {Record<string, unknown>}
+ */
 function removeBaggageItem (keyToRemove) {
   const { [keyToRemove]: _, ...newBaggage } = storage('baggage').getStore()
   storage('baggage').enterWith(newBaggage)

package/packages/dd-trace/src/ci-visibility/dynamic-instrumentation/worker/index.js

@@ -36,7 +36,7 @@ session.on('Debugger.paused', async ({ params: { hitBreakpoints: [hitBreakpoint]
 
   const stack = getStackFromCallFrames(callFrames)
 
-  const getLocalState = await getLocalStateForCallFrame(callFrames[0])
+  const { processLocalState } = await getLocalStateForCallFrame(callFrames[0])
 
   await session.post('Debugger.resume')
 
@@ -48,17 +48,13 @@ session.on('Debugger.paused', async ({ params: { hitBreakpoints: [hitBreakpoint]
       version: '0',
       location: probe.location
     },
+    captures: {
+      lines: { [probe.location.lines[0]]: { locals: processLocalState() } }
+    },
     stack,
     language: 'javascript'
   }
 
-  const state = getLocalState()
-  if (state) {
-    snapshot.captures = {
-      lines: { [probe.location.lines[0]]: { locals: state } }
-    }
-  }
-
   breakpointHitChannel.postMessage({ snapshot })
 })
 

package/packages/dd-trace/src/ci-visibility/exporters/git/git_metadata.js

@@ -245,7 +245,7 @@ function generateAndUploadPackFiles ({
 
 /**
  * This function uploads git metadata to CI Visibility's backend.
-*/
+ */
 function sendGitMetadata (url, { isEvpProxy, evpProxyPrefix }, configRepositoryUrl, callback) {
   if (!isGitAvailable()) {
     return callback(new Error('Git is not available'))

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

@@ -14,7 +14,8 @@ function getTestManagementTests ({
   commitMessage,
   sha,
   commitHeadSha,
-  commitHeadMessage
+  commitHeadMessage,
+  branch
 }, done) {
   const options = {
     path: '/api/v2/test/libraries/test-management/tests',
@@ -49,7 +50,8 @@ function getTestManagementTests ({
       attributes: {
         repository_url: repositoryUrl,
         commit_message: commitHeadMessage || commitMessage,
-        sha: commitHeadSha || sha
+        sha: commitHeadSha || sha,
+        branch
       }
     }
   })