dd-trace 6.12.0 → 6.13.0

package/ci/test-optimization-validation/framework-adapters/cypress.js

@@ -40,20 +40,18 @@ function getTestExtension (filename) {
  * @returns {string} canonical generated Cypress source
  */
 function getGeneratedTestContent ({ scenarioId, testName }) {
-  const lines = []
+  let content = ''
   if (scenarioId === 'atr-fail-once') {
-    lines.push('let attempt = 0', '')
+    content = 'let attempt = 0\n\n'
   }
-  lines.push(
-    "describe('dd-test-optimization-validation', () => {",
-    `  it(${JSON.stringify(testName)}, () => {`,
-    scenarioId === 'atr-fail-once'
-      ? '    expect(attempt++).to.equal(1)'
-      : '    expect(true).to.equal(true)',
-    '  })',
+  content += "describe('dd-test-optimization-validation', () => {\n" +
+    `  it(${JSON.stringify(testName)}, () => {\n` +
+    (scenarioId === 'atr-fail-once'
+      ? '    expect(attempt++).to.equal(1)\n'
+      : '    expect(true).to.equal(true)\n') +
+    '  })\n' +
     '})'
-  )
-  return lines.join('\n')
+  return content
 }
 
 /**

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

@@ -184,12 +184,13 @@ function runCiWiring ({ manifest, framework, projectFileSources }) {
   }
 
   if (resolution.status !== 'confirmed') {
-    const visibleFacts = []
+    let visibleFacts = ''
     if (initialization.status === 'missing') {
-      visibleFacts.push('The selected job has no visible dd-trace/ci/init preload.')
+      visibleFacts = 'The selected job has no visible dd-trace/ci/init preload.'
     }
     if (ciFacts.transport.status === 'missing') {
-      visibleFacts.push('The recorded review found no visible Datadog Agent or agentless reporting transport.')
+      if (visibleFacts) visibleFacts += ' '
+      visibleFacts += 'The recorded review found no visible Datadog Agent or agentless reporting transport.'
     }
     const recommendation = /working directory/i.test(resolution.reason)
       ? 'Keep the CI job\'s actual working directory. Resolve the repository-root wrapper to the selected test ' +
@@ -199,7 +200,7 @@ function runCiWiring ({ manifest, framework, projectFileSources }) {
     return getIncomplete(
       framework,
       'The CI audit remains incomplete because the selected command could not be resolved to the ' +
-        `${framework.framework} runner: ${resolution.reason}. ${visibleFacts.join(' ')}`.trim(),
+        `${framework.framework} runner: ${resolution.reason}. ${visibleFacts}`.trim(),
       {
         ...evidence,
         recommendation,

package/index.d.ts

@@ -356,6 +356,16 @@ declare namespace tracer {
     links?: { context: SpanContext, attributes?: Object }[]
   }
 
+  export interface Exception {
+    message: string;
+    name?: string;
+    stack?: string;
+  }
+
+  export type SpanEventAttributeValue =
+    string | number | boolean | Array<string> | Array<number> | Array<boolean>;
+  export type SpanEventAttributes = Record<string, SpanEventAttributeValue>;
+
   /**
    * Span represents a logical unit of work as part of a broader Trace.
    * Examples of span might include remote procedure calls or a in-process
@@ -366,6 +376,14 @@ declare namespace tracer {
   export interface Span extends opentracing.Span {
     context (): SpanContext;
 
+    /**
+     * Records an exception as a span event without marking the span as failed.
+     *
+     * @param exception The exception to record.
+     * @param attributes Additional attributes for the exception event.
+     */
+    recordException (exception: Exception, attributes?: SpanEventAttributes): void;
+
     /**
      * Adds a single link to the span.
      *
@@ -789,6 +807,13 @@ declare namespace tracer {
          * Programmatic configuration takes precedence over the environment variables listed above.
          */
         maxMessagesLength?: number,
+        /**
+         * Whether AI Guard applies backend-provided sensitive-data redaction replacements.
+         * @default true
+         * @env DD_AI_GUARD_REDACTION_ENABLED
+         * Programmatic configuration takes precedence over the environment variables listed above.
+         */
+        redactionEnabled?: boolean,
         /**
          * Max size of the content property set in the meta-struct
          * @env DD_AI_GUARD_MAX_CONTENT_SIZE
@@ -1706,6 +1731,25 @@ declare namespace tracer {
       };
     }
 
+    /**
+     * A structured content part in an AI Guard message.
+     */
+    export interface ContentPart {
+      type: string;
+      text?: string;
+      image_url?: { url: string };
+    }
+
+    /**
+     * A conversational message whose content is represented by structured parts.
+     */
+    export interface ContentPartsMessage {
+      role: string;
+      content: ContentPart[];
+      tool_call_id?: string;
+      tool_calls?: ToolCall[];
+    }
+
     /**
      * A standard conversational message exchanged with a Large Language Model (LLM).
      */
@@ -1777,10 +1821,25 @@ declare namespace tracer {
 
     export type Message =
       | TextMessage
+      | ContentPartsMessage
       | AssistantTextMessage
       | AssistantToolCallMessage
       | ToolMessage;
 
+    /**
+     * A sensitive data replacement the AI Guard service determined for the evaluated conversation.
+     */
+    export interface RedactionReplacement {
+      /**
+       * Location of the replaced value within the evaluated conversation (e.g. `messages[0].content`).
+       */
+      path: string;
+      /**
+       * The value that replaces the sensitive data found at `path`.
+       */
+      replacement: string;
+    }
+
     /**
      * The result returned by AI Guard after evaluating a conversation.
      */
@@ -1808,6 +1867,16 @@ declare namespace tracer {
        * Sensitive Data Scanner findings from the evaluation.
        */
       sds: Object[];
+      /**
+       * The evaluated conversation, redacted when required by the AI Guard service.
+       * This may contain sensitive data when redaction is disabled or no replacement was applied.
+       */
+      messages: Message[];
+      /**
+       * The replacements the AI Guard service determined for the evaluated conversation, reported whether or not
+       * the tracer applied them. Empty when the service determined no replacement.
+       */
+      redactionReplacements: RedactionReplacement[];
     }
 
     /**
@@ -2189,7 +2258,7 @@ declare namespace tracer {
      * This plugin automatically instruments the
      * [Vercel AI SDK](https://ai-sdk.dev/docs/introduction) module.
      */
-    interface ai extends Instrumentation {}
+    interface ai extends Instrumentation, LLMObsIntegration {}
 
     /**
      * This plugin automatically instruments the
@@ -2207,13 +2276,13 @@ declare namespace tracer {
      * This plugin automatically instruments the
      * [anthropic](https://www.npmjs.com/package/@anthropic-ai/sdk) module.
      */
-    interface anthropic extends Instrumentation {}
+    interface anthropic extends Instrumentation, LLMObsIntegration {}
 
     /**
      * This plugin automatically instruments the
      * [@anthropic-ai/claude-agent-sdk](https://www.npmjs.com/package/@anthropic-ai/claude-agent-sdk) module.
      */
-    interface claude_agent_sdk extends Instrumentation {}
+    interface claude_agent_sdk extends Instrumentation, LLMObsIntegration {}
 
     /**
      * Currently this plugin automatically instruments
@@ -2274,7 +2343,7 @@ declare namespace tracer {
      * This plugin automatically instruments the
      * [aws-sdk](https://github.com/aws/aws-sdk-js) module.
      */
-    interface aws_sdk extends Instrumentation {
+    interface aws_sdk extends Instrumentation, LLMObsIntegration {
       /**
        * The service name to be used for this plugin. When a function is used it is called with the AWS
        * request parameters (e.g. `{ TableName }` for DynamoDB, `{ Bucket }` for S3) and its return value
@@ -2503,13 +2572,13 @@ declare namespace tracer {
      * This plugin automatically instruments the
      * [@google-cloud/vertexai](https://github.com/googleapis/nodejs-vertexai) module.
     */
-  interface google_cloud_vertexai extends Integration {}
+  interface google_cloud_vertexai extends Integration, LLMObsIntegration {}
 
   /**
     * This plugin automatically instruments the
     * [@google-genai](https://github.com/googleapis/js-genai) module.
     */
-  interface google_genai extends Integration {}
+  interface google_genai extends Integration, LLMObsIntegration {}
 
   /** @hidden */
   interface ExecutionArgs {
@@ -2831,7 +2900,7 @@ declare namespace tracer {
      * This plugin automatically instruments the
      * [langgraph](https://github.com/npmjs/package/langgraph) library.
      */
-    interface langgraph extends Instrumentation {}
+    interface langgraph extends Instrumentation, LLMObsIntegration {}
 
       /**
      * This plugin automatically instruments the
@@ -2991,13 +3060,13 @@ declare namespace tracer {
      * [DogStatsD](https://docs.datadoghq.com/developers/dogstatsd/?tab=hostagent#setup)
      * in the agent.
      */
-    interface openai extends Instrumentation {}
+    interface openai extends Instrumentation, LLMObsIntegration {}
 
     /**
      * This plugin automatically instruments the
      * [@openai/agents](https://www.npmjs.com/package/@openai/agents) library.
      */
-    interface openai_agents extends Instrumentation {}
+    interface openai_agents extends Instrumentation, LLMObsIntegration {}
 
     /**
      * This plugin automatically instruments the
@@ -3610,7 +3679,7 @@ declare namespace tracer {
        *
        * @deprecated Enabling LLM Observability via `llmobs.enable()` is deprecated and will be removed in dd-trace@7.0.0. Please instantiate LLM Observability via DD_LLMOBS_ENABLED or `tracer.init({ llmobs: ...options })`.
        */
-      enable (options: LLMObsEnableOptions): void,
+      enable (options: LLMObsRuntimeEnableOptions): void,
 
       /**
        * Disable LLM Observability tracing.
@@ -3798,21 +3867,35 @@ declare namespace tracer {
       metadata?: Array<Record<string, any>>
     ) => any | Promise<any>
 
+    interface DatasetRecord {
+      id: string | null
+      input: JSONType
+      expectedOutput: JSONType
+      metadata: Record<string, JSONType>
+      tags: string[]
+    }
+
+    interface DatasetRecordNew {
+      id?: string
+      inputData: JSONType
+      expectedOutput?: JSONType
+      metadata?: Record<string, JSONType>
+      tags?: string[]
+    }
+
     interface CreateDatasetOptions {
+      /** Override the configured project for this dataset. */
+      projectName?: string
       description?: string
-      records?: Array<{
-        id?: string,
-        inputData: JSONType,
-        expectedOutput?: JSONType,
-        metadata?: Record<string, JSONType>,
-        tags?: string[]
-      }>
+      records?: DatasetRecordNew[]
     }
 
     interface ExperimentOptions {
       name: string
       dataset: Dataset
       task: ExperimentTask
+      /** Override the configured project for this experiment. */
+      projectName?: string
       /** Evaluators keyed by metric label, or named functions. */
       evaluators?: Record<string, ExperimentEvaluator> | ExperimentEvaluator[]
       /** Summary evaluators keyed by metric label, or named functions. */
@@ -3820,6 +3903,8 @@ declare namespace tracer {
       description?: string
       config?: Record<string, JSONType>
       tags?: Record<string, string>
+      /** Number of full experiment runs to execute. Default 1. */
+      runs?: number
     }
 
     interface ExperimentRunOptions {
@@ -3829,9 +3914,13 @@ declare namespace tracer {
       retryDelay?: (attempt: number) => number
       /** Reject on the first task/evaluator error instead of capturing it. Default false. */
       throwOnErrors?: boolean
+      /** Maximum number of task/evaluator executions to process concurrently. Default 10. */
+      concurrency?: number
     }
 
     interface PullDatasetOptions {
+      /** Override the configured project for this dataset pull. */
+      projectName?: string
       /** Dataset version to pull. Defaults to latest. */
       version?: number
       /** Wait until at least this many records are readable (absorbs write lag). */
@@ -3860,17 +3949,21 @@ declare namespace tracer {
 
     interface ExperimentRun {
       runId: string
+      /** 1-based run iteration. */
       runIteration: number
+      /** Whether this run had a task, row-evaluator, or summary-evaluator error. */
+      hasError: boolean
       rows: ExperimentResultRow[]
       summaryEvaluations: Record<string, { value: any, error: string | null }>
     }
 
     interface ExperimentResult {
       experimentId: string
+      /** Rows from the first run, kept as a compatibility alias. */
       rows: ExperimentResultRow[]
-      /** Single-run summary evaluator results. */
+      /** Summary evaluator results from the first run, kept as a compatibility alias. */
       summaryEvaluations: Record<string, { value: any, error: string | null }>
-      /** Experiment runs. P0 Node experiments currently return one run. */
+      /** All experiment runs. */
       runs: ExperimentRun[]
       /** Dashboard URL for the experiment. */
       url: string
@@ -3963,6 +4056,8 @@ declare namespace tracer {
         metadata?: Record<string, JSONType>,
         tags?: string[]
       ): Dataset
+      /** Add multiple records to the dataset. */
+      addRecords (records: DatasetRecordNew[]): Dataset
       /** Update fields on an existing dataset record. */
       update (index: number, fields: {
         input?: JSONType
@@ -3983,15 +4078,11 @@ declare namespace tracer {
       description (): string
       id (): string | null
       projectId (): string | null
+      /** Project associated with the client used to create or pull this dataset. */
+      projectName (): string | null | undefined
       version (): number | null
       latestVersion (): number | null
-      records (): Array<{
-        id: string | null,
-        input: JSONType,
-        expectedOutput: JSONType,
-        metadata: Record<string, JSONType>,
-        tags: string[]
-      }>
+      records (): DatasetRecord[]
       /** Return the tags used to filter this dataset. */
       filterTags (): string[]
       /** Dashboard URL for the dataset, or null until pushed. */
@@ -4507,6 +4598,13 @@ declare namespace tracer {
      * Options for enabling LLM Observability tracing.
      */
     interface LLMObsEnableOptions {
+      /**
+       * The name of the LLM Observability project used for experiments.
+       * @env DD_LLMOBS_PROJECT_NAME
+       * Programmatic configuration takes precedence over the environment variables listed above.
+       */
+      projectName?: string,
+
       /**
        * The name of your ML application.
        * @env DD_LLMOBS_ML_APP
@@ -4531,6 +4629,9 @@ declare namespace tracer {
       sampleRate?: number,
     }
 
+    /** Options accepted by the deprecated runtime `llmobs.enable()` method. */
+    type LLMObsRuntimeEnableOptions = Omit<LLMObsEnableOptions, 'projectName'>
+
     /** @hidden */
     type spanKind = 'agent' | 'workflow' | 'task' | 'tool' | 'retrieval' | 'embedding' | 'llm'
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dd-trace",
-  "version": "6.12.0",
+  "version": "6.13.0",
   "description": "Datadog APM tracing client for JavaScript",
   "main": "index.js",
   "typings": "index.d.ts",
@@ -115,7 +115,7 @@
     "test:integration:plugins:coverage": "yarn services && node ./integration-tests/coverage/run-suite.js \"packages/datadog-plugin-@(${PLUGINS})/test/integration-test/**/${SPEC:-*}*.spec.js\"",
     "test:unit:plugins": "mocha \"packages/datadog-instrumentations/test/@(${PLUGINS}).spec.js\" \"packages/datadog-plugin-@(${PLUGINS})/test/**/*.spec.js\" --exclude \"packages/datadog-plugin-@(${PLUGINS})/test/integration-test/**/*.spec.js\"",
     "test:release": "mocha \"scripts/release/**/*.spec.js\"",
-    "test:scripts": "mocha \"benchmark/sirun/*.spec.js\" \"scripts/helpers/**/*.spec.js\" \"scripts/*.spec.mjs\"",
+    "test:scripts": "mocha \"benchmark/e2e-test-optimization/*.spec.js\" \"benchmark/sirun/*.spec.js\" \"scripts/helpers/**/*.spec.js\" \"scripts/*.spec.mjs\"",
     "test:shimmer": "mocha \"packages/datadog-shimmer/test/**/*.spec.js\"",
     "test:shimmer:ci": "node scripts/c8-ci.js test:shimmer",
     "verify:workflow-job-names": "node scripts/verify-workflow-job-names.js",
@@ -184,11 +184,11 @@
   },
   "optionalDependencies": {
     "@datadog/libdatadog": "0.12.1",
-    "@datadog/native-appsec": "11.0.1",
-    "@datadog/native-iast-taint-tracking": "4.2.0",
-    "@datadog/native-metrics": "3.1.2",
+    "@datadog/native-appsec": "11.0.2",
+    "@datadog/native-iast-taint-tracking": "4.2.1",
+    "@datadog/native-metrics": "4.0.0",
     "@datadog/pprof": "5.18.1",
-    "@datadog/wasm-js-rewriter": "5.0.3",
+    "@datadog/wasm-js-rewriter": "5.0.4",
     "@opentelemetry/api": ">=1.0.0 <1.10.0",
     "@opentelemetry/api-logs": "<1.0.0",
     "oxc-parser": "^0.132.0"
@@ -200,7 +200,7 @@
     "@eslint/eslintrc": "^3.3.6",
     "@eslint/js": "^10.0.1",
     "@eslint/plugin-kit": "^0.7.2",
-    "@datadog/openfeature-node-server": "2.1.0",
+    "@datadog/openfeature-node-server": "2.2.0",
     "@msgpack/msgpack": "^3.1.3",
     "@openfeature/core": "^1.12.0",
     "@openfeature/server-sdk": "~1.23.0",
@@ -208,18 +208,18 @@
     "@types/mocha": "^10.0.10",
     "@types/node": "^18.19.106",
     "@types/sinon": "^22.0.0",
-    "@vercel/nft": "^1.10.2",
+    "@vercel/nft": "^1.11.0",
     "@yarnpkg/lockfile": "^1.1.0",
     "axios": "^1.19.0",
     "benchmark": "^2.1.4",
     "body-parser": "^2.3.0",
-    "bun": "1.3.14",
+    "bun": "1.4.0",
     "c8": "^12.0.0",
     "codeowners-audit": "^2.9.0",
     "eslint": "^10.8.1",
     "eslint-plugin-cypress": "^7.0.0",
     "eslint-plugin-import-x": "^4.16.2",
-    "eslint-plugin-jsdoc": "^64.2.0",
+    "eslint-plugin-jsdoc": "^64.2.1",
     "eslint-plugin-mocha": "^11.3.0",
     "eslint-plugin-n": "^18.3.0",
     "eslint-plugin-promise": "^7.3.0",

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

@@ -1,9 +1,11 @@
 'use strict'
 
 const wrapLogger = require('./helpers/bunyan')
-const { addHook } = require('./helpers/instrument')
+const { addHook, channel } = require('./helpers/instrument')
+
+const logSubmissionCh = channel('ci:log-submission:log')
 
 addHook({ name: 'bunyan', versions: ['>=1'] }, Logger => {
-  wrapLogger(Logger, 'bunyan')
+  wrapLogger(Logger, 'bunyan', logSubmissionCh)
   return Logger
 })

package/packages/datadog-instrumentations/src/helpers/bunyan.js

@@ -6,17 +6,26 @@ const { channel } = require('./instrument')
 /**
  * @param {{ prototype: object }} Logger
  * @param {string} id
+ * @param {import('node:diagnostics_channel').Channel} [logSubmissionCh]
  */
-module.exports = function wrapLogger (Logger, id) {
+module.exports = function wrapLogger (Logger, id, logSubmissionCh) {
   const logCh = channel(`apm:${id}:log`)
+  // The record must be replaceable before Bunyan emits it, while the serialized line is only available afterward.
+  // This before-and-after contract requires the existing runtime wrapper rather than an Orchestrion subscriber.
   shimmer.wrap(Logger.prototype, '_emit', emit => {
     return function wrappedEmit (rec) {
       if (logCh.hasSubscribers) {
         const payload = { message: rec }
         logCh.publish(payload)
-        arguments[0] = payload.message
+        rec = arguments[0] = payload.message
       }
-      return emit.apply(this, arguments)
+
+      // Reuse Bunyan's cycle-safe serialization instead of serializing the record again.
+      const line = emit.apply(this, arguments)
+      if (logSubmissionCh?.hasSubscribers && logCh.hasSubscribers && !arguments[1]) {
+        logSubmissionCh.publish({ source: id, message: line ?? rec })
+      }
+      return line
     }
   })
 }

package/packages/datadog-instrumentations/src/helpers/pool-acquire.js

@@ -621,6 +621,7 @@ module.exports = {
   clearPoolWaitTime,
   dispatchesAcquireSynchronously,
   isPoolQueryAcquire,
+  reportPoolAcquireError,
   runOutsidePoolQueryAcquire,
   runPoolAcquireError,
   runWithPoolWait,

package/packages/datadog-instrumentations/src/helpers/rewriter/instrumentations/webdriverio.js

@@ -54,6 +54,34 @@ module.exports = [
     channelName: 'LocalRunner_shutdown',
     transform: 'waitForAsyncEnd',
   },
+  {
+    module: {
+      name: '@wdio/runner',
+      versionRange: '>=9.0.0',
+      filePath: 'build/index.js',
+    },
+    functionQuery: {
+      className: 'BaseReporter',
+      methodName: 'waitForSync',
+      kind: 'Async',
+    },
+    channelName: 'BaseReporter_waitForSync',
+  },
+  {
+    module: {
+      name: '@wdio/runner',
+      versionRange: '>=9.0.0',
+      filePath: 'build/index.js',
+    },
+    astQuery: 'VariableDeclarator[id.name="BaseReporter"] > ClassExpression > ClassBody > ' +
+      'MethodDefinition[key.name="waitForSync"] ReturnStatement > ' +
+      'CallExpression[callee.object.name="promise"][callee.property.name="then"], ' +
+      'ClassDeclaration[id.name="BaseReporter"] > ClassBody > ' +
+      'MethodDefinition[key.name="waitForSync"] ReturnStatement > ' +
+      'CallExpression[callee.object.name="promise"][callee.property.name="then"]',
+    channelName: 'BaseReporter_waitForSync',
+    transform: 'waitForAsyncEnd',
+  },
   {
     module: {
       name: '@wdio/jasmine-framework',

package/packages/datadog-instrumentations/src/helpers/rewriter/targets.json

@@ -33,6 +33,7 @@
   "@wdio/cli/build/index.js": "@wdio/cli",
   "@wdio/jasmine-framework/build/index.js": "@wdio/jasmine-framework",
   "@wdio/local-runner/build/index.js": "@wdio/local-runner",
+  "@wdio/runner/build/index.js": "@wdio/runner",
   "@wdio/utils/build/index.js": "@wdio/utils",
   "ai/dist/index.js": "ai",
   "ai/dist/index.mjs": "ai",