dd-trace 6.15.0 → 6.17.0

package/ci/test-optimization-validation/runner-contract.js

@@ -241,7 +241,6 @@ function getRunnerSearchRoots (framework, command, projectRoot, repositoryRoot)
  * @param {string} projectRoot detected project root
  * @param {string} repositoryRoot repository root
  * @param {boolean} directory whether the option explicitly requires a directory
- * @returns {void}
  */
 function addRunnerSearchRoot (roots, value, projectRoot, repositoryRoot, directory) {
   if (typeof value !== 'string' || !value) return
@@ -523,7 +522,6 @@ function getRunnerArgs (framework, invocation) {
  * Normalizes executable shims and supported JavaScript runner entrypoints.
  *
  * @param {string} token command token
- * @returns {string} normalized executable basename
  */
 function normalizeRunnerBasename (token) {
   return path.basename(token)
@@ -670,7 +668,6 @@ function tokenizeCommand (command) {
  * Returns the executable name for a framework.
  *
  * @param {string} framework framework name
- * @returns {string} executable name
  */
 function getRunnerExecutableName (framework) {
   if (framework === 'cucumber') return 'cucumber-js'
@@ -682,7 +679,6 @@ function getRunnerExecutableName (framework) {
  *
  * @param {string} root root path
  * @param {string} filename candidate path
- * @returns {boolean} whether the candidate is contained
  */
 function isPathInside (root, filename) {
   const relative = path.relative(path.resolve(root), path.resolve(filename))

package/ci/test-optimization-validation/safe-files.js

@@ -189,7 +189,6 @@ function refuseSymbolicLink (filename, label) {
  *
  * @param {string} root allowed root
  * @param {string} filename candidate path
- * @returns {boolean} true when the candidate is inside the root
  */
 function isPathInside (root, filename) {
   const relative = path.relative(root, filename)

package/ci/test-optimization-validation/scenarios/basic-reporting.js

@@ -338,7 +338,6 @@ function getSelectorEvidence (framework, events) {
  *
  * @param {string} actual captured test source path
  * @param {string} expected approved representative path
- * @returns {boolean} whether both paths identify the same file
  */
 function sourceFilesMatch (actual, expected) {
   const normalizedActual = normalizeSourceFile(actual)

package/ci/test-optimization-validation/scenarios/ci-wiring.js

@@ -442,7 +442,7 @@ function hasUnavailableRemoteCiCommand (ci) {
   })) return true
 
   return evidence.some(item => {
-    const reference = /^\s*uses:\s*["']?([^"'\s]+)["']?\s*$/im.exec(item)?.[1]
+    const reference = /^[ \t]*uses:[ \t]*["']?([^"'\s]+)["']?[ \t]*$/im.exec(item)?.[1]
     return reference && !reference.startsWith('./')
   })
 }
@@ -592,7 +592,6 @@ function readProjectSource (filename, projectFileSources) {
  *
  * @param {string} source file source
  * @param {string} value recorded value
- * @returns {boolean} literal presence
  */
 function containsLiteral (source, value) {
   const normalizedSource = source.replaceAll('\r\n', '\n')

package/ci/test-optimization-validation/source-text.js

@@ -4,7 +4,6 @@
  * Replaces JavaScript comments with spaces while preserving line structure and string literals.
  *
  * @param {string} source JavaScript or TypeScript source
- * @returns {string} source with comments masked
  */
 function maskJavaScriptComments (source) {
   return maskJavaScriptSource(source, false)
@@ -14,7 +13,6 @@ function maskJavaScriptComments (source) {
  * Replaces JavaScript comments and string literals with spaces while preserving line structure.
  *
  * @param {string} source JavaScript or TypeScript source
- * @returns {string} source with non-code text masked
  */
 function maskJavaScriptNonCode (source) {
   return maskJavaScriptSource(source, true)
@@ -25,7 +23,6 @@ function maskJavaScriptNonCode (source) {
  *
  * @param {string} source JavaScript or TypeScript source
  * @param {boolean} maskStrings whether string and template literal contents should be masked
- * @returns {string} masked source
  */
 function maskJavaScriptSource (source, maskStrings) {
   const characters = [...source]

package/ci/vitest-no-worker-init-setup.mjs

@@ -15,6 +15,8 @@ const earlyFlakeDetectionRetryPolicy = providedContext.earlyFlakeDetectionRetryP
   schedulingRetryCount: 0,
 }
 const earlyFlakeDetectionRetries = earlyFlakeDetectionRetryPolicy.schedulingRetryCount
+const dynamicAtrRetryPolicy = providedContext.dynamicAtrRetryPolicy
+const flakyTestRetriesConfiguration = providedContext.flakyTestRetriesConfiguration
 const isEfdSuiteAdmissionEnabled = providedContext.isEfdSuiteAdmissionEnabled === true
 const isEarlyFlakeDetectionEnabled = providedContext.isEarlyFlakeDetectionEnabled === true
 const knownTests = providedContext.knownTests || {}
@@ -31,6 +33,7 @@ const earlyFlakeDetectionSkippedResults = new WeakMap()
 const earlyFlakeDetectionStartByTask = new WeakMap()
 const nextAttemptIndexByTask = new WeakMap()
 const retryAttemptIndexByTask = new WeakMap()
+const dynamicAtrExecutionStartByTask = new WeakMap()
 const usedRumTestExecutionIds = new Set()
 let browserCommands
 let now
@@ -86,6 +89,11 @@ if (isNoWorkerInitActive) {
     const isQuarantinedTest = quarantinedTests[testSuite]?.[testName] && !isAttemptToFixTest
     const attemptIndex = getNextAttemptIndex(task)
     const attemptStart = now()
+    if (task.retry?.__ddTestOptAtr && retryAttemptIndexByTask.get(task).index === 0) {
+      const executionStart = task.result.repeatCount > 0 ? attemptStart : task.result.startTime - timeOrigin
+      dynamicAtrExecutionStartByTask.set(task, executionStart)
+      task.meta.__ddTestOptAtrRetries = undefined
+    }
     if (attemptIndex > 0) {
       recordTestOptimizationStatus(task, attemptIndex - 1)
     }
@@ -153,11 +161,43 @@ function applyExecutionChanges (suite, isEfdSuiteAdmissionAllowed) {
         task.repeats = earlyFlakeDetectionRetries
         task.meta.__ddTestOptEfdRetries = earlyFlakeDetectionRetries
       }
+      configureDynamicAtr(task)
       wrapRetryCondition(task)
     }
   }
 }
 
+/**
+ * Stops Datadog-managed retries at the initial attempt's duration budget, after the complete lifecycle.
+ *
+ * @param {object} task
+ */
+function configureDynamicAtr (task) {
+  if (!dynamicAtrRetryPolicy || !flakyTestRetriesConfiguration) return
+  const projectName = task.file.projectName
+  const isManagedProject = projectName
+    ? flakyTestRetriesConfiguration.projectNames.includes(projectName)
+    : flakyTestRetriesConfiguration.includesUnnamedProject
+  if (!isManagedProject || !task.retry?.__ddTestOptAtr || task.retry.count <= 0) return
+
+  task.retry = {
+    ...task.retry,
+    condition () {
+      // AroundEach fixture teardown can fail after onTestFinished recorded the attempt's errors.
+      recordRetryErrorCount(task)
+      if (task.meta.__ddTestOptAtrRetries === undefined) {
+        const executionStart = dynamicAtrExecutionStartByTask.get(task) ?? task.result.startTime - timeOrigin
+        const duration = now() - executionStart
+        task.meta.__ddTestOptAtrRetries = dynamicAtrRetryPolicy.find(
+          ({ durationLimitMs }) => durationLimitMs === undefined || duration <= durationLimitMs
+        ).retryCount
+      }
+      const retryIndex = retryAttemptIndexByTask.get(task)?.index ?? task.result.retryCount
+      return retryIndex < task.meta.__ddTestOptAtrRetries
+    },
+  }
+}
+
 function getNextAttemptIndex (task) {
   const attemptIndex = nextAttemptIndexByTask.get(task) || 0
   nextAttemptIndexByTask.set(task, attemptIndex + 1)
@@ -179,7 +219,6 @@ function getNextAttemptIndex (task) {
  *
  * @param {object} task
  * @param {number} attemptIndex
- * @returns {void}
  */
 function prepareRumCorrelation (task, attemptIndex) {
   // A per-origin cookie cannot identify overlapping attempts without racing.
@@ -213,7 +252,6 @@ function prepareRumCorrelation (task, attemptIndex) {
  *
  * @param {object} task
  * @param {number} attemptIndex
- * @returns {void}
  */
 function finishRumCorrelation (task, attemptIndex) {
   const testExecutionId = task.meta.__ddTestOptRumTestExecutionIds?.[attemptIndex]
@@ -228,7 +266,6 @@ function finishRumCorrelation (task, attemptIndex) {
  *
  * @param {object} task
  * @param {number} attemptIndex
- * @returns {void}
  */
 function recordRumActivity (task, attemptIndex) {
   if (!getIsRumActive(getRum())) return
@@ -252,7 +289,6 @@ function getRum () {
  * Returns whether the current RUM session is active.
  *
  * @param {object|undefined} rum
- * @returns {boolean}
  */
 function getIsRumActive (rum) {
   if (!rum) return false
@@ -269,7 +305,6 @@ function getIsRumActive (rum) {
  * Returns whether a task or any containing suite is concurrent.
  *
  * @param {object} task
- * @returns {boolean}
  */
 function isConcurrentTask (task) {
   let currentTask = task
@@ -308,7 +343,6 @@ function generateTestExecutionId () {
  * Sets and verifies the RUM correlation cookie for the current origin.
  *
  * @param {string} testExecutionId
- * @returns {boolean}
  */
 function setRumCorrelationCookie (testExecutionId) {
   try {
@@ -324,7 +358,6 @@ function setRumCorrelationCookie (testExecutionId) {
  * Clears the RUM correlation cookie if it still belongs to this attempt.
  *
  * @param {string} testExecutionId
- * @returns {void}
  */
 function clearRumCorrelationCookie (testExecutionId) {
   try {
@@ -440,7 +473,6 @@ function recordManualRepeatStatus (task, attemptIndex) {
  * Records cumulative errors at the end of each configured retry attempt.
  *
  * @param {object} task
- * @returns {void}
  */
 function recordRetryErrorCount (task) {
   const retryLimit = getRetryLimit(task)
@@ -457,7 +489,6 @@ function recordRetryErrorCount (task) {
  * @param {object} task
  * @param {number} attemptIndex
  * @param {number} attemptStart
- * @returns {void}
  */
 function recordTestAttemptTiming (task, attemptIndex, attemptStart) {
   task.meta.__ddTestOptAttemptStartTimes ||= []
@@ -470,17 +501,15 @@ function recordTestAttemptTiming (task, attemptIndex, attemptStart) {
  * Returns the configured retry count for numeric and object-form retry options.
  *
  * @param {object} task
- * @returns {number}
  */
 function getRetryLimit (task) {
-  return typeof task.retry === 'number' ? task.retry : task.retry?.count || 0
+  return task.meta.__ddTestOptAtrRetries ?? (typeof task.retry === 'number' ? task.retry : task.retry?.count || 0)
 }
 
 /**
  * Wraps Vitest's retry condition so final-attempt handling follows the condition's actual result.
  *
  * @param {object} task
- * @returns {void}
  */
 function wrapRetryCondition (task) {
   if (typeof task.retry !== 'object' || !task.retry?.condition || getRetryLimit(task) === 0) return
@@ -572,7 +601,6 @@ function switchQuarantinedFinalFailure (task, attemptIndex) {
  * Converts a quarantined failure into the passing runner state expected by Vitest.
  *
  * @param {object} task
- * @returns {void}
  */
 function markQuarantinedFailure (task) {
   const testSuite = getTestSuite(task)
@@ -676,7 +704,6 @@ function noopTest () {}
 /**
  * Returns whether Vitest's private task function setter is available.
  *
- * @returns {boolean}
  */
 function canReplaceVitestTaskFn () {
   return typeof setVitestTaskFn === 'function'
@@ -703,7 +730,6 @@ function isEarlyFlakeDetectionTest (testSuite, testName) {
  * Returns whether Datadog admitted this task for EFD retries.
  *
  * @param {object} task
- * @returns {boolean}
  */
 function isEarlyFlakeDetectionTask (task) {
   return task.meta.__ddTestOptEfdRetries !== undefined
@@ -751,7 +777,6 @@ function getEarlyFlakeDetectionSuiteCandidate (suite) {
  *
  * @param {string} testSuite
  * @param {string} testName
- * @returns {boolean}
  */
 function isNewTest (testSuite, testName) {
   return !(knownTests[testSuite] || []).includes(testName)

package/index.d.ts

@@ -298,6 +298,7 @@ interface Plugins {
   "playwright": tracer.plugins.playwright;
   "pg": tracer.plugins.pg;
   "pino": tracer.plugins.pino;
+  "postgres": tracer.plugins.postgres;
   "prisma": tracer.plugins.prisma;
   "protobufjs": tracer.plugins.protobufjs;
   "redis": tracer.plugins.redis;
@@ -306,6 +307,7 @@ interface Plugins {
   "router": tracer.plugins.router;
   "selenium": tracer.plugins.selenium;
   "sharedb": tracer.plugins.sharedb;
+  "supabase": tracer.plugins.supabase;
   "tedious": tracer.plugins.tedious;
   "undici": tracer.plugins.undici;
   "vitest": tracer.plugins.vitest;
@@ -3126,6 +3128,25 @@ declare namespace tracer {
      */
     interface pino extends Integration {}
 
+    /**
+     * This plugin automatically instruments the
+     * [Postgres.js](https://github.com/porsager/postgres) module.
+     */
+    interface postgres extends DatabaseInstrumentation {
+      /**
+       * The service name to be used for this plugin.
+       */
+      service?: string;
+      /**
+       * The database monitoring propagation mode to be used for this plugin.
+       */
+      dbmPropagationMode?: TracerOptions['dbmPropagationMode'];
+      /**
+       * Appends the SQL comment propagation to the query string. Prepends the comment if `false`. For long query strings, the appended propagation comment might be truncated, causing loss of correlation between the query and trace.
+       */
+      appendComment?: boolean;
+    }
+
     /**
      * This plugin automatically instruments the
      * [@prisma/client](https://www.prisma.io/docs/orm/prisma-client) module.
@@ -3241,6 +3262,12 @@ declare namespace tracer {
       };
     }
 
+    /**
+     * This plugin automatically instruments the
+     * [Supabase JavaScript client](https://github.com/supabase/supabase-js).
+     */
+    interface supabase extends Instrumentation {}
+
     /**
      * This plugin automatically instruments the
      * [tedious](https://github.com/tediousjs/tedious/) module.
@@ -3287,6 +3314,10 @@ declare namespace tracer {
   }
 
   export namespace opentelemetry {
+    export interface MeterProvider {
+      shutdown(callback?: (error: Error | null) => void): void;
+    }
+
     /**
      * A registry for creating named {@link Tracer}s.
      */
@@ -3682,6 +3713,9 @@ declare namespace tracer {
        */
       experiments: Experiments,
 
+      /** Prompt Management API. */
+      prompts: Prompts,
+
       /**
        * Enable LLM Observability tracing.
        *
@@ -3842,6 +3876,135 @@ declare namespace tracer {
       flush (): void
     }
 
+    interface Prompts {
+      /** Resolve an exact, environment-targeted, or latest managed prompt. */
+      getPrompt (promptId: string, options?: GetPromptOptions): Promise<ManagedPrompt>
+      /** Refresh the prompt selected by the current environment. */
+      refreshPrompt (promptId: string): Promise<ManagedPrompt | undefined>
+      /** Clear the in-memory and/or persistent prompt caches. */
+      clearPromptCache (options?: ClearPromptCacheOptions): void
+      /** Create a text or chat prompt and its first version. */
+      createPrompt (
+        promptId: string,
+        template: string | PromptTemplateMessage[],
+        options?: CreatePromptOptions
+      ): Promise<PromptResponse>
+      /** Add a text or chat version to an existing prompt. */
+      createPromptVersion (
+        promptId: string,
+        template: string | PromptTemplateMessage[],
+        options?: CreatePromptVersionOptions
+      ): Promise<PromptVersionResponse>
+      /** Update prompt metadata. */
+      updatePrompt (promptId: string, options: UpdatePromptOptions): Promise<PromptResponse>
+      /** Update prompt-version metadata or environment assignments. */
+      updatePromptVersion (
+        promptId: string,
+        version: number,
+        options: UpdatePromptVersionOptions
+      ): Promise<PromptVersionResponse>
+      /** Delete a prompt. */
+      deletePrompt (promptId: string): Promise<DeletedPromptResponse>
+      /** List prompts. */
+      listPrompts (): Promise<PromptResponse[]>
+      /** List versions for a prompt. */
+      listPromptVersions (promptId: string): Promise<PromptVersionResponse[]>
+    }
+
+    interface PromptTemplateMessage {
+      role: string,
+      content: string
+    }
+
+    type PromptFallbackValue =
+      | string
+      | PromptTemplateMessage[]
+      | { template: string | PromptTemplateMessage[], version?: string }
+    type PromptFallback = PromptFallbackValue | (() => PromptFallbackValue)
+
+    interface GetPromptOptions {
+      version?: number,
+      fallback?: PromptFallback,
+      targetingKey?: string,
+      attributes?: Record<string, string | number | boolean>
+    }
+
+    interface ClearPromptCacheOptions {
+      hot?: boolean,
+      warm?: boolean
+    }
+
+    interface CreatePromptOptions {
+      title?: string,
+      description?: string,
+      userVersion?: string,
+      envIds?: string[]
+    }
+
+    interface CreatePromptVersionOptions {
+      description?: string,
+      userVersion?: string,
+      envIds?: string[]
+    }
+
+    interface UpdatePromptOptions {
+      title?: string,
+      description?: string
+    }
+
+    interface UpdatePromptVersionOptions {
+      description?: string,
+      envIds?: string[]
+    }
+
+    interface ManagedPrompt {
+      readonly id: string,
+      readonly version: string,
+      readonly source: 'registry' | 'cache' | 'fallback' | 'ff' | 'resolve',
+      readonly template: string | ReadonlyArray<Readonly<PromptTemplateMessage>>,
+      readonly promptUuid?: string,
+      readonly promptVersionUuid?: string,
+      format (variables?: Record<string, unknown>): string | PromptTemplateMessage[]
+      toAnnotation (variables?: Record<string, unknown>): Prompt
+    }
+
+    interface PromptResponse {
+      id?: string,
+      prompt_id?: string,
+      title?: string,
+      description?: string,
+      created_at?: string,
+      source?: string,
+      num_versions?: number,
+      in_registry?: boolean,
+      created_from?: string,
+      author?: string,
+      ml_app?: string,
+      ml_apps?: string[],
+      last_version_created_at?: string,
+      extracted_from?: string
+    }
+
+    interface PromptVersionResponse {
+      id?: string,
+      prompt_uuid?: string,
+      prompt_id?: string,
+      template?: string | PromptTemplateMessage[],
+      version?: number,
+      user_version?: string,
+      created_at?: string,
+      version_created_at?: string,
+      author?: string,
+      description?: string,
+      ml_app?: string
+    }
+
+    interface DeletedPromptResponse {
+      id?: string,
+      prompt_id?: string,
+      deleted_at?: string
+    }
+
     /** JSON-serializable value accepted by LLMObs Experiments. */
     type JSONType = string | number | boolean | null | JSONType[] | { [key: string]: JSONType }
 
@@ -4445,6 +4608,12 @@ declare namespace tracer {
        * A template string or chat message template list.
        */
       template?: string | Message[]
+
+      /** Internal Datadog prompt identity. */
+      promptUuid?: string,
+
+      /** Internal Datadog prompt-version identity. */
+      promptVersionUuid?: string
     }
 
     interface ToolDefinition {

package/next.d.ts

@@ -0,0 +1,27 @@
+import type { NextConfig } from 'next'
+
+type NextConfigValue = NextConfig | undefined
+
+export function withDatadogTurbopack<TArguments extends unknown[]> (
+  nextConfig: (...args: TArguments) => Promise<NextConfigValue>
+): (...args: TArguments) => Promise<NextConfig>
+
+export function withDatadogTurbopack<TArguments extends unknown[]> (
+  nextConfig: (...args: TArguments) => NextConfigValue
+): (...args: TArguments) => NextConfig
+
+export function withDatadogTurbopack<TArguments extends unknown[]> (
+  nextConfig: (...args: TArguments) => NextConfigValue | Promise<NextConfigValue>
+): (...args: TArguments) => NextConfig | Promise<NextConfig>
+
+export function withDatadogTurbopack (
+  nextConfig: Promise<NextConfigValue>
+): (phase?: string) => Promise<NextConfig>
+
+export function withDatadogTurbopack (
+  nextConfig?: NextConfigValue
+): (phase?: string) => NextConfig
+
+export function withDatadogTurbopack (
+  nextConfig: NextConfigValue | Promise<NextConfigValue>
+): (phase?: string) => NextConfig | Promise<NextConfig>

package/next.js

@@ -0,0 +1,3 @@
+'use strict'
+
+module.exports = require('./packages/datadog-turbopack')