Skip to content

Commit a299882

Browse files
chillaqchillaq
committed
polish
1 parent c3341fd commit a299882

File tree

2 files changed

+43
-42
lines changed

2 files changed

+43
-42
lines changed

‎splitio/models/telemetry.py‎

Lines changed: 41 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ class CounterConstants(Enum):
2727
EVENTS_QUEUED = 'eventsQueued'
2828
EVENTS_DROPPED = 'eventsDropped'
2929

30-
class ConfigParams(Enum):
30+
class _ConfigParams(Enum):
3131
"""Config parameters constants"""
3232
SPLITS_REFRESH_RATE = 'featuresRefreshRate'
3333
SEGMENTS_REFRESH_RATE = 'segmentsRefreshRate'
@@ -41,9 +41,9 @@ class ConfigParams(Enum):
4141
EVENTS_QUEUE_SIZE = 'eventsQueueSize'
4242
IMPRESSIONS_MODE = 'impressionsMode'
4343
IMPRESSIONS_LISTENER = 'impressionListener'
44-
FLAG_SETS = 'FlagSetsFilter'
44+
FLAG_SETS = 'flagSetsFilter'
4545

46-
class ExtraConfig(Enum):
46+
class _ExtraConfig(Enum):
4747
"""Extra config constants"""
4848
ACTIVE_FACTORY_COUNT = 'activeFactoryCount'
4949
REDUNDANT_FACTORY_COUNT = 'redundantFactoryCount'
@@ -54,7 +54,7 @@ class ExtraConfig(Enum):
5454
HTTP_PROXY = 'httpProxy'
5555
HTTPS_PROXY_ENV = 'HTTPS_PROXY'
5656

57-
class ApiURLs(Enum):
57+
class _ApiURLs(Enum):
5858
"""Api URL constants"""
5959
SDK_URL = 'sdk_url'
6060
EVENTS_URL = 'events_url'
@@ -89,7 +89,7 @@ class MethodExceptionsAndLatencies(Enum):
8989
TREATMENTS_WITH_CONFIG_BY_FLAG_SETS = 'treatments_with_config_by_flag_sets'
9090
TRACK = 'track'
9191

92-
class LastSynchronizationConstants(Enum):
92+
class _LastSynchronizationConstants(Enum):
9393
"""Last sync constants"""
9494
LAST_SYNCHRONIZATIONS = 'lastSynchronizations'
9595

@@ -109,7 +109,7 @@ class SSESyncMode(Enum):
109109
STREAMING = 0
110110
POLLING = 1
111111

112-
class StreamingEventsConstant(Enum):
112+
class _StreamingEventsConstant(Enum):
113113
"""Storage types constant"""
114114
STREAMING_EVENTS = 'streamingEvents'
115115

@@ -427,7 +427,7 @@ def get_all(self):
427427
:rtype: dict
428428
"""
429429
with self._lock:
430-
return {LastSynchronizationConstants.LAST_SYNCHRONIZATIONS.value: {HTTPExceptionsAndLatencies.SPLIT.value: self._split, HTTPExceptionsAndLatencies.SEGMENT.value: self._segment, HTTPExceptionsAndLatencies.IMPRESSION.value: self._impression,
430+
return {_LastSynchronizationConstants.LAST_SYNCHRONIZATIONS.value: {HTTPExceptionsAndLatencies.SPLIT.value: self._split, HTTPExceptionsAndLatencies.SEGMENT.value: self._segment, HTTPExceptionsAndLatencies.IMPRESSION.value: self._impression,
431431
HTTPExceptionsAndLatencies.IMPRESSION_COUNT.value: self._impression_count, HTTPExceptionsAndLatencies.EVENT.value: self._event,
432432
HTTPExceptionsAndLatencies.TELEMETRY.value: self._telemetry, HTTPExceptionsAndLatencies.TOKEN.value: self._token}
433433
}
@@ -761,7 +761,7 @@ def pop_streaming_events(self):
761761
with self._lock:
762762
streaming_events = self._streaming_events
763763
self._streaming_events = []
764-
return {StreamingEventsConstant.STREAMING_EVENTS.value: [{'e': streaming_event.type, 'd': streaming_event.data,
764+
return {_StreamingEventsConstant.STREAMING_EVENTS.value: [{'e': streaming_event.type, 'd': streaming_event.data,
765765
't': streaming_event.time} for streaming_event in streaming_events]}
766766

767767
class TelemetryConfig(object):
@@ -783,10 +783,10 @@ def _reset_all(self):
783783
self._operation_mode = None
784784
self._storage_type = None
785785
self._streaming_enabled = None
786-
self._refresh_rate = {ConfigParams.SPLITS_REFRESH_RATE.value: 0, ConfigParams.SEGMENTS_REFRESH_RATE.value: 0,
787-
ConfigParams.IMPRESSIONS_REFRESH_RATE.value: 0, ConfigParams.EVENTS_REFRESH_RATE.value: 0, ConfigParams.TELEMETRY_REFRESH_RATE.value: 0}
788-
self._url_override = {ApiURLs.SDK_URL.value: False, ApiURLs.EVENTS_URL.value: False, ApiURLs.AUTH_URL.value: False,
789-
ApiURLs.STREAMING_URL.value: False, ApiURLs.TELEMETRY_URL.value: False}
786+
self._refresh_rate = {_ConfigParams.SPLITS_REFRESH_RATE.value: 0, _ConfigParams.SEGMENTS_REFRESH_RATE.value: 0,
787+
_ConfigParams.IMPRESSIONS_REFRESH_RATE.value: 0, _ConfigParams.EVENTS_REFRESH_RATE.value: 0, _ConfigParams.TELEMETRY_REFRESH_RATE.value: 0}
788+
self._url_override = {_ApiURLs.SDK_URL.value: False, _ApiURLs.EVENTS_URL.value: False, _ApiURLs.AUTH_URL.value: False,
789+
_ApiURLs.STREAMING_URL.value: False, _ApiURLs.TELEMETRY_URL.value: False}
790790
self._impressions_queue_size = 0
791791
self._events_queue_size = 0
792792
self._impressions_mode = None
@@ -819,17 +819,17 @@ def record_config(self, config, extra_config):
819819
:type config: dict
820820
"""
821821
with self._lock:
822-
self._operation_mode = self._get_operation_mode(config[ConfigParams.OPERATION_MODE.value])
823-
self._storage_type = self._get_storage_type(config[ConfigParams.OPERATION_MODE.value], config[ConfigParams.STORAGE_TYPE.value])
824-
self._streaming_enabled = config[ConfigParams.STREAMING_ENABLED.value]
822+
self._operation_mode = self._get_operation_mode(config[_ConfigParams.OPERATION_MODE.value])
823+
self._storage_type = self._get_storage_type(config[_ConfigParams.OPERATION_MODE.value], config[_ConfigParams.STORAGE_TYPE.value])
824+
self._streaming_enabled = config[_ConfigParams.STREAMING_ENABLED.value]
825825
self._refresh_rate = self._get_refresh_rates(config)
826826
self._url_override = self._get_url_overrides(extra_config)
827-
self._impressions_queue_size = config[ConfigParams.IMPRESSIONS_QUEUE_SIZE.value]
828-
self._events_queue_size = config[ConfigParams.EVENTS_QUEUE_SIZE.value]
829-
self._impressions_mode = self._get_impressions_mode(config[ConfigParams.IMPRESSIONS_MODE.value])
830-
self._impression_listener = True if config[ConfigParams.IMPRESSIONS_LISTENER.value] is not None else False
827+
self._impressions_queue_size = config[_ConfigParams.IMPRESSIONS_QUEUE_SIZE.value]
828+
self._events_queue_size = config[_ConfigParams.EVENTS_QUEUE_SIZE.value]
829+
self._impressions_mode = self._get_impressions_mode(config[_ConfigParams.IMPRESSIONS_MODE.value])
830+
self._impression_listener = True if config[_ConfigParams.IMPRESSIONS_LISTENER.value] is not None else False
831831
self._http_proxy = self._check_if_proxy_detected()
832-
self._flag_sets = len(config[ConfigParams.FLAG_SETS.value]) if config[ConfigParams.FLAG_SETS.value] is not None else 0
832+
self._flag_sets = len(config[_ConfigParams.FLAG_SETS.value]) if config[_ConfigParams.FLAG_SETS.value] is not None else 0
833833

834834
def record_active_and_redundant_factories(self, active_factory_count, redundant_factory_count):
835835
with self._lock:
@@ -915,16 +915,16 @@ def get_stats(self):
915915
'oM': self._operation_mode,
916916
'sT': self._storage_type,
917917
'sE': self._streaming_enabled,
918-
'rR': {'sp': self._refresh_rate[ConfigParams.SPLITS_REFRESH_RATE.value],
919-
'se': self._refresh_rate[ConfigParams.SEGMENTS_REFRESH_RATE.value],
920-
'im': self._refresh_rate[ConfigParams.IMPRESSIONS_REFRESH_RATE.value],
921-
'ev': self._refresh_rate[ConfigParams.EVENTS_REFRESH_RATE.value],
922-
'te': self._refresh_rate[ConfigParams.TELEMETRY_REFRESH_RATE.value]},
923-
'uO': {'s': self._url_override[ApiURLs.SDK_URL.value],
924-
'e': self._url_override[ApiURLs.EVENTS_URL.value],
925-
'a': self._url_override[ApiURLs.AUTH_URL.value],
926-
'st': self._url_override[ApiURLs.STREAMING_URL.value],
927-
't': self._url_override[ApiURLs.TELEMETRY_URL.value]},
918+
'rR': {'sp': self._refresh_rate[_ConfigParams.SPLITS_REFRESH_RATE.value],
919+
'se': self._refresh_rate[_ConfigParams.SEGMENTS_REFRESH_RATE.value],
920+
'im': self._refresh_rate[_ConfigParams.IMPRESSIONS_REFRESH_RATE.value],
921+
'ev': self._refresh_rate[_ConfigParams.EVENTS_REFRESH_RATE.value],
922+
'te': self._refresh_rate[_ConfigParams.TELEMETRY_REFRESH_RATE.value]},
923+
'uO': {'s': self._url_override[_ApiURLs.SDK_URL.value],
924+
'e': self._url_override[_ApiURLs.EVENTS_URL.value],
925+
'a': self._url_override[_ApiURLs.AUTH_URL.value],
926+
'st': self._url_override[_ApiURLs.STREAMING_URL.value],
927+
't': self._url_override[_ApiURLs.TELEMETRY_URL.value]},
928928
'iQ': self._impressions_queue_size,
929929
'eQ': self._events_queue_size,
930930
'iM': self._impressions_mode,
@@ -983,11 +983,11 @@ def _get_refresh_rates(self, config):
983983
"""
984984
with self._lock:
985985
return {
986-
ConfigParams.SPLITS_REFRESH_RATE.value: config[ConfigParams.SPLITS_REFRESH_RATE.value],
987-
ConfigParams.SEGMENTS_REFRESH_RATE.value: config[ConfigParams.SEGMENTS_REFRESH_RATE.value],
988-
ConfigParams.IMPRESSIONS_REFRESH_RATE.value: config[ConfigParams.IMPRESSIONS_REFRESH_RATE.value],
989-
ConfigParams.EVENTS_REFRESH_RATE.value: config[ConfigParams.EVENTS_REFRESH_RATE.value],
990-
ConfigParams.TELEMETRY_REFRESH_RATE.value: config[ConfigParams.TELEMETRY_REFRESH_RATE.value]
986+
_ConfigParams.SPLITS_REFRESH_RATE.value: config[_ConfigParams.SPLITS_REFRESH_RATE.value],
987+
_ConfigParams.SEGMENTS_REFRESH_RATE.value: config[_ConfigParams.SEGMENTS_REFRESH_RATE.value],
988+
_ConfigParams.IMPRESSIONS_REFRESH_RATE.value: config[_ConfigParams.IMPRESSIONS_REFRESH_RATE.value],
989+
_ConfigParams.EVENTS_REFRESH_RATE.value: config[_ConfigParams.EVENTS_REFRESH_RATE.value],
990+
_ConfigParams.TELEMETRY_REFRESH_RATE.value: config[_ConfigParams.TELEMETRY_REFRESH_RATE.value]
991991
}
992992

993993
def _get_url_overrides(self, config):
@@ -1002,11 +1002,11 @@ def _get_url_overrides(self, config):
10021002
"""
10031003
with self._lock:
10041004
return {
1005-
ApiURLs.SDK_URL.value: True if ApiURLs.SDK_URL.value in config else False,
1006-
ApiURLs.EVENTS_URL.value: True if ApiURLs.EVENTS_URL.value in config else False,
1007-
ApiURLs.AUTH_URL.value: True if ApiURLs.AUTH_URL.value in config else False,
1008-
ApiURLs.STREAMING_URL.value: True if ApiURLs.STREAMING_URL.value in config else False,
1009-
ApiURLs.TELEMETRY_URL.value: True if ApiURLs.TELEMETRY_URL.value in config else False
1005+
_ApiURLs.SDK_URL.value: True if _ApiURLs.SDK_URL.value in config else False,
1006+
_ApiURLs.EVENTS_URL.value: True if _ApiURLs.EVENTS_URL.value in config else False,
1007+
_ApiURLs.AUTH_URL.value: True if _ApiURLs.AUTH_URL.value in config else False,
1008+
_ApiURLs.STREAMING_URL.value: True if _ApiURLs.STREAMING_URL.value in config else False,
1009+
_ApiURLs.TELEMETRY_URL.value: True if _ApiURLs.TELEMETRY_URL.value in config else False
10101010
}
10111011

10121012
def _get_impressions_mode(self, imp_mode):
@@ -1036,6 +1036,6 @@ def _check_if_proxy_detected(self):
10361036
"""
10371037
with self._lock:
10381038
for x in os.environ:
1039-
if x.upper() == ExtraConfig.HTTPS_PROXY_ENV.value:
1039+
if x.upper() == _ExtraConfig.HTTPS_PROXY_ENV.value:
10401040
return True
10411041
return False

‎tests/models/test_telemetry_model.py‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -297,7 +297,8 @@ def test_telemetry_config(self):
297297
'impressionsRefreshRate': 60,
298298
'eventsPushRate': 60,
299299
'metricsRefreshRate': 10,
300-
'storageType': None
300+
'storageType': None,
301+
'flagSetsFilter': None
301302
}
302303
telemetry_config.record_config(config, {})
303304
assert(telemetry_config.get_stats() == {'oM': 0,

0 commit comments

Comments
 (0)