[fixme] #4185 conflicts with staging-08

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

@@ -2,11 +2,7 @@ import type { RumEvent } from '../../../../rum-core/src'
 import { EXHAUSTIVE_INIT_CONFIGURATION, SERIALIZED_EXHAUSTIVE_INIT_CONFIGURATION } from '../../../test'
 import type { ExtractTelemetryConfiguration, MapInitConfigurationKey } from '../../../test'
 import { DOCS_ORIGIN, MORE_DETAILS, display } from '../../tools/display'
-import {
-  ExperimentalFeature,
-  isExperimentalFeatureEnabled,
-  resetExperimentalFeatures,
-} from '../../tools/experimentalFeatures'
+import { ExperimentalFeature, isExperimentalFeatureEnabled } from '../../tools/experimentalFeatures'
 import { SessionPersistence } from '../session/sessionConstants'
 import { TrackingConsent } from '../trackingConsent'
 import type { InitConfiguration } from './configuration'
@@ -21,10 +17,6 @@ describe('validateAndBuildConfiguration', () => {
     displaySpy = spyOn(display, 'error')
   })
 
-  afterEach(() => {
-    resetExperimentalFeatures()
-  })
-
   describe('experimentalFeatures', () => {
     const TEST_FEATURE_FLAG = 'foo' as ExperimentalFeature
 

packages/core/src/domain/telemetry/telemetry.spec.ts

@@ -2,7 +2,7 @@ import type { TimeStamp } from '@datadog/browser-rum/internal'
 import { NO_ERROR_STACK_PRESENT_MESSAGE } from '../error/error'
 import { callMonitored } from '../../tools/monitor'
 import type { ExperimentalFeature } from '../../tools/experimentalFeatures'
-import { resetExperimentalFeatures, addExperimentalFeatures } from '../../tools/experimentalFeatures'
+import { addExperimentalFeatures } from '../../tools/experimentalFeatures'
 import { validateAndBuildConfiguration, type Configuration } from '../configuration'
 import { INTAKE_SITE_US1_FED, INTAKE_SITE_US1 } from '../intakeSites'
 import {
@@ -87,10 +87,6 @@ describe('telemetry', () => {
   })
 
   describe('addTelemetryConfiguration', () => {
-    afterEach(() => {
-      resetExperimentalFeatures()
-    })
-
     it('should collects configuration when sampled', async () => {
       const { getTelemetryEvents } = startAndSpyTelemetry({
         telemetrySampleRate: 100,

packages/core/src/index.ts

@@ -14,7 +14,6 @@ export { TrackingConsent, createTrackingConsentState } from './domain/trackingCo
 export {
   isExperimentalFeatureEnabled,
   addExperimentalFeatures,
-  resetExperimentalFeatures,
   getExperimentalFeatures,
   initFeatureFlags,
   ExperimentalFeature,

packages/core/src/tools/experimentalFeatures.spec.ts

@@ -3,17 +3,12 @@ import {
   addExperimentalFeatures,
   initFeatureFlags,
   isExperimentalFeatureEnabled,
-  resetExperimentalFeatures,
 } from './experimentalFeatures'
 
 const TEST_FEATURE_FLAG_ONE = 'foo' as ExperimentalFeature
 const TEST_FEATURE_FLAG_TWO = 'bar' as ExperimentalFeature
 
 describe('experimentalFeatures', () => {
-  afterEach(() => {
-    resetExperimentalFeatures()
-  })
-
   it('initial state is empty', () => {
     expect(isExperimentalFeatureEnabled(TEST_FEATURE_FLAG_ONE)).toBeFalse()
     expect(isExperimentalFeatureEnabled(TEST_FEATURE_FLAG_TWO)).toBeFalse()
@@ -41,7 +36,6 @@ describe('initFeatureFlags', () => {
 
   afterEach(() => {
     delete (ExperimentalFeature as any).FOO
-    resetExperimentalFeatures()
   })
 
   it('ignores unknown experimental features', () => {

packages/core/test/forEach.spec.ts

@@ -1,3 +1,4 @@
+import { resetExperimentalFeatures } from '../src/tools/experimentalFeatures'
 import { resetValueHistoryGlobals } from '../src/tools/valueHistory'
 import { resetFetchObservable } from '../src/browser/fetchObservable'
 import { resetConsoleObservable } from '../src/domain/console/consoleObservable'
@@ -35,6 +36,7 @@ afterEach(() => {
   resetMonitor()
   resetTelemetry()
   resetInteractionCountPolyfill()
+  resetExperimentalFeatures()
 })
 
 function clearAllCookies() {

packages/core/test/index.ts

@@ -15,7 +15,6 @@ export * from './emulate/mockVisibilityState'
 export * from './emulate/mockNavigator'
 export * from './emulate/mockEventBridge'
 export * from './emulate/mockFlushController'
-export * from './emulate/mockExperimentalFeatures'
 export * from './emulate/mockFetch'
 export * from './emulate/mockXhr'
 export * from './emulate/mockEventTarget'

packages/rum-core/src/boot/preStartRum.spec.ts

@@ -10,6 +10,7 @@ import {
   DefaultPrivacyLevel,
   ExperimentalFeature,
   startTelemetry,
+  addExperimentalFeatures,
 } from '@datadog/browser-core'
 import type { Clock } from '@datadog/browser-core/test'
 import {
@@ -18,7 +19,6 @@ import {
   mockClock,
   mockEventBridge,
   mockSyntheticsWorkerValues,
-  mockExperimentalFeatures,
   createFakeTelemetryObject,
   replaceMockableWithSpy,
 } from '@datadog/browser-core/test'
@@ -686,7 +686,7 @@ describe('preStartRum', () => {
     })
 
     it('startAction / stopAction', () => {
-      mockExperimentalFeatures([ExperimentalFeature.START_STOP_ACTION])
+      addExperimentalFeatures([ExperimentalFeature.START_STOP_ACTION])
 
       const startActionSpy = jasmine.createSpy()
       const stopActionSpy = jasmine.createSpy()

packages/rum-core/src/boot/rumPublicApi.spec.ts

@@ -7,14 +7,10 @@ import {
   ExperimentalFeature,
   ResourceType,
   startTelemetry,
+  addExperimentalFeatures,
 } from '@datadog/browser-core'
 import type { Clock } from '@datadog/browser-core/test'
-import {
-  createFakeTelemetryObject,
-  mockClock,
-  mockExperimentalFeatures,
-  replaceMockableWithSpy,
-} from '@datadog/browser-core/test'
+import { createFakeTelemetryObject, mockClock, replaceMockableWithSpy } from '@datadog/browser-core/test'
 import { noopRecorderApi, noopProfilerApi } from '../../test'
 import { ActionType, VitalType } from '../rawRumEvent.types'
 import type { DurationVitalReference } from '../domain/vital/vitalCollection'
@@ -742,7 +738,7 @@ describe('rum public api', () => {
 
   describe('startAction / stopAction', () => {
     it('should call startAction and stopAction on the strategy', () => {
-      mockExperimentalFeatures([ExperimentalFeature.START_STOP_ACTION])
+      addExperimentalFeatures([ExperimentalFeature.START_STOP_ACTION])
 
       const startActionSpy = jasmine.createSpy()
       const stopActionSpy = jasmine.createSpy()
@@ -778,7 +774,7 @@ describe('rum public api', () => {
     })
 
     it('should sanitize startAction and stopAction inputs', () => {
-      mockExperimentalFeatures([ExperimentalFeature.START_STOP_ACTION])
+      addExperimentalFeatures([ExperimentalFeature.START_STOP_ACTION])
 
       const startActionSpy = jasmine.createSpy()
       const { rumPublicApi } = makeRumPublicApiWithDefaults({
@@ -824,7 +820,7 @@ describe('rum public api', () => {
 
   describe('startResource / stopResource', () => {
     it('should call startResource and stopResource on the strategy', () => {
-      mockExperimentalFeatures([ExperimentalFeature.START_STOP_RESOURCE])
+      addExperimentalFeatures([ExperimentalFeature.START_STOP_RESOURCE])
 
       const startResourceSpy = jasmine.createSpy()
       const stopResourceSpy = jasmine.createSpy()
@@ -864,7 +860,7 @@ describe('rum public api', () => {
     })
 
     it('should sanitize startResource and stopResource inputs', () => {
-      mockExperimentalFeatures([ExperimentalFeature.START_STOP_RESOURCE])
+      addExperimentalFeatures([ExperimentalFeature.START_STOP_RESOURCE])
 
       const startResourceSpy = jasmine.createSpy()
       const { rumPublicApi } = makeRumPublicApiWithDefaults({

packages/rum-core/src/domain/action/getActionNameFromElement.spec.ts

@@ -1,5 +1,4 @@
-import { ExperimentalFeature } from '@datadog/browser-core'
-import { mockExperimentalFeatures } from '../../../../core/test'
+import { addExperimentalFeatures, ExperimentalFeature } from '@datadog/browser-core'
 import { appendElement, mockRumConfiguration } from '../../../test'
 import { NodePrivacyLevel } from '../privacyConstants'
 import { getNodeSelfPrivacyLevel } from '../privacy'
@@ -115,7 +114,7 @@ describe('getActionNameFromElement', () => {
   })
 
   it('should introduce whitespace for block-level display values', () => {
-    mockExperimentalFeatures([ExperimentalFeature.USE_TREE_WALKER_FOR_ACTION_NAME])
+    addExperimentalFeatures([ExperimentalFeature.USE_TREE_WALKER_FOR_ACTION_NAME])
     const testCases = [
       { display: 'block', expected: 'space' },
       { display: 'inline-block', expected: 'no-space' },
@@ -484,7 +483,7 @@ describe('getActionNameFromElement', () => {
     })
 
     it('removes only the child with programmatic action name in textual content', () => {
-      mockExperimentalFeatures([ExperimentalFeature.USE_TREE_WALKER_FOR_ACTION_NAME])
+      addExperimentalFeatures([ExperimentalFeature.USE_TREE_WALKER_FOR_ACTION_NAME])
       const { name, nameSource } = getActionNameFromElement(
         appendElement('<div>Foobar Baz<div data-dd-action-name="custom action">bar<div></div>'),
         defaultConfiguration
@@ -512,7 +511,7 @@ describe('getActionNameFromElement', () => {
     }
 
     it('preserves privacy level of the element when defaultPrivacyLevel is mask-unless-allowlisted', () => {
-      mockExperimentalFeatures([ExperimentalFeature.USE_TREE_WALKER_FOR_ACTION_NAME])
+      addExperimentalFeatures([ExperimentalFeature.USE_TREE_WALKER_FOR_ACTION_NAME])
       const { name, nameSource } = getActionNameFromElement(
         appendElement(`
         <div data-dd-privacy="mask">
@@ -666,7 +665,7 @@ describe('getActionNameFromElement', () => {
         },
       ]
       testCases.forEach(({ html, defaultPrivacyLevel, allowlist, expectedName, expectedNameSource }) => {
-        mockExperimentalFeatures([ExperimentalFeature.USE_TREE_WALKER_FOR_ACTION_NAME])
+        addExperimentalFeatures([ExperimentalFeature.USE_TREE_WALKER_FOR_ACTION_NAME])
         ;(window as BrowserWindow).$DD_ALLOW = new Set(allowlist)
         const target = appendElement(html)
         const { name, nameSource } = getActionNameFromElement(
@@ -883,7 +882,7 @@ describe('getActionNameFromElement', () => {
       })
 
       it('inherit privacy level and remove only the masked child', () => {
-        mockExperimentalFeatures([ExperimentalFeature.USE_TREE_WALKER_FOR_ACTION_NAME])
+        addExperimentalFeatures([ExperimentalFeature.USE_TREE_WALKER_FOR_ACTION_NAME])
         expect(
           getActionNameFromElement(
             appendElement(`

packages/rum-core/src/domain/action/trackClickActions.spec.ts

@@ -8,9 +8,10 @@ import {
   Observable,
   ExperimentalFeature,
   PageExitReason,
+  addExperimentalFeatures,
 } from '@datadog/browser-core'
 import type { Clock } from '@datadog/browser-core/test'
-import { createNewEvent, mockClock, mockExperimentalFeatures } from '@datadog/browser-core/test'
+import { createNewEvent, mockClock } from '@datadog/browser-core/test'
 import { createFakeClick, createMutationRecord, mockRumConfiguration } from '../../../test'
 import type { AssembledRumEvent } from '../../rawRumEvent.types'
 import { RumEventType, ActionType, FrustrationType } from '../../rawRumEvent.types'
@@ -478,7 +479,7 @@ describe('trackClickActions', () => {
     })
 
     it('should mask action name when defaultPrivacyLevel is mask_unless_allowlisted and not in allowlist', () => {
-      mockExperimentalFeatures([ExperimentalFeature.USE_TREE_WALKER_FOR_ACTION_NAME])
+      addExperimentalFeatures([ExperimentalFeature.USE_TREE_WALKER_FOR_ACTION_NAME])
       startClickActionsTracking({
         defaultPrivacyLevel: DefaultPrivacyLevel.MASK_UNLESS_ALLOWLISTED,
         enablePrivacyForActionName: true,
@@ -523,7 +524,7 @@ describe('trackClickActions', () => {
     })
 
     it('should use allowlist masking when defaultPrivacyLevel is allow and node privacy level is mask-unless-allowlisted', () => {
-      mockExperimentalFeatures([ExperimentalFeature.USE_TREE_WALKER_FOR_ACTION_NAME])
+      addExperimentalFeatures([ExperimentalFeature.USE_TREE_WALKER_FOR_ACTION_NAME])
       button.setAttribute('data-dd-privacy', 'mask-unless-allowlisted')
       startClickActionsTracking({
         defaultPrivacyLevel: DefaultPrivacyLevel.ALLOW,

packages/rum-core/src/domain/action/trackManualActions.spec.ts

@@ -1,7 +1,7 @@
 import type { Duration, ServerDuration } from '@datadog/browser-core'
-import { ExperimentalFeature, Observable } from '@datadog/browser-core'
+import { addExperimentalFeatures, ExperimentalFeature, Observable } from '@datadog/browser-core'
 import type { Clock } from '@datadog/browser-core/test'
-import { mockClock, mockExperimentalFeatures, registerCleanupTask } from '@datadog/browser-core/test'
+import { mockClock, registerCleanupTask } from '@datadog/browser-core/test'
 import { collectAndValidateRawRumEvents, mockRumConfiguration } from '../../../test'
 import type { RawRumActionEvent, RawRumEvent } from '../../rawRumEvent.types'
 import { RumEventType, ActionType, FrustrationType } from '../../rawRumEvent.types'
@@ -21,7 +21,7 @@ describe('trackManualActions', () => {
 
   beforeEach(() => {
     clock = mockClock()
-    mockExperimentalFeatures([ExperimentalFeature.START_STOP_ACTION])
+    addExperimentalFeatures([ExperimentalFeature.START_STOP_ACTION])
 
     const domMutationObservable = new Observable<RumMutationRecord[]>()
     const windowOpenObservable = new Observable<void>()

packages/rum-core/src/domain/contexts/sourceCodeContext.spec.ts

@@ -1,8 +1,8 @@
-import { ExperimentalFeature, HookNames } from '@datadog/browser-core'
+import { addExperimentalFeatures, ExperimentalFeature, HookNames } from '@datadog/browser-core'
 import type { RelativeTime } from '@datadog/browser-core'
 import type { AssembleHookParams, Hooks } from '../hooks'
 import { createHooks } from '../hooks'
-import { mockExperimentalFeatures, registerCleanupTask } from '../../../../core/test'
+import { registerCleanupTask } from '../../../../core/test'
 import type { RawRumLongAnimationFrameEvent } from '../../rawRumEvent.types'
 import type { BrowserWindow } from './sourceCodeContext'
 import { startSourceCodeContext } from './sourceCodeContext'
@@ -59,7 +59,7 @@ describe('sourceCodeContext', () => {
 
   describe('assemble hook when FF enabled', () => {
     beforeEach(() => {
-      mockExperimentalFeatures([ExperimentalFeature.SOURCE_CODE_CONTEXT])
+      addExperimentalFeatures([ExperimentalFeature.SOURCE_CODE_CONTEXT])
     })
 
     it('should add source code context matching the error stack first frame URL', () => {

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

@@ -1,6 +1,5 @@
-import { type Duration, type RelativeTime, type ServerDuration } from '@datadog/browser-core'
+import { addExperimentalFeatures, type Duration, type RelativeTime, type ServerDuration } from '@datadog/browser-core'
 import { ExperimentalFeature } from '@datadog/browser-core'
-import { mockExperimentalFeatures } from '@datadog/browser-core/test'
 import { RumPerformanceEntryType, type RumPerformanceResourceTiming } from '../../browser/performanceObservable'
 import {
   MAX_RESOURCE_VALUE_CHAR_LENGTH,
@@ -296,7 +295,7 @@ describe('shouldTrackResource', () => {
   })
 
   it('should allow requests on intake endpoints when TRACK_INTAKE_REQUESTS is enabled', () => {
-    mockExperimentalFeatures([ExperimentalFeature.TRACK_INTAKE_REQUESTS])
+    addExperimentalFeatures([ExperimentalFeature.TRACK_INTAKE_REQUESTS])
     expect(isAllowedRequestUrl(`https://rum-intake.com/v1/input/abcde?${intakeParameters}`)).toBe(true)
   })
 

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

@@ -1,5 +1,5 @@
 import type { FlushEvent, Context, Telemetry } from '@datadog/browser-core'
-import { Observable, resetExperimentalFeatures } from '@datadog/browser-core'
+import { Observable } from '@datadog/browser-core'
 import type { Clock, MockTelemetry } from '@datadog/browser-core/test'
 import { mockClock, startMockTelemetry } from '@datadog/browser-core/test'
 import type { AssembledRumEvent } from '../rawRumEvent.types'
@@ -52,10 +52,6 @@ describe('customerDataTelemetry', () => {
     clock = mockClock()
   })
 
-  afterEach(() => {
-    resetExperimentalFeatures()
-  })
-
   it('should collect customer data telemetry', async () => {
     setupCustomerTelemetryCollection()
 

packages/rum-core/src/domain/view/trackViews.spec.ts

@@ -5,7 +5,6 @@ import {
   display,
   relativeToClocks,
   relativeNow,
-  resetExperimentalFeatures,
   addExperimentalFeatures,
   ExperimentalFeature,
 } from '@datadog/browser-core'
@@ -432,7 +431,6 @@ describe('view metrics', () => {
 
   beforeEach(() => {
     addExperimentalFeatures([ExperimentalFeature.LCP_SUBPARTS])
-    registerCleanupTask(resetExperimentalFeatures)
 
     clock = mockClock()
     ;({ notifyPerformanceEntries } = mockPerformanceObserver())
@@ -899,7 +897,6 @@ describe('view event count', () => {
 
     registerCleanupTask(() => {
       viewTest.stop()
-      resetExperimentalFeatures()
     })
   })
 
@@ -1057,7 +1054,6 @@ describe('service and version', () => {
 
     registerCleanupTask(() => {
       viewTest.stop()
-      resetExperimentalFeatures()
     })
   })
 

packages/rum-core/src/domain/view/viewMetrics/trackCumulativeLayoutShift.spec.ts

@@ -1,6 +1,6 @@
 import type { RelativeTime } from '@datadog/browser-core'
 import { registerCleanupTask } from '@datadog/browser-core/test'
-import { resetExperimentalFeatures, elapsed, ONE_SECOND } from '@datadog/browser-core'
+import { elapsed, ONE_SECOND } from '@datadog/browser-core'
 import {
   appendElement,
   appendText,
@@ -238,10 +238,6 @@ describe('trackCumulativeLayoutShift', () => {
   })
 
   describe('cls target element', () => {
-    afterEach(() => {
-      resetExperimentalFeatures()
-    })
-
     it('should return the first target element selector amongst all the shifted nodes', () => {
       startCLSTracking()
       const textNode = appendText('text')