fixed typo for segment event type

Author: chillaq

splitio/client/factory.py

@@ -1145,11 +1145,11 @@ def _build_localhost_factory(cfg):
     telemetry_runtime_producer = telemetry_producer.get_telemetry_runtime_producer()
     telemetry_evaluation_producer = telemetry_producer.get_telemetry_evaluation_producer()
 
-    events_queue = queue.Queue()
+    internal_events_queue = queue.Queue()
     storages = {
-        'splits': InMemorySplitStorage(events_queue, cfg['flagSetsFilter'] if cfg['flagSetsFilter'] is not None else []),
-        'segments': InMemorySegmentStorage(events_queue),  # not used, just to avoid possible future errors.
-        'rule_based_segments': InMemoryRuleBasedSegmentStorage(events_queue),   
+        'splits': InMemorySplitStorage(internal_events_queue, cfg['flagSetsFilter'] if cfg['flagSetsFilter'] is not None else []),
+        'segments': InMemorySegmentStorage(internal_events_queue),  # not used, just to avoid possible future errors.
+        'rule_based_segments': InMemoryRuleBasedSegmentStorage(internal_events_queue),   
         'impressions': LocalhostImpressionsStorage(),
         'events': LocalhostEventsStorage(),
     }
@@ -1162,6 +1162,8 @@ def _build_localhost_factory(cfg):
         LocalSegmentSynchronizer(cfg['segmentDirectory'], storages['splits'], storages['segments']),
         None, None, None,
     )
+    events_manager = EventsManager(EventsManagerConfig(), EventsDelivery())
+    internal_events_task = EventsTask(events_manager.notify_internal_event, internal_events_queue)
 
     feature_flag_sync_task = None
     segment_sync_task = None
@@ -1178,6 +1180,7 @@ def _build_localhost_factory(cfg):
         feature_flag_sync_task,
         segment_sync_task,
         None, None, None,
+        internal_events_task
     )
 
     sdk_metadata = util.get_metadata(cfg)
@@ -1199,8 +1202,7 @@ def _build_localhost_factory(cfg):
         telemetry_evaluation_producer,
         telemetry_runtime_producer
     )
-    internal_events_queue = queue.Queue()
-    events_manager = EventsManager(EventsManagerConfig(), EventsDelivery())
+    internal_events_task.start()
 
     return SplitFactory(
         'localhost',
@@ -1226,6 +1228,8 @@ async def _build_localhost_factory_async(cfg):
 
     internal_events_queue = asyncio.Queue()
     events_manager = EventsManagerAsync(EventsManagerConfig(), EventsDelivery())
+    internal_events_task = EventsTaskAsync(events_manager.notify_internal_event, internal_events_queue)
+
     storages = {
         'splits': InMemorySplitStorageAsync(internal_events_queue),
         'segments': InMemorySegmentStorageAsync(internal_events_queue),  # not used, just to avoid possible future errors.
@@ -1258,6 +1262,7 @@ async def _build_localhost_factory_async(cfg):
         feature_flag_sync_task,
         segment_sync_task,
         None, None, None,
+        internal_events_task
     )
 
     sdk_metadata = util.get_metadata(cfg)
@@ -1277,8 +1282,9 @@ async def _build_localhost_factory_async(cfg):
         storages['impressions'],
         telemetry_evaluation_producer,
         telemetry_runtime_producer
-    )
-        
+    )        
+    internal_events_task.start()
+
     return SplitFactoryAsync(
         'localhost',
         storages,

splitio/events/events_metadata.py

@@ -5,7 +5,7 @@ class SdkEventType(Enum):
     """Public event types"""
 
     FLAG_UPDATE = 'FLAG_UPDATE'
-    SEGMENT_UPDATE = 'SEGMENT_UPDATE'
+    SEGMENTS_UPDATE = 'SEGMENTS_UPDATE'
 
 class EventsMetadata(object):
     """Events Metadata class."""

splitio/storage/inmemmory.py

@@ -158,7 +158,7 @@ def update(self, to_add, to_delete, new_change_number):
             self._internal_event_queue.put(
                 SdkInternalEventNotification(
                     SdkInternalEvent.RB_SEGMENTS_UPDATED,
-                    EventsMetadata(SdkEventType.SEGMENT_UPDATE, {})))        
+                    EventsMetadata(SdkEventType.SEGMENTS_UPDATE, {})))        
 
     def _put(self, rule_based_segment):
         """
@@ -290,7 +290,7 @@ async def update(self, to_add, to_delete, new_change_number):
             await self._internal_event_queue.put(
                 SdkInternalEventNotification(
                     SdkInternalEvent.RB_SEGMENTS_UPDATED,
-                    EventsMetadata(SdkEventType.SEGMENT_UPDATE, {})))        
+                    EventsMetadata(SdkEventType.SEGMENTS_UPDATE, {})))        
 
     async def _put(self, rule_based_segment):
         """
@@ -999,7 +999,7 @@ def put(self, segment):
             self._internal_event_queue.put(
             SdkInternalEventNotification(
                 SdkInternalEvent.SEGMENTS_UPDATED,
-                EventsMetadata(SdkEventType.SEGMENT_UPDATE, {})))        
+                EventsMetadata(SdkEventType.SEGMENTS_UPDATE, {})))        
 
     def update(self, segment_name, to_add, to_remove, change_number=None):
         """
@@ -1025,7 +1025,7 @@ def update(self, segment_name, to_add, to_remove, change_number=None):
                 self._internal_event_queue.put(
                 SdkInternalEventNotification(
                     SdkInternalEvent.SEGMENTS_UPDATED,
-                    EventsMetadata(SdkEventType.SEGMENT_UPDATE, {})))        
+                    EventsMetadata(SdkEventType.SEGMENTS_UPDATE, {})))        
 
     def get_change_number(self, segment_name):
         """
@@ -1140,7 +1140,7 @@ async def put(self, segment):
             await self._internal_event_queue.put(
             SdkInternalEventNotification(
                 SdkInternalEvent.SEGMENTS_UPDATED,
-                EventsMetadata(SdkEventType.SEGMENT_UPDATE, {})))        
+                EventsMetadata(SdkEventType.SEGMENTS_UPDATE, {})))        
 
 
     async def update(self, segment_name, to_add, to_remove, change_number=None):
@@ -1166,7 +1166,7 @@ async def update(self, segment_name, to_add, to_remove, change_number=None):
                 await self._internal_event_queue.put(
                 SdkInternalEventNotification(
                     SdkInternalEvent.SEGMENTS_UPDATED,
-                    EventsMetadata(SdkEventType.SEGMENT_UPDATE, {})))        
+                    EventsMetadata(SdkEventType.SEGMENTS_UPDATE, {})))        
 
 
     async def get_change_number(self, segment_name):

tests/integration/test_streaming_e2e.py

@@ -128,7 +128,7 @@ def test_happiness(self):
         sse_server.publish(make_segment_change_event('segment1', 1))
         time.sleep(1)
         assert self.update_flag
-        assert self.metadata[len(self.metadata)-1].get_type() == SdkEventType.SEGMENT_UPDATE
+        assert self.metadata[len(self.metadata)-1].get_type() == SdkEventType.SEGMENTS_UPDATE
         flag = False
         for meta in self.metadata:
             if 'split2' in meta.get_names():

tests/storage/test_inmemory_storage.py

@@ -811,13 +811,13 @@ def test_internal_event_notification(self):
         storage.put(segment)
         event = events_queue.get()
         assert event.internal_event == SdkInternalEvent.SEGMENTS_UPDATED
-        assert event.metadata.get_type() == SdkEventType.SEGMENT_UPDATE
+        assert event.metadata.get_type() == SdkEventType.SEGMENTS_UPDATE
         assert len(event.metadata.get_names()) == 0
 
         storage.update('some_segment', ['key4', 'key5'], ['key2', 'key3'], 456)
         event = events_queue.get()
         assert event.internal_event == SdkInternalEvent.SEGMENTS_UPDATED
-        assert event.metadata.get_type() == SdkEventType.SEGMENT_UPDATE
+        assert event.metadata.get_type() == SdkEventType.SEGMENTS_UPDATE
         assert len(event.metadata.get_names()) == 0
 
 class InMemorySegmentStorageAsyncTests(object):
@@ -893,13 +893,13 @@ async def test_internal_event_notification(self):
         await storage.put(segment)
         event = await events_queue.get()
         assert event.internal_event == SdkInternalEvent.SEGMENTS_UPDATED
-        assert event.metadata.get_type() == SdkEventType.SEGMENT_UPDATE
+        assert event.metadata.get_type() == SdkEventType.SEGMENTS_UPDATE
         assert len(event.metadata.get_names()) == 0
 
         await storage.update('some_segment', ['key4', 'key5'], ['key2', 'key3'], 456)
         event = await events_queue.get()
         assert event.internal_event == SdkInternalEvent.SEGMENTS_UPDATED
-        assert event.metadata.get_type() == SdkEventType.SEGMENT_UPDATE
+        assert event.metadata.get_type() == SdkEventType.SEGMENTS_UPDATE
         assert len(event.metadata.get_names()) == 0
 
 class InMemoryImpressionsStorageTests(object):
@@ -2006,12 +2006,12 @@ def test_internal_event_notification(self, mocker):
         rbs_storage.update([segment1, segment2], [], -1)
         event = events_queue.get()
         assert event.internal_event == SdkInternalEvent.RB_SEGMENTS_UPDATED
-        assert event.metadata.get_type() == SdkEventType.SEGMENT_UPDATE
+        assert event.metadata.get_type() == SdkEventType.SEGMENTS_UPDATE
         assert len(event.metadata.get_names()) == 0
 
         rbs_storage.update([], ['some_segment'], -1)
         assert event.internal_event == SdkInternalEvent.RB_SEGMENTS_UPDATED
-        assert event.metadata.get_type() == SdkEventType.SEGMENT_UPDATE
+        assert event.metadata.get_type() == SdkEventType.SEGMENTS_UPDATE
         assert len(event.metadata.get_names()) == 0
 
 class InMemoryRuleBasedSegmentStorageAsyncTests(object):
@@ -2093,12 +2093,12 @@ async def test_internal_event_notification(self, mocker):
         await rbs_storage.update([segment1, segment2], [], -1)
         event = await events_queue.get()
         assert event.internal_event == SdkInternalEvent.RB_SEGMENTS_UPDATED
-        assert event.metadata.get_type() == SdkEventType.SEGMENT_UPDATE
+        assert event.metadata.get_type() == SdkEventType.SEGMENTS_UPDATE
         assert len(event.metadata.get_names()) == 0
 
         await rbs_storage.update([], ['some_segment'], -1)
         event = await events_queue.get()
         assert event.internal_event == SdkInternalEvent.RB_SEGMENTS_UPDATED
-        assert event.metadata.get_type() == SdkEventType.SEGMENT_UPDATE
+        assert event.metadata.get_type() == SdkEventType.SEGMENTS_UPDATE
         assert len(event.metadata.get_names()) == 0