fix(EP): Event processor fixes (#193)

Author: msohailhussain

OptimizelySDK.Tests/EventTests/BatchEventProcessorTest.cs

@@ -28,8 +28,7 @@ class BatchEventProcessorTest
         private Mock<ILogger> LoggerMock;
         private BlockingCollection<object> eventQueue;
         private BatchEventProcessor EventProcessor;
-        private Mock<IEventDispatcher> EventDispatcherMock;
-        private TestEventDispatcher TestEventDispatcher;
+        private Mock<IEventDispatcher> EventDispatcherMock;        
         private NotificationCenter NotificationCenter = new NotificationCenter();
         private Mock<TestNotificationCallbacks> NotificationCallbackMock;
 

OptimizelySDK/Event/BatchEventProcessor.cs

@@ -145,6 +145,8 @@ public void Flush()
 
         private void FlushQueue()
         {
+            FlushingIntervalDeadline = DateTime.Now.MillisecondsSince1970() + (long)FlushInterval.TotalMilliseconds;
+
             if (CurrentBatch.Count == 0)
             {
                 return;
@@ -350,8 +352,8 @@ public BatchEventProcessor Build(bool start)
                 batchEventProcessor.NotificationCenter = NotificationCenter;
 
                 batchEventProcessor.BatchSize = BatchSize < 1 ? BatchEventProcessor.DEFAULT_BATCH_SIZE : BatchSize;
-                batchEventProcessor.FlushInterval = FlushInterval < TimeSpan.FromSeconds(1) ? BatchEventProcessor.DEFAULT_FLUSH_INTERVAL : FlushInterval;
-                batchEventProcessor.TimeoutInterval = TimeoutInterval < TimeSpan.FromSeconds(1) ? BatchEventProcessor.DEFAULT_TIMEOUT_INTERVAL : TimeoutInterval;
+                batchEventProcessor.FlushInterval = FlushInterval <= TimeSpan.FromSeconds(0) ? BatchEventProcessor.DEFAULT_FLUSH_INTERVAL : FlushInterval;
+                batchEventProcessor.TimeoutInterval = TimeoutInterval <= TimeSpan.FromSeconds(0) ? BatchEventProcessor.DEFAULT_TIMEOUT_INTERVAL : TimeoutInterval;
 
                 if (start)
                     batchEventProcessor.Start();

OptimizelySDK/Event/Entity/EventContext.cs

@@ -48,8 +48,6 @@ public class Builder
             private string AccountId;
             private string ProjectId;
             private string Revision;
-            private string ClientName;
-            private string ClientVersion;
             private bool AnonymizeIP;
 
             public Builder WithAccountId(string accountId)

OptimizelySDK/Event/Entity/ImpressionEvent.cs

@@ -36,9 +36,7 @@ public class ImpressionEvent : UserEvent
         /// </summary>
         public class Builder
         {
-            private string UserId;            
-            private string UUID;
-            private long Timestamp;
+            private string UserId;
             private EventContext EventContext;
 
             public VisitorAttribute[] VisitorAttributes;