recording: send meta event again if session rotates (#183)

PostHog · Sep 6, 2024 · 5eb2ff8 · 5eb2ff8
1 parent e9b8f2b
commit 5eb2ff8
Show file tree

Hide file tree

Showing 5 changed files with 43 additions and 15 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,7 @@
 ## Next
 
 - chore: add SwiftUI View extensions to capture screen view and views in general (postHogViewEvent, postHogScreenView) ([#180](https://github.com/PostHog/posthog-ios/pull/180))
+- recording: send meta event again if session rotates ([#183](https://github.com/PostHog/posthog-ios/pull/183))
 
 ## 3.8.3 - 2024-09-03
 

diff --git a/PostHog/PostHogSDK.swift b/PostHog/PostHogSDK.swift
@@ -183,15 +183,19 @@ let maxRetryDelay = 30.0
             return
         }
 
-        return PostHogSessionManager.shared.startSession()
+        PostHogSessionManager.shared.startSession {
+            self.resetViews()
+        }
     }
 
     @objc public func endSession() {
         if !isEnabled() {
             return
         }
 
-        return PostHogSessionManager.shared.endSession()
+        PostHogSessionManager.shared.endSession {
+            self.resetViews()
+        }
     }
 
     // EVENT CAPTURE
@@ -310,13 +314,23 @@ let maxRetryDelay = 30.0
         // storage also removes all feature flags
         storage?.reset()
         flagCallReported.removeAll()
-        PostHogSessionManager.shared.endSession()
+        PostHogSessionManager.shared.endSession {
+            self.resetViews()
+        }
         PostHogSessionManager.shared.startSession()
 
         // reload flags as anon user
         reloadFeatureFlags()
     }
 
+    private func resetViews() {
+        #if os(iOS)
+            if config.sessionReplay, featureFlags?.isSessionReplayFlagActive() ?? false {
+                replayIntegration?.resetViews()
+            }
+        #endif
+    }
+
     private func getGroups() -> [String: String] {
         guard let groups = storage?.getDictionary(forKey: .groups) as? [String: String] else {
             return [:]
@@ -471,7 +485,9 @@ let maxRetryDelay = 30.0
 
         // If events fire in the background after the threshold, they should no longer have a sessionId
         if isInBackground {
-            PostHogSessionManager.shared.resetSessionIfExpired()
+            PostHogSessionManager.shared.resetSessionIfExpired {
+                self.resetViews()
+            }
         }
 
         let distinctId = getDistinctId()
@@ -814,7 +830,9 @@ let maxRetryDelay = 30.0
             #endif
             flagCallReported.removeAll()
             context = nil
-            PostHogSessionManager.shared.endSession()
+            PostHogSessionManager.shared.endSession {
+                self.resetViews()
+            }
             unregisterNotifications()
             capturedAppInstalled = false
             appFromBackground = false
@@ -948,7 +966,9 @@ let maxRetryDelay = 30.0
     }
 
     @objc func handleAppDidBecomeActive() {
-        PostHogSessionManager.shared.rotateSessionIdIfRequired()
+        PostHogSessionManager.shared.rotateSessionIdIfRequired {
+            self.resetViews()
+        }
 
         isInBackground = false
         captureAppOpened()

diff --git a/PostHog/PostHogSessionManager.swift b/PostHog/PostHogSessionManager.swift
@@ -33,58 +33,61 @@ class PostHogSessionManager {
         }
     }
 
-    func endSession() {
+    func endSession(_ completion: () -> Void) {
         sessionLock.withLock {
             sessionId = nil
             sessionLastTimestamp = nil
+            completion()
         }
     }
 
     private func isExpired(_ timeNow: TimeInterval, _ sessionLastTimestamp: TimeInterval) -> Bool {
         timeNow - sessionLastTimestamp > sessionChangeThreshold
     }
 
-    func resetSessionIfExpired() {
+    func resetSessionIfExpired(_ completion: () -> Void) {
         sessionLock.withLock {
             let timeNow = now().timeIntervalSince1970
             if sessionId != nil,
                let sessionLastTimestamp = sessionLastTimestamp,
                isExpired(timeNow, sessionLastTimestamp)
             {
                 sessionId = nil
+                completion()
             }
         }
     }
 
-    private func rotateSession() {
+    private func rotateSession(_ completion: (() -> Void)?) {
         let newSessionId = UUID.v7().uuidString
         let newSessionLastTimestamp = now().timeIntervalSince1970
 
         sessionId = newSessionId
         sessionLastTimestamp = newSessionLastTimestamp
+        completion?()
     }
 
-    func startSession() {
+    func startSession(_ completion: (() -> Void)? = nil) {
         sessionLock.withLock {
             // only start if there is no session
             if sessionId != nil {
                 return
             }
-            rotateSession()
+            rotateSession(completion)
         }
     }
 
-    func rotateSessionIdIfRequired() {
+    func rotateSessionIdIfRequired(_ completion: @escaping (() -> Void)) {
         sessionLock.withLock {
             let timeNow = now().timeIntervalSince1970
 
             guard sessionId != nil, let sessionLastTimestamp = sessionLastTimestamp else {
-                rotateSession()
+                rotateSession(completion)
                 return
             }
 
             if isExpired(timeNow, sessionLastTimestamp) {
-                rotateSession()
+                rotateSession(completion)
             }
         }
     }

diff --git a/PostHog/Replay/PostHogReplayIntegration.swift b/PostHog/Replay/PostHogReplayIntegration.swift
@@ -73,6 +73,10 @@
             timer = nil
         }
 
+        func resetViews() {
+            windowViews.removeAllObjects()
+        }
+
         private func generateSnapshot(_ view: UIView, _ screenName: String? = nil) {
             var hasChanges = false
 

diff --git a/PostHogTests/PostHogSDKTest.swift b/PostHogTests/PostHogSDKTest.swift
@@ -52,7 +52,7 @@ class PostHogSDKTest: QuickSpec {
             now = { Date() }
             server.stop()
             server = nil
-            PostHogSessionManager.shared.endSession()
+            PostHogSessionManager.shared.endSession {}
         }
 
         it("captures the capture event") {