dd-trace 5.73.0 → 5.75.0

package/packages/datadog-instrumentations/src/vitest.js

@@ -153,6 +153,10 @@ function isCliApiPackage (vitestPackage) {
   return vitestPackage.s?.name === 'startVitest'
 }
 
+function isTestPackage (testPackage) {
+  return testPackage.V?.name === 'VitestTestRunner'
+}
+
 function getSessionStatus (state) {
   if (state.getCountOfFailedTests() > 0) {
     return 'fail'
@@ -240,7 +244,9 @@ function getSortWrapper (sort, frameworkVersion) {
     if (isFlakyTestRetriesEnabled && !this.ctx.config.retry && flakyTestRetriesCount > 0) {
       this.ctx.config.retry = flakyTestRetriesCount
       try {
-        const workspaceProject = this.ctx.getCoreWorkspaceProject()
+        const workspaceProject = this.ctx.getCoreWorkspaceProject
+          ? this.ctx.getCoreWorkspaceProject()
+          : this.ctx.getRootProject()
         workspaceProject._provided._ddIsFlakyTestRetriesEnabled = isFlakyTestRetriesEnabled
       } catch {
         log.warn('Could not send library configuration to workers.')
@@ -272,7 +278,9 @@ function getSortWrapper (sort, frameworkVersion) {
             // TODO: use this to pass session and module IDs to the worker, instead of polluting process.env
             // Note: setting this.ctx.config.provide directly does not work because it's cached
             try {
-              const workspaceProject = this.ctx.getCoreWorkspaceProject()
+              const workspaceProject = this.ctx.getCoreWorkspaceProject
+                ? this.ctx.getCoreWorkspaceProject()
+                : this.ctx.getRootProject()
               workspaceProject._provided._ddIsKnownTestsEnabled = isKnownTestsEnabled
               workspaceProject._provided._ddKnownTests = knownTests
               workspaceProject._provided._ddIsEarlyFlakeDetectionEnabled = isEarlyFlakeDetectionEnabled
@@ -290,7 +298,9 @@ function getSortWrapper (sort, frameworkVersion) {
 
     if (isDiEnabled) {
       try {
-        const workspaceProject = this.ctx.getCoreWorkspaceProject()
+        const workspaceProject = this.ctx.getCoreWorkspaceProject
+          ? this.ctx.getCoreWorkspaceProject()
+          : this.ctx.getRootProject()
         workspaceProject._provided._ddIsDiEnabled = isDiEnabled
       } catch {
         log.warn('Could not send Dynamic Instrumentation configuration to workers.')
@@ -305,7 +315,9 @@ function getSortWrapper (sort, frameworkVersion) {
       } else {
         const testManagementTests = receivedTestManagementTests
         try {
-          const workspaceProject = this.ctx.getCoreWorkspaceProject()
+          const workspaceProject = this.ctx.getCoreWorkspaceProject
+            ? this.ctx.getCoreWorkspaceProject()
+            : this.ctx.getRootProject()
           workspaceProject._provided._ddIsTestManagementTestsEnabled = isTestManagementTestsEnabled
           workspaceProject._provided._ddTestManagementAttemptToFixRetries = testManagementAttemptToFixRetries
           workspaceProject._provided._ddTestManagementTests = testManagementTests
@@ -321,7 +333,9 @@ function getSortWrapper (sort, frameworkVersion) {
         log.error('Could not get modified tests.')
       } else {
         try {
-          const workspaceProject = this.ctx.getCoreWorkspaceProject()
+          const workspaceProject = this.ctx.getCoreWorkspaceProject
+            ? this.ctx.getCoreWorkspaceProject()
+            : this.ctx.getRootProject()
           workspaceProject._provided._ddIsImpactedTestsEnabled = isImpactedTestsEnabled
           workspaceProject._provided._ddModifiedFiles = modifiedFiles
         } catch {
@@ -443,13 +457,7 @@ function getStartVitestWrapper (cliApiPackage, frameworkVersion) {
   return cliApiPackage
 }
 
-addHook({
-  name: 'vitest',
-  versions: ['>=1.6.0'],
-  file: 'dist/runners.js'
-}, (vitestPackage) => {
-  const { VitestTestRunner } = vitestPackage
-
+function wrapVitestTestRunner (VitestTestRunner) {
   // `onBeforeRunTask` is run before any repetition or attempt is run
   // `onBeforeRunTask` is an async function
   shimmer.wrap(VitestTestRunner.prototype, 'onBeforeRunTask', onBeforeRunTask => function (task) {
@@ -744,6 +752,30 @@ addHook({
 
       return result
     })
+}
+
+addHook({
+  name: 'vitest',
+  versions: ['>=4.0.0'],
+  filePattern: 'dist/chunks/test.*'
+}, (testPackage) => {
+  if (!isTestPackage(testPackage)) {
+    return testPackage
+  }
+
+  wrapVitestTestRunner(testPackage.V)
+
+  return testPackage
+})
+
+addHook({
+  name: 'vitest',
+  versions: ['>=1.6.0 <4.0.0'],
+  file: 'dist/runners.js'
+}, (vitestPackage) => {
+  const { VitestTestRunner } = vitestPackage
+
+  wrapVitestTestRunner(VitestTestRunner)
 
   return vitestPackage
 })

package/packages/datadog-instrumentations/src/ws.js

@@ -41,7 +41,7 @@ function wrapSend (send) {
 
     const [data, options, cb] = arguments
 
-    const ctx = { data, socket: this._sender._socket }
+    const ctx = { data, socket: this._sender?._socket }
 
     return typeof cb === 'function'
       ? producerCh.traceCallback(send, undefined, ctx, this, data, options, cb)
@@ -70,7 +70,7 @@ function createWrappedHandler (handler) {
   return function wrappedMessageHandler (data, binary) {
     const byteLength = dataLength(data)
 
-    const ctx = { data, binary, socket: this._sender._socket, byteLength }
+    const ctx = { data, binary, socket: this._sender?._socket, byteLength }
 
     return receiverCh.traceSync(handler, ctx, this, data, binary)
   }
@@ -93,7 +93,7 @@ function wrapClose (close) {
     // if both are true then the self is sending the close event
     const isPeerClose = this._closeFrameReceived === true && this._closeFrameSent === false
 
-    const ctx = { code, data, socket: this._sender._socket, isPeerClose }
+    const ctx = { code, data, socket: this._sender?._socket, isPeerClose }
 
     return closeCh.traceSync(close, ctx, this, ...arguments)
   }

package/packages/datadog-plugin-aws-sdk/src/base.js

@@ -282,7 +282,6 @@ function normalizeConfig (config, serviceIdentifier) {
   return {
     ...config,
     ...specificConfig,
-    splitByAwsService: config.splitByAwsService !== false,
     batchPropagationEnabled,
     hooks
   }

package/packages/datadog-plugin-express/src/code_origin.js

@@ -19,6 +19,7 @@ class ExpressCodeOriginForSpansPlugin extends Plugin {
     })
 
     this.addSub('apm:express:route:added', ({ topOfStackFunc, layer }) => {
+      if (!layer) return
       if (layerTags.has(layer)) return
       layerTags.set(layer, entryTags(topOfStackFunc))
     })
@@ -30,6 +31,7 @@ class ExpressCodeOriginForSpansPlugin extends Plugin {
     })
 
     this.addSub('apm:router:route:added', ({ topOfStackFunc, layer }) => {
+      if (!layer) return
       if (layerTags.has(layer)) return
       layerTags.set(layer, entryTags(topOfStackFunc))
     })

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

@@ -47,6 +47,7 @@ const {
   TELEMETRY_EVENT_FINISHED
 } = require('../../dd-trace/src/ci-visibility/telemetry')
 const { appClosing: appClosingTelemetry } = require('../../dd-trace/src/telemetry')
+const log = require('../../dd-trace/src/log')
 
 class PlaywrightPlugin extends CiPlugin {
   static id = 'playwright'
@@ -174,7 +175,10 @@ class PlaywrightPlugin extends CiPlugin {
     }) => {
       const store = storage('legacy').getStore()
       const span = store && store.span
-      if (!span) return
+      if (!span) {
+        log.error('ci:playwright:test:page-goto: test span not found')
+        return
+      }
 
       if (isRumActive) {
         span.setTag(TEST_IS_RUM_ACTIVE, 'true')
@@ -198,36 +202,6 @@ class PlaywrightPlugin extends CiPlugin {
       }
     })
 
-    this.addBind('ci:playwright:test:start', (ctx) => {
-      const {
-        testName,
-        testSuiteAbsolutePath,
-        testSourceLine,
-        browserName,
-        isDisabled
-      } = ctx
-      const store = storage('legacy').getStore()
-      const testSuite = getTestSuitePath(testSuiteAbsolutePath, this.rootDir)
-      const testSourceFile = getTestSuitePath(testSuiteAbsolutePath, this.repositoryRoot)
-      const span = this.startTestSpan(
-        testName,
-        testSuiteAbsolutePath,
-        testSuite,
-        testSourceFile,
-        testSourceLine,
-        browserName
-      )
-
-      if (isDisabled) {
-        span.setTag(TEST_MANAGEMENT_IS_DISABLED, 'true')
-      }
-
-      ctx.parentStore = store
-      ctx.currentStore = { ...store, span }
-
-      return ctx.currentStore
-    })
-
     this.addSub('ci:playwright:worker:report', (serializedTraces) => {
       const traces = JSON.parse(serializedTraces)
       const formattedTraces = []
@@ -277,6 +251,36 @@ class PlaywrightPlugin extends CiPlugin {
       })
     })
 
+    this.addBind('ci:playwright:test:start', (ctx) => {
+      const {
+        testName,
+        testSuiteAbsolutePath,
+        testSourceLine,
+        browserName,
+        isDisabled
+      } = ctx
+      const store = storage('legacy').getStore()
+      const testSuite = getTestSuitePath(testSuiteAbsolutePath, this.rootDir)
+      const testSourceFile = getTestSuitePath(testSuiteAbsolutePath, this.repositoryRoot)
+      const span = this.startTestSpan(
+        testName,
+        testSuiteAbsolutePath,
+        testSuite,
+        testSourceFile,
+        testSourceLine,
+        browserName
+      )
+
+      if (isDisabled) {
+        span.setTag(TEST_MANAGEMENT_IS_DISABLED, 'true')
+      }
+
+      ctx.parentStore = store
+      ctx.currentStore = { ...store, span }
+
+      return ctx.currentStore
+    })
+
     this.addSub('ci:playwright:test:finish', ({
       span,
       testStatus,
@@ -393,6 +397,45 @@ class PlaywrightPlugin extends CiPlugin {
         this.tracer._exporter.flush(onDone)
       }
     })
+
+    this.addSub('ci:playwright:test:skip', ({
+      testName,
+      testSuiteAbsolutePath,
+      testSourceLine,
+      browserName,
+      isNew,
+      isDisabled,
+      isModified,
+      isQuarantined
+    }) => {
+      const testSuite = getTestSuitePath(testSuiteAbsolutePath, this.rootDir)
+      const testSourceFile = getTestSuitePath(testSuiteAbsolutePath, this.repositoryRoot)
+      const span = this.startTestSpan(
+        testName,
+        testSuiteAbsolutePath,
+        testSuite,
+        testSourceFile,
+        testSourceLine,
+        browserName
+      )
+
+      span.setTag(TEST_STATUS, 'skip')
+
+      if (isNew) {
+        span.setTag(TEST_IS_NEW, 'true')
+      }
+      if (isDisabled) {
+        span.setTag(TEST_MANAGEMENT_IS_DISABLED, 'true')
+      }
+      if (isModified) {
+        span.setTag(TEST_IS_MODIFIED, 'true')
+      }
+      if (isQuarantined) {
+        span.setTag(TEST_MANAGEMENT_IS_QUARANTINED, 'true')
+      }
+
+      span.finish()
+    })
   }
 
   // TODO: this runs both in worker and main process (main process: skipped tests that do not go through _runTest)

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

@@ -17,7 +17,7 @@ class WSClosePlugin extends TracingPlugin {
     if (!traceWebsocketMessagesEnabled) return
 
     const { code, data, socket, isPeerClose } = ctx
-    if (!socket.spanContext) return
+    if (!socket?.spanContext) return
 
     const spanKind = isPeerClose ? 'consumer' : 'producer'
     const spanTags = socket.spanContext.spanTags

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

@@ -73,6 +73,8 @@ function copyObjectProperties (original, wrapped, skipKey) {
  * @returns {Function} The wrapped function.
  */
 function wrapFunction (original, wrapper) {
+  if (typeof original !== 'function') return original
+
   const wrapped = wrapper(original)
 
   if (typeof original === 'function') {

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

@@ -9,9 +9,15 @@ const {
   AI_GUARD_ACTION_TAG_KEY,
   AI_GUARD_BLOCKED_TAG_KEY,
   AI_GUARD_META_STRUCT_KEY,
-  AI_GUARD_TOOL_NAME_TAG_KEY
+  AI_GUARD_TOOL_NAME_TAG_KEY,
+  AI_GUARD_TELEMETRY_REQUESTS,
+  AI_GUARD_TELEMETRY_TRUNCATED
 } = require('./tags')
 const log = require('../log')
+const telemetryMetrics = require('../telemetry/metrics')
+const tracerVersion = require('../../../../package.json').version
+
+const appsecMetrics = telemetryMetrics.manager.namespace('appsec')
 
 const ALLOW = 'ALLOW'
 
@@ -58,6 +64,9 @@ class AIGuard extends NoopAIGuard {
     this.#headers = {
       'DD-API-KEY': config.apiKey,
       'DD-APPLICATION-KEY': config.appKey,
+      'DD-AI-GUARD-VERSION': tracerVersion,
+      'DD-AI-GUARD-SOURCE': 'SDK',
+      'DD-AI-GUARD-LANGUAGE': 'nodejs'
     }
     const endpoint = config.experimental.aiguard.endpoint || `https://app.${config.site}/api/v2/ai-guard`
     this.#evaluateUrl = `${endpoint}/evaluate`
@@ -70,14 +79,22 @@ class AIGuard extends NoopAIGuard {
 
   #truncate (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)
 
+    let contentTruncated = false
     for (let i = 0; i < size; i++) {
       const message = result[i]
       if (message.content?.length > this.#maxContentSize) {
+        contentTruncated = true
         result[i] = { ...message, content: message.content.slice(0, this.#maxContentSize) }
       }
     }
+    if (contentTruncated) {
+      appsecMetrics.count(AI_GUARD_TELEMETRY_TRUNCATED, { type: 'content' }).inc(1)
+    }
     return result
   }
 
@@ -140,9 +157,11 @@ class AIGuard extends NoopAIGuard {
           payload,
           { url: this.#evaluateUrl, headers: this.#headers, timeout: this.#timeout })
       } catch (e) {
-        throw new AIGuardClientError('Unexpected error calling AI Guard service', { cause: e })
+        appsecMetrics.count(AI_GUARD_TELEMETRY_REQUESTS, { error: true }).inc(1)
+        throw new AIGuardClientError(`Unexpected error calling AI Guard service: ${e.message}`, { cause: e })
       }
       if (response.status !== 200) {
+        appsecMetrics.count(AI_GUARD_TELEMETRY_REQUESTS, { error: true }).inc(1)
         throw new AIGuardClientError(
           `AI Guard service call failed, status ${response.status}`,
           { errors: response.body?.errors })
@@ -157,11 +176,14 @@ class AIGuard extends NoopAIGuard {
         reason = attr.reason
         blockingEnabled = attr.is_blocking_enabled ?? false
       } catch (e) {
+        appsecMetrics.count(AI_GUARD_TELEMETRY_REQUESTS, { error: true }).inc(1)
         throw new AIGuardClientError(`AI Guard service returned unexpected response : ${response.body}`, { cause: e })
       }
+      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 (block && blockingEnabled && action !== ALLOW) {
+      if (shouldBlock) {
         span.setTag(AI_GUARD_BLOCKED_TAG_KEY, 'true')
         throw new AIGuardAbortError(reason)
       }

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

@@ -7,5 +7,8 @@ module.exports = {
   AI_GUARD_ACTION_TAG_KEY: 'ai_guard.action',
   AI_GUARD_REASON_TAG_KEY: 'ai_guard.reason',
   AI_GUARD_BLOCKED_TAG_KEY: 'ai_guard.blocked',
-  AI_GUARD_META_STRUCT_KEY: 'ai_guard'
+  AI_GUARD_META_STRUCT_KEY: 'ai_guard',
+
+  AI_GUARD_TELEMETRY_REQUESTS: 'ai_guard.requests',
+  AI_GUARD_TELEMETRY_TRUNCATED: 'ai_guard.truncated'
 }

package/packages/dd-trace/src/config-helper.js

@@ -37,7 +37,9 @@ for (const deprecation of Object.keys(deprecations)) {
 module.exports = {
   /**
    * Returns the environment variables that are supported by the tracer
-   * (including all non-Datadog/OTEL specific environment variables)
+   * (including all non-Datadog/OTEL specific environment variables).
+   *
+   * This should only be called once in config.js to avoid copying the object frequently.
    *
    * @returns {TracerEnv} The environment variables
    */
@@ -78,6 +80,7 @@ module.exports = {
    * @returns {string|undefined}
    * @throws {Error} if the configuration is not supported
    */
+  // This method, and callers of this method, need to be updated to check for declarative config sources as well.
   getEnvironmentVariable (name) {
     if ((name.startsWith('DD_') || name.startsWith('OTEL_') || aliasToCanonical[name]) &&
         !supportedConfigurations[name]) {