diff --git a/packages/core/src/tools/experimentalFeatures.ts b/packages/core/src/tools/experimentalFeatures.ts index c0027b81e0..3bc5286f28 100644 --- a/packages/core/src/tools/experimentalFeatures.ts +++ b/packages/core/src/tools/experimentalFeatures.ts @@ -16,7 +16,6 @@ export enum ExperimentalFeature { RESOURCE_PAGE_STATES = 'resource_page_states', PAGE_STATES = 'page_states', COLLECT_FLUSH_REASON = 'collect_flush_reason', - NO_RESOURCE_DURATION_FROZEN_STATE = 'no_resource_duration_frozen_state', } const enabledExperimentalFeatures: Set = new Set() diff --git a/packages/rum-core/src/domain/rumEventsCollection/resource/resourceCollection.spec.ts b/packages/rum-core/src/domain/rumEventsCollection/resource/resourceCollection.spec.ts index 169e0cd1cc..1ec2b64976 100644 --- a/packages/rum-core/src/domain/rumEventsCollection/resource/resourceCollection.spec.ts +++ b/packages/rum-core/src/domain/rumEventsCollection/resource/resourceCollection.spec.ts @@ -132,8 +132,7 @@ describe('resourceCollection', () => { expect(rawRumResourceEventEntry._dd.page_states).toEqual(jasmine.objectContaining(mockPageStates)) }) - it('should not have a duration if a frozen state happens during the request and no performance entry matches when NO_RESOURCE_DURATION_FROZEN_STATE enabled', () => { - addExperimentalFeatures([ExperimentalFeature.NO_RESOURCE_DURATION_FROZEN_STATE]) + it('should not have a duration if a frozen state happens during the request and no performance entry matches', () => { const { lifeCycle, rawRumEvents } = setupBuilder.build() const mockPageStates = [{ state: PageState.FROZEN, startTime: 0 as RelativeTime }] const mockXHR = createCompletedRequest() @@ -146,19 +145,6 @@ describe('resourceCollection', () => { expect(rawRumResourceEventFetch.resource.duration).toBeUndefined() }) - it('should have a duration if a frozen state happens during the request and no performance entry matches when NO_RESOURCE_DURATION_FROZEN_STATE disabled', () => { - const { lifeCycle, rawRumEvents } = setupBuilder.build() - const mockPageStates = [{ state: PageState.FROZEN, startTime: 0 as RelativeTime }] - const mockXHR = createCompletedRequest() - - pageStateHistorySpy.and.returnValue(mockPageStates) - - lifeCycle.notify(LifeCycleEventType.REQUEST_COMPLETED, mockXHR) - - const rawRumResourceEventFetch = rawRumEvents[0].rawRumEvent as RawRumResourceEvent - expect(rawRumResourceEventFetch.resource.duration).toBeDefined() - }) - it('should not collect page states on resources when ff resource_page_states disabled', () => { const { lifeCycle, rawRumEvents } = setupBuilder.build() const mockPageStates = [{ state: PageState.ACTIVE, startTime: 0 as RelativeTime }] @@ -173,7 +159,6 @@ describe('resourceCollection', () => { const rawRumResourceEventFetch = rawRumEvents[0].rawRumEvent as RawRumResourceEvent const rawRumResourceEventEntry = rawRumEvents[1].rawRumEvent as RawRumResourceEvent - expect(pageStateHistorySpy).not.toHaveBeenCalled() expect(rawRumResourceEventFetch._dd.page_states).not.toBeDefined() expect(rawRumResourceEventEntry._dd.page_states).not.toBeDefined() }) diff --git a/packages/rum-core/src/domain/rumEventsCollection/resource/resourceCollection.ts b/packages/rum-core/src/domain/rumEventsCollection/resource/resourceCollection.ts index 9ab57ed2a6..4f8d059223 100644 --- a/packages/rum-core/src/domain/rumEventsCollection/resource/resourceCollection.ts +++ b/packages/rum-core/src/domain/rumEventsCollection/resource/resourceCollection.ts @@ -231,11 +231,6 @@ function computePageStateInfo(pageStateHistory: PageStateHistory, startClocks: C } function computeRequestDuration(pageStateHistory: PageStateHistory, startClocks: ClocksState, duration: Duration) { - // TODO remove FF in next major - if (!isExperimentalFeatureEnabled(ExperimentalFeature.NO_RESOURCE_DURATION_FROZEN_STATE)) { - return toServerDuration(duration) - } - const requestCrossedFrozenState = pageStateHistory .findAll(startClocks.relative, duration) ?.some((pageState) => pageState.state === PageState.FROZEN)