dd-trace 5.80.0 → 5.81.0

package/packages/datadog-plugin-cypress/src/support.js

@@ -9,6 +9,9 @@ let testManagementAttemptToFixRetries = 0
 let testManagementTests = {}
 let isImpactedTestsEnabled = false
 let isModifiedTest = false
+let isTestIsolationEnabled = false
+// Array of test names that have been retried and the reason
+const retryReasonsByTestName = new Map()
 
 // We need to grab the original window as soon as possible,
 // in case the test changes the origin. If the test does change the origin,
@@ -43,17 +46,20 @@ function getTestProperties (testName) {
   return { isAttemptToFix, isDisabled, isQuarantined }
 }
 
-function retryTest (test, suiteTests, numRetries, tags) {
+function getRetriedTests (test, numRetries, tags) {
+  const retriedTests = []
   for (let retryIndex = 0; retryIndex < numRetries; retryIndex++) {
-    const clonedTest = test.clone()
     // TODO: signal in framework logs that this is a retry.
     // TODO: Change it so these tests are allowed to fail.
-    // TODO: figure out if reported duration is skewed.
-    suiteTests.unshift(clonedTest)
+    const clonedTest = test.clone()
     tags.forEach(tag => {
-      clonedTest[tag] = true
+      if (tag) {
+        clonedTest[tag] = true
+      }
     })
+    retriedTests.push(clonedTest)
   }
+  return retriedTests
 }
 
 const oldRunTests = Cypress.mocha.getRunner().runTests
@@ -61,45 +67,80 @@ Cypress.mocha.getRunner().runTests = function (suite, fn) {
   if (!isKnownTestsEnabled && !isTestManagementEnabled && !isImpactedTestsEnabled) {
     return oldRunTests.apply(this, arguments)
   }
-  // We copy the new tests at the beginning of the suite run (runTests), so that they're run
-  // multiple times.
-  suite.tests.forEach(test => {
-    const testName = test.fullTitle()
+  // We copy the tests array and add retries to it, then assign it back to suite.tests
+  // to avoid modifying the array while iterating over it
+  const testsWithRetries = []
 
+  for (let testIndex = 0; testIndex < suite.tests.length; testIndex++) {
+    const test = suite.tests[testIndex]
+    const testName = test.fullTitle()
     const { isAttemptToFix } = getTestProperties(testName)
+    const isSkipped = test.isPending()
 
-    if (isTestManagementEnabled && isAttemptToFix && !test.isPending()) {
-      test._ddIsAttemptToFix = true
-      retryTest(test, suite.tests, testManagementAttemptToFixRetries, ['_ddIsAttemptToFix'])
-    }
-    if (isImpactedTestsEnabled && isModifiedTest) {
+    const isAtemptToFix = isTestManagementEnabled && isAttemptToFix && !isSkipped
+    const isModified = isImpactedTestsEnabled && isModifiedTest
+    const isNew = isKnownTestsEnabled && !isSkipped && isNewTest(test)
+
+    // We want is_modified and is_new regardless of the retry reason
+    if (isModified) {
       test._ddIsModified = true
-      if (isEarlyFlakeDetectionEnabled && !isAttemptToFix) {
-        retryTest(
-          test,
-          suite.tests,
-          earlyFlakeDetectionNumRetries,
-          ['_ddIsModified', '_ddIsEfdRetry', isKnownTestsEnabled && isNewTest(test) && '_ddIsNew']
-        )
-      }
     }
-    if (isKnownTestsEnabled && !test._ddIsNew && !test.isPending() && isNewTest(test)) {
+    if (isNew) {
       test._ddIsNew = true
-      if (isImpactedTestsEnabled && isModifiedTest) {
-        test._ddIsModified = true
-      }
-      if (isEarlyFlakeDetectionEnabled && !isAttemptToFix && !isModifiedTest) {
-        retryTest(test, suite.tests, earlyFlakeDetectionNumRetries, ['_ddIsNew', '_ddIsEfdRetry'])
-      }
     }
-  })
+
+    // Add the original test first
+    testsWithRetries.push(test)
+
+    if (!isTestIsolationEnabled) {
+      continue
+    }
+
+    // Then add retries right after it
+    let retriedTests = []
+    let retryMessage = ''
+    if (isAtemptToFix) {
+      test._ddIsAttemptToFix = true
+      retryMessage = 'because it is an attempt to fix'
+      retriedTests = getRetriedTests(test, testManagementAttemptToFixRetries, ['_ddIsAttemptToFix'])
+    } else if (isModified && isEarlyFlakeDetectionEnabled) {
+      retryMessage = 'to detect flakes because it is modified'
+      retriedTests = getRetriedTests(test, earlyFlakeDetectionNumRetries, [
+        '_ddIsModified',
+        '_ddIsEfdRetry',
+        isKnownTestsEnabled && isNewTest(test) && '_ddIsNew'
+      ])
+    } else if (isNew && isEarlyFlakeDetectionEnabled) {
+      retryMessage = 'to detect flakes because it is new'
+      retriedTests = getRetriedTests(test, earlyFlakeDetectionNumRetries, ['_ddIsNew', '_ddIsEfdRetry'])
+    }
+
+    testsWithRetries.push(...retriedTests)
+
+    if (retryMessage) {
+      retryReasonsByTestName.set(testName, retryMessage)
+    }
+  }
+
+  suite.tests = testsWithRetries
 
   return oldRunTests.apply(this, [suite, fn])
 }
 
 beforeEach(function () {
+  const testName = Cypress.mocha.getRunner().suite.ctx.currentTest.fullTitle()
+
+  const retryMessage = retryReasonsByTestName.get(testName)
+  if (retryMessage) {
+    cy.task(
+      'dd:log',
+      `Retrying "${testName}" ${retryMessage}`
+    )
+    retryReasonsByTestName.delete(testName)
+  }
+
   cy.task('dd:beforeEach', {
-    testName: Cypress.mocha.getRunner().suite.ctx.currentTest.fullTitle(),
+    testName,
     testSuite: Cypress.mocha.getRootSuite().file
   }).then(({ traceId, shouldSkip }) => {
     Cypress.env('traceId', traceId)
@@ -127,6 +168,7 @@ before(function () {
       testManagementTests = suiteConfig.testManagementTests
       isImpactedTestsEnabled = suiteConfig.isImpactedTestsEnabled
       isModifiedTest = suiteConfig.isModifiedTest
+      isTestIsolationEnabled = suiteConfig.isTestIsolationEnabled
     }
   })
 })

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

@@ -0,0 +1,17 @@
+'use strict'
+
+const CompositePlugin = require('../../dd-trace/src/plugins/composite')
+const GenAiTracingPlugin = require('./tracing')
+const GenAiLLMObsPlugin = require('../../dd-trace/src/llmobs/plugins/genai')
+
+class GenAiPlugin extends CompositePlugin {
+  static id = 'google-genai'
+  static get plugins () {
+    return {
+      llmobs: GenAiLLMObsPlugin,
+      tracing: GenAiTracingPlugin
+    }
+  }
+}
+
+module.exports = GenAiPlugin

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')

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/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)
@@ -139,7 +147,7 @@ class AIGuard extends NoopAIGuard {
         }
       }
       const metaStruct = {
-        messages: this.#truncate(messages)
+        messages: this.#buildMessagesForMetaStruct(messages)
       }
       span.meta_struct = {
         [AI_GUARD_META_STRUCT_KEY]: metaStruct
@@ -192,9 +200,9 @@ class AIGuard extends NoopAIGuard {
       }
       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/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/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
       }
     }
   })