Merge branch 'feature/mtkTracking' into ImpressionsSender

Author: chillaq

splitio/client/factory.py

@@ -332,6 +332,14 @@ def _build_in_memory_factory(api_key, cfg, sdk_url=None, events_url=None,  # pyl
     }
     imp_strategy = strategies[cfg['impressionsMode']]
 
+    imp_counter = ImpressionsCounter() if cfg['impressionsMode'] != ImpressionsMode.DEBUG else None
+
+    strategies = {
+        ImpressionsMode.OPTIMIZED : StrategyOptimizedMode(imp_counter),
+        ImpressionsMode.DEBUG : StrategyDebugMode(),
+    }
+    imp_strategy = strategies[cfg['impressionsMode']]
+
     imp_manager = ImpressionsManager(
         _wrap_impression_listener(cfg['impressionListener'], sdk_metadata),
         imp_strategy)
@@ -344,6 +352,7 @@ def _build_in_memory_factory(api_key, cfg, sdk_url=None, events_url=None,  # pyl
         EventSynchronizer(apis['events'], storages['events'], cfg['eventsBulkSize']),
         ImpressionsCountSynchronizer(apis['impressions'], imp_manager),
     )
+    imp_count_sync_task = ImpressionsCountSyncTask(synchronizers.impressions_count_sync.synchronize_counters) if cfg['impressionsMode'] == 'OPTIMIZED' else None
 
     tasks = SplitTasks(
         SplitSynchronizationTask(
@@ -429,7 +438,6 @@ def _build_redis_factory(api_key, cfg):
         recorder,
     )
 
-
 def _build_localhost_factory(cfg):
     """Build and return a localhost factory for testing/development purposes."""
     storages = {
@@ -456,6 +464,7 @@ def _build_localhost_factory(cfg):
     synchronizer = LocalhostSynchronizer(synchronizers, tasks)
     manager = Manager(ready_event, synchronizer, None, False, sdk_metadata)
     manager.start()
+
     recorder = StandardRecorder(
         ImpressionsManager(None, StrategyDebugMode()),
         storages['events'],

splitio/sync/impression.py

@@ -2,6 +2,7 @@
 import queue
 
 from splitio.api import APIException
+from splitio.engine.strategies import Counter
 
 
 _LOGGER = logging.getLogger(__name__)
@@ -68,18 +69,18 @@ def synchronize_impressions(self):
 
 
 class ImpressionsCountSynchronizer(object):
-    def __init__(self, impressions_api, impressions_manager):
+    def __init__(self, impressions_api, impressions_counter):
         """
         Class constructor.
 
         :param impressions_api: Impressions Api object to send data to the backend
         :type impressions_api: splitio.api.impressions.ImpressionsAPI
         :param impressions_manager: Impressions manager instance
-        :type impressions_manager: splitio.engine.impressions.Manager
+        :type impressions_counter: splitio.engine.strategies
 
         """
         self._impressions_api = impressions_api
-        self._impressions_manager = impressions_manager
+        self._impressions_counter = impressions_counter
 
     def synchronize_counters(self):
         """Send impressions from both the failed and new queues."""

splitio/sync/synchronizer.py

@@ -300,7 +300,8 @@ def start_periodic_data_recording(self):
         _LOGGER.debug('Starting periodic data recording')
         self._split_tasks.impressions_task.start()
         self._split_tasks.events_task.start()
-        self._split_tasks.impressions_count_task.start()
+        if self._split_tasks.impressions_count_task is not None:
+            self._split_tasks.impressions_count_task.start()
 
     def stop_periodic_data_recording(self, blocking):
         """
@@ -324,7 +325,8 @@ def stop_periodic_data_recording(self, blocking):
         else:
             self._split_tasks.impressions_task.stop()
             self._split_tasks.events_task.stop()
-            self._split_tasks.impressions_count_task.stop()
+            if self._split_tasks.impressions_count_task is not None:
+                self._split_tasks.impressions_count_task.stop()
 
     def kill_split(self, split_name, default_treatment, change_number):
         """

tests/integration/test_client_e2e.py

@@ -21,7 +21,6 @@
 from splitio.recorder.recorder import StandardRecorder, PipelinedRecorder
 from splitio.client.config import DEFAULT_CONFIG
 
-
 class InMemoryIntegrationTests(object):
     """Inmemory storage-based integration tests."""