Merge pull request #275 from splitio/feature/mtk-counter-fix

Feature/mtk counter fix

Author: chillaq

splitio/engine/impressions/strategies.py

@@ -99,6 +99,6 @@ def process_impressions(self, impressions):
         :rtype: list[tuple[splitio.models.impression.Impression, dict]]
         """
         imps = [(self._observer.test_and_set(imp), attrs) for imp, attrs in impressions]
-        self._counter.track([imp for imp, _ in imps])
+        self._counter.track([imp for imp, _ in imps if imp.previous_time != None])
         this_hour = truncate_time(util.utctime_ms())
         return [i for i, _ in imps if i.previous_time is None or i.previous_time < this_hour], imps

tests/engine/test_impressions.py

@@ -113,11 +113,6 @@ def test_standalone_optimized(self, mocker):
         assert imps == [Impression('k1', 'f1', 'on', 'l1', 123, None, utc_now-3),
                         Impression('k1', 'f2', 'on', 'l1', 123, None, utc_now-3)]
 
-        assert [Counter.CountPerFeature(k.feature, k.timeframe, v)
-                for (k, v) in manager._strategy._counter._data.items()] == [
-            Counter.CountPerFeature('f1', truncate_time(utc_now-3), 1),
-            Counter.CountPerFeature('f2', truncate_time(utc_now-3), 1)]
-
         # Tracking the same impression a ms later should be empty
         imps = manager.process_impressions([
             (Impression('k1', 'f1', 'on', 'l1', 123, None, utc_now-2), None)
@@ -144,14 +139,26 @@ def test_standalone_optimized(self, mocker):
                         Impression('k2', 'f1', 'on', 'l1', 123, None, utc_now-2, old_utc-1)]
 
         assert len(manager._strategy._observer._cache._data) == 3  # distinct impressions seen
-        assert len(manager._strategy._counter._data) == 3  # 2 distinct features. 1 seen in 2 different timeframes
+        assert len(manager._strategy._counter._data) == 2  # 2 distinct features. 1 seen in 2 different timeframes
 
         assert set(manager._strategy._counter.pop_all()) == set([
-            Counter.CountPerFeature('f1', truncate_time(old_utc), 3),
-            Counter.CountPerFeature('f2', truncate_time(old_utc), 1),
+            Counter.CountPerFeature('f1', truncate_time(old_utc), 1),
             Counter.CountPerFeature('f1', truncate_time(utc_now), 2)
         ])
 
+        # Test counting only from the second impression
+        imps = manager.process_impressions([
+            (Impression('k3', 'f3', 'on', 'l1', 123, None, utc_now-1), None)
+        ])
+        assert set(manager._strategy._counter.pop_all()) == set([])
+
+        imps = manager.process_impressions([
+            (Impression('k3', 'f3', 'on', 'l1', 123, None, utc_now-1), None)
+        ])
+        assert set(manager._strategy._counter.pop_all()) == set([
+            Counter.CountPerFeature('f3', truncate_time(utc_now), 1)
+        ])
+
     def test_standalone_debug(self, mocker):
         """Test impressions manager in debug mode with sdk in standalone mode."""
 
@@ -291,10 +298,6 @@ def test_standalone_optimized_listener(self, mocker):
         ])
         assert imps == [Impression('k1', 'f1', 'on', 'l1', 123, None, utc_now-3),
                         Impression('k1', 'f2', 'on', 'l1', 123, None, utc_now-3)]
-        assert [Counter.CountPerFeature(k.feature, k.timeframe, v)
-                for (k, v) in manager._strategy._counter._data.items()] == [
-            Counter.CountPerFeature('f1', truncate_time(utc_now-3), 1),
-            Counter.CountPerFeature('f2', truncate_time(utc_now-3), 1)]
 
         # Tracking the same impression a ms later should return empty
         imps = manager.process_impressions([
@@ -322,11 +325,10 @@ def test_standalone_optimized_listener(self, mocker):
                         Impression('k2', 'f1', 'on', 'l1', 123, None, utc_now-2, old_utc-1)]
 
         assert len(manager._strategy._observer._cache._data) == 3  # distinct impressions seen
-        assert len(manager._strategy._counter._data) == 3  # 2 distinct features. 1 seen in 2 different timeframes
+        assert len(manager._strategy._counter._data) == 2  # 2 distinct features. 1 seen in 2 different timeframes
 
         assert set(manager._strategy._counter.pop_all()) == set([
-            Counter.CountPerFeature('f1', truncate_time(old_utc), 3),
-            Counter.CountPerFeature('f2', truncate_time(old_utc), 1),
+            Counter.CountPerFeature('f1', truncate_time(old_utc), 1),
             Counter.CountPerFeature('f1', truncate_time(utc_now), 2)
         ])
 
@@ -339,6 +341,19 @@ def test_standalone_optimized_listener(self, mocker):
             mocker.call(Impression('k2', 'f1', 'on', 'l1', 123, None, utc_now-2, old_utc-1), None)
         ]
 
+        # Test counting only from the second impression
+        imps = manager.process_impressions([
+            (Impression('k3', 'f3', 'on', 'l1', 123, None, utc_now-1), None)
+        ])
+        assert set(manager._strategy._counter.pop_all()) == set([])
+
+        imps = manager.process_impressions([
+            (Impression('k3', 'f3', 'on', 'l1', 123, None, utc_now-1), None)
+        ])
+        assert set(manager._strategy._counter.pop_all()) == set([
+            Counter.CountPerFeature('f3', truncate_time(utc_now), 1)
+        ])
+
     def test_standalone_debug_listener(self, mocker):
         """Test impressions manager in optimized mode with sdk in standalone mode."""