[Improvement] Changed data type of session timeout from int to long

rudderlabs · Sep 21, 2022 · dbbdda4 · dbbdda4
1 parent b3fe089
commit dbbdda4
Show file tree

Hide file tree

Showing 11 changed files with 17 additions and 16 deletions.
diff --git a/.gitignore b/.gitignore
@@ -67,4 +67,5 @@ fastlane/report.xml
 fastlane/Preview.html
 fastlane/screenshots
 fastlane/test_output
-IDEWorkspaceChecks.plist
+IDEWorkspaceChecks.plist
+*.DS_Store
diff --git a/Examples/RudderSampleAppSwift/RudderSampleAppSwift/AppDelegate.swift b/Examples/RudderSampleAppSwift/RudderSampleAppSwift/AppDelegate.swift
@@ -23,7 +23,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
             .withTrackLifecycleEvens(false)
             .withRecordScreenViews(false)
             .withSleepTimeOut(4)
-            .withSessionDuration(10)
+            .withSessionTimeoutMillis(30000)
         RSClient.getInstance("1wvsoF3Kx2SczQNlx1dvcqW9ODW", config: builder.build())
 
 

diff --git a/Examples/RudderSampleAppSwift/RudderSampleAppSwift/SessionViewController.swift b/Examples/RudderSampleAppSwift/RudderSampleAppSwift/SessionViewController.swift
@@ -58,7 +58,7 @@ extension SessionViewController: UITableViewDataSource, UITableViewDelegate {
         case 1:
             RSClient.sharedInstance()?.endSession()
         case 2:
-            RSClient.sharedInstance()?.startSession(UUID().uuidString.lowercased())
+            RSClient.sharedInstance()?.startSession(1234567890)
         case 3:
             RSClient.sharedInstance()?.reset()
         case 4:
@@ -128,7 +128,7 @@ extension SessionViewController: UITableViewDataSource, UITableViewDelegate {
             } else if index % 9 == 5 {
                 RSClient.sharedInstance()?.startSession()
             } else if index % 9 == 6 {
-                RSClient.sharedInstance()?.startSession("session_id_\(index)")
+                RSClient.sharedInstance()?.startSession(Int(Date().timeIntervalSince1970))
             } else if index % 9 == 7 {
                 RSClient.sharedInstance()?.endSession()
             } else if index % 9 == 8 {

diff --git a/Sources/Classes/Public/RSConfig.h b/Sources/Classes/Public/RSConfig.h
@@ -19,7 +19,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic) int sleepTimeout;
 @property (nonatomic) int logLevel;
 @property (nonatomic) int configRefreshInterval;
-@property (nonatomic) int sessionInActivityTimeOut;
+@property (nonatomic) long sessionInActivityTimeOut;
 @property (nonatomic) bool trackLifecycleEvents;
 @property (nonatomic) bool recordScreenViews;
 @property (nonatomic) bool enableBackgroundMode;

diff --git a/Sources/Classes/Public/RSConfigBuilder.h b/Sources/Classes/Public/RSConfigBuilder.h
@@ -26,7 +26,7 @@ NS_ASSUME_NONNULL_BEGIN
 - (instancetype)withLoglevel:(int)logLevel;
 - (instancetype)withDBCountThreshold:(int)dbCountThreshold;
 - (instancetype)withSleepTimeOut:(int)sleepTimeOut;
-- (instancetype)withSessionTimeoutMillis:(int)sessionTimeout;
+- (instancetype)withSessionTimeoutMillis:(long)sessionTimeout;
 - (instancetype)withConfigRefreshInteval:(int)configRefreshInterval;
 - (instancetype)withTrackLifecycleEvens:(BOOL)trackLifecycleEvents;
 - (instancetype)withRecordScreenViews:(BOOL)recordScreenViews;

diff --git a/Sources/Classes/Public/RSConstants.h b/Sources/Classes/Public/RSConstants.h
@@ -24,9 +24,9 @@ extern int const RSDBCountThreshold;
 // events will be flushed to server after sleepTimeOut seconds
 extern int const RSSleepTimeout;
 // Minimum value for the In Activity timeout after which the current session expires.
-extern int const RSSessionInActivityMinTimeOut;
+extern long const RSSessionInActivityMinTimeOut;
 // Default value for the In Activity timeout after which the current session expires.
-extern int const RSSessionInActivityDefaultTimeOut;
+extern long const RSSessionInActivityDefaultTimeOut;
 // config-plane url to get the config for the writeKey
 extern NSString *const RSControlPlaneUrl;
 // whether we should trackLifecycle events

diff --git a/Sources/Classes/Public/RSUserSession.h b/Sources/Classes/Public/RSUserSession.h
@@ -10,14 +10,14 @@
 NS_ASSUME_NONNULL_BEGIN
 
 @interface RSUserSession : NSObject {
-    int sessionInActivityTimeOut;
+    long sessionInActivityTimeOut;
     long sessionId;
     BOOL sessionStart;
     long lastEventTimeStamp;
     RSPreferenceManager* preferenceManager;
 }
 
-+ (instancetype) initiate:(int)sessionInActivityTimeOut with:(RSPreferenceManager *) preferenceManager;
++ (instancetype) initiate:(long)sessionInActivityTimeOut with:(RSPreferenceManager *) preferenceManager;
 
 - (void) startSession;
 - (void)startSession:(long)sessionId;

diff --git a/Sources/Classes/RSConfig.m b/Sources/Classes/RSConfig.m
@@ -38,7 +38,7 @@ - (instancetype)init:(NSString *) dataPlaneUrl
     dbCountThreshold: (int) dbCountThreshold
         sleepTimeOut: (int) sleepTimeout
             logLevel: (int) logLevel
-     sessionInActivityTimeOut: (int) sessionInActivityTimeOut
+     sessionInActivityTimeOut: (long) sessionInActivityTimeOut
 configRefreshInterval: (int) configRefreshInteval
 trackLifecycleEvents: (BOOL) trackLifecycleEvents
 enableBackgroundMode: (BOOL) enableBackgroundMode

diff --git a/Sources/Classes/RSConfigBuilder.m b/Sources/Classes/RSConfigBuilder.m
@@ -176,7 +176,7 @@ - (instancetype)withAutoSessionTracking:(BOOL)autoSessionTracking {
     return self;
 }
 
-- (instancetype)withSessionTimeoutMillis:(int)sessionTimeout {
+- (instancetype)withSessionTimeoutMillis:(long)sessionTimeout {
     if (config == nil) {
         config = [[RSConfig alloc] init];
     }

diff --git a/Sources/Classes/RSConstants.m b/Sources/Classes/RSConstants.m
@@ -14,8 +14,8 @@ @implementation RSConstants
 int const RSFlushQueueSize = 30;
 int const RSDBCountThreshold = 10000;
 int const RSSleepTimeout = 10;
-int const RSSessionInActivityMinTimeOut = 0;
-int const RSSessionInActivityDefaultTimeOut = 300000;
+long const RSSessionInActivityMinTimeOut = 0;
+long const RSSessionInActivityDefaultTimeOut = 300000;
 NSString *const RSControlPlaneUrl = @"https://api.rudderlabs.com/";
 bool const RSTrackLifeCycleEvents = YES;
 bool const RSRecordScreenViews = NO;

diff --git a/Sources/Classes/RSUserSession.m b/Sources/Classes/RSUserSession.m
@@ -14,7 +14,7 @@ @implementation RSUserSession
 static RSUserSession* _instance;
 static dispatch_queue_t queue;
 
-+ (instancetype) initiate:(int)sessionInActivityTimeOut with:(RSPreferenceManager *) preferenceManager {
++ (instancetype) initiate:(long)sessionInActivityTimeOut with:(RSPreferenceManager *) preferenceManager {
     if (_instance == nil) {
         static dispatch_once_t onceToken;
         dispatch_once(&onceToken, ^{
@@ -24,7 +24,7 @@ + (instancetype) initiate:(int)sessionInActivityTimeOut with:(RSPreferenceManage
     return _instance;
 }
 
-- (instancetype) init:(int)sessionInActivityTimeOut with:(RSPreferenceManager *) preferenceManager {
+- (instancetype) init:(long)sessionInActivityTimeOut with:(RSPreferenceManager *) preferenceManager {
     self = [super init];
     if (self) {
         if (queue == nil) {