Merge branch 'benoit/re-enable-retry-replay' (cbc83ff) into staging-51

pm_trace_id: 11831456 feature_branch_pipeline_id: 11831456 source: to-staging * commit 'cbc83fff4aa26f23b27b36d8e0123db90d32ecec': Revert "Revert "✨ [RUMF-1425] enable request retry/throttle for replay intake (#1819)" (#1820)" v4.28.0 (#1876)
DataDog · Dec 14, 2022 · 40919f8 · 40919f8
2 parents 37de1b8 + cbc83ff
commit 40919f8
Show file tree

Hide file tree

Showing 12 changed files with 43 additions and 115 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -16,6 +16,10 @@
 
 ---
 
+## v4.28.0
+
+- 🐛 [RUMF-1337] Fix incorrect fetch duration ([#1875](https://github.com/DataDog/browser-sdk/pull/1875))
+
 ## v4.27.1
 
 - 🐛 [RUMF-1449] fix Zone support when **symbol** is missing ([#1872](https://github.com/DataDog/browser-sdk/pull/1872))

diff --git a/developer-extension/package.json b/developer-extension/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@datadog/browser-sdk-developer-extension",
-  "version": "4.27.1",
+  "version": "4.28.0",
   "private": true,
   "scripts": {
     "build": "rm -rf dist && webpack --mode production",

diff --git a/lerna.json b/lerna.json
@@ -1,7 +1,7 @@
 {
   "npmClient": "yarn",
   "useWorkspaces": true,
-  "version": "4.27.1",
+  "version": "4.28.0",
   "publishConfig": {
     "access": "public"
   }

diff --git a/packages/core/package.json b/packages/core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@datadog/browser-core",
-  "version": "4.27.1",
+  "version": "4.28.0",
   "license": "Apache-2.0",
   "main": "cjs/index.js",
   "module": "esm/index.js",

diff --git a/packages/logs/package.json b/packages/logs/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@datadog/browser-logs",
-  "version": "4.27.1",
+  "version": "4.28.0",
   "license": "Apache-2.0",
   "main": "cjs/entries/main.js",
   "module": "esm/entries/main.js",
@@ -13,7 +13,7 @@
     "replace-build-env": "node ../../scripts/replace-build-env.js"
   },
   "dependencies": {
-    "@datadog/browser-core": "4.27.1"
+    "@datadog/browser-core": "4.28.0"
   },
   "peerDependencies": {
     "@datadog/browser-rum": "4.27.1"

diff --git a/packages/rum-core/package.json b/packages/rum-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@datadog/browser-rum-core",
-  "version": "4.27.1",
+  "version": "4.28.0",
   "license": "Apache-2.0",
   "main": "cjs/index.js",
   "module": "esm/index.js",
@@ -12,7 +12,7 @@
     "replace-build-env": "node ../../scripts/replace-build-env.js"
   },
   "dependencies": {
-    "@datadog/browser-core": "4.27.1"
+    "@datadog/browser-core": "4.28.0"
   },
   "devDependencies": {
     "ajv": "6.12.6"

diff --git a/packages/rum-slim/package.json b/packages/rum-slim/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@datadog/browser-rum-slim",
-  "version": "4.27.1",
+  "version": "4.28.0",
   "license": "Apache-2.0",
   "main": "cjs/entries/main.js",
   "module": "esm/entries/main.js",
@@ -12,8 +12,8 @@
     "build:esm": "rm -rf esm && tsc -p tsconfig.esm.json"
   },
   "dependencies": {
-    "@datadog/browser-core": "4.27.1",
-    "@datadog/browser-rum-core": "4.27.1"
+    "@datadog/browser-core": "4.28.0",
+    "@datadog/browser-rum-core": "4.28.0"
   },
   "peerDependencies": {
     "@datadog/browser-logs": "4.27.1"

diff --git a/packages/rum/package.json b/packages/rum/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@datadog/browser-rum",
-  "version": "4.27.1",
+  "version": "4.28.0",
   "license": "Apache-2.0",
   "main": "cjs/entries/main.js",
   "module": "esm/entries/main.js",
@@ -12,8 +12,8 @@
     "build:esm": "rm -rf esm && tsc -p tsconfig.esm.json"
   },
   "dependencies": {
-    "@datadog/browser-core": "4.27.1",
-    "@datadog/browser-rum-core": "4.27.1"
+    "@datadog/browser-core": "4.28.0",
+    "@datadog/browser-rum-core": "4.28.0"
   },
   "peerDependencies": {
     "@datadog/browser-logs": "4.27.1"

diff --git a/packages/rum/src/domain/segmentCollection/segmentCollection.spec.ts b/packages/rum/src/domain/segmentCollection/segmentCollection.spec.ts
@@ -1,5 +1,5 @@
 import type { HttpRequest, TimeStamp } from '@datadog/browser-core'
-import { PageExitReason, updateExperimentalFeatures, resetExperimentalFeatures, isIE } from '@datadog/browser-core'
+import { PageExitReason, isIE } from '@datadog/browser-core'
 import type { ViewContexts, ViewContext } from '@datadog/browser-rum-core'
 import { LifeCycle, LifeCycleEventType } from '@datadog/browser-rum-core'
 import type { Clock } from '@datadog/browser-core/test/specHelper'
@@ -83,7 +83,6 @@ describe('startSegmentCollection', () => {
   afterEach(() => {
     clock?.cleanup()
     stopSegmentCollection()
-    resetExperimentalFeatures()
   })
 
   describe('initial segment', () => {
@@ -135,17 +134,6 @@ describe('startSegmentCollection', () => {
         expect(httpRequestSpy.sendOnExit).toHaveBeenCalled()
       })
 
-      describe('with the retry_replay experimental flag', () => {
-        beforeEach(() => {
-          updateExperimentalFeatures(['retry_replay'])
-        })
-
-        it('uses `httpRequest.sendOnExit` when sending the segment', () => {
-          addRecordAndFlushSegment(emulatePageUnload)
-          expect(httpRequestSpy.sendOnExit).toHaveBeenCalled()
-        })
-      })
-
       it('next segment is created because of beforeunload event', () => {
         addRecordAndFlushSegment(emulatePageUnload)
         addRecordAndFlushSegment()
@@ -163,17 +151,6 @@ describe('startSegmentCollection', () => {
         expect(httpRequestSpy.sendOnExit).toHaveBeenCalled()
       })
 
-      describe('with the retry_replay experimental flag', () => {
-        beforeEach(() => {
-          updateExperimentalFeatures(['retry_replay'])
-        })
-
-        it('uses `httpRequest.sendOnExit` when sending the segment', () => {
-          addRecordAndFlushSegment(emulatePageHidden)
-          expect(httpRequestSpy.sendOnExit).toHaveBeenCalled()
-        })
-      })
-
       it('next segment is created because of visibility hidden event', () => {
         addRecordAndFlushSegment(emulatePageHidden)
         addRecordAndFlushSegment()
@@ -186,20 +163,9 @@ describe('startSegmentCollection', () => {
         lifeCycle.notify(LifeCycleEventType.VIEW_CREATED, {} as any)
       }
 
-      it('uses `httpRequest.sendOnExit` when sending the segment', () => {
+      it('uses `httpRequest.send` when sending the segment', () => {
         addRecordAndFlushSegment(emulateViewChange)
-        expect(httpRequestSpy.sendOnExit).toHaveBeenCalled()
-      })
-
-      describe('with the retry_replay experimental flag', () => {
-        beforeEach(() => {
-          updateExperimentalFeatures(['retry_replay'])
-        })
-
-        it('uses `httpRequest.send` when sending the segment', () => {
-          addRecordAndFlushSegment(emulateViewChange)
-          expect(httpRequestSpy.send).toHaveBeenCalled()
-        })
+        expect(httpRequestSpy.send).toHaveBeenCalled()
       })
 
       it('next segment is created because of view change', () => {
@@ -210,24 +176,11 @@ describe('startSegmentCollection', () => {
     })
 
     describe('flush when reaching a bytes limit', () => {
-      it('uses `httpRequest.sendOnExit` when sending the segment', () => {
+      it('uses `httpRequest.send` when sending the segment', () => {
         addRecordAndFlushSegment(() => {
           addRecord(VERY_BIG_RECORD)
         })
-        expect(httpRequestSpy.sendOnExit).toHaveBeenCalled()
-      })
-
-      describe('with the retry_replay experimental flag', () => {
-        beforeEach(() => {
-          updateExperimentalFeatures(['retry_replay'])
-        })
-
-        it('uses `httpRequest.send` when sending the segment', () => {
-          addRecordAndFlushSegment(() => {
-            addRecord(VERY_BIG_RECORD)
-          })
-          expect(httpRequestSpy.send).toHaveBeenCalled()
-        })
+        expect(httpRequestSpy.send).toHaveBeenCalled()
       })
 
       it('next segment is created because the bytes limit has been reached', () => {
@@ -246,8 +199,8 @@ describe('startSegmentCollection', () => {
         addRecord(RECORD)
         worker.processAllMessages()
 
-        expect(httpRequestSpy.sendOnExit).toHaveBeenCalledTimes(1)
-        expect(getSentFormData(httpRequestSpy.sendOnExit).get('records_count')).toBe('4')
+        expect(httpRequestSpy.send).toHaveBeenCalledTimes(1)
+        expect(getSentFormData(httpRequestSpy.send).get('records_count')).toBe('4')
       })
 
       it('does not flush segment prematurely when records from the previous segment are still being processed', () => {
@@ -264,32 +217,18 @@ describe('startSegmentCollection', () => {
 
         worker.processAllMessages()
 
-        expect(httpRequestSpy.sendOnExit).toHaveBeenCalledTimes(1)
-        expect(getSentFormData(httpRequestSpy.sendOnExit).get('records_count')).toBe('2')
+        expect(httpRequestSpy.send).toHaveBeenCalledTimes(1)
+        expect(getSentFormData(httpRequestSpy.send).get('records_count')).toBe('2')
       })
     })
 
     describe('flush when a duration has been reached', () => {
-      it('uses `httpRequest.sendOnExit` when sending the segment', () => {
+      it('uses `httpRequest.send` when sending the segment', () => {
         clock = mockClock()
         addRecordAndFlushSegment(() => {
           clock!.tick(SEGMENT_DURATION_LIMIT)
         })
-        expect(httpRequestSpy.sendOnExit).toHaveBeenCalled()
-      })
-
-      describe('with the retry_replay experimental flag', () => {
-        beforeEach(() => {
-          updateExperimentalFeatures(['retry_replay'])
-        })
-
-        it('uses `httpRequest.send` when sending the segment', () => {
-          clock = mockClock()
-          addRecordAndFlushSegment(() => {
-            clock!.tick(SEGMENT_DURATION_LIMIT)
-          })
-          expect(httpRequestSpy.send).toHaveBeenCalled()
-        })
+        expect(httpRequestSpy.send).toHaveBeenCalled()
       })
 
       it('next segment is created because of the segment duration limit has been reached', () => {
@@ -317,20 +256,9 @@ describe('startSegmentCollection', () => {
     })
 
     describe('flush when stopping segment collection', () => {
-      it('uses `httpRequest.sendOnExit` when sending the segment', () => {
+      it('uses `httpRequest.send` when sending the segment', () => {
         addRecordAndFlushSegment(stopSegmentCollection)
-        expect(httpRequestSpy.sendOnExit).toHaveBeenCalled()
-      })
-
-      describe('with the retry_replay experimental flag', () => {
-        beforeEach(() => {
-          updateExperimentalFeatures(['retry_replay'])
-        })
-
-        it('uses `httpRequest.send` when sending the segment', () => {
-          addRecordAndFlushSegment(stopSegmentCollection)
-          expect(httpRequestSpy.send).toHaveBeenCalled()
-        })
+        expect(httpRequestSpy.send).toHaveBeenCalled()
       })
     })
   })

diff --git a/packages/rum/src/domain/segmentCollection/segmentCollection.ts b/packages/rum/src/domain/segmentCollection/segmentCollection.ts
@@ -1,5 +1,5 @@
 import type { HttpRequest, TimeoutId } from '@datadog/browser-core'
-import { isExperimentalFeatureEnabled, ONE_SECOND, monitor } from '@datadog/browser-core'
+import { ONE_SECOND, monitor } from '@datadog/browser-core'
 import type { LifeCycle, ViewContexts, RumSessionManager } from '@datadog/browser-rum-core'
 import { LifeCycleEventType } from '@datadog/browser-rum-core'
 import type { BrowserRecord, CreationReason, SegmentContext } from '../../types'
@@ -133,11 +133,7 @@ export function doStartSegmentCollection(
       },
       (data, rawSegmentBytesCount) => {
         const payload = buildReplayPayload(data, segment.metadata, rawSegmentBytesCount)
-        if (
-          !isExperimentalFeatureEnabled('retry_replay') ||
-          segment.flushReason === 'visibility_hidden' ||
-          segment.flushReason === 'before_unload'
-        ) {
+        if (segment.flushReason === 'visibility_hidden' || segment.flushReason === 'before_unload') {
           httpRequest.sendOnExit(payload)
         } else {
           httpRequest.send(payload)

diff --git a/performances/package.json b/performances/package.json
@@ -1,7 +1,7 @@
 {
   "private": true,
   "name": "performances",
-  "version": "4.27.1",
+  "version": "4.28.0",
   "scripts": {
     "start": "ts-node ./src/main.ts"
   },

diff --git a/test/app/yarn.lock b/test/app/yarn.lock
@@ -2,24 +2,24 @@
 # yarn lockfile v1
 
 
-"@datadog/browser-core@4.27.1", "@datadog/browser-core@file:../../packages/core":
-  version "4.27.1"
+"@datadog/browser-core@4.28.0", "@datadog/browser-core@file:../../packages/core":
+  version "4.28.0"
 
 "@datadog/browser-logs@file:../../packages/logs":
-  version "4.27.1"
+  version "4.28.0"
   dependencies:
-    "@datadog/browser-core" "4.27.1"
+    "@datadog/browser-core" "4.28.0"
 
-"@datadog/browser-rum-core@4.27.1", "@datadog/browser-rum-core@file:../../packages/rum-core":
-  version "4.27.1"
+"@datadog/browser-rum-core@4.28.0", "@datadog/browser-rum-core@file:../../packages/rum-core":
+  version "4.28.0"
   dependencies:
-    "@datadog/browser-core" "4.27.1"
+    "@datadog/browser-core" "4.28.0"
 
 "@datadog/browser-rum@file:../../packages/rum":
-  version "4.27.1"
+  version "4.28.0"
   dependencies:
-    "@datadog/browser-core" "4.27.1"
-    "@datadog/browser-rum-core" "4.27.1"
+    "@datadog/browser-core" "4.28.0"
+    "@datadog/browser-rum-core" "4.28.0"
 
 "@jridgewell/gen-mapping@^0.3.0":
   version "0.3.2"