dd-trace 5.86.0 → 5.88.0

package/packages/datadog-plugin-azure-functions/src/index.js

@@ -1,7 +1,6 @@
 'use strict'
 
 const TracingPlugin = require('../../dd-trace/src/plugins/tracing')
-const serverless = require('../../dd-trace/src/plugins/util/serverless')
 const web = require('../../dd-trace/src/plugins/util/web')
 
 const triggerMap = {
@@ -26,19 +25,51 @@ class AzureFunctionsPlugin extends TracingPlugin {
   bindStart (ctx) {
     const meta = getMetaForTrigger(ctx)
     const triggerType = triggerMap[ctx.methodName]
+    const isHttpTrigger = triggerType === 'Http'
     const isMessagingService = (triggerType === 'ServiceBus' || triggerType === 'EventHubs')
-    const childOf = isMessagingService ? null : extractTraceContext(this._tracer, ctx)
-    const span = this.startSpan(this.operationName(), {
-      childOf,
-      service: this.serviceName(),
-      type: 'serverless',
-      meta,
-    }, ctx)
-
-    if (isMessagingService) {
-      setSpanLinks(triggerType, this.tracer, span, ctx)
-    }
 
+    let span
+
+    if (isHttpTrigger) {
+      const { httpRequest } = ctx
+      const path = (new URL(httpRequest.url)).pathname
+      const req = {
+        method: httpRequest.method,
+        headers: Object.fromEntries(httpRequest.headers),
+        url: path,
+      }
+      // Patch the request to create web context
+      const webContext = web.patch(req)
+      webContext.config = this.config
+      webContext.tracer = this.tracer
+      webContext.paths = [path]
+      // Creates a standard span and an inferred proxy span if headers are present
+      span = web.startServerlessSpanWithInferredProxy(
+        this.tracer,
+        this.config,
+        this.operationName(),
+        req,
+        ctx
+      )
+
+      span._integrationName = 'azure-functions'
+      span.context()._tags.component = 'azure-functions'
+      span.addTags(meta)
+      webContext.span = span
+      webContext.azureFunctionCtx = ctx
+      ctx.webContext = webContext
+    } else {
+      // For non-HTTP triggers, use standard flow
+      span = this.startSpan(this.operationName(), {
+        service: this.serviceName(),
+        type: 'serverless',
+        meta,
+      }, ctx)
+
+      if (isMessagingService) {
+        setSpanLinks(triggerType, this.tracer, span, ctx)
+      }
+    }
     ctx.span = span
     return ctx.currentStore
   }
@@ -48,24 +79,16 @@ class AzureFunctionsPlugin extends TracingPlugin {
     ctx.currentStore.span.setTag('error.message', ctx.error)
   }
 
-  asyncEnd (ctx) {
-    const { httpRequest, methodName, result = {} } = ctx
-    if (triggerMap[methodName] === 'Http') {
-      // If the method is an HTTP trigger, we need to patch the request and finish the span
-      const path = (new URL(httpRequest.url)).pathname
-      const req = {
-        method: httpRequest.method,
-        headers: Object.fromEntries(httpRequest.headers),
-        url: path,
+  asyncStart (ctx) {
+    const { methodName, result = {}, webContext } = ctx
+    const triggerType = triggerMap[methodName]
+
+    // For HTTP triggers, use web utilities to finish all spans (including inferred proxy)
+    if (triggerType === 'Http') {
+      if (webContext) {
+        webContext.res = { statusCode: result.status }
+        web.finishAll(webContext, 'serverless')
       }
-      const context = web.patch(req)
-      context.config = this.config
-      context.paths = [path]
-      context.res = { statusCode: result.status }
-      context.span = ctx.currentStore.span
-
-      serverless.finishSpan(context)
-    // Fallback for other trigger types
     } else {
       super.finish()
     }
@@ -80,6 +103,7 @@ function getMetaForTrigger ({ functionName, methodName, invocationContext }) {
   let meta = {
     'aas.function.name': functionName,
     'aas.function.trigger': mapTriggerTag(methodName),
+    'span.type': 'serverless',
   }
 
   if (triggerMap[methodName] === 'ServiceBus') {
@@ -112,14 +136,6 @@ function mapTriggerTag (methodName) {
   return triggerMap[methodName] || 'Unknown'
 }
 
-function extractTraceContext (tracer, ctx) {
-  if (triggerMap[ctx.methodName] === 'Http') {
-    return tracer.extract('http_headers', Object.fromEntries(ctx.httpRequest.headers))
-  }
-  // Returning null indicates that the span is a root span
-  return null
-}
-
 // message & messages & batch with cardinality of 1 == applicationProperties
 // messages with cardinality of many == applicationPropertiesArray
 function setSpanLinks (triggerType, tracer, span, ctx) {

package/packages/datadog-plugin-bullmq/src/consumer.js

@@ -11,17 +11,24 @@ class BullmqConsumerPlugin extends ConsumerPlugin {
     ctx.currentStore?.span?.finish()
   }
 
+  start (ctx) {
+    if (!this.config.dsmEnabled) return
+    const { span } = ctx.currentStore
+    this.setConsumerCheckpoint(span, ctx)
+  }
+
   bindStart (ctx) {
     const job = ctx.arguments?.[0]
     const queueName = job?.queueName || job?.queue?.name || 'bullmq'
 
     let childOf
-    const datadogContext = job?.data?._datadog
-    if (datadogContext) {
-      childOf = this.tracer.extract('text_map', datadogContext)
+    const ddCarrier = this._extractDatadog(job)
+    if (ddCarrier) {
+      ctx._ddCarrier = ddCarrier
+      childOf = this.tracer.extract('text_map', ddCarrier)
     }
 
-    const span = this.startSpan({
+    this.startSpan({
       childOf,
       resource: queueName,
       meta: {
@@ -33,10 +40,6 @@ class BullmqConsumerPlugin extends ConsumerPlugin {
       },
     }, ctx)
 
-    if (this.config.dsmEnabled) {
-      this.setConsumerCheckpoint(span, ctx)
-    }
-
     return ctx.currentStore
   }
 
@@ -47,14 +50,33 @@ class BullmqConsumerPlugin extends ConsumerPlugin {
     const queueName = job.queueName || job.queue?.name || 'bullmq'
     const payloadSize = job.data ? getMessageSize(job.data) : 0
 
-    const datadogContext = job.data?._datadog
-    if (datadogContext) {
-      this.tracer.decodeDataStreamsContext(datadogContext)
+    const ddCarrier = ctx._ddCarrier
+    if (ddCarrier) {
+      this.tracer.decodeDataStreamsContext(ddCarrier)
     }
 
     const edgeTags = ['direction:in', `topic:${queueName}`, 'type:bullmq']
     this.tracer.setCheckpoint(edgeTags, span, payloadSize)
   }
+
+  _extractDatadog (job) {
+    const metadataStr = job?.opts?.telemetry?.metadata
+    if (!metadataStr) return
+
+    try {
+      const metadata = JSON.parse(metadataStr)
+      const ddCarrier = metadata._datadog
+      if (!ddCarrier) return
+
+      // Clean up only our _datadog key, preserve other metadata
+      delete metadata._datadog
+      job.opts.telemetry.metadata = JSON.stringify(metadata)
+
+      return ddCarrier
+    } catch {
+      // Ignore malformed metadata
+    }
+  }
 }
 
 module.exports = BullmqConsumerPlugin

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

@@ -10,6 +10,12 @@ class BaseBullmqProducerPlugin extends ProducerPlugin {
     ctx.currentStore?.span?.finish()
   }
 
+  start (ctx) {
+    if (!this.config.dsmEnabled) return
+    const { span } = ctx.currentStore
+    this.setProducerCheckpoint(span, ctx)
+  }
+
   bindStart (ctx) {
     const { resource, meta } = this.getSpanData(ctx)
     const span = this.startSpan({
@@ -25,10 +31,6 @@ class BaseBullmqProducerPlugin extends ProducerPlugin {
 
     this.injectTraceContext(span, ctx)
 
-    if (this.config.dsmEnabled) {
-      this.setProducerCheckpoint(span, ctx)
-    }
-
     return ctx.currentStore
   }
 
@@ -40,13 +42,24 @@ class BaseBullmqProducerPlugin extends ProducerPlugin {
     throw new Error('injectTraceContext must be implemented by subclass')
   }
 
+  _injectIntoOpts (span, opts) {
+    const carrier = {}
+    this.tracer.inject(span, 'text_map', carrier)
+    const existing = opts.telemetry?.metadata ? JSON.parse(opts.telemetry.metadata) : {}
+    existing._datadog = carrier
+    opts.telemetry = { metadata: JSON.stringify(existing), omitContext: true }
+  }
+
   setProducerCheckpoint (span, ctx) {
-    const { queueName, payloadSize, injectTarget } = this.getDsmData(ctx)
+    const { queueName, payloadSize, optsTarget } = this.getDsmData(ctx)
     const edgeTags = ['direction:out', `topic:${queueName}`, 'type:bullmq']
     const dataStreamsContext = this.tracer.setCheckpoint(edgeTags, span, payloadSize)
-    if (injectTarget && typeof injectTarget === 'object') {
-      injectTarget._datadog = injectTarget._datadog || {}
-      DsmPathwayCodec.encode(dataStreamsContext, injectTarget._datadog)
+
+    if (optsTarget && typeof optsTarget === 'object') {
+      const existing = optsTarget.telemetry?.metadata ? JSON.parse(optsTarget.telemetry.metadata) : {}
+      DsmPathwayCodec.encode(dataStreamsContext, existing._datadog || existing)
+      if (!existing._datadog) existing._datadog = {}
+      optsTarget.telemetry = { metadata: JSON.stringify(existing), omitContext: true }
     }
   }
 
@@ -68,12 +81,22 @@ class QueueAddPlugin extends BaseBullmqProducerPlugin {
     }
   }
 
-  injectTraceContext (span, ctx) {
-    const data = ctx.arguments?.[1]
-    if (data?.constructor?.name === 'Object') {
-      data._datadog = data._datadog || {}
-      this.tracer.inject(span, 'text_map', data._datadog)
+  #ensureOpts (ctx) {
+    let opts = ctx.arguments?.[2]
+    if (!opts || typeof opts !== 'object') {
+      opts = {}
+      if (ctx.arguments.length <= 2) {
+        Array.prototype.push.call(ctx.arguments, opts)
+      } else {
+        ctx.arguments[2] = opts
+      }
     }
+    return opts
+  }
+
+  injectTraceContext (span, ctx) {
+    const opts = this.#ensureOpts(ctx)
+    this._injectIntoOpts(span, opts)
   }
 
   getDsmData (ctx) {
@@ -81,7 +104,7 @@ class QueueAddPlugin extends BaseBullmqProducerPlugin {
     return {
       queueName: ctx.self?.name || 'bullmq',
       payloadSize: data ? getMessageSize(data) : 0,
-      injectTarget: data,
+      optsTarget: this.#ensureOpts(ctx),
     }
   }
 }
@@ -108,10 +131,11 @@ class QueueAddBulkPlugin extends BaseBullmqProducerPlugin {
   injectTraceContext (span, ctx) {
     const jobs = ctx.arguments?.[0]
     if (!Array.isArray(jobs)) return
+
     for (const job of jobs) {
-      if (job?.data?.constructor?.name !== 'Object') continue
-      job.data._datadog = job.data._datadog || {}
-      this.tracer.inject(span, 'text_map', job.data._datadog)
+      if (!job) continue
+      job.opts = job.opts || {}
+      this._injectIntoOpts(span, job.opts)
     }
   }
 
@@ -123,7 +147,7 @@ class QueueAddBulkPlugin extends BaseBullmqProducerPlugin {
     return {
       queueName: ctx.self?.name || 'bullmq',
       payloadSize,
-      injectTarget: jobs[0]?.data,
+      optsTarget: jobs[0]?.opts,
     }
   }
 
@@ -133,12 +157,14 @@ class QueueAddBulkPlugin extends BaseBullmqProducerPlugin {
     const edgeTags = ['direction:out', `topic:${queueName}`, 'type:bullmq']
 
     for (const job of jobs) {
-      if (job?.data && job.data !== null && job.data.constructor.name === 'Object') {
-        const payloadSize = getMessageSize(job.data)
-        const dataStreamsContext = this.tracer.setCheckpoint(edgeTags, span, payloadSize)
-        job.data._datadog = job.data._datadog || {}
-        DsmPathwayCodec.encode(dataStreamsContext, job.data._datadog)
-      }
+      if (!job?.data) continue
+      const payloadSize = getMessageSize(job.data)
+      const dataStreamsContext = this.tracer.setCheckpoint(edgeTags, span, payloadSize)
+      job.opts = job.opts || {}
+      const existing = job.opts.telemetry?.metadata ? JSON.parse(job.opts.telemetry.metadata) : {}
+      DsmPathwayCodec.encode(dataStreamsContext, existing._datadog || existing)
+      if (!existing._datadog) existing._datadog = {}
+      job.opts.telemetry = { metadata: JSON.stringify(existing), omitContext: true }
     }
   }
 }
@@ -159,18 +185,21 @@ class FlowProducerAddPlugin extends BaseBullmqProducerPlugin {
 
   injectTraceContext (span, ctx) {
     const flow = ctx.arguments?.[0]
-    if (flow?.data?.constructor?.name === 'Object') {
-      flow.data._datadog = flow.data._datadog || {}
-      this.tracer.inject(span, 'text_map', flow.data._datadog)
-    }
+    if (!flow) return
+    flow.opts = flow.opts || {}
+    this._injectIntoOpts(span, flow.opts)
   }
 
   getDsmData (ctx) {
     const flow = ctx.arguments?.[0]
+    if (!flow) {
+      return { queueName: 'bullmq', payloadSize: 0, optsTarget: undefined }
+    }
+    flow.opts = flow.opts || {}
     return {
-      queueName: flow?.queueName || 'bullmq',
-      payloadSize: flow?.data ? getMessageSize(flow.data) : 0,
-      injectTarget: flow?.data,
+      queueName: flow.queueName || 'bullmq',
+      payloadSize: flow.data ? getMessageSize(flow.data) : 0,
+      optsTarget: flow.opts,
     }
   }
 }

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

@@ -128,12 +128,15 @@ class CucumberPlugin extends CiPlugin {
       const testSuitePath = getTestSuitePath(testFileAbsolutePath, process.cwd())
       const testSourceFile = getTestSuitePath(testFileAbsolutePath, this.repositoryRoot)
 
-      const testSuiteMetadata = getTestSuiteCommonTags(
-        this.command,
-        this.frameworkVersion,
-        testSuitePath,
-        'cucumber'
-      )
+      const testSuiteMetadata = {
+        ...getTestSuiteCommonTags(
+          this.command,
+          this.frameworkVersion,
+          testSuitePath,
+          'cucumber'
+        ),
+        ...this.getSessionRequestErrorTags(),
+      }
       if (isUnskippable) {
         this.telemetry.count(TELEMETRY_ITR_UNSKIPPABLE, { testLevel: 'suite' })
         testSuiteMetadata[TEST_ITR_UNSKIPPABLE] = 'true'

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

@@ -46,6 +46,8 @@ const {
   TEST_RETRY_REASON_TYPES,
   getPullRequestDiff,
   getModifiedFilesFromDiff,
+  getSessionRequestErrorTags,
+  DD_CI_LIBRARY_CONFIGURATION_ERROR,
   TEST_IS_MODIFIED,
   getPullRequestBaseBranch,
 } = require('../../dd-trace/src/plugins/util/test')
@@ -306,6 +308,9 @@ class CypressPlugin {
 
     this.isTestIsolationEnabled = getIsTestIsolationEnabled(cypressConfig)
 
+    const envFlushWait = Number(getValueFromEnvSources('DD_CIVISIBILITY_RUM_FLUSH_WAIT_MILLIS'))
+    this.rumFlushWaitMillis = Number.isFinite(envFlushWait) ? envFlushWait : undefined
+
     if (!this.isTestIsolationEnabled) {
       log.warn('Test isolation is disabled, retries will not be enabled')
     }
@@ -314,10 +319,15 @@ class CypressPlugin {
     this.testEnvironmentMetadata[DD_TEST_IS_USER_PROVIDED_SERVICE] =
       tracer._tracer._config.isServiceUserProvided ? 'true' : 'false'
 
+    this._pendingRequestErrorTags = []
     this.libraryConfigurationPromise = getLibraryConfiguration(this.tracer, this.testConfiguration)
       .then((libraryConfigurationResponse) => {
         if (libraryConfigurationResponse.err) {
           log.error('Cypress plugin library config response error', libraryConfigurationResponse.err)
+          this._pendingRequestErrorTags.push({
+            tag: DD_CI_LIBRARY_CONFIGURATION_ERROR,
+            value: 'true',
+          })
         } else {
           const {
             libraryConfig: {
@@ -412,6 +422,7 @@ class CypressPlugin {
     if (this.testSessionSpan && this.testModuleSpan) {
       testSuiteTags[TEST_SESSION_ID] = this.testSessionSpan.context().toTraceId()
       testSuiteTags[TEST_MODULE_ID] = this.testModuleSpan.context().toSpanId()
+      Object.assign(testSuiteTags, this.getSessionRequestErrorTags())
       // If testSuiteSpan couldn't be created, we'll use the testModuleSpan as the parent
       if (!this.testSuiteSpan) {
         testSuiteTags[TEST_SUITE_ID] = this.testModuleSpan.context().toSpanId()
@@ -468,6 +479,14 @@ class CypressPlugin {
     })
   }
 
+  /**
+   * Returns request error tags from the test session span for propagation to test spans.
+   * @returns {Record<string, string>}
+   */
+  getSessionRequestErrorTags () {
+    return getSessionRequestErrorTags(this.testSessionSpan)
+  }
+
   ciVisEvent (name, testLevel, tags = {}) {
     incrementCountMetric(name, {
       testLevel,
@@ -596,14 +615,20 @@ class CypressPlugin {
       },
       integrationName: TEST_FRAMEWORK_NAME,
     })
+    for (const { tag, value } of this._pendingRequestErrorTags) {
+      this.testSessionSpan.setTag(tag, value)
+    }
+    this._pendingRequestErrorTags = []
     this.ciVisEvent(TELEMETRY_EVENT_CREATED, 'session')
 
+    const sessionRequestErrorTags = getSessionRequestErrorTags(this.testSessionSpan)
     this.testModuleSpan = this.tracer.startSpan(`${TEST_FRAMEWORK_NAME}.test_module`, {
       childOf: this.testSessionSpan,
       tags: {
         [COMPONENT]: TEST_FRAMEWORK_NAME,
         ...this.testEnvironmentMetadata,
         ...testModuleSpanMetadata,
+        ...sessionRequestErrorTags,
       },
       integrationName: TEST_FRAMEWORK_NAME,
     })
@@ -823,6 +848,7 @@ class CypressPlugin {
           isModifiedTest: this.getIsTestModified(testSuiteAbsolutePath),
           repositoryRoot: this.repositoryRoot,
           isTestIsolationEnabled: this.isTestIsolationEnabled,
+          rumFlushWaitMillis: this.rumFlushWaitMillis,
         }
 
         if (this.testSuiteSpan) {
@@ -937,6 +963,13 @@ class CypressPlugin {
             this.activeTestSpan.setTag(TEST_RETRY_REASON, TEST_RETRY_REASON_TYPES.efd)
           }
         }
+        // Check if all EFD retries failed
+        if ((isNew || isModified) && this.earlyFlakeDetectionNumRetries > 0) {
+          const isLastEfdAttempt = testStatuses.length === this.earlyFlakeDetectionNumRetries + 1
+          if (isLastEfdAttempt && testStatuses.every(status => status === 'fail')) {
+            this.activeTestSpan.setTag(TEST_HAS_FAILED_ALL_RETRIES, 'true')
+          }
+        }
         if (isAttemptToFix) {
           this.activeTestSpan.setTag(TEST_MANAGEMENT_IS_ATTEMPT_TO_FIX, 'true')
           if (testStatuses.length > 1) {

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

@@ -1,5 +1,8 @@
 'use strict'
 
+const DD_CIVISIBILITY_TEST_EXECUTION_ID_COOKIE_NAME = 'datadog-ci-visibility-test-execution-id'
+let rumFlushWaitMillis = 500
+
 let isEarlyFlakeDetectionEnabled = false
 let isKnownTestsEnabled = false
 let knownTestsForSuite = []
@@ -15,9 +18,10 @@ const retryReasonsByTestName = new Map()
 // Track quarantined test errors - we catch them in Cypress.on('fail') but need to report to Datadog
 const quarantinedTestErrors = 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,
-// any call to `cy.window()` will result in a cross origin error.
+// Track the most recently loaded window in the AUT. Updated via the 'window:load'
+// event so we always get the real app window (after cy.visit()), not the
+// about:blank window that exists when beforeEach runs. If the test later navigates
+// to a cross-origin URL, safeGetRum() handles the access error.
 let originalWindow
 
 // If the test is using multi domain with cy.origin, trying to access
@@ -165,18 +169,45 @@ beforeEach(function () {
     retryReasonsByTestName.delete(testName)
   }
 
+  cy.on('window:load', (win) => {
+    originalWindow = win
+  })
+
   cy.task('dd:beforeEach', {
     testName,
     testSuite: Cypress.mocha.getRootSuite().file,
   }).then(({ traceId, shouldSkip }) => {
-    Cypress.env('traceId', traceId)
+    if (traceId) {
+      cy.setCookie(DD_CIVISIBILITY_TEST_EXECUTION_ID_COOKIE_NAME, traceId).then(() => {
+        // When testIsolation:false, the page is not reset between tests, so the RUM session
+        // stopped in afterEach must be explicitly restarted so events in this test are
+        // associated with the new testExecutionId.
+        //
+        // After stopSession(), the RUM SDK creates a new session upon a user interaction
+        // (click, scroll, keydown, or touchstart). We dispatch a synthetic click on the window
+        // to trigger session renewal, then call startView() to establish a view boundary.
+        if (!isTestIsolationEnabled && originalWindow) {
+          const rum = safeGetRum(originalWindow)
+          if (rum) {
+            try {
+              const evt = new originalWindow.MouseEvent('click', { bubbles: true, cancelable: true })
+              // The browser-sdk addEventListener wrapper filters out untrusted synthetic events
+              // unless __ddIsTrusted is set. Set it so the click triggers expandOrRenewSession().
+              // See: https://github.com/DataDog/browser-sdk/blob/v6.27.1/packages/core/src/browser/addEventListener.ts#L119
+              Object.defineProperty(evt, '__ddIsTrusted', { value: true })
+              originalWindow.dispatchEvent(evt)
+            } catch {}
+            if (rum.startView) {
+              rum.startView()
+            }
+          }
+        }
+      })
+    }
     if (shouldSkip) {
       this.skip()
     }
   })
-  cy.window().then(win => {
-    originalWindow = win
-  })
 })
 
 before(function () {
@@ -195,6 +226,9 @@ before(function () {
       isImpactedTestsEnabled = suiteConfig.isImpactedTestsEnabled
       isModifiedTest = suiteConfig.isModifiedTest
       isTestIsolationEnabled = suiteConfig.isTestIsolationEnabled
+      if (Number.isFinite(suiteConfig.rumFlushWaitMillis)) {
+        rumFlushWaitMillis = suiteConfig.rumFlushWaitMillis
+      }
     }
   })
 })
@@ -241,8 +275,14 @@ afterEach(function () {
     testInfo.testSourceLine = Cypress.mocha.getRunner().currentRunnable.invocationDetails.line
   } catch {}
 
-  if (safeGetRum(originalWindow)) {
+  const rum = safeGetRum(originalWindow)
+  if (rum) {
     testInfo.isRUMActive = true
+    if (rum.stopSession) {
+      rum.stopSession()
+      // eslint-disable-next-line cypress/no-unnecessary-waiting
+      cy.wait(rumFlushWaitMillis)
+    }
   }
   let coverage
   try {

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

@@ -182,9 +182,10 @@ class JestPlugin extends CiPlugin {
         config._ddTestSessionId = this.testSessionSpan.context().toTraceId()
         config._ddTestModuleId = this.testModuleSpan.context().toSpanId()
         config._ddTestCommand = this.testSessionSpan.context()._tags[TEST_COMMAND]
+        config._ddRequestErrorTags = this.getSessionRequestErrorTags()
         config._ddItrCorrelationId = this.itrCorrelationId
         config._ddIsEarlyFlakeDetectionEnabled = !!this.libraryConfig?.isEarlyFlakeDetectionEnabled
-        config._ddEarlyFlakeDetectionNumRetries = this.libraryConfig?.earlyFlakeDetectionNumRetries ?? 0
+        config._ddEarlyFlakeDetectionSlowTestRetries = this.libraryConfig?.earlyFlakeDetectionSlowTestRetries ?? {}
         config._ddRepositoryRoot = this.repositoryRoot
         config._ddIsFlakyTestRetriesEnabled = this.libraryConfig?.isFlakyTestRetriesEnabled ?? false
         config._ddIsTestManagementTestsEnabled = this.libraryConfig?.isTestManagementEnabled ?? false
@@ -208,6 +209,7 @@ class JestPlugin extends CiPlugin {
         _ddTestSessionId: testSessionId,
         _ddTestCommand: testCommand,
         _ddTestModuleId: testModuleId,
+        _ddRequestErrorTags: requestErrorTags,
         _ddItrCorrelationId: itrCorrelationId,
         _ddForcedToRun,
         _ddUnskippable,
@@ -219,7 +221,11 @@ class JestPlugin extends CiPlugin {
         'x-datadog-parent-id': testModuleId,
       })
 
-      const testSuiteMetadata = getTestSuiteCommonTags(testCommand, frameworkVersion, testSuite, 'jest')
+      const testSuiteMetadata = {
+        ...getTestSuiteCommonTags(testCommand, frameworkVersion, testSuite, 'jest'),
+        // requestErrorTags from test env options may be undefined
+        ...(requestErrorTags !== undefined && requestErrorTags !== null ? requestErrorTags : {}),
+      }
 
       if (_ddUnskippable) {
         const unskippableSuites = this.getUnskippableSuites(_ddUnskippable)
@@ -389,6 +395,7 @@ class JestPlugin extends CiPlugin {
       attemptToFixFailed,
       isAtrRetry,
       finalStatus,
+      earlyFlakeAbortReason,
     }) => {
       span.setTag(TEST_STATUS, status)
       if (finalStatus) {
@@ -409,6 +416,9 @@ class JestPlugin extends CiPlugin {
         span.setTag(TEST_IS_RETRY, 'true')
         span.setTag(TEST_RETRY_REASON, TEST_RETRY_REASON_TYPES.atr)
       }
+      if (earlyFlakeAbortReason) {
+        span.setTag(TEST_EARLY_FLAKE_ABORT_REASON, earlyFlakeAbortReason)
+      }
 
       this.telemetry.ciVisEvent(
         TELEMETRY_EVENT_FINISHED,

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

@@ -3,7 +3,7 @@
 const { readFileSync } = require('fs')
 const { parse } = require('../../../vendor/dist/jest-docblock')
 
-const { getTestSuitePath } = require('../../dd-trace/src/plugins/util/test')
+const { getTestSuitePath, getEfdRetryCount } = require('../../dd-trace/src/plugins/util/test')
 const log = require('../../dd-trace/src/log')
 
 /**
@@ -172,4 +172,5 @@ module.exports = {
   getJestTestName,
   getJestSuitesToRun,
   isMarkedAsUnskippable,
+  getEfdRetryCount,
 }