dd-trace 5.104.0 → 5.105.0

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

@@ -12,9 +12,9 @@ const {
   TEST_BROWSER_NAME,
   TEST_BROWSER_VERSION,
   TEST_CODE_OWNERS,
-  TEST_COMMAND,
   TEST_EARLY_FLAKE_ABORT_REASON,
   TEST_EARLY_FLAKE_ENABLED,
+  TEST_FRAMEWORK_VERSION,
   TEST_HAS_FAILED_ALL_RETRIES,
   TEST_IS_MODIFIED,
   TEST_IS_NEW,
@@ -234,7 +234,7 @@ class PlaywrightPlugin extends CiPlugin {
             formattedSpan.meta[TEST_SESSION_ID] = this.testSessionSpan.context().toTraceId()
             formattedSpan.meta[TEST_MODULE_ID] = this.testModuleSpan.context().toSpanId()
             Object.assign(formattedSpan.meta, this.getSessionRequestErrorTags())
-            formattedSpan.meta[TEST_COMMAND] = this.command
+            formattedSpan.meta[TEST_FRAMEWORK_VERSION] = this.frameworkVersion
             formattedSpan.meta[TEST_MODULE] = this.constructor.id
             // MISSING _trace.startTime and _trace.ticks - because by now the suite is already serialized
             const testSuite = this._testSuiteSpansByTestSuiteAbsolutePath.get(
@@ -326,7 +326,7 @@ class PlaywrightPlugin extends CiPlugin {
     }) => {
       if (!span) return
 
-      const isRUMActive = span.context()._tags[TEST_IS_RUM_ACTIVE]
+      const isRUMActive = span.context().getTag(TEST_IS_RUM_ACTIVE)
 
       span.setTag(TEST_STATUS, testStatus)
 
@@ -416,7 +416,7 @@ class PlaywrightPlugin extends CiPlugin {
         TELEMETRY_EVENT_FINISHED,
         'test',
         {
-          hasCodeOwners: !!span.context()._tags[TEST_CODE_OWNERS],
+          hasCodeOwners: !!span.context().getTag(TEST_CODE_OWNERS),
           isNew,
           isRum: isRUMActive,
           browserDriver: 'playwright',

package/packages/datadog-plugin-protobufjs/src/schema_iterator.js

@@ -135,7 +135,7 @@ class SchemaExtractor {
       return
     }
 
-    if (span.context()._tags[SCHEMA_TYPE] && operation === 'serialization') {
+    if (span.context().getTag(SCHEMA_TYPE) && operation === 'serialization') {
       // we have already added a schema to this span, this call is an encode of nested schema types
       return
     }

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

@@ -42,7 +42,7 @@ function addDeliveryAnnotations (msg, tracer, span) {
     tracer.inject(span, 'text_map', msg.delivery_annotations)
 
     if (tracer._config.dsmEnabled) {
-      const targetName = span.context()._tags['amqp.link.target.address']
+      const targetName = span.context().getTag('amqp.link.target.address')
       const payloadSize = getAmqpMessageSize({ content: msg.body, headers: msg.delivery_annotations })
       const dataStreamsContext = tracer
         .setCheckpoint(['direction:out', `exchange:${targetName}`, 'type:rabbitmq'], span, payloadSize)

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

@@ -9,31 +9,35 @@ const { COMPONENT } = require('../../dd-trace/src/constants')
 class RouterPlugin extends WebPlugin {
   static id = 'router'
 
-  #storeStacks = new WeakMap()
   #contexts = new WeakMap()
 
   constructor (...args) {
     super(...args)
 
     this.addSub(`apm:${this.constructor.id}:middleware:enter`, ({ req, name, route }) => {
-      const childOf = this.#getActive(req) || this.#getStoreSpan()
-
+      // One ALS hop covers both the parent-span fallback (when no
+      // per-request context exists yet) and the `storeStack` push below.
+      // The previous shape paid an ALS read inside `#getStoreSpan` and a
+      // second one here for the saved-store push.
+      const store = storage('legacy').getStore()
+      let context = this.#contexts.get(req)
+      let childOf
+      if (context !== undefined) {
+        const middleware = context.middleware
+        childOf = middleware.length === 0 ? context.span : middleware[middleware.length - 1]
+      } else if (store) {
+        childOf = store.span
+      }
       if (!childOf) return
 
       const span = this.#getMiddlewareSpan(name, childOf)
-      const context = this.#createContext(req, route, childOf)
+      context = this.#updateContext(req, context, route, childOf)
 
       if (childOf !== span) {
         context.middleware.push(span)
       }
 
-      const store = storage('legacy').getStore()
-      let storeStack = this.#storeStacks.get(req)
-      if (!storeStack) {
-        storeStack = []
-        this.#storeStacks.set(req, storeStack)
-      }
-      storeStack.push(store)
+      context.storeStack.push(store)
       this.enter(span, store)
 
       web.patch(req)
@@ -57,11 +61,8 @@ class RouterPlugin extends WebPlugin {
     })
 
     this.addSub(`apm:${this.constructor.id}:middleware:exit`, ({ req }) => {
-      const storeStack = this.#storeStacks.get(req)
-      const savedStore = storeStack && storeStack.pop()
-      if (storeStack && storeStack.length === 0) {
-        this.#storeStacks.delete(req)
-      }
+      const context = this.#contexts.get(req)
+      const savedStore = context && context.storeStack.pop()
       const span = savedStore && savedStore.span
       this.enter(span, savedStore)
     })
@@ -71,8 +72,10 @@ class RouterPlugin extends WebPlugin {
 
       if (!this.config.middleware) return
 
-      const span = this.#getActive(req)
-
+      const context = this.#contexts.get(req)
+      if (!context) return
+      const middleware = context.middleware
+      const span = middleware.length === 0 ? context.span : middleware[middleware.length - 1]
       if (!span) return
 
       span.setTag('error', error)
@@ -91,21 +94,6 @@ class RouterPlugin extends WebPlugin {
     })
   }
 
-  #getActive (req) {
-    const context = this.#contexts.get(req)
-
-    if (!context) return
-    if (context.middleware.length === 0) return context.span
-
-    return context.middleware.at(-1)
-  }
-
-  #getStoreSpan () {
-    const store = storage('legacy').getStore()
-
-    return store && store.span
-  }
-
   #getMiddlewareSpan (name, childOf) {
     if (this.config.middleware === false) {
       return childOf
@@ -125,9 +113,7 @@ class RouterPlugin extends WebPlugin {
     return span
   }
 
-  #createContext (req, route, span) {
-    let context = this.#contexts.get(req)
-
+  #updateContext (req, context, route, span) {
     if (!route || route === '/' || route === '*') {
       route = ''
     }
@@ -141,17 +127,20 @@ class RouterPlugin extends WebPlugin {
       if (isMoreSpecificThan(route, context.route)) {
         context.route = route
       }
-    } else {
-      context = {
-        span,
-        stack: [route],
-        route,
-        middleware: [],
-      }
+      return context
+    }
 
-      this.#contexts.set(req, context)
+    // Five-property shape pinned at allocation so every request shares the
+    // same hidden class — no per-field transitions after construction.
+    context = {
+      span,
+      stack: [route],
+      route,
+      middleware: [],
+      storeStack: [],
     }
 
+    this.#contexts.set(req, context)
     return context
   }
 }

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

@@ -14,7 +14,7 @@ const {
 const { SPAN_TYPE } = require('../../../ext/tags')
 
 function isTestSpan (span) {
-  return span.context()._tags[SPAN_TYPE] === 'test'
+  return span.context().getTag(SPAN_TYPE) === 'test'
 }
 
 function getTestSpanFromTrace (trace) {

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

@@ -15,7 +15,7 @@ const {
   TEST_IS_RETRY,
   TEST_CODE_COVERAGE_LINES_PCT,
   TEST_CODE_OWNERS,
-  TEST_LEVEL_EVENT_TYPES,
+  TEST_COMMAND,
   TEST_SESSION_NAME,
   TEST_SOURCE_START,
   TEST_IS_NEW,
@@ -323,19 +323,11 @@ class VitestPlugin extends CiPlugin {
       const trimmedCommand = DD_MAJOR < 6 ? this.command : 'vitest run'
       // test suites run in a different process, so they also need to init the metadata dictionary
       const testSessionName = getTestSessionName(this.config, trimmedCommand, this.testEnvironmentMetadata)
-      const metadataTags = {}
-      for (const testLevel of TEST_LEVEL_EVENT_TYPES) {
-        metadataTags[testLevel] = {
-          [TEST_SESSION_NAME]: testSessionName,
-        }
-      }
       if (this.tracer._exporter.addMetadataTags) {
-        const libraryCapabilitiesTags = getLibraryCapabilitiesTags(this.constructor.id)
-        metadataTags.test = {
-          ...metadataTags.test,
-          ...libraryCapabilitiesTags,
-        }
-        this.tracer._exporter.addMetadataTags(metadataTags)
+        this.tracer._exporter.addMetadataTags({
+          '*': { [TEST_COMMAND]: testCommand, [TEST_SESSION_NAME]: testSessionName },
+          test: getLibraryCapabilitiesTags(this.constructor.id),
+        })
       }
 
       const testSuite = getTestSuitePath(testSuiteAbsolutePath, this.repositoryRoot)

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

@@ -1,8 +1,38 @@
 'use strict'
 
+const { buildLogHolder, messageProxy } = require('../../dd-trace/src/plugins/log_injection')
 const LogPlugin = require('../../dd-trace/src/plugins/log_plugin')
 
 class WinstonPlugin extends LogPlugin {
   static id = 'winston'
+
+  constructor (...args) {
+    super(...args)
+    this.addSub('apm:winston:log', (arg) => this.handleLog(arg))
+  }
+
+  /**
+   * The prototype + extensibility check is load-bearing. The Proxy
+   * fallback keeps `dd` off caller-owned objects (Error, Set, Map, any
+   * user class) and out of non-extensible records, where a strict-mode
+   * write would throw and `Plugin.addSub` would react by disabling the
+   * plugin for the rest of the process.
+   *
+   * @param {{ message: unknown }} arg
+   */
+  handleLog (arg) {
+    const info = arg.message
+    if (info === null || typeof info !== 'object' || Object.hasOwn(info, 'dd')) return
+
+    const logHolder = buildLogHolder(this.tracer)
+    if (!logHolder) return
+
+    if (Object.getPrototypeOf(info) === Object.prototype && Object.isExtensible(info)) {
+      info.dd = logHolder.dd
+    } else {
+      arg.message = messageProxy(info, logHolder)
+    }
+  }
 }
+
 module.exports = WinstonPlugin

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

@@ -13,11 +13,16 @@ const skipMethodSize = skipMethods.size
 
 const nonConfigurableModuleExports = new WeakMap()
 
+// Reused descriptor scratch space for the `name` and `length` slots that
+// `copyProperties` and `wrapCallback` rewrite per wrap. `Object.defineProperty`
+// reads the descriptor's slots synchronously and does not retain the object,
+// so mutating `value` between calls is safe.
+const lengthDescriptor = { value: 0, configurable: true }
+const nameDescriptor = { value: '', configurable: true }
+
 /**
- * Copies properties from the original function to the wrapped function.
- *
- * @param {Function} original - The original function.
- * @param {Function} wrapped - The wrapped function.
+ * @param {Function} original
+ * @param {Function} wrapped
  */
 function copyProperties (original, wrapped) {
   if (original.constructor !== wrapped.constructor) {
@@ -26,11 +31,15 @@ function copyProperties (original, wrapped) {
   }
 
   const ownKeys = Reflect.ownKeys(original)
-  if (original.length !== wrapped.length) {
-    Object.defineProperty(wrapped, 'length', { value: original.length, configurable: true })
+  const originalLength = original.length
+  if (originalLength !== wrapped.length) {
+    lengthDescriptor.value = originalLength
+    Object.defineProperty(wrapped, 'length', lengthDescriptor)
   }
-  if (original.name !== wrapped.name) {
-    Object.defineProperty(wrapped, 'name', { value: original.name, configurable: true })
+  const originalName = original.name
+  if (originalName !== wrapped.name) {
+    nameDescriptor.value = originalName
+    Object.defineProperty(wrapped, 'name', nameDescriptor)
   }
   if (ownKeys.length !== 2) {
     for (const key of ownKeys) {
@@ -46,11 +55,9 @@ function copyProperties (original, wrapped) {
 }
 
 /**
- * Copies properties from the original object to the wrapped object, skipping a specific key.
- *
- * @param {Record<string | symbol, unknown>} original - The original object.
- * @param {Record<string | symbol, unknown>} wrapped - The wrapped object.
- * @param {string | symbol} skipKey - The key to skip during copying.
+ * @param {Record<string | symbol, unknown>} original
+ * @param {Record<string | symbol, unknown>} wrapped
+ * @param {string | symbol} skipKey
  */
 function copyObjectProperties (original, wrapped, skipKey) {
   const ownKeys = Reflect.ownKeys(original)
@@ -66,11 +73,8 @@ function copyObjectProperties (original, wrapped, skipKey) {
 }
 
 /**
- * Wraps a function with a wrapper function.
- *
- * @param {Function} original - The original function to wrap.
- * @param {(original: Function) => Function} wrapper - The wrapper function.
- * @returns {Function} The wrapped function.
+ * @param {Function} original
+ * @param {(original: Function) => Function} wrapper
  */
 function wrapFunction (original, wrapper) {
   if (typeof original !== 'function') return original
@@ -83,24 +87,14 @@ function wrapFunction (original, wrapper) {
 }
 
 /**
- * Lean variant of `wrapFunction` for the case where the wrapped value is a
- * user-supplied callback that the user cannot reasonably introspect beyond
- * `name` and `length`, and the wrapper closure is fully controlled by us.
- *
- * Compared to `wrapFunction`, this skips the prototype copy, the
- * `assertNotClass` guard, and the `Reflect.ownKeys` descriptor-copy loop.
- * Only `name` and `length` are preserved, and only when the wrapper's
- * autogenerated values differ -- a wrapper whose closure already has the
- * right arity / name pays no overhead.
- *
- * Use `wrapFunction` instead when any of the following is true: the wrapped
- * function needs to keep its prototype, has custom own properties the caller
- * may read, or is `new`-ed.
+ * Lean variant of `wrapFunction` for tracer-owned closures wrapping a
+ * user-supplied callback. Preserves `name` and `length` only; skips the
+ * prototype copy, `assertNotClass`, and the `Reflect.ownKeys` descriptor
+ * walk. Use `wrapFunction` instead when the wrapped value needs its
+ * prototype, has own properties the caller may read, or is `new`-ed.
  *
- * @param {Function} original - User-supplied callback being wrapped.
- * @param {(original: Function) => Function} wrapper - Factory that receives
- * `original` and returns the wrapper closure.
- * @returns {Function} The wrapper closure with `name` and `length` preserved.
+ * @param {Function} original
+ * @param {(original: Function) => Function} wrapper
  */
 function wrapCallback (original, wrapper) {
   if (typeof original !== 'function') {
@@ -108,10 +102,12 @@ function wrapCallback (original, wrapper) {
   }
   const wrapped = wrapper(original)
   if (wrapped.name !== original.name) {
-    Object.defineProperty(wrapped, 'name', { value: original.name, configurable: true })
+    nameDescriptor.value = original.name
+    Object.defineProperty(wrapped, 'name', nameDescriptor)
   }
   if (wrapped.length !== original.length) {
-    Object.defineProperty(wrapped, 'length', { value: original.length, configurable: true })
+    lengthDescriptor.value = original.length
+    Object.defineProperty(wrapped, 'length', lengthDescriptor)
   }
   return wrapped
 }
@@ -174,7 +170,6 @@ function wrap (target, name, wrapper, options) {
   copyProperties(original, wrapped)
 
   if (descriptor.writable) {
-    // Fast path for assigned properties.
     if (descriptor.configurable && descriptor.enumerable) {
       target[name] = wrapped
       return target
@@ -209,8 +204,6 @@ function wrap (target, name, wrapper, options) {
       // with this code. That way it would be possible to directly pass through
       // the entries.
 
-      // In case more than a single property is not configurable and writable,
-      // Just reuse the already created object.
       let moduleExports = nonConfigurableModuleExports.get(target)
       if (!moduleExports) {
         if (typeof target === 'function') {

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

@@ -44,7 +44,7 @@ function disable () {
 /**
  * Handles channel messages with pre-converted messages.
  *
- * @param {{messages: Array<object>, resolve: Function, reject: Function}} ctx
+ * @param {{messages: Array<object>, integration?: string, resolve: Function, reject: Function}} ctx
  */
 function onEvaluate (ctx) {
   if (!ctx.messages?.length) {

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

@@ -148,7 +148,7 @@ class AIGuard extends NoopAIGuard {
   #setRootSpanClientIpTags (rootSpan) {
     if (!rootSpan) return
 
-    const currentTags = rootSpan.context()._tags
+    const currentTags = rootSpan.context().getTags()
     const needsHttpClientIp = !Object.hasOwn(currentTags, HTTP_CLIENT_IP)
     const needsNetworkClientIp = !Object.hasOwn(currentTags, NETWORK_CLIENT_IP)
 

package/packages/dd-trace/src/appsec/api_security_sampler.js

@@ -79,7 +79,7 @@ function getRouteOrEndpoint (context, statusCode) {
 
   // If route is not available, fallback to http.endpoint
   if (statusCode !== 404) {
-    const endpoint = context?.span?.context()?._tags?.['http.endpoint']
+    const endpoint = context?.span?.context()?.getTag('http.endpoint')
     if (endpoint) {
       return endpoint
     }

package/packages/dd-trace/src/appsec/index.js

@@ -289,7 +289,7 @@ function onExpressSession ({ req, res, sessionId, abortController }) {
     return
   }
 
-  const isSdkCalled = rootSpan.context()._tags['usr.session_id']
+  const isSdkCalled = rootSpan.context().getTag('usr.session_id')
   if (isSdkCalled) return
 
   const results = waf.run({

package/packages/dd-trace/src/appsec/reporter.js

@@ -361,18 +361,18 @@ function reportAttack ({ events: attackData, actions }, req) {
   const rootSpan = web.root(req)
   if (!rootSpan) return
 
-  const currentTags = rootSpan.context()._tags
+  const spanContext = rootSpan.context()
 
   const newTags = {
     'appsec.event': 'true',
   }
 
   // TODO: maybe add this to format.js later (to take decision as late as possible)
-  if (!currentTags['_dd.origin']) {
+  if (!spanContext.getTag('_dd.origin')) {
     newTags['_dd.origin'] = 'appsec'
   }
 
-  const currentJson = currentTags['_dd.appsec.json']
+  const currentJson = spanContext.getTag('_dd.appsec.json')
 
   // merge JSON arrays without parsing them
   const attackDataStr = JSON.stringify(attackData)
@@ -469,8 +469,7 @@ function reportRequestBody (rootSpan, requestBody, comesFromRaspAction = false)
 
   if (rootSpan.meta_struct['http.request.body']) {
     // If the rasp.exceed metric exists, set also the same for the new tag
-    const currentTags = rootSpan.context()._tags
-    const sizeExceedTagValue = currentTags['_dd.appsec.rasp.request_body_size.exceeded']
+    const sizeExceedTagValue = rootSpan.context().getTag('_dd.appsec.rasp.request_body_size.exceeded')
 
     if (sizeExceedTagValue) {
       rootSpan.setTag('_dd.appsec.request_body_size.exceeded', sizeExceedTagValue)
@@ -572,7 +571,7 @@ function finishRequest (req, res, storedResponseHeaders, requestBody) {
 
   incrementWafRequestsMetric(req)
 
-  const tags = rootSpan.context()._tags
+  const tags = rootSpan.context().getTags()
 
   const extendedDataCollection = extendedDataCollectionRequest.get(req)
   const newTags = getCollectedHeaders(

package/packages/dd-trace/src/appsec/sdk/user_blocking.js

@@ -22,7 +22,7 @@ function checkUserAndSetUser (tracer, user) {
 
   const rootSpan = getRootSpan()
   if (rootSpan) {
-    if (!rootSpan.context()._tags['usr.id']) {
+    if (!rootSpan.context().getTag('usr.id')) {
       setUserTags(user, rootSpan)
     }
   } else {

package/packages/dd-trace/src/appsec/sdk/utils.js

@@ -18,7 +18,7 @@ function getRootSpan () {
 
     parentId = pContext._parentId
 
-    if (!pContext._tags?._inferred_span) {
+    if (!pContext.getTag('_inferred_span')) {
       span = parent
     }
   }

package/packages/dd-trace/src/appsec/user_tracking.js

@@ -91,12 +91,13 @@ function trackLogin (framework, login, user, success, rootSpan) {
     [addresses.USER_LOGIN]: login,
   }
 
-  const currentTags = rootSpan.context()._tags
-  const isSdkCalled = currentTags[`_dd.appsec.events.users.login.${success ? 'success' : 'failure'}.sdk`] === 'true'
+  const spanContext = rootSpan.context()
+  const sdkTag = `_dd.appsec.events.users.login.${success ? 'success' : 'failure'}.sdk`
+  const isSdkCalled = spanContext.getTag(sdkTag) === 'true'
 
   // used to not overwrite tags set by SDK
   function shouldSetTag (tag) {
-    return !(isSdkCalled && currentTags[tag])
+    return !(isSdkCalled && spanContext.getTag(tag))
   }
 
   if (success) {
@@ -167,7 +168,7 @@ function trackUser (user, rootSpan) {
 
   rootSpan.setTag('_dd.appsec.usr.id', userId)
 
-  const isSdkCalled = rootSpan.context()._tags['_dd.appsec.user.collection_mode'] === 'sdk'
+  const isSdkCalled = rootSpan.context().getTag('_dd.appsec.user.collection_mode') === 'sdk'
   // do not override SDK
   if (!isSdkCalled) {
     rootSpan.addTags({

package/packages/dd-trace/src/baggage.js

@@ -62,7 +62,13 @@ function removeBaggageItem (keyToRemove) {
 }
 
 function removeAllBaggageItems () {
-  baggageStorage.enterWith(EMPTY_STORE)
+  // Skip `enterWith` (a real ALS frame switch) when the store is already
+  // the empty sentinel. Entry-point services without active baggage hit this
+  // on every extract.
+  const store = baggageStorage.getStore()
+  if (store !== undefined && store !== EMPTY_STORE) {
+    baggageStorage.enterWith(EMPTY_STORE)
+  }
   return EMPTY_STORE
 }
 

package/packages/dd-trace/src/ci-visibility/exporters/ci-visibility-exporter.js

@@ -236,7 +236,6 @@ class CiVisibilityExporter extends BufferingExporter {
         testManagementAttemptToFixRetries ?? this._config.testManagementAttemptToFixRetries,
       isImpactedTestsEnabled: isImpactedTestsEnabled && this._config.isImpactedTestsEnabled,
       isCoverageReportUploadEnabled,
-      DD_TEST_TIA_KEEP_COV_CONFIG: this._config.DD_TEST_TIA_KEEP_COV_CONFIG,
     }
   }
 

package/packages/dd-trace/src/ci-visibility/intelligent-test-runner/get-skippable-suites.js

@@ -31,10 +31,11 @@ function getSkippableSuites ({
   runtimeVersion,
   custom,
   testLevel = 'suite',
+  isCoverageReportUploadEnabled = false,
 }, done) {
   const cacheKey = buildCacheKey('skippable', [
     sha, service, env, repositoryUrl, osPlatform, osVersion, osArchitecture,
-    runtimeName, runtimeVersion, testLevel, custom,
+    runtimeName, runtimeVersion, testLevel, custom, isCoverageReportUploadEnabled,
   ])
 
   withCache(cacheKey, (activeCacheKey, cb) => {
@@ -54,11 +55,12 @@ function getSkippableSuites ({
       runtimeVersion,
       custom,
       testLevel,
+      isCoverageReportUploadEnabled,
       cacheKey: activeCacheKey,
     }, cb)
   }, (err, data) => {
     if (err) return done(err)
-    done(null, data.skippableSuites, data.correlationId)
+    done(null, data.skippableSuites, data.correlationId, data.coverage)
   })
 }
 
@@ -81,6 +83,7 @@ function getSkippableSuites ({
  * @param {string} params.runtimeVersion
  * @param {object} [params.custom]
  * @param {string} [params.testLevel]
+ * @param {boolean} [params.isCoverageReportUploadEnabled]
  * @param {string | null} params.cacheKey
  * @param {Function} done
  */
@@ -100,6 +103,7 @@ function fetchFromApi ({
   runtimeVersion,
   custom,
   testLevel,
+  isCoverageReportUploadEnabled,
   cacheKey,
 }, done) {
   const options = {
@@ -148,7 +152,6 @@ function fetchFromApi ({
       },
     },
   })
-
   incrementCountMetric(TELEMETRY_ITR_SKIPPABLE_TESTS)
 
   const startTime = Date.now()
@@ -161,27 +164,36 @@ function fetchFromApi ({
     } else {
       try {
         const parsedResponse = JSON.parse(res)
-        const skippableSuites = parsedResponse
+        const coverage = parsedResponse.meta?.coverage || {}
+
+        const skippableItems = parsedResponse
           .data
           .filter(({ type }) => type === testLevel)
-          .map(({ attributes: { suite, name } }) => {
-            if (testLevel === 'suite') {
-              return suite
-            }
-            return { suite, name }
-          })
-        const { meta: { correlation_id: correlationId } } = parsedResponse
+        const skippableSuites = []
+        for (const {
+          attributes: {
+            suite,
+            name,
+            _is_missing_line_code_coverage: isMissingLineCodeCoverage,
+          },
+        } of skippableItems) {
+          // Only reject candidates without backend line coverage when we need that coverage to backfill reports.
+          if (isCoverageReportUploadEnabled && isMissingLineCodeCoverage) continue
+
+          skippableSuites.push(testLevel === 'suite' ? suite : { suite, name })
+        }
+        const correlationId = parsedResponse.meta?.correlation_id
         incrementCountMetric(
           testLevel === 'test'
             ? TELEMETRY_ITR_SKIPPABLE_TESTS_RESPONSE_TESTS
             : TELEMETRY_ITR_SKIPPABLE_TESTS_RESPONSE_SUITES,
           {},
-          skippableSuites.length
+          skippableItems.length
         )
         distributionMetric(TELEMETRY_ITR_SKIPPABLE_TESTS_RESPONSE_BYTES, {}, res.length)
         log.debug('Number of received skippable %ss:', testLevel, skippableSuites.length)
 
-        const result = { skippableSuites, correlationId }
+        const result = { skippableSuites, correlationId, coverage }
         writeToCache(cacheKey, result)
 
         done(null, result)