1- Added backoff to sync_all that fixes the timeout when invalid api key is used

2- Removed api key validation

Author: chillaq

splitio/client/factory.py

@@ -316,9 +316,6 @@ def _build_in_memory_factory(api_key, cfg, sdk_url=None, events_url=None,  # pyl
         'telemetry': TelemetryAPI(http_client, api_key, sdk_metadata),
     }
 
-    if not input_validator.validate_apikey_type(apis['segments']):
-        return None
-
     storages = {
         'splits': InMemorySplitStorage(),
         'segments': InMemorySegmentStorage(),

splitio/client/input_validator.py

@@ -446,32 +446,7 @@ def validate_attributes(attributes, method_name):
 class _ApiLogFilter(logging.Filter):  # pylint: disable=too-few-public-methods
     def filter(self, record):
         return record.name not in ('SegmentsAPI', 'HttpClient')
-
-
-def validate_apikey_type(segment_api):
-    """
-    Try to guess if the apikey is of browser type and let the user know.
-
-    :param segment_api: Segments API client.
-    :type segment_api: splitio.api.segments.SegmentsAPI
-    """
-    api_messages_filter = _ApiLogFilter()
-    _logger = logging.getLogger('splitio.api.segments')
-    try:
-        _logger.addFilter(api_messages_filter)  # pylint: disable=protected-access
-        segment_api.fetch_segment('__SOME_INVALID_SEGMENT__', -1, FetchOptions())
-    except APIException as exc:
-        if exc.status_code == 403:
-            _LOGGER.error('factory instantiation: you passed a browser type '
-                          + 'api_key, please grab an api key from the Split '
-                          + 'console that is of type sdk')
-            return False
-    finally:
-        _logger.removeFilter(api_messages_filter)  # pylint: disable=protected-access
-
-    # True doesn't mean that the APIKEY is right, only that it's not of type "browser"
-    return True
-
+        
 
 def validate_factory_instantiation(apikey):
     """

splitio/sync/synchronizer.py

@@ -3,8 +3,10 @@
 import abc
 import logging
 import threading
+import time
 
 from splitio.api import APIException
+from splitio.util.backoff import Backoff
 
 
 _LOGGER = logging.getLogger(__name__)
@@ -212,6 +214,9 @@ def shutdown(self, blocking):
 class Synchronizer(BaseSynchronizer):
     """Synchronizer."""
 
+    _ON_DEMAND_FETCH_BACKOFF_BASE = 10  # backoff base starting at 10 seconds
+    _ON_DEMAND_FETCH_BACKOFF_MAX_WAIT = 30  # don't sleep for more than 1 minute
+
     def __init__(self, split_synchronizers, split_tasks):
         """
         Class constructor.
@@ -221,6 +226,9 @@ def __init__(self, split_synchronizers, split_tasks):
         :param split_tasks: tasks for starting/stopping tasks
         :type split_tasks: splitio.sync.synchronizer.SplitTasks
         """
+        self._backoff = Backoff(
+                                self._ON_DEMAND_FETCH_BACKOFF_BASE,
+                                self._ON_DEMAND_FETCH_BACKOFF_MAX_WAIT)
         self._split_synchronizers = split_synchronizers
         self._split_tasks = split_tasks
         self._periodic_data_recording_tasks = [
@@ -291,6 +299,8 @@ def sync_all(self):
             try:
                 if not self.synchronize_splits(None, False):
                     attempts -= 1
+                    how_long = self._backoff.get()
+                    time.sleep(how_long)
                     continue
 
                 # Only retrying splits, since segments may trigger too many calls.

tests/integration/test_client_e2e.py

@@ -3,6 +3,7 @@
 import json
 import os
 import threading
+import pytest
 
 from redis import StrictRedis
 

tests/integration/test_streaming_e2e.py

@@ -127,12 +127,6 @@ def test_happiness(self):
                                                          '[?occupancy=metrics.publishers]control_sec'])
         assert qs['v'][0] == '1.1'
 
-        # Initial apikey validation
-        req = split_backend_requests.get()
-        assert req.method == 'GET'
-        assert req.path == '/api/segmentChanges/__SOME_INVALID_SEGMENT__?since=-1'
-        assert req.headers['authorization'] == 'Bearer some_apikey'
-
         # Initial splits fetch
         req = split_backend_requests.get()
         assert req.method == 'GET'
@@ -334,12 +328,6 @@ def test_occupancy_flicker(self):
                                                          '[?occupancy=metrics.publishers]control_sec'])
         assert qs['v'][0] == '1.1'
 
-        # Initial apikey validation
-        req = split_backend_requests.get()
-        assert req.method == 'GET'
-        assert req.path == '/api/segmentChanges/__SOME_INVALID_SEGMENT__?since=-1'
-        assert req.headers['authorization'] == 'Bearer some_apikey'
-
         # Initial splits fetch
         req = split_backend_requests.get()
         assert req.method == 'GET'
@@ -514,12 +502,6 @@ def test_start_without_occupancy(self):
                                                          '[?occupancy=metrics.publishers]control_sec'])
         assert qs['v'][0] == '1.1'
 
-        # Initial apikey validation
-        req = split_backend_requests.get()
-        assert req.method == 'GET'
-        assert req.path == '/api/segmentChanges/__SOME_INVALID_SEGMENT__?since=-1'
-        assert req.headers['authorization'] == 'Bearer some_apikey'
-
         # Initial splits fetch
         req = split_backend_requests.get()
         assert req.method == 'GET'
@@ -704,12 +686,6 @@ def test_streaming_status_changes(self):
                                                          '[?occupancy=metrics.publishers]control_sec'])
         assert qs['v'][0] == '1.1'
 
-        # Initial apikey validation
-        req = split_backend_requests.get()
-        assert req.method == 'GET'
-        assert req.path == '/api/segmentChanges/__SOME_INVALID_SEGMENT__?since=-1'
-        assert req.headers['authorization'] == 'Bearer some_apikey'
-
         # Initial splits fetch
         req = split_backend_requests.get()
         assert req.method == 'GET'
@@ -931,12 +907,6 @@ def test_server_closes_connection(self):
                                                          '[?occupancy=metrics.publishers]control_sec'])
         assert qs['v'][0] == '1.1'
 
-        # Initial apikey validation
-        req = split_backend_requests.get()
-        assert req.method == 'GET'
-        assert req.path == '/api/segmentChanges/__SOME_INVALID_SEGMENT__?since=-1'
-        assert req.headers['authorization'] == 'Bearer some_apikey'
-
         # Initial splits fetch
         req = split_backend_requests.get()
         assert req.method == 'GET'
@@ -1168,12 +1138,6 @@ def test_ably_errors_handling(self):
                                                          '[?occupancy=metrics.publishers]control_sec'])
         assert qs['v'][0] == '1.1'
 
-        # Initial apikey validation
-        req = split_backend_requests.get()
-        assert req.method == 'GET'
-        assert req.path == '/api/segmentChanges/__SOME_INVALID_SEGMENT__?since=-1'
-        assert req.headers['authorization'] == 'Bearer some_apikey'
-
         # Initial splits fetch
         req = split_backend_requests.get()
         assert req.method == 'GET'