From 037fb51a0d6b89653cb5ee37e7ae0c700a903730 Mon Sep 17 00:00:00 2001
From: "roman.gaignault" <roman.gaignault@datadoghq.com>
Date: Wed, 23 Oct 2024 14:39:54 +0200
Subject: [PATCH] remove feature flag

---
 packages/core/src/tools/experimentalFeatures.ts |  1 -
 .../segmentCollection/segmentCollection.spec.ts |  8 ++++----
 .../segmentCollection/segmentCollection.ts      | 17 +++--------------
 3 files changed, 7 insertions(+), 19 deletions(-)

diff --git a/packages/core/src/tools/experimentalFeatures.ts b/packages/core/src/tools/experimentalFeatures.ts
index d0a718a913..77ad3ce389 100644
--- a/packages/core/src/tools/experimentalFeatures.ts
+++ b/packages/core/src/tools/experimentalFeatures.ts
@@ -18,7 +18,6 @@ export enum ExperimentalFeature {
   REMOTE_CONFIGURATION = 'remote_configuration',
   UPDATE_VIEW_NAME = 'update_view_name',
   LONG_ANIMATION_FRAME = 'long_animation_frame',
-  REDUCE_SEGMENT_LIMIT_BATCH_TIME = 'reduce_segment_limit_batch_time',
 }
 
 const enabledExperimentalFeatures: Set<ExperimentalFeature> = new Set()
diff --git a/packages/rum/src/domain/segmentCollection/segmentCollection.spec.ts b/packages/rum/src/domain/segmentCollection/segmentCollection.spec.ts
index 9dc685e372..979354528b 100644
--- a/packages/rum/src/domain/segmentCollection/segmentCollection.spec.ts
+++ b/packages/rum/src/domain/segmentCollection/segmentCollection.spec.ts
@@ -13,7 +13,7 @@ import {
   computeSegmentContext,
   doStartSegmentCollection,
   SEGMENT_BYTES_LIMIT,
-  getSegmentDurationLimit,
+  SEGMENT_DURATION_LIMIT,
 } from './segmentCollection'
 
 const CONTEXT: SegmentContext = { application: { id: 'a' }, view: { id: 'b' }, session: { id: 'c' } }
@@ -26,7 +26,7 @@ const VERY_BIG_RECORD: BrowserRecord = {
   data: Array(SEGMENT_BYTES_LIMIT).join('a') as any,
 }
 
-const BEFORE_SEGMENT_DURATION_LIMIT = getSegmentDurationLimit() * 0.9
+const BEFORE_SEGMENT_DURATION_LIMIT = SEGMENT_DURATION_LIMIT * 0.9
 
 describe('startSegmentCollection', () => {
   let stopSegmentCollection: () => void
@@ -240,7 +240,7 @@ describe('startSegmentCollection', () => {
       it('uses `httpRequest.send` when sending the segment', () => {
         clock = mockClock()
         addRecordAndFlushSegment(() => {
-          clock!.tick(getSegmentDurationLimit())
+          clock!.tick(SEGMENT_DURATION_LIMIT)
         })
         expect(httpRequestSpy.send).toHaveBeenCalled()
       })
@@ -248,7 +248,7 @@ describe('startSegmentCollection', () => {
       it('next segment is created because of the segment duration limit has been reached', async () => {
         clock = mockClock()
         addRecordAndFlushSegment(() => {
-          clock!.tick(getSegmentDurationLimit())
+          clock!.tick(SEGMENT_DURATION_LIMIT)
         })
         addRecordAndFlushSegment()
         expect((await readMostRecentMetadata(httpRequestSpy.sendOnExit)).creation_reason).toBe('segment_duration_limit')
diff --git a/packages/rum/src/domain/segmentCollection/segmentCollection.ts b/packages/rum/src/domain/segmentCollection/segmentCollection.ts
index bd4431202a..e5cd1670c1 100644
--- a/packages/rum/src/domain/segmentCollection/segmentCollection.ts
+++ b/packages/rum/src/domain/segmentCollection/segmentCollection.ts
@@ -1,12 +1,5 @@
 import type { DeflateEncoder, HttpRequest, TimeoutId } from '@datadog/browser-core'
-import {
-  isPageExitReason,
-  ONE_SECOND,
-  clearTimeout,
-  setTimeout,
-  isExperimentalFeatureEnabled,
-  ExperimentalFeature,
-} from '@datadog/browser-core'
+import { isPageExitReason, ONE_SECOND, clearTimeout, setTimeout } from '@datadog/browser-core'
 import type { LifeCycle, ViewHistory, RumSessionManager, RumConfiguration } from '@datadog/browser-rum-core'
 import { LifeCycleEventType } from '@datadog/browser-rum-core'
 import type { BrowserRecord, CreationReason, SegmentContext } from '../../types'
@@ -14,11 +7,7 @@ import { buildReplayPayload } from './buildReplayPayload'
 import type { FlushReason, Segment } from './segment'
 import { createSegment } from './segment'
 
-export function getSegmentDurationLimit() {
-  return isExperimentalFeatureEnabled(ExperimentalFeature.REDUCE_SEGMENT_LIMIT_BATCH_TIME)
-    ? 5 * ONE_SECOND
-    : 30 * ONE_SECOND
-}
+export const SEGMENT_DURATION_LIMIT = 5 * ONE_SECOND
 /**
  * beacon payload max queue size implementation is 64kb
  * ensure that we leave room for logs, rum and potential other users
@@ -150,7 +139,7 @@ export function doStartSegmentCollection(
           segment: createSegment({ encoder, context, creationReason: state.nextSegmentCreationReason }),
           expirationTimeoutId: setTimeout(() => {
             flushSegment('segment_duration_limit')
-          }, getSegmentDurationLimit()),
+          }, SEGMENT_DURATION_LIMIT),
         }
       }