Skip to content

Commit e1f3657

Browse files
authored
Merge branch 'feature/telemetryv2' into telemetry-attach-services
2 parents b0687c6 + 8d2e7d0 commit e1f3657

File tree

8 files changed

+289
-14
lines changed

8 files changed

+289
-14
lines changed

splitio/api/impressions.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
from splitio.api import APIException
77
from splitio.api.client import HttpClientException
88
from splitio.api.commons import headers_from_metadata
9-
from splitio.engine.impressions import ImpressionsMode
9+
from splitio.engine.impressions.impressions import ImpressionsMode
1010

1111

1212
_LOGGER = logging.getLogger(__name__)

splitio/client/config.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
import os.path
33
import logging
44

5-
from splitio.engine.impressions import ImpressionsMode
5+
from splitio.engine.impressions.impressions import ImpressionsMode
66

77

88
_LOGGER = logging.getLogger(__name__)

splitio/client/factory.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,7 @@ def block_until_ready(self, timeout=None):
204204
self._telemetry_init_producer.record_bur_time_out()
205205
raise TimeoutException('SDK Initialization: time of %d exceeded' % timeout)
206206
else:
207-
redundant_factory_count, active_factory_count = _get_active_and_derundant_count()
207+
redundant_factory_count, active_factory_count = _get_active_and_redundant_count()
208208
self._telemetry_init_producer.record_active_and_redundant_factories(active_factory_count, redundant_factory_count)
209209

210210
config_post_thread = threading.Thread(target=self._telemetry_api.record_init(self._telemetry_init_consumer.get_config_stats()), name="PostConfigData")
@@ -576,7 +576,7 @@ def get_factory(api_key, **kwargs):
576576
_INSTANTIATED_FACTORIES.update([api_key])
577577
_INSTANTIATED_FACTORIES_LOCK.release()
578578

579-
def _get_active_and_derundant_count():
579+
def _get_active_and_redundant_count():
580580
redundant_factory_count = 0
581581
active_factory_count = 0
582582
_INSTANTIATED_FACTORIES_LOCK.acquire()

splitio/models/telemetry.py

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,9 @@
22
from bisect import bisect_left
33
import threading
44
import os
5-
import logging
65

76
from splitio.engine.impressions import ImpressionsMode
87

9-
_LOGGER = logging.getLogger(__name__)
10-
11-
128
BUCKETS = (
139
1000, 1500, 2250, 3375, 5063,
1410
7594, 11391, 17086, 25629, 38443,
@@ -270,7 +266,6 @@ def add_exception(self, method):
270266
self._track = self._track + 1
271267
else:
272268
return
273-
_LOGGER.debug(self._treatment)
274269

275270
def pop_all(self):
276271
"""
@@ -745,7 +740,6 @@ def record_active_and_redundant_factories(self, active_factory_count, redundant_
745740
self._active_factory_count = active_factory_count
746741
self._redundant_factory_count = redundant_factory_count
747742

748-
749743
def record_ready_time(self, ready_time):
750744
"""
751745
Record ready time.

splitio/sync/telemetry.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,4 +49,4 @@ def _build_stats(self):
4949
}
5050
merged_dict.update(self._telemetry_runtime_consumer.pop_formatted_stats())
5151
merged_dict.update(self._telemetry_evaluation_consumer.pop_formatted_stats())
52-
return merged_dict
52+
return merged_dict

tests/api/test_impressions_api.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import pytest
44
from splitio.api import impressions, client, APIException
55
from splitio.models.impressions import Impression
6-
from splitio.engine.impressions import ImpressionsMode
6+
from splitio.engine.impressions.impressions import ImpressionsMode
77
from splitio.engine.impressions.manager import Counter
88
from splitio.client.util import get_metadata
99
from splitio.client.config import DEFAULT_CONFIG

tests/client/test_config.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# pylint: disable=protected-access,no-self-use,line-too-long
33

44
from splitio.client import config
5-
from splitio.engine.impressions import ImpressionsMode
5+
from splitio.engine.impressions.impressions import ImpressionsMode
66

77

88
class ConfigSanitizationTests(object):

tests/storage/test_inmemory_storage.py

Lines changed: 282 additions & 1 deletion
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)