Merge branch 'development' into DW

Author: chillaq

splitio/storage/redis.py

@@ -71,6 +71,8 @@ def get(self, split_name):  # pylint: disable=method-hidden
         """
         try:
             raw = self._redis.get(self._get_key(split_name))
+            _LOGGER.debug("Fetchting Split [%s] from redis" % split_name)
+            _LOGGER.debug(raw)
             return splits.from_raw(json.loads(raw)) if raw is not None else None
         except RedisAdapterException:
             _LOGGER.error('Error fetching split from storage')
@@ -91,6 +93,8 @@ def fetch_many(self, split_names):
         try:
             keys = [self._get_key(split_name) for split_name in split_names]
             raw_splits = self._redis.mget(keys)
+            _LOGGER.debug("Fetchting Splits [%s] from redis" % split_names)
+            _LOGGER.debug(raw_splits)
             for i in range(len(split_names)):
                 split = None
                 try:
@@ -117,6 +121,7 @@ def is_valid_traffic_type(self, traffic_type_name):  # pylint: disable=method-hi
         try:
             raw = self._redis.get(self._get_traffic_type_key(traffic_type_name))
             count = json.loads(raw) if raw else 0
+            _LOGGER.debug("Fetching TrafficType [%s] count in redis: %s" % (traffic_type_name, count))
             return count > 0
         except RedisAdapterException:
             _LOGGER.error('Error fetching split from storage')
@@ -152,6 +157,7 @@ def get_change_number(self):
         """
         try:
             stored_value = self._redis.get(self._SPLIT_TILL_KEY)
+            _LOGGER.debug("Fetching Split Change Number from redis: %s" % stored_value)
             return json.loads(stored_value) if stored_value is not None else None
         except RedisAdapterException:
             _LOGGER.error('Error fetching split change number from storage')
@@ -176,6 +182,7 @@ def get_split_names(self):
         """
         try:
             keys = self._redis.keys(self._get_key('*'))
+            _LOGGER.debug("Fetchting Split names from redis: %s" % keys)
             return [key.replace(self._get_key(''), '') for key in keys]
         except RedisAdapterException:
             _LOGGER.error('Error fetching split names from storage')
@@ -199,7 +206,9 @@ def get_all_splits(self):
         keys = self._redis.keys(self._get_key('*'))
         to_return = []
         try:
+            _LOGGER.debug("Fetchting all Splits from redis: %s" % keys)
             raw_splits = self._redis.mget(keys)
+            _LOGGER.debug(raw_splits)
             for raw in raw_splits:
                 try:
                     to_return.append(splits.from_raw(json.loads(raw)))
@@ -276,6 +285,8 @@ def get(self, segment_name):
         """
         try:
             keys = (self._redis.smembers(self._get_key(segment_name)))
+            _LOGGER.debug("Fetchting Segment [%s] from redis" % segment_name)
+            _LOGGER.debug(keys)
             till = self.get_change_number(segment_name)
             if not keys or till is None:
                 return None
@@ -309,6 +320,7 @@ def get_change_number(self, segment_name):
         """
         try:
             stored_value = self._redis.get(self._get_till_key(segment_name))
+            _LOGGER.debug("Fetchting Change Number for Segment [%s] from redis: " % stored_value)
             return json.loads(stored_value) if stored_value is not None else None
         except RedisAdapterException:
             _LOGGER.error('Error fetching segment change number from storage')
@@ -348,7 +360,9 @@ def segment_contains(self, segment_name, key):
         :rtype: bool
         """
         try:
-            return self._redis.sismember(self._get_key(segment_name), key)
+            res = self._redis.sismember(self._get_key(segment_name), key)
+            _LOGGER.debug("Checking Segment [%s] contain key [%s] in redis: %s" % (segment_name, key, res))
+            return res
         except RedisAdapterException:
             _LOGGER.error('Error testing members in segment stored in redis')
             _LOGGER.debug('Error: ', exc_info=True)
@@ -443,6 +457,8 @@ def add_impressions_to_pipe(self, impressions, pipe):
         :type pipe: redis.pipe
         """
         bulk_impressions = self._wrap_impressions(impressions)
+        _LOGGER.debug("Adding Impressions to redis key %s" % (self.IMPRESSIONS_QUEUE_KEY))
+        _LOGGER.debug(bulk_impressions)
         pipe.rpush(self.IMPRESSIONS_QUEUE_KEY, *bulk_impressions)
 
     def put(self, impressions):
@@ -457,6 +473,8 @@ def put(self, impressions):
         """
         bulk_impressions = self._wrap_impressions(impressions)
         try:
+            _LOGGER.debug("Adding Impressions to redis key %s" % (self.IMPRESSIONS_QUEUE_KEY))
+            _LOGGER.debug(bulk_impressions)
             inserted = self._redis.rpush(self.IMPRESSIONS_QUEUE_KEY, *bulk_impressions)
             self.expire_key(inserted, len(bulk_impressions))
             return True
@@ -509,6 +527,8 @@ def add_events_to_pipe(self, events, pipe):
         :type pipe: redis.pipe
         """
         bulk_events = self._wrap_events(events)
+        _LOGGER.debug("Adding Events to redis key %s" % (self._EVENTS_KEY_TEMPLATE))
+        _LOGGER.debug(bulk_events)
         pipe.rpush(self._EVENTS_KEY_TEMPLATE, *bulk_events)
 
     def _wrap_events(self, events):
@@ -544,6 +564,8 @@ def put(self, events):
         key = self._EVENTS_KEY_TEMPLATE
         to_store = self._wrap_events(events)
         try:
+            _LOGGER.debug("Adding Events to redis key %s" % (key))
+            _LOGGER.debug(to_store)
             self._redis.rpush(key, *to_store)
             return True
         except RedisAdapterException:
@@ -632,6 +654,8 @@ def pop_config_tags(self):
 
     def push_config_stats(self):
         """push config stats to redis."""
+        _LOGGER.debug("Adding Config stats to redis key %s" % (self._TELEMETRY_CONFIG_KEY))
+        _LOGGER.debug(str(self._format_config_stats()))
         self._redis_client.hset(self._TELEMETRY_CONFIG_KEY, self._sdk_metadata.sdk_version + '/' + self._sdk_metadata.instance_name + '/' + self._sdk_metadata.instance_ip, str(self._format_config_stats()))
 
     def _format_config_stats(self):
@@ -660,6 +684,9 @@ def add_latency_to_pipe(self, method, bucket, pipe):
         :param pipe: Redis pipe.
         :type pipe: redis.pipe
         """
+        _LOGGER.debug("Adding Latency stats to redis key %s" % (self._TELEMETRY_LATENCIES_KEY))
+        _LOGGER.debug(self._sdk_metadata.sdk_version + '/' + self._sdk_metadata.instance_name + '/' + self._sdk_metadata.instance_ip + '/' +
+            method.value + '/' + str(bucket))
         pipe.hincrby(self._TELEMETRY_LATENCIES_KEY, self._sdk_metadata.sdk_version + '/' + self._sdk_metadata.instance_name + '/' + self._sdk_metadata.instance_ip + '/' +
             method.value + '/' + str(bucket), 1)
 
@@ -676,6 +703,9 @@ def record_exception(self, method):
         :param method: method name
         :type method: string
         """
+        _LOGGER.debug("Adding Excepction stats to redis key %s" % (self._TELEMETRY_EXCEPTIONS_KEY))
+        _LOGGER.debug(self._sdk_metadata.sdk_version + '/' + self._sdk_metadata.instance_name + '/' + self._sdk_metadata.instance_ip + '/' +
+                    method.value)
         pipe = self._make_pipe()
         pipe.hincrby(self._TELEMETRY_EXCEPTIONS_KEY, self._sdk_metadata.sdk_version + '/' + self._sdk_metadata.instance_name + '/' + self._sdk_metadata.instance_ip + '/' +
                     method.value, 1)