dd-trace 6.15.0 → 6.17.0

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

@@ -16,10 +16,15 @@ let testManagementTests = {}
 let isImpactedTestsEnabled = false
 let isModifiedTest = false
 let isTestIsolationEnabled = false
+let isDynamicAtrEnabled = false
+let isTextTerminal = false
 let hasWarnedMissingBeforeEachTaskResult = false
 let hasWarnedMissingBeforeEachRetryResult = false
 // Array of test names that have been retried and the reason
 const retryReasonsByTestName = new Map()
+// Dynamic ATR computes the selected budget after the first attempt. Keep that result
+// in browser state and apply it when Cypress starts the retry runnable.
+const dynamicAtrRetryCountByTest = new Map()
 // Track test errors suppressed by test management so we can still report them to Datadog.
 const suppressedTestFailures = new Map()
 
@@ -93,7 +98,6 @@ function getTestProperties (testName) {
 
 /**
  * @param {string} message
- * @returns {void}
  */
 function warnMissingBeforeEachTaskResult (message) {
   // eslint-disable-next-line no-console
@@ -192,7 +196,6 @@ function setRumCorrelationCookie (traceId) {
 
 /**
  * @param {boolean} isCookieSet
- * @returns {void}
  */
 function restartRumSession (isCookieSet) {
   if (!isCookieSet || isTestIsolationEnabled || !originalWindow) {
@@ -362,20 +365,47 @@ Cypress.mocha.getRunner().runTests = function (suite, fn) {
   return oldRunTests.apply(this, [suite, fn])
 }
 
-Cypress.on('test:before:run', (attributes, test) => {
+/**
+ * @param {{ id: string }} test
+ */
+function getDynamicAtrTestKey (test) {
+  // Cypress preserves the runnable ID when cloning a retry, including across browser reloads.
+  return `${Cypress.mocha.getRootSuite().file}\0${test.id}`
+}
+
+/**
+ * @param {{ id: string, _retries: number }} test
+ */
+function configureTestRetries (test) {
   if (shouldDisableFrameworkRetries(test)) {
     disableFrameworkRetries(test)
+    return
+  }
+
+  if (!isTextTerminal) return
+
+  const dynamicAtrRetryCount = dynamicAtrRetryCountByTest.get(getDynamicAtrTestKey(test))
+  if (Number.isSafeInteger(dynamicAtrRetryCount)) {
+    test._retries = dynamicAtrRetryCount
+  } else if (isDynamicAtrEnabled) {
+    // Cypress forbids calling retries(count) on the original runnable.
+    // Ensure local retries: 0 overrides still reach the duration-based budget selection.
+    test._retries = Math.max(1, test._retries)
   }
+}
+
+Cypress.on('test:before:run', (attributes, test) => {
+  configureTestRetries(test)
 })
 
 Cypress.on('test:before:run:async', (attributes, test) => {
-  if (shouldDisableFrameworkRetries(test)) {
-    disableFrameworkRetries(test)
-  }
+  configureTestRetries(test)
 })
 
 beforeEach(function () {
   const currentTest = Cypress.mocha.getRunner().suite.ctx.currentTest
+  // The first test:before:run event can precede the suite configuration task.
+  configureTestRetries(currentTest)
   const testName = currentTest.fullTitle()
 
   const retryMessage = retryReasonsByTestName.get(testName)
@@ -427,6 +457,7 @@ before(function () {
   cy.task('dd:testSuiteStart', {
     testSuite: Cypress.mocha.getRootSuite().file,
     testSuiteAbsolutePath: Cypress.spec && Cypress.spec.absolute,
+    isTextTerminal: Cypress.config('isTextTerminal'),
   }).then((suiteConfig) => {
     if (suiteConfig) {
       isEarlyFlakeDetectionEnabled = suiteConfig.isEarlyFlakeDetectionEnabled
@@ -439,6 +470,12 @@ before(function () {
       isImpactedTestsEnabled = suiteConfig.isImpactedTestsEnabled
       isModifiedTest = suiteConfig.isModifiedTest
       isTestIsolationEnabled = suiteConfig.isTestIsolationEnabled
+      isDynamicAtrEnabled = suiteConfig.isDynamicAtrEnabled
+      isTextTerminal = suiteConfig.isTextTerminal
+      if (isDynamicAtrEnabled && isTextTerminal) {
+        // The first test event can precede this task, and an earlier user hook can skip our beforeEach.
+        Cypress.mocha.getRootSuite().eachTest(configureTestRetries)
+      }
       rumTestExecutionIdCookieName = suiteConfig.rumTestExecutionIdCookieName
       if (Number.isFinite(suiteConfig.rumFlushWaitMillis)) {
         rumFlushWaitMillis = suiteConfig.rumFlushWaitMillis
@@ -448,6 +485,7 @@ before(function () {
 })
 
 after(() => {
+  dynamicAtrRetryCountByTest.clear()
   try {
     if (safeGetRum(originalWindow)) {
       originalWindow.dispatchEvent(new Event('beforeunload'))
@@ -475,6 +513,7 @@ afterEach(function () {
     : currentTest.err
 
   const testInfo = {
+    testId: currentTest.id,
     testName,
     testItTitle: currentTest.title,
     testSuite: Cypress.mocha.getRootSuite().file,
@@ -522,5 +561,11 @@ afterEach(function () {
     suppressedTestFailures.delete(testName)
   }
 
-  cy.task('dd:afterEach', { test: testInfo, coverage, commands: commandsToReport })
+  cy.task('dd:afterEach', { test: testInfo, coverage, commands: commandsToReport }).then((taskResult) => {
+    // Preserve the first-attempt result until Cypress starts the retry runnable.
+    // Changing the completed test here is too late for Cypress's retry lifecycle.
+    if (taskResult && Number.isSafeInteger(taskResult.dynamicAtrRetryCount)) {
+      dynamicAtrRetryCountByTest.set(getDynamicAtrTestKey(currentTest), taskResult.dynamicAtrRetryCount)
+    }
+  })
 })

package/packages/datadog-plugin-google-cloud-pubsub/src/consumer.js

@@ -2,9 +2,8 @@
 
 const { getMessageSize } = require('../../dd-trace/src/datastreams')
 const ConsumerPlugin = require('../../dd-trace/src/plugins/consumer')
-const SpanContext = require('../../dd-trace/src/opentracing/span_context')
-const id = require('../../dd-trace/src/id')
 const { storage } = require('../../datadog-core')
+const reconstructPubSubRequestContext = require('./pubsub-request-context')
 
 /**
  * PULL SUBSCRIPTION: Service explicitly pulls messages from Pub/Sub and processes them.
@@ -75,27 +74,6 @@ class GoogleCloudPubsubConsumerPlugin extends ConsumerPlugin {
     })
   }
 
-  #reconstructPubSubRequestContext (attrs) {
-    const traceIdLower = attrs['_dd.pubsub_request.trace_id']
-    const spanId = attrs['_dd.pubsub_request.span_id']
-    const traceIdUpper = attrs['_dd.pubsub_request.p.tid']
-
-    if (!traceIdLower || !spanId) return null
-
-    const traceId128 = traceIdUpper ? traceIdUpper + traceIdLower : traceIdLower.padStart(32, '0')
-    const traceId = id(traceId128, 16)
-    const parentId = id(spanId, 16)
-
-    const tags = {}
-    if (traceIdUpper) tags['_dd.p.tid'] = traceIdUpper
-
-    return new SpanContext({
-      traceId,
-      spanId: parentId,
-      tags,
-    })
-  }
-
   start (ctx) {
     if (!this.config.dsmEnabled) return
     const { message } = ctx
@@ -128,7 +106,7 @@ class GoogleCloudPubsubConsumerPlugin extends ConsumerPlugin {
 
     const isFirstMessage = batchIndex === 0
     if (isFirstMessage && batchRequestSpanId) {
-      const pubsubRequestContext = this.#reconstructPubSubRequestContext(message.attributes)
+      const pubsubRequestContext = reconstructPubSubRequestContext(message.attributes)
       if (pubsubRequestContext) {
         childOf = pubsubRequestContext
       }

package/packages/datadog-plugin-google-cloud-pubsub/src/pubsub-push-subscription.js

@@ -1,9 +1,8 @@
 'use strict'
 
 const TracingPlugin = require('../../dd-trace/src/plugins/tracing')
-const SpanContext = require('../../dd-trace/src/opentracing/span_context')
-const id = require('../../dd-trace/src/id')
 const log = require('../../dd-trace/src/log')
+const reconstructPubSubRequestContext = require('./pubsub-request-context')
 
 // WeakMap to track push receive spans by request
 const pushReceiveSpans = new WeakMap()
@@ -69,7 +68,7 @@ class GoogleCloudPubsubPushSubscriptionPlugin extends TracingPlugin {
     }
 
     const originalContext = this.#extractContext(messageData)
-    const pubsubRequestContext = this.#reconstructPubSubContext(messageData.attrs) || originalContext
+    const pubsubRequestContext = reconstructPubSubRequestContext(messageData.attrs) || originalContext
     const isSameTrace = pubsubRequestContext &&
       originalContext?.toTraceId() === pubsubRequestContext.toTraceId()
 
@@ -109,39 +108,6 @@ class GoogleCloudPubsubPushSubscriptionPlugin extends TracingPlugin {
     return this.tracer.extract('text_map', messageData.attrs)
   }
 
-  #reconstructPubSubContext (attrs) {
-    /**
-     * Reconstruct the batch publish span context from message attributes.
-     *
-     * When a batch is published, the producer injects:
-     * - _dd.pubsub_request.trace_id: lower 64 bits of the batch span's trace ID (hex)
-     * - _dd.pubsub_request.span_id: the batch span's span ID (hex)
-     * - _dd.pubsub_request.p.tid: upper 64 bits of trace ID (hex, optional for 128-bit traces)
-     *
-     * This context represents the "pubsub.request" span on the producer side.
-     * We use it to create span links, connecting each pubsub.push.receive span back to the original batch.
-     */
-    const traceIdLower = attrs['_dd.pubsub_request.trace_id']
-    const spanId = attrs['_dd.pubsub_request.span_id']
-    const traceIdUpper = attrs['_dd.pubsub_request.p.tid']
-
-    if (!traceIdLower || !spanId) return null
-
-    // Reconstruct full 128-bit trace ID (or pad 64-bit to 128-bit)
-    const traceId128 = traceIdUpper ? traceIdUpper + traceIdLower : traceIdLower.padStart(32, '0')
-    const traceId = id(traceId128, 16)
-    const parentId = id(spanId, 16)
-
-    const tags = {}
-    if (traceIdUpper) tags['_dd.p.tid'] = traceIdUpper
-
-    return new SpanContext({
-      traceId,
-      spanId: parentId,
-      tags,
-    })
-  }
-
   #createPushReceiveSpan (messageData, parentContext, linkContext) {
     const { message, subscription, topicName, attrs } = messageData
     const subscriptionName = subscription?.slice(subscription.lastIndexOf('/') + 1) ?? subscription

package/packages/datadog-plugin-google-cloud-pubsub/src/pubsub-request-context.js

@@ -0,0 +1,31 @@
+'use strict'
+
+const SpanContext = require('../../dd-trace/src/opentracing/span_context')
+const id = require('../../dd-trace/src/id')
+
+/**
+ * @param {Record<string, string>} attributes
+ * @returns {import('../../dd-trace/src/opentracing/span_context') | null}
+ */
+function reconstructPubSubRequestContext (attributes) {
+  const traceIdLower = attributes['_dd.pubsub_request.trace_id']
+  const spanId = attributes['_dd.pubsub_request.span_id']
+  const traceIdUpper = attributes['_dd.pubsub_request.p.tid']
+
+  if (!traceIdLower || !spanId) return null
+
+  const traceId128 = traceIdUpper ? traceIdUpper + traceIdLower : traceIdLower.padStart(32, '0')
+  const traceId = id(traceId128, 16)
+  const parentId = id(spanId, 16)
+
+  const tags = {}
+  if (traceIdUpper) tags['_dd.p.tid'] = traceIdUpper
+
+  return new SpanContext({
+    traceId,
+    spanId: parentId,
+    tags,
+  })
+}
+
+module.exports = reconstructPubSubRequestContext

package/packages/datadog-plugin-graphql/src/resolve-error.js

@@ -61,28 +61,49 @@ class GraphQLToolsResolveErrorPlugin extends TracingPlugin {
  * @param {readonly object[]} [fieldNodes]
  */
 function recordResolveErrorForPath (error, path, fieldNodes) {
-  const fieldNode = fieldNodes?.[0]
   const rootCtx = legacyStorage.getStore()?.graphqlRootCtx
-  for (let field = rootCtx?.resolveFields; field; field = field.nextResolveField) {
-    if ((!fieldNode || field.fieldNode === fieldNode) && matchesPath(field.pathString, path)) {
-      recordResolveError(field, error)
-      return
-    }
-  }
+  if (!rootCtx?.config?.collapse || !rootCtx.fields) return
+
+  const field = findResolveField(rootCtx.fields, getPathString(path), fieldNodes?.[0])
+  if (field) recordResolveError(field, error)
 }
 
 /**
- * @param {string} fieldPath
  * @param {(string | number)[]} path
- * @returns {boolean}
  */
-function matchesPath (fieldPath, path) {
+function getPathString (path) {
   let pathString = ''
   for (let index = 0; index < path.length; index++) {
     if (index !== 0) pathString += '.'
     pathString += typeof path[index] === 'number' ? '*' : path[index]
   }
-  return pathString === fieldPath
+  return pathString
+}
+
+/**
+ * @param {Map<unknown, object>} fields
+ * @param {string} pathString
+ * @param {object} [fieldNode]
+ * @returns {object | undefined}
+ */
+function findResolveField (fields, pathString, fieldNode) {
+  const field = fields.get(pathString)
+  if (field === undefined) return
+
+  const parentTypeFields = field.parentTypeFields
+  if (parentTypeFields === undefined) {
+    return fieldNode === undefined || field.fieldNode === fieldNode ? field : undefined
+  }
+  if (parentTypeFields.parentTypeName !== undefined) {
+    if (fieldNode === undefined || parentTypeFields.fieldNode === fieldNode) return parentTypeFields
+    return field.fieldNode === fieldNode ? field : undefined
+  }
+
+  let matchingField
+  for (const candidate of parentTypeFields.values()) {
+    if (fieldNode === undefined || candidate.fieldNode === fieldNode) matchingField = candidate
+  }
+  return matchingField
 }
 
 /**

package/packages/datadog-plugin-graphql/src/utils.js

@@ -54,7 +54,6 @@ function getRequestCache (owner, configuredLimit) {
 /**
  * @param {string | null | undefined} operationName
  * @param {boolean} calculateSignature
- * @returns {string}
  */
 function operationCacheKey (operationName, calculateSignature) {
   return `${calculateSignature === false ? 0 : 1}\n${operationName ?? ''}`
@@ -309,7 +308,6 @@ const HEALTH_CHECK_QUERY = 'query __ApolloServiceHealthCheck__ { __typename }'
  * Matches the raw query string before it is parsed (the only input parse has).
  *
  * @param {unknown} source Raw query string or a graphql `Source` body.
- * @returns {boolean}
  */
 function isApolloHealthCheckSource (source) {
   return source === HEALTH_CHECK_QUERY
@@ -319,7 +317,6 @@ function isApolloHealthCheckSource (source) {
  * Matches Apollo's parsed health-check operation exactly for cached documents.
  *
  * @param {import('graphql').OperationDefinitionNode | undefined} operation
- * @returns {boolean}
  */
 function isApolloHealthCheck (operation) {
   const selections = operation?.selectionSet?.selections
@@ -342,7 +339,6 @@ function isApolloHealthCheck (operation) {
 
 /**
  * @param {import('graphql').GraphQLOutputType} type
- * @returns {string}
  */
 function getBaseTypeName (type) {
   let current = type
@@ -357,7 +353,6 @@ let tools
  * @param {string | undefined} operationName
  * @param {import('graphql').OperationTypeNode} operationType
  * @param {boolean} [calculate]
- * @returns {string}
  */
 function getSignature (document, operationName, operationType, calculate) {
   if (calculate !== false && tools !== false) {

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

@@ -41,6 +41,7 @@ const {
   TEST_HAS_FAILED_ALL_RETRIES,
   TEST_RETRY_REASON_TYPES,
   TEST_IS_MODIFIED,
+  setExpectedEmptyTestSessionTags,
 } = require('../../dd-trace/src/plugins/util/test')
 const { COMPONENT } = require('../../dd-trace/src/constants')
 const id = require('../../dd-trace/src/id')
@@ -116,12 +117,22 @@ class JestPlugin extends CiPlugin {
       isEarlyFlakeDetectionEnabled,
       isEarlyFlakeDetectionFaulty,
       isTestManagementTestsEnabled,
+      isExpectedEmptySession,
       onDone,
     }) => {
       const finishSession = () => {
         this.testSessionSpan.setTag(TEST_STATUS, status)
         this.testModuleSpan.setTag(TEST_STATUS, status)
 
+        if (isExpectedEmptySession) {
+          setExpectedEmptyTestSessionTags(
+            this.testSessionSpan,
+            this.testModuleSpan,
+            'No tests were found',
+            'zero_tests'
+          )
+        }
+
         if (error) {
           this.testSessionSpan.setTag('error', error)
           this.testModuleSpan.setTag('error', error)
@@ -204,6 +215,8 @@ class JestPlugin extends CiPlugin {
         config._ddIsTestManagementTestsEnabled = this.libraryConfig?.isTestManagementEnabled ?? false
         config._ddTestManagementAttemptToFixRetries = this.libraryConfig?.testManagementAttemptToFixRetries ?? 0
         config._ddFlakyTestRetriesCount = this.libraryConfig?.flakyTestRetriesCount
+        config._ddIsDynamicAtrEnabled = this.libraryConfig?.isDynamicAtrEnabled ?? false
+        config._ddDynamicAtrBuckets = this.libraryConfig?.dynamicAtrBuckets
         config._ddIsDiEnabled = this.libraryConfig?.isDiEnabled ?? false
         config._ddIsKnownTestsEnabled = this.libraryConfig?.isKnownTestsEnabled ?? false
         config._ddIsImpactedTestsEnabled = this.libraryConfig?.isImpactedTestsEnabled ?? false

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

@@ -58,7 +58,6 @@ class KafkajsProducerPlugin extends ProducerPlugin {
   /**
    *
    * @param {{ result: ProducerResponseItem[] }} ctx
-   * @returns {void}
    */
   commit (ctx) {
     const commitList = ctx.result

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

@@ -12,6 +12,9 @@ const {
   getEfdRetryCountForDuration,
   hasEfdRetries,
 } = require('../../dd-trace/src/ci-visibility/efd-retry-policy')
+const {
+  getDynamicAtrRetryCount,
+} = require('../../dd-trace/src/ci-visibility/dynamic-atr-retries')
 const {
   SCREENSHOT_UPLOAD_RESULT_ERROR,
   SCREENSHOT_UPLOAD_RESULT_UPLOADED,
@@ -65,6 +68,7 @@ const {
   TEST_BROWSER_NAME,
   TEST_BROWSER_VERSION,
   TEST_IS_RUM_ACTIVE,
+  setExpectedEmptyTestSessionTags,
 } = require('../../dd-trace/src/plugins/util/test')
 const { COMPONENT } = require('../../dd-trace/src/constants')
 const {
@@ -184,7 +188,6 @@ function setWebdriverioRumTestCorrelation (context, activeSpan) {
  * Converts a screenshot capture failure into its upload result.
  *
  * @param {unknown} error
- * @returns {string}
  */
 function handleWebdriverioScreenshotError (error) {
   log.error('Error capturing WebdriverIO failure screenshot: %s', error?.message || String(error))
@@ -882,6 +885,7 @@ class MochaPlugin extends CiPlugin {
       isTestManagementEnabled,
       isParallel,
       isFrameworkError,
+      isExpectedEmptySession,
       onDone,
     }) => {
       this._exportPendingWorkerTraces()
@@ -894,6 +898,15 @@ class MochaPlugin extends CiPlugin {
         this.testSessionSpan.setTag(TEST_STATUS, status)
         this.testModuleSpan.setTag(TEST_STATUS, status)
 
+        if (isExpectedEmptySession) {
+          setExpectedEmptyTestSessionTags(
+            this.testSessionSpan,
+            this.testModuleSpan,
+            'No tests were executed',
+            'zero_tests'
+          )
+        }
+
         if (error) {
           this.testSessionSpan.setTag('error', error)
           this.testModuleSpan.setTag('error', error)
@@ -1027,7 +1040,17 @@ class MochaPlugin extends CiPlugin {
     } else if (isEarlyFlakeDetection) {
       retryCount = this.libraryConfig.earlyFlakeDetectionRetryPolicy.schedulingRetryCount
     } else if (isAtr) {
-      retryCount = this.libraryConfig.flakyTestRetriesCount
+      // When dynamic ATR is enabled, use the max bucket value as the initial count.
+      // The actual duration-based count is computed after the first attempt.
+      if (this.libraryConfig.isDynamicAtrEnabled) {
+        const maximumDynamicAtrRetries = this.libraryConfig.dynamicAtrBuckets
+          ? Math.max(...this.libraryConfig.dynamicAtrBuckets)
+          : this.libraryConfig.earlyFlakeDetectionRetryPolicy.schedulingRetryCount
+        // Dynamic ATR guarantees one retry, including the >5m EFD fallback bucket.
+        retryCount = Math.max(1, maximumDynamicAtrRetries)
+      } else {
+        retryCount = this.libraryConfig.flakyTestRetriesCount
+      }
     }
 
     const test = {
@@ -1041,6 +1064,7 @@ class MochaPlugin extends CiPlugin {
       isAttemptToFix,
       isAtr,
       isDisabled,
+      isDynamicAtr: isAtr && this.libraryConfig?.isDynamicAtrEnabled,
       isEarlyFlakeDetection,
       isModified,
       isNew,
@@ -1090,7 +1114,6 @@ class MochaPlugin extends CiPlugin {
    *
    * @param {object} test
    * @param {object|undefined} parentStore
-   * @returns {void}
    */
   #startWebdriverioJasmineAttempt (test, parentStore) {
     test.attemptStart = performance.now()
@@ -1121,7 +1144,6 @@ class MochaPlugin extends CiPlugin {
    * Delays Jasmine's parent runner until every Datadog-managed spec execution has completed.
    *
    * @param {object} context
-   * @returns {void}
    */
   #configureWebdriverioJasmineLifecycle (context) {
     const isLegacyJasmine = Boolean(context.self?.queueableFn)
@@ -1215,6 +1237,19 @@ class MochaPlugin extends CiPlugin {
       }
     }
 
+    // Dynamic ATR: after the first attempt, compute the duration-based retry budget.
+    if (
+      testStatus !== 'skip' &&
+      test.isDynamicAtr &&
+      test.attempt === 0
+    ) {
+      test.retryCount = getDynamicAtrRetryCount(
+        performance.now() - test.attemptStart,
+        this.libraryConfig.earlyFlakeDetectionRetryPolicy,
+        this.libraryConfig.dynamicAtrBuckets
+      )
+    }
+
     const hasManagedRetry = testStatus !== 'skip' && test.attempt < test.retryCount
     test.willRetry = hasManagedRetry && (
       test.isAttemptToFix ||
@@ -1250,7 +1285,6 @@ class MochaPlugin extends CiPlugin {
    *
    * @param {object} test
    * @param {WebdriverioJasmineResult} result
-   * @returns {void}
    */
   #finishWebdriverioJasmineRetry (test, result) {
     const status = getJasmineStatus(test.reportedStatus || result.status)
@@ -1290,7 +1324,6 @@ class MochaPlugin extends CiPlugin {
    * Advances a Jasmine test and starts its next attempt span.
    *
    * @param {object} test
-   * @returns {void}
    */
   #startNextWebdriverioJasmineAttempt (test) {
     test.attempt++
@@ -1404,7 +1437,6 @@ class MochaPlugin extends CiPlugin {
    *
    * @param {object} test
    * @param {WebdriverioJasmineResult} result
-   * @returns {void}
    */
   #completeWebdriverioJasmineTest (test, result) {
     const state = this._webdriverioJasmineState
@@ -1460,7 +1492,6 @@ class MochaPlugin extends CiPlugin {
    *
    * @param {object} span - Failed test span
    * @param {() => void} [onDone] - Called after the screenshot upload finishes
-   * @returns {boolean} Whether a screenshot upload exists for the span
    */
   #startWebdriverioScreenshotUpload (span, onDone) {
     if (
@@ -1547,7 +1578,6 @@ class MochaPlugin extends CiPlugin {
    * @param {object} span - Failed test span
    * @param {{callbacks: Array<() => void>, finished: boolean}} upload - Upload state
    * @param {string} result - Aggregate screenshot upload result
-   * @returns {void}
    */
   #finishWebdriverioScreenshotUpload (span, upload, result) {
     if (upload.finished) return
@@ -1577,7 +1607,6 @@ class MochaPlugin extends CiPlugin {
    * @param {object} span - Failed test span
    * @param {string|string[]} screenshots - Base64-encoded PNG data
    * @param {(result: string) => void} onDone - Aggregate upload completion callback
-   * @returns {void}
    */
   #uploadWebdriverioScreenshots (span, screenshots, onDone) {
     const screenshotList = Array.isArray(screenshots) ? screenshots : [screenshots]
@@ -1647,7 +1676,6 @@ class MochaPlugin extends CiPlugin {
    *   resolveCallback?: (onDone: () => void) => void,
    *   rejectCallback?: (onDone: () => void) => void
    * }} context
-   * @returns {void}
    */
   #finishWebdriverioJasmineWorker (context) {
     const state = this._webdriverioJasmineState

package/packages/datadog-plugin-mongodb-core/src/query.js

@@ -206,7 +206,6 @@ const REDACT_LEAF = '"?"'
 
 /**
  * @param {RegExp} value
- * @returns {string}
  */
 function stringifyRegExp (value) {
   return `{"$regex":${JSON.stringify(value.source)},"$options":${JSON.stringify(value.flags)}}`

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

@@ -2,15 +2,30 @@
 
 const CompositePlugin = require('../../dd-trace/src/plugins/composite')
 const OpenAiLLMObsPlugin = require('../../dd-trace/src/llmobs/plugins/openai')
+const OpenAiRealtimeLLMObsPlugins = require('../../dd-trace/src/llmobs/plugins/openai/realtime')
+const OpenAiRealtimeTracingPlugins = require('./realtime')
 const OpenAiTracingPlugin = require('./tracing')
 
 class OpenAiPlugin extends CompositePlugin {
   static id = 'openai'
   static get plugins () {
-    return {
+    const plugins = {
       llmobs: OpenAiLLMObsPlugin,
       tracing: OpenAiTracingPlugin,
     }
+
+    // LLM Obs plugins must be registered before their tracing counterparts so that annotations are
+    // added to the span before it finishes: subscribers run in registration order, and the realtime
+    // tracing plugins finish their span in `end`.
+    for (const Plugin of OpenAiRealtimeLLMObsPlugins) {
+      plugins[Plugin.id] = Plugin
+    }
+
+    for (const Plugin of OpenAiRealtimeTracingPlugins) {
+      plugins[Plugin.id] = Plugin
+    }
+
+    return plugins
   }
 }