Fix conflicts with #1354

DataDog · Jul 10, 2023 · 08540ad · 08540ad
1 parent 524eb9e
commit 08540ad
Show file tree

Hide file tree

Showing 9 changed files with 38 additions and 466 deletions.
diff --git a/Datadog/Datadog.xcodeproj/project.pbxproj b/Datadog/Datadog.xcodeproj/project.pbxproj
diff --git a/DatadogCore/Tests/Datadog/Mocks/RUMFeatureMocks.swift b/DatadogCore/Tests/Datadog/Mocks/RUMFeatureMocks.swift
@@ -653,12 +653,6 @@ extension RUMSessionState: AnyMockable, RandomMockable {
 
 // MARK: - RUMScope Mocks
 
-internal struct NoOpRUMViewUpdatesThrottler: RUMViewUpdatesThrottlerType {
-    func accept(event: RUMViewEvent) -> Bool {
-        return true // always send view update
-    }
-}
-
 func mockNoOpSessionListener() -> RUM.SessionListener {
     return { _, _ in }
 }

diff --git a/DatadogCore/Tests/Datadog/RUM/RUMMonitorTests.swift b/DatadogCore/Tests/Datadog/RUM/RUMMonitorTests.swift
@@ -21,7 +21,6 @@ class RUMMonitorTests: XCTestCase {
         super.setUp()
         core = DatadogCoreProxy()
         config = RUM.Configuration(applicationID: .mockAny())
-        config.viewUpdatesThrottlerFactory = { NoOpRUMViewUpdatesThrottler() } // disable view updates sampling for deterministic behaviour
     }
 
     override func tearDown() {

diff --git a/DatadogCore/Tests/DatadogObjc/DDRUMMonitorTests.swift b/DatadogCore/Tests/DatadogObjc/DDRUMMonitorTests.swift
@@ -141,7 +141,6 @@ class DDRUMMonitorTests: XCTestCase {
         core = DatadogCoreProxy()
         CoreRegistry.register(default: core)
         config = RUM.Configuration(applicationID: .mockAny())
-        config.viewUpdatesThrottlerFactory = { NoOpRUMViewUpdatesThrottler() } // disable view updates sampling for deterministic behaviour
     }
 
     override func tearDown() {
@@ -198,7 +197,6 @@ class DDRUMMonitorTests: XCTestCase {
     }
 
     func testSendingViewEventsWithTiming() throws {
-        config.viewUpdatesThrottlerFactory = { RUMViewUpdatesThrottler() }
         RUM.enable(with: config)
         let objcRUMMonitor = DDRUMMonitor.shared()
 
@@ -211,7 +209,7 @@ class DDRUMMonitorTests: XCTestCase {
         let viewEvents = rumEventMatchers.filterRUMEvents(ofType: RUMViewEvent.self) { event in
             return event.view.name != RUMOffViewEventsHandlingRule.Constants.applicationLaunchViewName
         }
-        XCTAssertEqual(viewEvents.count, 2)
+        XCTAssertEqual(viewEvents.count, 3)
 
         let event1: RUMViewEvent = try viewEvents[0].model()
         let event2: RUMViewEvent = try viewEvents[1].model()

diff --git a/DatadogRUM/Sources/Feature/RUMFeature.swift b/DatadogRUM/Sources/Feature/RUMFeature.swift
@@ -51,7 +51,6 @@ internal final class RUMFeature: DatadogRemoteFeature {
             ),
             rumUUIDGenerator: configuration.uuidGenerator,
             ciTest: configuration.ciTestExecutionID.map { RUMCITest(testExecutionId: $0) },
-            viewUpdatesThrottlerFactory: configuration.viewUpdatesThrottlerFactory,
             vitalsReaders: configuration.vitalsUpdateFrequency.map { VitalsReaders(frequency: $0.timeInterval) },
             onSessionStart: configuration.onSessionStart
         )

diff --git a/DatadogRUM/Sources/RUMConfiguration.swift b/DatadogRUM/Sources/RUMConfiguration.swift
@@ -250,9 +250,6 @@ extension RUM {
 
         internal var dateProvider: DateProvider = SystemDateProvider()
 
-        /// Produces view update events' throttler for each started RUM view scope.
-        internal var viewUpdatesThrottlerFactory: () -> RUMViewUpdatesThrottlerType = { RUMViewUpdatesThrottler() }
-
         internal var debugSDK: Bool = ProcessInfo.processInfo.arguments.contains(LaunchArguments.Debug)
         internal var debugViews: Bool = ProcessInfo.processInfo.arguments.contains("DD_DEBUG_RUM")
         internal var ciTestExecutionID: String? = ProcessInfo.processInfo.environment["CI_VISIBILITY_TEST_EXECUTION_ID"]

diff --git a/DatadogRUM/Sources/RUMMonitor/Scopes/RUMScopeDependencies.swift b/DatadogRUM/Sources/RUMMonitor/Scopes/RUMScopeDependencies.swift
@@ -27,9 +27,6 @@ internal struct RUMScopeDependencies {
     let rumUUIDGenerator: RUMUUIDGenerator
     /// Integration with CIApp tests. It contains the CIApp test context when active.
     let ciTest: RUMCITest?
-    /// Produces `RUMViewUpdatesThrottlerType` for each started RUM view scope.
-    let viewUpdatesThrottlerFactory: () -> RUMViewUpdatesThrottlerType
-
     let vitalsReaders: VitalsReaders?
     let onSessionStart: RUM.SessionListener?
 }
diff --git a/DatadogRUM/Sources/RUMMonitor/Scopes/RUMViewScope.swift b/DatadogRUM/Sources/RUMMonitor/Scopes/RUMViewScope.swift
@@ -90,9 +90,6 @@ internal class RUMViewScope: RUMScope, RUMContextProvider {
 
     private let vitalInfoSampler: VitalInfoSampler?
 
-    /// Samples view update events, so we can minimize the number of events in payload.
-    private let viewUpdatesThrottler: RUMViewUpdatesThrottlerType
-
     private var viewPerformanceMetrics: [PerformanceMetric: VitalInfo] = [:]
 
     init(
@@ -127,7 +124,6 @@ internal class RUMViewScope: RUMScope, RUMContextProvider {
                 frequency: $0.frequency
             )
         }
-        self.viewUpdatesThrottler = dependencies.viewUpdatesThrottlerFactory()
     }
 
     // MARK: - RUMContextProvider
@@ -395,7 +391,7 @@ internal class RUMViewScope: RUMScope, RUMContextProvider {
             os: .init(context: context),
             service: context.service,
             session: .init(
-                hasReplay: context.srBaggage?.isReplayBeingRecorded,
+                hasReplay: context.srBaggage?.hasReplay,
                 id: self.context.sessionID.toRUMDataFormat,
                 type: dependencies.ciTest != nil ? .ciTest : .user
             ),
@@ -442,6 +438,12 @@ internal class RUMViewScope: RUMScope, RUMContextProvider {
             dd: .init(
                 browserSdkVersion: nil,
                 documentVersion: version.toInt64,
+                pageStates: nil,
+                replayStats: .init(
+                    recordsCount: context.srBaggage?.recordsCountByViewID[viewUUID.toRUMDataFormat],
+                    segmentsCount: nil,
+                    segmentsTotalRawSize: nil
+                ),
                 session: .init(plan: .plan1)
             ),
             application: .init(id: self.context.rumApplicationID),
@@ -453,12 +455,14 @@ internal class RUMViewScope: RUMScope, RUMContextProvider {
             display: nil,
             featureFlags: .init(featureFlagsInfo: featureFlags),
             os: .init(context: context),
+            privacy: nil,
             service: context.service,
             session: .init(
-                hasReplay: context.srBaggage?.isReplayBeingRecorded,
+                hasReplay: context.srBaggage?.hasReplay,
                 id: self.context.sessionID.toRUMDataFormat,
                 isActive: self.context.isSessionActive,
-                startReason: nil,
+                sampledForReplay: nil,
+                startPrecondition: nil,
                 type: dependencies.ciTest != nil ? .ciTest : .user
             ),
             source: .init(rawValue: context.source) ?? .ios,
@@ -509,11 +513,7 @@ internal class RUMViewScope: RUMScope, RUMContextProvider {
         )
 
         if let event = dependencies.eventBuilder.build(from: viewEvent) {
-            if viewUpdatesThrottler.accept(event: event) {
-                writer.write(value: event, metadata: event.metadata())
-            } else { // if event was dropped by sampler
-                version -= 1
-            }
+            writer.write(value: event, metadata: event.metadata())
 
             // Update `CrashContext` with recent RUM view (no matter sampling - we want to always
             // have recent information if process is interrupted by crash):
@@ -564,7 +564,7 @@ internal class RUMViewScope: RUMScope, RUMContextProvider {
             os: .init(context: context),
             service: context.service,
             session: .init(
-                hasReplay: context.srBaggage?.isReplayBeingRecorded,
+                hasReplay: context.srBaggage?.hasReplay,
                 id: self.context.sessionID.toRUMDataFormat,
                 type: dependencies.ciTest != nil ? .ciTest : .user
             ),
@@ -615,7 +615,7 @@ internal class RUMViewScope: RUMScope, RUMContextProvider {
             os: .init(context: context),
             service: context.service,
             session: .init(
-                hasReplay: context.srBaggage?.isReplayBeingRecorded,
+                hasReplay: context.srBaggage?.hasReplay,
                 id: self.context.sessionID.toRUMDataFormat,
                 type: dependencies.ciTest != nil ? .ciTest : .user
             ),

diff --git a/DatadogRUM/Tests/Mocks/RUMFeatureMocks.swift b/DatadogRUM/Tests/Mocks/RUMFeatureMocks.swift
@@ -640,12 +640,6 @@ extension RUMContext {
 
 // MARK: - RUMScope Mocks
 
-internal struct NoOpRUMViewUpdatesThrottler: RUMViewUpdatesThrottlerType {
-    func accept(event: RUMViewEvent) -> Bool {
-        return true // always send view update
-    }
-}
-
 func mockNoOpSessionListener() -> RUM.SessionListener {
     return { _, _ in }
 }
@@ -665,7 +659,6 @@ extension RUMScopeDependencies {
         eventBuilder: RUMEventBuilder = RUMEventBuilder(eventsMapper: .mockNoOp()),
         rumUUIDGenerator: RUMUUIDGenerator = DefaultRUMUUIDGenerator(),
         ciTest: RUMCITest? = nil,
-        viewUpdatesThrottlerFactory: @escaping () -> RUMViewUpdatesThrottlerType = { NoOpRUMViewUpdatesThrottler() },
         vitalsReaders: VitalsReaders? = nil,
         onSessionStart: @escaping RUM.SessionListener = mockNoOpSessionListener()
     ) -> RUMScopeDependencies {
@@ -679,7 +672,6 @@ extension RUMScopeDependencies {
             eventBuilder: eventBuilder,
             rumUUIDGenerator: rumUUIDGenerator,
             ciTest: ciTest,
-            viewUpdatesThrottlerFactory: viewUpdatesThrottlerFactory,
             vitalsReaders: vitalsReaders,
             onSessionStart: onSessionStart
         )
@@ -695,7 +687,6 @@ extension RUMScopeDependencies {
         eventBuilder: RUMEventBuilder? = nil,
         rumUUIDGenerator: RUMUUIDGenerator? = nil,
         ciTest: RUMCITest? = nil,
-        viewUpdatesThrottlerFactory: (() -> RUMViewUpdatesThrottlerType)? = nil,
         vitalsReaders: VitalsReaders? = nil,
         onSessionStart: RUM.SessionListener? = nil
     ) -> RUMScopeDependencies {
@@ -709,7 +700,6 @@ extension RUMScopeDependencies {
             eventBuilder: eventBuilder ?? self.eventBuilder,
             rumUUIDGenerator: rumUUIDGenerator ?? self.rumUUIDGenerator,
             ciTest: ciTest ?? self.ciTest,
-            viewUpdatesThrottlerFactory: viewUpdatesThrottlerFactory ?? self.viewUpdatesThrottlerFactory,
             vitalsReaders: vitalsReaders ?? self.vitalsReaders,
             onSessionStart: onSessionStart ?? self.onSessionStart
         )
@@ -733,14 +723,14 @@ extension RUMSessionScope {
         parent: RUMContextProvider = RUMContextProviderMock(),
         startTime: Date = .mockAny(),
         dependencies: RUMScopeDependencies = .mockAny(),
-        isReplayBeingRecorded: Bool? = .mockAny()
+        hasReplay: Bool? = .mockAny()
     ) -> RUMSessionScope {
         return RUMSessionScope(
             isInitialSession: isInitialSession,
             parent: parent,
             startTime: startTime,
             dependencies: dependencies,
-            isReplayBeingRecorded: isReplayBeingRecorded
+            hasReplay: hasReplay
         )
     }
 }