Integrate fix-merge-b4ff364e61-into-staging-38 (#3848) into staging-38

Integrated commit sha: 07ece22

Co-authored-by: BenoitZugmeyer <[email protected]>

Author: dd-mergequeue[bot]

packages/core/src/tools/experimentalFeatures.ts

@@ -16,7 +16,6 @@ import { objectHasValue } from './utils/objectUtils'
 export enum ExperimentalFeature {
   TRACK_INTAKE_REQUESTS = 'track_intake_requests',
   WRITABLE_RESOURCE_GRAPHQL = 'writable_resource_graphql',
-  EARLY_REQUEST_COLLECTION = 'early_request_collection',
   USE_TREE_WALKER_FOR_ACTION_NAME = 'use_tree_walker_for_action_name',
   GRAPHQL_TRACKING = 'graphql_tracking',
   FEATURE_OPERATION_VITAL = 'feature_operation_vital',

packages/rum-core/src/domain/configuration/configuration.spec.ts

@@ -591,6 +591,7 @@ describe('serializeRumConfiguration', () => {
       trackResources: true,
       trackLongTasks: true,
       trackBfcacheViews: true,
+      trackEarlyRequests: true,
       remoteConfigurationId: '123',
       remoteConfigurationProxy: 'config',
       plugins: [{ name: 'foo', getConfigurationTelemetry: () => ({ bar: true }) }],
@@ -642,6 +643,7 @@ describe('serializeRumConfiguration', () => {
       track_resources: true,
       track_long_task: true,
       track_bfcache_views: true,
+      track_early_requests: true,
       use_worker_url: true,
       compress_intake_requests: true,
       plugins: [{ name: 'foo', bar: true }],

packages/rum-core/src/domain/configuration/configuration.ts

@@ -198,6 +198,14 @@ export interface RumInitConfiguration extends InitConfiguration {
    */
   trackLongTasks?: boolean | undefined
 
+  /**
+   * Enables early request collection before resource timing entries are available.
+   *
+   * @category Data Collection
+   * @defaultValue false
+   */
+  trackEarlyRequests?: boolean | undefined
+
   /**
    * List of plugins to enable. The plugins API is unstable and experimental, and may change without
    * notice. Please use only plugins provided by Datadog matching the version of the SDK you are
@@ -258,6 +266,7 @@ export interface RumConfiguration extends Configuration {
   trackResources: boolean
   trackLongTasks: boolean
   trackBfcacheViews: boolean
+  trackEarlyRequests: boolean
   subdomain?: string
   customerDataTelemetrySampleRate: number
   initialViewMetricsTelemetrySampleRate: number
@@ -331,6 +340,7 @@ export function validateAndBuildRumConfiguration(
     trackResources: !!(initConfiguration.trackResources ?? true),
     trackLongTasks: !!(initConfiguration.trackLongTasks ?? true),
     trackBfcacheViews: !!initConfiguration.trackBfcacheViews,
+    trackEarlyRequests: !!initConfiguration.trackEarlyRequests,
     subdomain: initConfiguration.subdomain,
     defaultPrivacyLevel: objectHasValue(DefaultPrivacyLevel, initConfiguration.defaultPrivacyLevel)
       ? initConfiguration.defaultPrivacyLevel
@@ -470,6 +480,7 @@ export function serializeRumConfiguration(configuration: RumInitConfiguration) {
     track_resources: configuration.trackResources,
     track_long_task: configuration.trackLongTasks,
     track_bfcache_views: configuration.trackBfcacheViews,
+    track_early_requests: configuration.trackEarlyRequests,
     plugins: configuration.plugins?.map((plugin) => ({
       name: plugin.name,
       ...plugin.getConfigurationTelemetry?.(),

packages/rum-core/src/domain/resource/resourceCollection.spec.ts

@@ -307,13 +307,9 @@ describe('resourceCollection', () => {
     expect(resourceEvent.resource.graphql).toBeUndefined()
   })
 
-  describe('with EARLY_REQUEST_COLLECTION enabled', () => {
-    beforeEach(() => {
-      mockExperimentalFeatures([ExperimentalFeature.EARLY_REQUEST_COLLECTION])
-    })
-
+  describe('with trackEarlyRequests enabled', () => {
     it('creates a resource from a performance entry without a matching request', () => {
-      setupResourceCollection({ trackResources: true })
+      setupResourceCollection({ trackResources: true, trackEarlyRequests: true })
 
       notifyPerformanceEntries([
         createPerformanceEntry(RumPerformanceEntryType.RESOURCE, {

packages/rum-core/src/domain/resource/resourceCollection.ts

@@ -51,7 +51,7 @@ export function startResourceCollection(
   retrieveInitialDocumentResourceTimingImpl = retrieveInitialDocumentResourceTiming
 ) {
   let requestRegistry: RequestRegistry | undefined
-  const isEarlyRequestCollectionEnabled = isExperimentalFeatureEnabled(ExperimentalFeature.EARLY_REQUEST_COLLECTION)
+  const isEarlyRequestCollectionEnabled = configuration.trackEarlyRequests
 
   if (isEarlyRequestCollectionEnabled) {
     requestRegistry = createRequestRegistry(lifeCycle)