Merge pull request #333 from splitio/splitclient-init-rollback

removed mode from splitclient init

Author: chillaq

Splitio.Redis/Services/Client/Classes/RedisClient.cs

@@ -16,6 +16,7 @@
 using Splitio.Services.InputValidation.Classes;
 using Splitio.Services.Parsing;
 using Splitio.Services.Shared.Classes;
+using Splitio.Services.Tasks;
 
 namespace Splitio.Redis.Services.Client.Classes
 {
@@ -29,12 +30,14 @@ public class RedisClient : SplitClient
         private ConnectionPoolManager _connectionPoolManager;
         private IFeatureFlagCacheConsumer _featureFlagCacheConsumer;
 
-        public RedisClient(ConfigurationOptions config, string apiKey) : base(apiKey, config.Mode)
+        public RedisClient(ConfigurationOptions config, string apiKey) : base(apiKey)
         {
             _config = new RedisConfig();
 
             ReadConfig(config);
-
+  
+            BuildRedisEventsManager();
+            BuildStatusAndTaskManager();
             BuildFallbackCalculator(_config.FallbackTreatments);
             BuildRedisCache();
             BuildTreatmentLog(config.ImpressionListener);
@@ -56,6 +59,12 @@ public RedisClient(ConfigurationOptions config, string apiKey) : base(apiKey, co
         }
 
         #region Private Methods
+        private void BuildRedisEventsManager()
+        {
+            _eventsManager = null;
+            _internalEventsTask = new NoOpInternalEventsTask();
+        }
+
         private void ReadConfig(ConfigurationOptions config)
         {            
             var baseConfig = _configService.ReadConfig(config, ConfigTypes.Redis);

src/Splitio/Services/Cache/Classes/InMemorySplitCache.cs

@@ -78,7 +78,7 @@ public void Update(List<ParsedSplit> toAdd, List<string> toRemove, long till)
             }
 
             SetChangeNumber(till);
-            if (eventsFlags.Any())
+            if (eventsFlags.Count > 0)
             {
                 Task task = new Task(() =>
                 {

src/Splitio/Services/Client/Classes/JSONFileClient.cs

@@ -32,7 +32,7 @@ public JSONFileClient(string splitsFilePath,
             ITrafficTypeValidator trafficTypeValidator = null,
             IImpressionsManager impressionsManager = null,
             IRuleBasedSegmentCache ruleBasedSegmentCache = null
-            ) : base("localhost", config.Mode)
+            ) : base("localhost")
         {
             _segmentCache = segmentCacheInstance ?? new InMemorySegmentCache(new ConcurrentDictionary<string, Segment>(), _internalEventsTask);
             var rbsCache = ruleBasedSegmentCache ?? new InMemoryRuleBasedSegmentCache(new ConcurrentDictionary<string, RuleBasedSegment>(), _internalEventsTask);
@@ -52,6 +52,8 @@ public JSONFileClient(string splitsFilePath,
                 parsedSplits.TryAdd(split.name, _splitParser.Parse(split, rbsCache));
             }
 
+            BuildEventsManager();
+            BuildStatusAndTaskManager();
             BuildFallbackCalculator(config.FallbackTreatments);
             BuildFlagSetsFilter(new HashSet<string>());
             _featureFlagCache = featureFlagCacheInstance ?? new InMemorySplitCache(new ConcurrentDictionary<string, ParsedSplit>(parsedSplits), _flagSetsFilter, _internalEventsTask);

src/Splitio/Services/Client/Classes/LocalhostClient.cs

@@ -27,8 +27,10 @@ public class LocalhostClient : SplitClient
 
         private readonly object _lock = new object();
 
-        public LocalhostClient(ConfigurationOptions configurationOptions) : base("localhost", configurationOptions.Mode)
+        public LocalhostClient(ConfigurationOptions configurationOptions) : base("localhost")
         {
+            BuildEventsManager();
+            BuildStatusAndTaskManager();
             var configs = (LocalhostClientConfigurations)_configService.ReadConfig(configurationOptions, ConfigTypes.Localhost, _statusManager);
 
             _fullPath = LookupFilePath(configs.FilePath);

src/Splitio/Services/Client/Classes/SelfRefreshingClient.cs

@@ -52,10 +52,12 @@ public class SelfRefreshingClient : SplitClient
         private IRuleBasedSegmentCache _ruleBasedSegmentCache;
         private IUpdater<RuleBasedSegmentDto> _ruleBasedSegmentUpdater;
 
-        public SelfRefreshingClient(string apiKey, ConfigurationOptions config) : base(apiKey, config.Mode)
+        public SelfRefreshingClient(string apiKey, ConfigurationOptions config) : base(apiKey)
         {
             _config = (SelfRefreshingConfig)_configService.ReadConfig(config, ConfigTypes.InMemory);
 
+            BuildEventsManager();
+            BuildStatusAndTaskManager();
             BuildFallbackCalculator(_config.FallbackTreatments);
             BuildFlagSetsFilter(_config.FlagSetsFilter);
             BuildSplitCache();

src/Splitio/Services/Client/Classes/SplitClient.cs

@@ -66,7 +66,6 @@ public abstract class SplitClient : ISplitClient
         protected IEventsManager<SdkEvent, SdkInternalEvent, EventMetadata> _eventsManager;
         protected IInternalEventsTask _internalEventsTask;
         private EventHandler<EventMetadata> SdkReadyEvent;
-        private Mode _configMode;
 
         public event EventHandler<EventMetadata> SdkReady
         {
@@ -86,24 +85,9 @@ public event EventHandler<EventMetadata> SdkReady
         }
         public event EventHandler<EventMetadata> SdkUpdate;
 
-        protected SplitClient(string apikey, Mode configMode)
+        protected SplitClient(string apikey)
         {
             ApiKey = apikey;
-            _configMode = configMode;
-
-            if (configMode == Mode.Standalone)
-            {
-                _eventsManager = new EventsManager<SdkEvent, SdkInternalEvent, EventMetadata>(new EventsManagerConfig(), new EventDelivery<SdkEvent, EventMetadata>());
-                _internalEventsTask = new InternalEventsTask(_eventsManager, new SplitQueue<EventSource.Workers.SdkEventNotification>());
-                _internalEventsTask.Start();
-                RegisterEvents();
-            } 
-            else
-            {
-                _eventsManager = null;
-                _internalEventsTask = new NoOpInternalEventsTask();
-            }
-
             _wrapperAdapter = WrapperAdapter.Instance();
             _keyValidator = new KeyValidator();
             _splitNameValidator = new SplitNameValidator();
@@ -112,8 +96,6 @@ protected SplitClient(string apikey, Mode configMode)
             _factoryInstantiationsService = FactoryInstantiationsService.Instance();
             _flagSetsValidator = new FlagSetsValidator();
             _configService = new ConfigService(_wrapperAdapter, _flagSetsValidator, new SdkMetadataValidator());
-            _statusManager = new InMemoryReadinessGatesCache(_internalEventsTask);
-            _tasksManager = new TasksManager(_statusManager);
         }
 
         #region GetTreatment
@@ -330,12 +312,14 @@ public virtual async Task DestroyAsync()
             if (_statusManager.IsDestroyed()) return;
 
             _log.Info(Messages.InitDestroy);
-            _internalEventsTask.Stop();
             _factoryInstantiationsService.Decrease(ApiKey);
             _statusManager.SetDestroy();
             await _syncManager.ShutdownAsync();
-            UnregisterEvents();
-
+            if (_eventsManager != null)
+            {
+                _internalEventsTask.Stop();
+                UnregisterEvents();
+            }
             _log.Info(Messages.Destroyed);
         }
 
@@ -345,12 +329,14 @@ public virtual void Destroy()
 
             _log.Info(Messages.InitDestroy);
 
-            _internalEventsTask.Stop();
             _factoryInstantiationsService.Decrease(ApiKey);
             _statusManager.SetDestroy();
             _syncManager.Shutdown();
-            UnregisterEvents();
-
+            if (_eventsManager != null)
+            {
+                _internalEventsTask.Stop();
+                UnregisterEvents();
+            }
             _log.Info(Messages.Destroyed);
         }
         #endregion
@@ -427,6 +413,12 @@ public ISplitManager GetSplitManager()
         #endregion
 
         #region Protected Methods
+        protected void BuildStatusAndTaskManager()
+        {
+            _statusManager = new InMemoryReadinessGatesCache(_internalEventsTask);
+            _tasksManager = new TasksManager(_statusManager);
+        }
+
         protected void BuildUniqueKeysTracker(BaseConfig config)
         {
             var bloomFilter = new BloomFilter(config.BfExpectedElements, config.BfErrorRate);
@@ -464,6 +456,14 @@ protected void BuildFallbackCalculator(FallbackTreatmentsConfiguration fallbackT
         {
             _fallbackTreatmentCalculator = new FallbackTreatmentCalculator(fallbackTreatmentsConfiguration);
         }
+
+        protected void BuildEventsManager()
+        {
+            _eventsManager = new EventsManager<SdkEvent, SdkInternalEvent, EventMetadata>(new EventsManagerConfig(), new EventDelivery<SdkEvent, EventMetadata>());
+            _internalEventsTask = new InternalEventsTask(_eventsManager, new SplitQueue<EventSource.Workers.SdkEventNotification>());
+            _internalEventsTask.Start();
+            RegisterEvents();
+        }
         #endregion
 
         #region Private Async Methods
@@ -532,11 +532,8 @@ private void RegisterEvents()
         }
         private void UnregisterEvents()
         {
-            if (_configMode == Mode.Standalone)
-            {
-                _eventsManager.Unregister(SdkEvent.SdkReady);
-                _eventsManager.Unregister(SdkEvent.SdkUpdate);
-            }
+            _eventsManager.Unregister(SdkEvent.SdkReady);
+            _eventsManager.Unregister(SdkEvent.SdkUpdate);
         }
         private List<TreatmentResult> GetTreatmentsSync(Enums.API method, Key key, List<string> features, Dictionary<string, object> attributes = null, EvaluationOptions evaluationOptions = null)
         {

src/Splitio/Services/Tasks/NoOpInternalEventsTask.cs

@@ -5,15 +5,15 @@ namespace Splitio.Services.Tasks
 {
     public class NoOpInternalEventsTask : IInternalEventsTask
     {
-        public NoOpInternalEventsTask()
-        {
-            return;
-        }
+        public NoOpInternalEventsTask() {}
         public async Task AddToQueue(SdkInternalEvent sdkInternalEvent, EventMetadata eventMetadata)
-        { return; }
+        { await DoNothing(); }
 
-        public void Start() { return; }
+        public void Start() { }
 
-        public void Stop() { return; }
+        public void Stop() { }
+
+        public static Task<bool> DoNothing()
+        { return Task.FromResult(true); }
     }
 }

tests/Splitio-tests/Unit Tests/Client/SplitClientForTesting.cs

@@ -22,8 +22,10 @@ public SplitClientForTesting(IFeatureFlagCacheConsumer featureFlagCacheConsumer,
             ISyncManager syncManager,
             ITelemetryEvaluationProducer telemetryEvaluationProducer,
             IFallbackTreatmentCalculator fallbackTreatmentCalculator)
-            : base("SplitClientForTesting", Mode.Standalone)
+            : base("SplitClientForTesting")
         {
+            BuildEventsManager();
+            BuildStatusAndTaskManager();
             _fallbackTreatmentCalculator = fallbackTreatmentCalculator;
             _eventsLog = eventsLog;
             _impressionsLog = impressionsLog;
@@ -33,7 +35,6 @@ public SplitClientForTesting(IFeatureFlagCacheConsumer featureFlagCacheConsumer,
             _impressionsManager = impressionsManager;
             _syncManager = syncManager;
             _telemetryEvaluationProducer = telemetryEvaluationProducer;
-
             BuildClientExtension();
         }
     }

tests/Splitio.TestSupport/SplitClientForTest.cs

@@ -8,8 +8,9 @@ public class SplitClientForTest : SplitClient
     {
         private readonly Dictionary<string, string> _tests;
 
-        public SplitClientForTest(ConfigurationOptions config) : base("SplitClientForTest", config.Mode)
+        public SplitClientForTest(ConfigurationOptions config) : base("SplitClientForTest")
         {
+            BuildEventsManager();
             BuildFallbackCalculator(config.FallbackTreatments);
             _tests = new Dictionary<string, string>();
         }

tests/Splitio.Tests.Common/BaseAsyncClientTests.cs

@@ -984,7 +984,7 @@ public async Task TrackAsync_WithValidData_ReturnsTrue()
                 new EventBackend { Key = "key_4", TrafficTypeName = "traffic_type_4", EventTypeId = "event_type_4", Value = 444, Properties = properties }
             };
 
-            var apikey = "base-apikey17";
+            var apikey = "base-apikey20";
 
             var splitFactory = new SplitFactory(apikey, configurations);
             var client = splitFactory.Client();
@@ -1001,6 +1001,7 @@ public async Task TrackAsync_WithValidData_ReturnsTrue()
             }
 
             //Validate Events sent to the be.
+            await Task.Delay(1000);
             AssertSentEvents(events);
             await client.DestroyAsync();
         }
@@ -1042,6 +1043,7 @@ public async Task TrackAsync_WithBUR_ReturnsTrue()
             }
 
             //Validate Events sent to the be.
+            await Task.Delay(1000);
             AssertSentEvents(events);
             await client.DestroyAsync();
         }
@@ -1091,6 +1093,7 @@ public async Task TrackAsync_WithInvalidData_ReturnsFalse()
                 .ToList();
 
             //Validate Events sent to the be.
+            await Task.Delay(1000);
             AssertSentEvents(events);
             await client.DestroyAsync();
         }