diff --git a/splitio/api/kerberos_client.py b/splitio/api/kerberos_client.py index 8b30a291..9b49b49c 100644 --- a/splitio/api/kerberos_client.py +++ b/splitio/api/kerberos_client.py @@ -8,11 +8,11 @@ import threading from urllib3.util import parse_url -from harness_commons.api.client import HttpClientBase, build_url, construct_urls, HttpResponse +from splitio_commons.api.client import HttpClientBase, build_url, construct_urls, HttpResponse from splitio.optional.loaders import HTTPKerberosAuth, OPTIONAL from splitio.client.config import AuthenticateScheme from splitio.optional.loaders import aiohttp -from harness_commons.util.time import get_current_epoch_time_ms +from splitio_commons.util.time import get_current_epoch_time_ms _LOGGER = logging.getLogger(__name__) _EXC_MSG = '{source} library is throwing exceptions' diff --git a/splitio/api/splits.py b/splitio/api/splits.py index 6ff1feec..ccf085c4 100644 --- a/splitio/api/splits.py +++ b/splitio/api/splits.py @@ -3,13 +3,13 @@ import logging import json -from harness_commons.api import APIException, headers_from_metadata -from harness_commons.api.commons import build_fetch, FetchOptions -from harness_commons.api.client import HttpClientException -from harness_commons.models.telemetry import HTTPExceptionsAndLatencies -from harness_commons.util.time import utctime_ms +from splitio_commons.api import APIException, headers_from_metadata +from splitio_commons.api.commons import build_fetch, FetchOptions +from splitio_commons.api.client import HttpClientException +from splitio_commons.models.telemetry import HTTPExceptionsAndLatencies +from splitio_commons.util.time import utctime_ms from splitio.spec import SPEC_VERSION -from harness_commons.sync import util +from splitio_commons.sync import util _LOGGER = logging.getLogger(__name__) _SPEC_1_1 = "1.1" @@ -83,7 +83,7 @@ def fetch_definitions(self, change_number, rbs_change_number, fetch_options): :type rbs_change_number: int :param fetch_options: Fetch options for getting feature flag definitions. - :type fetch_options: harness_commons.api.commons.FetchOptions + :type fetch_options: splitio_commons.api.commons.FetchOptions :return: Json representation of a splitChanges response. :rtype: dict @@ -160,7 +160,7 @@ async def fetch_definitions(self, change_number, rbs_change_number, fetch_option :type rbs_change_number: int :param fetch_options: Fetch options for getting feature flag definitions. - :type fetch_options: harness_commons.api.commons.FetchOptions + :type fetch_options: splitio_commons.api.commons.FetchOptions :return: Json representation of a splitChanges response. :rtype: dict diff --git a/splitio/client/client.py b/splitio/client/client.py index 7429fe72..7dcb3edc 100644 --- a/splitio/client/client.py +++ b/splitio/client/client.py @@ -5,14 +5,14 @@ import copy from splitio.client import input_validator -from harness_commons.engine.evaluator import Evaluator, CONTROL, EvaluationDataFactory, AsyncEvaluationDataFactory -from harness_commons.engine.splitters import Splitter -from harness_commons.models.impressions import Impression, ImpressionDecorated +from splitio_commons.engine.evaluator import Evaluator, CONTROL, EvaluationDataFactory, AsyncEvaluationDataFactory +from splitio_commons.engine.splitters import Splitter +from splitio_commons.models.impressions import Impression, ImpressionDecorated from splitio.models.label import Label -from harness_commons.models.events import Event, EventWrapper, SdkEvent -from harness_commons.models.telemetry import get_latency_bucket_index, MethodExceptionsAndLatencies +from splitio_commons.models.events import Event, EventWrapper, SdkEvent +from splitio_commons.models.telemetry import get_latency_bucket_index, MethodExceptionsAndLatencies from splitio.optional.loaders import asyncio -from harness_commons.util.time import get_current_epoch_time_ms, utctime_ms +from splitio_commons.util.time import get_current_epoch_time_ms, utctime_ms _LOGGER = logging.getLogger(__name__) @@ -53,7 +53,7 @@ def __init__(self, factory, recorder, events_manager, labels_enabled=True, fallb :type labels_enabled: bool :param recorder: recorder instance - :type recorder: harness_commons.recorder.StatsRecorder + :type recorder: splitio_commons.recorder.StatsRecorder :rtype: Client """ @@ -175,7 +175,7 @@ def _validate_track(self, key, traffic_type, event_type, value=None, properties= :type properties: dict :return: validation, event created and its properties size. - :rtype: tuple(bool, harness_commons.models.events.Event, int) + :rtype: tuple(bool, splitio_commons.models.events.Event, int) """ if self.destroyed: _LOGGER.error("Client has already been destroyed - no calls possible") @@ -268,7 +268,7 @@ def __init__(self, factory, recorder, events_manager, labels_enabled=True, fallb :type labels_enabled: bool :param recorder: recorder instance - :type recorder: harness_commons.recorder.StatsRecorder + :type recorder: splitio_commons.recorder.StatsRecorder :rtype: Client """ @@ -352,7 +352,7 @@ def _get_treatment(self, method, key, feature, attributes=None, evaluation_optio :param attributes: An optional dictionary of attributes :type attributes: dict :param method: The method calling this function - :type method: harness_commons.models.telemetry.MethodExceptionsAndLatencies + :type method: splitio_commons.models.telemetry.MethodExceptionsAndLatencies :param evaluation_options: An optional dictionary of options :type evaluation_options: dict :return: The treatment and config for the key and feature flag @@ -523,7 +523,7 @@ def _get_treatments_by_flag_sets(self, key, flag_sets, method, attributes=None, :param flag_sets: list of flag sets :type flag_sets: list :param method: Treatment by flag set method flavor - :type method: harness_commons.models.telemetry.MethodExceptionsAndLatencies + :type method: splitio_commons.models.telemetry.MethodExceptionsAndLatencies :param attributes: An optional dictionary of attributes :type attributes: dict :param evaluation_options: An optional dictionary of options @@ -652,7 +652,7 @@ def _get_treatments(self, key, features, method, attributes=None, evaluation_opt :param feature_flag_names: Array of feature flag names for which to get the treatments :type feature_flag_names: list(str) :param method: The method calling this function - :type method: harness_commons.models.telemetry.MethodExceptionsAndLatencies + :type method: splitio_commons.models.telemetry.MethodExceptionsAndLatencies :param attributes: An optional dictionary of attributes :type attributes: dict :param evaluation_options: An optional dictionary of options @@ -704,7 +704,7 @@ def _record_stats(self, impressions_decorated, start, operation): Record impressions. :param impressions_decorated: Generated impressions - :type impressions_decorated: list[tuple[harness_commons.models.impression.ImpressionDecorated, dict]] + :type impressions_decorated: list[tuple[splitio_commons.models.impression.ImpressionDecorated, dict]] :param start: timestamp when get_treatment or get_treatments was called :type start: int @@ -777,7 +777,7 @@ def __init__(self, factory, recorder, events_manager, labels_enabled=True, fallb :type labels_enabled: bool :param recorder: recorder instance - :type recorder: harness_commons.recorder.StatsRecorder + :type recorder: splitio_commons.recorder.StatsRecorder :rtype: Client """ @@ -861,7 +861,7 @@ async def _get_treatment(self, method, key, feature, attributes=None, evaluation :param attributes: An optional dictionary of attributes :type attributes: dict :param method: The method calling this function - :type method: harness_commons.models.telemetry.MethodExceptionsAndLatencies + :type method: splitio_commons.models.telemetry.MethodExceptionsAndLatencies :param evaluation_options: An optional dictionary of options :type evaluation_options: dict :return: The treatment and config for the key and feature flag @@ -1030,7 +1030,7 @@ async def _get_treatments_by_flag_sets(self, key, flag_sets, method, attributes= :param flag_sets: list of flag sets :type flag_sets: list :param method: Treatment by flag set method flavor - :type method: harness_commons.models.telemetry.MethodExceptionsAndLatencies + :type method: splitio_commons.models.telemetry.MethodExceptionsAndLatencies :param attributes: An optional dictionary of attributes :type attributes: dict :param evaluation_options: An optional dictionary of options @@ -1074,7 +1074,7 @@ async def _get_treatments(self, key, features, method, attributes=None, evaluati :param feature_flag_names: Array of feature flag names for which to get the treatments :type feature_flag_names: list(str) :param method: The method calling this function - :type method: harness_commons.models.telemetry.MethodExceptionsAndLatencies + :type method: splitio_commons.models.telemetry.MethodExceptionsAndLatencies :param attributes: An optional dictionary of attributes :type attributes: dict :param evaluation_options: An optional dictionary of options @@ -1125,7 +1125,7 @@ async def _record_stats(self, impressions_decorated, start, operation): Record impressions for async calls :param impressions_decorated: Generated impressions decorated - :type impressions_decorated: list[tuple[harness_commons.models.impression.Impression, dict]] + :type impressions_decorated: list[tuple[splitio_commons.models.impression.Impression, dict]] :param start: timestamp when get_treatment or get_treatments was called :type start: int diff --git a/splitio/client/config.py b/splitio/client/config.py index fd908f80..e1df1706 100644 --- a/splitio/client/config.py +++ b/splitio/client/config.py @@ -3,9 +3,9 @@ import logging from enum import Enum -from harness_commons.engine.impressions.impressions import ImpressionsMode +from splitio_commons.engine.impressions.impressions import ImpressionsMode from splitio.client.input_validator import validate_flag_sets, validate_fallback_treatment, validate_regex_name -from harness_commons.models.fallback_config import FallbackTreatmentsConfiguration +from splitio_commons.models.fallback_config import FallbackTreatmentsConfiguration _LOGGER = logging.getLogger(__name__) DEFAULT_DATA_SAMPLING = 1 diff --git a/splitio/client/factory.py b/splitio/client/factory.py index de1dbdc2..f38afeaa 100644 --- a/splitio/client/factory.py +++ b/splitio/client/factory.py @@ -14,23 +14,23 @@ from splitio.client.listener import ImpressionListenerWrapper, ImpressionListenerWrapperAsync # events -from harness_commons.events.events_manager import EventsManager, EventsManagerAsync -from harness_commons.events.events_manager_config import EventsManagerConfig -from harness_commons.events.events_task import EventsTask, EventsTaskAsync -from harness_commons.events.events_delivery import EventsDelivery -from harness_commons.models.fallback_config import FallbackTreatmentCalculator -from harness_commons.models.notification import SdkInternalEventNotification -from harness_commons.models.events import SdkInternalEvent +from splitio_commons.events.events_manager import EventsManager, EventsManagerAsync +from splitio_commons.events.events_manager_config import EventsManagerConfig +from splitio_commons.events.events_task import EventsTask, EventsTaskAsync +from splitio_commons.events.events_delivery import EventsDelivery +from splitio_commons.models.fallback_config import FallbackTreatmentCalculator +from splitio_commons.models.notification import SdkInternalEventNotification +from splitio_commons.models.events import SdkInternalEvent # push -from harness_commons.push.manager import PushManager, PushManagerAsync -from harness_commons.push.processor import MessageProcessor, MessageProcessorAsync -from harness_commons.push.parser import UpdateType +from splitio_commons.push.manager import PushManager, PushManagerAsync +from splitio_commons.push.processor import MessageProcessor, MessageProcessorAsync +from splitio_commons.push.parser import UpdateType from splitio.push.workers import SplitWorker, SplitWorkerAsync # Storage from splitio.storage.inmemory import InMemorySplitStorage, InMemorySplitStorageAsync -from harness_commons.storage.inmemmory import InMemorySegmentStorage, \ +from splitio_commons.storage.inmemmory import InMemorySegmentStorage, \ InMemoryImpressionStorage, InMemoryEventStorage, InMemoryTelemetryStorage, LocalhostTelemetryStorage, \ InMemorySegmentStorageAsync, InMemoryImpressionStorageAsync, \ InMemoryEventStorageAsync, InMemoryTelemetryStorageAsync, LocalhostTelemetryStorageAsync, \ @@ -46,62 +46,62 @@ PluggableRuleBasedSegmentsStorage, PluggableRuleBasedSegmentsStorageAsync # APIs -from harness_commons.api.client import HttpClient, HttpClientAsync +from splitio_commons.api.client import HttpClient, HttpClientAsync from splitio.api.kerberos_client import HttpClientKerberos from splitio.api.splits import SplitsAPI, SplitsAPIAsync -from harness_commons.api.segments import SegmentsAPI, SegmentsAPIAsync -from harness_commons.api.impressions import ImpressionsAPI, ImpressionsAPIAsync -from harness_commons.api.events import EventsAPI, EventsAPIAsync -from harness_commons.api.auth import AuthAPI, AuthAPIAsync -from harness_commons.api.telemetry import TelemetryAPI, TelemetryAPIAsync -from harness_commons.util.time import get_current_epoch_time_ms +from splitio_commons.api.segments import SegmentsAPI, SegmentsAPIAsync +from splitio_commons.api.impressions import ImpressionsAPI, ImpressionsAPIAsync +from splitio_commons.api.events import EventsAPI, EventsAPIAsync +from splitio_commons.api.auth import AuthAPI, AuthAPIAsync +from splitio_commons.api.telemetry import TelemetryAPI, TelemetryAPIAsync +from splitio_commons.util.time import get_current_epoch_time_ms from splitio.spec import SPEC_VERSION # engine -from harness_commons.engine.impressions.impressions import ImpressionsMode -from harness_commons.engine.impressions.strategies import StrategyNoneMode, StrategyDebugMode, StrategyOptimizedMode -from harness_commons.engine.impressions.adapters import InMemorySenderAdapter, RedisSenderAdapter, PluggableSenderAdapter, RedisSenderAdapterAsync, \ +from splitio_commons.engine.impressions.impressions import ImpressionsMode +from splitio_commons.engine.impressions.strategies import StrategyNoneMode, StrategyDebugMode, StrategyOptimizedMode +from splitio_commons.engine.impressions.adapters import InMemorySenderAdapter, RedisSenderAdapter, PluggableSenderAdapter, RedisSenderAdapterAsync, \ InMemorySenderAdapterAsync, PluggableSenderAdapterAsync -from harness_commons.engine.impressions.strategies import StrategyDebugMode, StrategyNoneMode -from harness_commons.engine.telemetry import TelemetryStorageProducer, TelemetryStorageConsumer, \ +from splitio_commons.engine.impressions.strategies import StrategyDebugMode, StrategyNoneMode +from splitio_commons.engine.telemetry import TelemetryStorageProducer, TelemetryStorageConsumer, \ TelemetryStorageProducerAsync, TelemetryStorageConsumerAsync -from harness_commons.engine.impressions.manager import Counter as ImpressionsCounter -from harness_commons.engine.impressions.unique_keys_tracker import UniqueKeysTracker, UniqueKeysTrackerAsync -from harness_commons.engine.impressions.impressions import Manager as ImpressionsManager +from splitio_commons.engine.impressions.manager import Counter as ImpressionsCounter +from splitio_commons.engine.impressions.unique_keys_tracker import UniqueKeysTracker, UniqueKeysTrackerAsync +from splitio_commons.engine.impressions.impressions import Manager as ImpressionsManager # Tasks from splitio.tasks.split_sync import SplitSynchronizationTask, SplitSynchronizationTaskAsync -from harness_commons.tasks.segment_sync import SegmentSynchronizationTask, SegmentSynchronizationTaskAsync -from harness_commons.tasks.impressions_sync import ImpressionsSyncTask, ImpressionsCountSyncTask,\ +from splitio_commons.tasks.segment_sync import SegmentSynchronizationTask, SegmentSynchronizationTaskAsync +from splitio_commons.tasks.impressions_sync import ImpressionsSyncTask, ImpressionsCountSyncTask,\ ImpressionsCountSyncTaskAsync, ImpressionsSyncTaskAsync -from harness_commons.tasks.events_sync import EventsSyncTask, EventsSyncTaskAsync -from harness_commons.tasks.telemetry_sync import TelemetrySyncTask, TelemetrySyncTaskAsync -from harness_commons.tasks.unique_keys_sync import UniqueKeysSyncTask, ClearFilterSyncTask, UniqueKeysSyncTaskAsync, ClearFilterSyncTaskAsync -from harness_commons.sync.unique_keys import UniqueKeysSynchronizer, ClearFilterSynchronizer, UniqueKeysSynchronizerAsync, ClearFilterSynchronizerAsync -from harness_commons.sync.impression import ImpressionsCountSynchronizer, ImpressionsCountSynchronizerAsync -from harness_commons.tasks.impressions_sync import ImpressionsCountSyncTask, ImpressionsCountSyncTaskAsync +from splitio_commons.tasks.events_sync import EventsSyncTask, EventsSyncTaskAsync +from splitio_commons.tasks.telemetry_sync import TelemetrySyncTask, TelemetrySyncTaskAsync +from splitio_commons.tasks.unique_keys_sync import UniqueKeysSyncTask, ClearFilterSyncTask, UniqueKeysSyncTaskAsync, ClearFilterSyncTaskAsync +from splitio_commons.sync.unique_keys import UniqueKeysSynchronizer, ClearFilterSynchronizer, UniqueKeysSynchronizerAsync, ClearFilterSynchronizerAsync +from splitio_commons.sync.impression import ImpressionsCountSynchronizer, ImpressionsCountSynchronizerAsync +from splitio_commons.tasks.impressions_sync import ImpressionsCountSyncTask, ImpressionsCountSyncTaskAsync # Synchronizer -from harness_commons.sync.synchronizer import HarnessTasks, HarnessSynchronizers, Synchronizer, \ +from splitio_commons.sync.synchronizer import HarnessTasks, HarnessSynchronizers, Synchronizer, \ LocalhostSynchronizer, RedisSynchronizer, PluggableSynchronizer,\ SynchronizerAsync, RedisSynchronizerAsync, LocalhostSynchronizerAsync -from harness_commons.sync.manager import Manager, RedisManager, ManagerAsync, RedisManagerAsync +from splitio_commons.sync.manager import Manager, RedisManager, ManagerAsync, RedisManagerAsync from splitio.sync.split import SplitSynchronizer, LocalSplitSynchronizer, LocalhostMode,\ SplitSynchronizerAsync, LocalSplitSynchronizerAsync -from harness_commons.sync.segment import SegmentSynchronizer, LocalSegmentSynchronizer, SegmentSynchronizerAsync,\ +from splitio_commons.sync.segment import SegmentSynchronizer, LocalSegmentSynchronizer, SegmentSynchronizerAsync,\ LocalSegmentSynchronizerAsync -from harness_commons.sync.impression import ImpressionSynchronizer, ImpressionsCountSynchronizer, \ +from splitio_commons.sync.impression import ImpressionSynchronizer, ImpressionsCountSynchronizer, \ ImpressionsCountSynchronizerAsync, ImpressionSynchronizerAsync -from harness_commons.sync.event import EventSynchronizer, EventSynchronizerAsync -from harness_commons.sync.telemetry import TelemetrySynchronizer, InMemoryTelemetrySubmitter, \ +from splitio_commons.sync.event import EventSynchronizer, EventSynchronizerAsync +from splitio_commons.sync.telemetry import TelemetrySynchronizer, InMemoryTelemetrySubmitter, \ LocalhostTelemetrySubmitter, RedisTelemetrySubmitter, LocalhostTelemetrySubmitterAsync, \ InMemoryTelemetrySubmitterAsync, TelemetrySynchronizerAsync, RedisTelemetrySubmitterAsync -from harness_commons.sync.auth import AuthSynchronizer, AuthSynchronizerAsync -from harness_commons.sync.unique_keys import UniqueKeysSynchronizer, ClearFilterSynchronizer, UniqueKeysSynchronizerAsync, ClearFilterSynchronizerAsync -from harness_commons.sync.impression import ImpressionsCountSynchronizer, ImpressionsCountSynchronizerAsync +from splitio_commons.sync.auth import AuthSynchronizer, AuthSynchronizerAsync +from splitio_commons.sync.unique_keys import UniqueKeysSynchronizer, ClearFilterSynchronizer, UniqueKeysSynchronizerAsync, ClearFilterSynchronizerAsync +from splitio_commons.sync.impression import ImpressionsCountSynchronizer, ImpressionsCountSynchronizerAsync # Recorder -from harness_commons.recorder.recorder import StandardRecorder, PipelinedRecorder, StandardRecorderAsync, PipelinedRecorderAsync +from splitio_commons.recorder.recorder import StandardRecorder, PipelinedRecorder, StandardRecorderAsync, PipelinedRecorderAsync # Localhost stuff from splitio.client.localhost import LocalhostEventsStorage, LocalhostImpressionsStorage, \ @@ -220,7 +220,7 @@ def __init__( # pylint: disable=too-many-arguments :param apis: Dictionary of apis client wrappers :type apis: dict :param sync_manager: Manager synchronization - :type sync_manager: harness_commons.sync.manager.Manager + :type sync_manager: splitio_commons.sync.manager.Manager :param sdk_ready_flag: Event to set when the sdk is ready. :type sdk_ready_flag: threading.Event :param recorder: StatsRecorder instance @@ -398,7 +398,7 @@ def __init__( # pylint: disable=too-many-arguments :param apis: Dictionary of apis client wrappers :type apis: dict :param sync_manager: Manager synchronization - :type sync_manager: harness_commons.sync.manager.Manager + :type sync_manager: splitio_commons.sync.manager.Manager :param sdk_ready_flag: Event to set when the sdk is ready. :type sdk_ready_flag: threading.Event :param recorder: StatsRecorder instance diff --git a/splitio/client/input_validator.py b/splitio/client/input_validator.py index cb1afa75..c04a13b9 100644 --- a/splitio/client/input_validator.py +++ b/splitio/client/input_validator.py @@ -7,8 +7,8 @@ from splitio.client.key import Key from splitio.client import client -from harness_commons.engine.evaluator import CONTROL -from harness_commons.models.fallback_treatment import FallbackTreatment +from splitio_commons.engine.evaluator import CONTROL +from splitio_commons.models.fallback_treatment import FallbackTreatment _LOGGER = logging.getLogger(__name__) diff --git a/splitio/client/localhost.py b/splitio/client/localhost.py index 1b824d32..67c185eb 100644 --- a/splitio/client/localhost.py +++ b/splitio/client/localhost.py @@ -2,7 +2,7 @@ import logging import re -from harness_commons.storage import ImpressionStorage, EventStorage +from splitio_commons.storage import ImpressionStorage, EventStorage _LEGACY_COMMENT_LINE_RE = re.compile(r'^#.*$') _LEGACY_DEFINITION_LINE_RE = re.compile(r'^(?[\w_-]+)\s+(?P[\w_-]+)$') diff --git a/splitio/models/label.py b/splitio/models/label.py index cb8ab398..1ca38f59 100644 --- a/splitio/models/label.py +++ b/splitio/models/label.py @@ -1,6 +1,6 @@ """Impressions model module.""" from collections import namedtuple -from harness_commons.models.impressions import Label as CommonsLabel +from splitio_commons.models.impressions import Label as CommonsLabel class Label(CommonsLabel): # pylint: disable=too-few-public-methods """Impressions labels.""" diff --git a/splitio/models/splits.py b/splitio/models/splits.py index aea28b5f..6aa14a15 100644 --- a/splitio/models/splits.py +++ b/splitio/models/splits.py @@ -3,9 +3,9 @@ from collections import namedtuple import logging -from harness_commons.models import MatcherNotFoundException, _DEFAULT_CONDITIONS_TEMPLATE, Status, HashAlgorithm, Prerequisites -from harness_commons.models.grammar import condition -from harness_commons.models.definitions import Definition, Prerequisites, Status, from_raw_prerequisites +from splitio_commons.models import MatcherNotFoundException, _DEFAULT_CONDITIONS_TEMPLATE, Status, HashAlgorithm, Prerequisites +from splitio_commons.models.grammar import condition +from splitio_commons.models.definitions import Definition, Prerequisites, Status, from_raw_prerequisites _LOGGER = logging.getLogger(__name__) diff --git a/splitio/push/workers.py b/splitio/push/workers.py index 568411e1..c16d0eeb 100644 --- a/splitio/push/workers.py +++ b/splitio/push/workers.py @@ -11,13 +11,13 @@ from splitio.optional.loaders import asyncio from splitio.models.splits import from_raw -from harness_commons.models.rule_based_segments import from_raw as rbs_from_raw -from harness_commons.models.telemetry import UpdateFromSSE -from harness_commons.push import SplitStorageException -from harness_commons.push.parser import UpdateType -from harness_commons.push.workers import WorkerBase -from harness_commons.optional.loaders import asyncio -from harness_commons.util.storage_helper import update_definition_storage, update_definition_storage_async, \ +from splitio_commons.models.rule_based_segments import from_raw as rbs_from_raw +from splitio_commons.models.telemetry import UpdateFromSSE +from splitio_commons.push import SplitStorageException +from splitio_commons.push.parser import UpdateType +from splitio_commons.push.workers import WorkerBase +from splitio_commons.optional.loaders import asyncio +from splitio_commons.util.storage_helper import update_definition_storage, update_definition_storage_async, \ update_rule_based_segment_storage, update_rule_based_segment_storage_async _LOGGER = logging.getLogger(__name__) diff --git a/splitio/storage/inmemory.py b/splitio/storage/inmemory.py index da895a15..c4830acd 100644 --- a/splitio/storage/inmemory.py +++ b/splitio/storage/inmemory.py @@ -1,6 +1,6 @@ import abc -from harness_commons.storage.inmemmory import InMemoryDefinitionStorage, InMemoryDefinitionStorageAsync +from splitio_commons.storage.inmemmory import InMemoryDefinitionStorage, InMemoryDefinitionStorageAsync class SplitStorage(object, metaclass=abc.ABCMeta): """Split storage interface implemented as an abstract class.""" diff --git a/splitio/storage/pluggable.py b/splitio/storage/pluggable.py index 594a5b9f..25ce30cb 100644 --- a/splitio/storage/pluggable.py +++ b/splitio/storage/pluggable.py @@ -6,13 +6,13 @@ from splitio.optional.loaders import asyncio from splitio.models import splits -from harness_commons.models import segments, rule_based_segments -from harness_commons.models.impressions import Impression -from harness_commons.models.telemetry import MethodExceptions, MethodLatencies, TelemetryConfig, MAX_TAGS,\ +from splitio_commons.models import segments, rule_based_segments +from splitio_commons.models.impressions import Impression +from splitio_commons.models.telemetry import MethodExceptions, MethodLatencies, TelemetryConfig, MAX_TAGS,\ MethodLatenciesAsync, MethodExceptionsAsync, TelemetryConfigAsync -from harness_commons.storage import FlagSetsFilter, SegmentStorage, ImpressionStorage, EventStorage, TelemetryStorage, RuleBasedSegmentsStorage +from splitio_commons.storage import FlagSetsFilter, SegmentStorage, ImpressionStorage, EventStorage, TelemetryStorage, RuleBasedSegmentsStorage from splitio.storage.inmemory import SplitStorage -from harness_commons.util.storage_helper import get_valid_flag_sets, combine_valid_flag_sets +from splitio_commons.util.storage_helper import get_valid_flag_sets, combine_valid_flag_sets _LOGGER = logging.getLogger(__name__) @@ -82,9 +82,9 @@ def update(self, to_add, to_delete, new_change_number): Update rule based segment.. :param to_add: List of rule based segment. to add - :type to_add: list[harness_commons.models.rule_based_segments.RuleBasedSegment] + :type to_add: list[splitio_commons.models.rule_based_segments.RuleBasedSegment] :param to_delete: List of rule based segment. to delete - :type to_delete: list[harness_commons.models.rule_based_segments.RuleBasedSegment] + :type to_delete: list[splitio_commons.models.rule_based_segments.RuleBasedSegment] :param new_change_number: New change number. :type new_change_number: int """ @@ -188,7 +188,7 @@ def fetch_many(self, rb_segment_names): :type rb_segment_names: list(str) :return: A dict with rule based segment objects parsed from queue. - :rtype: dict(rb_segment_names, harness_commons.models.rule_based_segments.RuleBasedSegment) + :rtype: dict(rb_segment_names, splitio_commons.models.rule_based_segments.RuleBasedSegment) """ try: prefix_added = [self._prefix.format(segment_name=rb_segment_name) for rb_segment_name in rb_segment_names] @@ -285,7 +285,7 @@ async def fetch_many(self, rb_segment_names): :type rb_segment_names: list(str) :return: A dict with rule based segment objects parsed from queue. - :rtype: dict(rb_segment_names, harness_commons.models.rule_based_segments.RuleBasedSegment) + :rtype: dict(rb_segment_names, splitio_commons.models.rule_based_segments.RuleBasedSegment) """ try: prefix_added = [self._prefix.format(segment_name=rb_segment_name) for rb_segment_name in rb_segment_names] @@ -984,7 +984,7 @@ def get(self, segment_name): :type segment_name: str :return: segment object - :rtype: harness_commons.models.segments.Segment + :rtype: splitio_commons.models.segments.Segment """ pass @@ -993,7 +993,7 @@ def put(self, segment): Store a segment. :param segment: Segment to store. - :type segment: harness_commons.models.segments.Segment + :type segment: splitio_commons.models.segments.Segment """ pass # TODO: To be added when producer mode is aupported @@ -1085,7 +1085,7 @@ def get(self, segment_name): :type segment_name: str :return: segment object - :rtype: harness_commons.models.segments.Segment + :rtype: splitio_commons.models.segments.Segment """ try: return segments.from_raw({'name': segment_name, 'added': self._pluggable_adapter.get_items(self._prefix.format(segment_name=segment_name)), 'removed': [], 'till': self._pluggable_adapter.get(self._segment_till_prefix.format(segment_name=segment_name))}) @@ -1174,7 +1174,7 @@ async def get(self, segment_name): :type segment_name: str :return: segment object - :rtype: harness_commons.models.segments.Segment + :rtype: splitio_commons.models.segments.Segment """ try: return segments.from_raw({'name': segment_name, 'added': await self._pluggable_adapter.get_items(self._prefix.format(segment_name=segment_name)), 'removed': [], 'till': await self._pluggable_adapter.get(self._segment_till_prefix.format(segment_name=segment_name))}) @@ -1215,10 +1215,10 @@ def _wrap_impressions(self, impressions): Wrap impressions to be stored in storage :param impressions: Impression to add to the queue. - :type impressions: harness_commons.models.impressions.Impression + :type impressions: splitio_commons.models.impressions.Impression :return: Processed impressions. - :rtype: list[harness_commons.models.impressions.Impression] + :rtype: list[splitio_commons.models.impressions.Impression] """ bulk_impressions = [] for impression in impressions: @@ -1244,7 +1244,7 @@ def put(self, impressions): Add an impression to the pluggable storage. :param impressions: Impression to add to the queue. - :type impressions: harness_commons.models.impressions.Impression + :type impressions: splitio_commons.models.impressions.Impression :return: Whether the impression has been added or not. :rtype: bool @@ -1299,7 +1299,7 @@ def put(self, impressions): Add an impression to the pluggable storage. :param impressions: Impression to add to the queue. - :type impressions: harness_commons.models.impressions.Impression + :type impressions: splitio_commons.models.impressions.Impression :return: Whether the impression has been added or not. :rtype: bool @@ -1349,7 +1349,7 @@ async def put(self, impressions): Add an impression to the pluggable storage. :param impressions: Impression to add to the queue. - :type impressions: harness_commons.models.impressions.Impression + :type impressions: splitio_commons.models.impressions.Impression :return: Whether the impression has been added or not. :rtype: bool @@ -1400,7 +1400,7 @@ def __init__(self, pluggable_adapter, sdk_metadata, prefix=None): 'n': sdk_metadata.instance_name, 'i': sdk_metadata.instance_ip, } - self._events_queue_key = 'harness_commons.events' + self._events_queue_key = 'splitio_commons.events' if prefix is not None: self._events_queue_key = prefix + "." + self._events_queue_key @@ -1425,7 +1425,7 @@ def put(self, events): Add an event to the redis storage. :param event: Event to add to the queue. - :type event: harness_commons.models.events.Event + :type event: splitio_commons.models.events.Event :return: Whether the event has been added or not. :rtype: bool @@ -1479,7 +1479,7 @@ def put(self, events): Add an event to the redis storage. :param event: Event to add to the queue. - :type event: harness_commons.models.events.Event + :type event: splitio_commons.models.events.Event :return: Whether the event has been added or not. :rtype: bool @@ -1529,7 +1529,7 @@ async def put(self, events): Add an event to the redis storage. :param event: Event to add to the queue. - :type event: harness_commons.models.events.Event + :type event: splitio_commons.models.events.Event :return: Whether the event has been added or not. :rtype: bool diff --git a/splitio/storage/redis.py b/splitio/storage/redis.py index 7f4d73c5..3c439bb8 100644 --- a/splitio/storage/redis.py +++ b/splitio/storage/redis.py @@ -3,17 +3,17 @@ import logging import threading -from harness_commons.models.impressions import Impression +from splitio_commons.models.impressions import Impression from splitio.models import splits -from harness_commons.models import segments, rule_based_segments -from harness_commons.models.telemetry import TelemetryConfig, TelemetryConfigAsync -from harness_commons.storage import SegmentStorage, ImpressionStorage, EventStorage, \ +from splitio_commons.models import segments, rule_based_segments +from splitio_commons.models.telemetry import TelemetryConfig, TelemetryConfigAsync +from splitio_commons.storage import SegmentStorage, ImpressionStorage, EventStorage, \ ImpressionPipelinedStorage, TelemetryStorage, FlagSetsFilter, RuleBasedSegmentsStorage from splitio.storage.inmemory import SplitStorage from splitio.storage.adapters.redis import RedisAdapterException from splitio.storage.adapters.cache_trait import decorate as add_cache, DEFAULT_MAX_AGE from splitio.storage.adapters.cache_trait import LocalMemoryCache, LocalMemoryCacheAsync -from harness_commons.util.storage_helper import get_valid_flag_sets, combine_valid_flag_sets +from splitio_commons.util.storage_helper import get_valid_flag_sets, combine_valid_flag_sets _LOGGER = logging.getLogger(__name__) MAX_TAGS = 10 @@ -71,9 +71,9 @@ def update(self, to_add, to_delete, new_change_number): Update rule based segment.. :param to_add: List of rule based segment. to add - :type to_add: list[harness_commons.models.rule_based_segments.RuleBasedSegment] + :type to_add: list[splitio_commons.models.rule_based_segments.RuleBasedSegment] :param to_delete: List of rule based segment. to delete - :type to_delete: list[harness_commons.models.rule_based_segments.RuleBasedSegment] + :type to_delete: list[splitio_commons.models.rule_based_segments.RuleBasedSegment] :param new_change_number: New change number. :type new_change_number: int """ @@ -141,7 +141,7 @@ def fetch_many(self, segment_names): :type segment_names: list(str) :return: A dict with rule based segment objects parsed from redis. - :rtype: dict(segment_name, harness_commons.models.rule_based_segments.RuleBasedSegment) + :rtype: dict(segment_name, splitio_commons.models.rule_based_segments.RuleBasedSegment) """ to_return = dict() if len(segment_names) == 0: @@ -218,9 +218,9 @@ async def update(self, to_add, to_delete, new_change_number): Update rule based segment.. :param to_add: List of rule based segment. to add - :type to_add: list[harness_commons.models.rule_based_segments.RuleBasedSegment] + :type to_add: list[splitio_commons.models.rule_based_segments.RuleBasedSegment] :param to_delete: List of rule based segment. to delete - :type to_delete: list[harness_commons.models.rule_based_segments.RuleBasedSegment] + :type to_delete: list[splitio_commons.models.rule_based_segments.RuleBasedSegment] :param new_change_number: New change number. :type new_change_number: int """ @@ -288,7 +288,7 @@ async def fetch_many(self, segment_names): :type segment_names: list(str) :return: A dict with rule based segment objects parsed from redis. - :rtype: dict(segment_name, harness_commons.models.rule_based_segments.RuleBasedSegment) + :rtype: dict(segment_name, splitio_commons.models.rule_based_segments.RuleBasedSegment) """ to_return = dict() if len(segment_names) == 0: @@ -874,7 +874,7 @@ def put(self, segment): Store a segment. :param segment: Segment to store. - :type segment: harness_commons.models.segments.Segment + :type segment: splitio_commons.models.segments.Segment """ raise NotImplementedError('Only redis-consumer mode is supported.') @@ -937,7 +937,7 @@ def get(self, segment_name): :type segment_name: str :return: Segment object is key exists. None otherwise. - :rtype: harness_commons.models.segments.Segment + :rtype: splitio_commons.models.segments.Segment """ try: keys = (self._redis.smembers(self._get_key(segment_name))) @@ -1016,7 +1016,7 @@ async def get(self, segment_name): :type segment_name: str :return: Segment object is key exists. None otherwise. - :rtype: harness_commons.models.segments.Segment + :rtype: splitio_commons.models.segments.Segment """ try: keys = (await self._redis.smembers(self._get_key(segment_name))) @@ -1086,10 +1086,10 @@ def _wrap_impressions(self, impressions): Wrap impressions to be stored in redis :param impressions: Impression to add to the queue. - :type impressions: harness_commons.models.impressions.Impression + :type impressions: splitio_commons.models.impressions.Impression :return: Processed impressions. - :rtype: list[harness_commons.models.impressions.Impression] + :rtype: list[splitio_commons.models.impressions.Impression] """ bulk_impressions = [] for impression in impressions: @@ -1144,7 +1144,7 @@ def put(self, impressions): Add an impression to the redis storage. :param impressions: Impression to add to the queue. - :type impressions: harness_commons.models.impressions.Impression + :type impressions: splitio_commons.models.impressions.Impression :return: Whether the impression has been added or not. :rtype: bool @@ -1199,7 +1199,7 @@ def put(self, impressions): Add an impression to the redis storage. :param impressions: Impression to add to the queue. - :type impressions: harness_commons.models.impressions.Impression + :type impressions: splitio_commons.models.impressions.Impression :return: Whether the impression has been added or not. :rtype: bool @@ -1250,7 +1250,7 @@ async def put(self, impressions): Add an impression to the redis storage. :param impressions: Impression to add to the queue. - :type impressions: harness_commons.models.impressions.Impression + :type impressions: splitio_commons.models.impressions.Impression :return: Whether the impression has been added or not. :rtype: bool @@ -1272,7 +1272,7 @@ async def put(self, impressions): class RedisEventsStorageBase(EventStorage): """Redis based event storage base class.""" - _EVENTS_KEY_TEMPLATE = 'harness_commons.events' + _EVENTS_KEY_TEMPLATE = 'splitio_commons.events' _EVENTS_KEY_DEFAULT_TTL = 3600 def add_events_to_pipe(self, events, pipe): @@ -1314,7 +1314,7 @@ def put(self, events): Add an event to the redis storage. :param event: Event to add to the queue. - :type event: harness_commons.models.events.Event + :type event: splitio_commons.models.events.Event :return: Whether the event has been added or not. :rtype: bool @@ -1367,7 +1367,7 @@ def put(self, events): Add an event to the redis storage. :param event: Event to add to the queue. - :type event: harness_commons.models.events.Event + :type event: splitio_commons.models.events.Event :return: Whether the event has been added or not. :rtype: bool @@ -1418,7 +1418,7 @@ async def put(self, events): Add an event to the redis storage. :param event: Event to add to the queue. - :type event: harness_commons.models.events.Event + :type event: splitio_commons.models.events.Event :return: Whether the event has been added or not. :rtype: bool diff --git a/splitio/sync/split.py b/splitio/sync/split.py index cb15d849..c6a9c71a 100644 --- a/splitio/sync/split.py +++ b/splitio/sync/split.py @@ -7,15 +7,15 @@ import json from enum import Enum -from harness_commons.api import APIException +from splitio_commons.api import APIException from splitio.spec import SPEC_VERSION from splitio.client.input_validator import validate_flag_sets from splitio.models import splits -from harness_commons.models import rule_based_segments -from harness_commons.util.time import get_current_epoch_time_ms -from harness_commons.sync.definition import DefinitionSynchronizer, DefinitionSynchronizerAsync, _ON_DEMAND_FETCH_BACKOFF_MAX_RETRIES -from harness_commons.sync import util -from harness_commons.util.storage_helper import update_definition_storage, update_definition_storage_async, \ +from splitio_commons.models import rule_based_segments +from splitio_commons.util.time import get_current_epoch_time_ms +from splitio_commons.sync.definition import DefinitionSynchronizer, DefinitionSynchronizerAsync, _ON_DEMAND_FETCH_BACKOFF_MAX_RETRIES +from splitio_commons.sync import util +from splitio_commons.util.storage_helper import update_definition_storage, update_definition_storage_async, \ update_rule_based_segment_storage, update_rule_based_segment_storage_async from splitio.optional.loaders import aiofiles @@ -32,7 +32,7 @@ def __init__(self, feature_flag_api, feature_flag_storage, rule_based_segment_st Class constructor. :param feature_flag_api: Feature Flag API Client. - :type feature_flag_api: harness_commons.api.splits.SplitsAPI + :type feature_flag_api: splitio_commons.api.splits.SplitsAPI :param feature_flag_storage: Feature Flag Storage. :type feature_flag_storage: splitio.storage.InMemorySplitStorage @@ -50,7 +50,7 @@ def __init__(self, feature_flag_api, feature_flag_storage, rule_based_segment_st Class constructor. :param feature_flag_api: Feature Flag API Client. - :type feature_flag_api: harness_commons.api.splits.SplitsAPI + :type feature_flag_api: splitio_commons.api.splits.SplitsAPI :param feature_flag_storage: Feature Flag Storage. :type feature_flag_storage: splitio.storage.InMemorySplitStorage diff --git a/splitio/tasks/split_sync.py b/splitio/tasks/split_sync.py index 2267b1b3..9e11f85f 100644 --- a/splitio/tasks/split_sync.py +++ b/splitio/tasks/split_sync.py @@ -1,8 +1,8 @@ """Split Synchronization task.""" import logging -from harness_commons.tasks import BaseSynchronizationTask -from harness_commons.tasks.util.asynctask import AsyncTask, AsyncTaskAsync +from splitio_commons.tasks import BaseSynchronizationTask +from splitio_commons.tasks.util.asynctask import AsyncTask, AsyncTaskAsync _LOGGER = logging.getLogger(__name__) diff --git a/tests/api/test_kerberos_client.py b/tests/api/test_kerberos_client.py index 86289fd8..6d4a7231 100644 --- a/tests/api/test_kerberos_client.py +++ b/tests/api/test_kerberos_client.py @@ -7,8 +7,8 @@ from splitio.client.config import AuthenticateScheme from splitio.api import kerberos_client as client -from harness_commons.engine.telemetry import TelemetryStorageProducer, TelemetryStorageProducerAsync -from harness_commons.storage.inmemmory import InMemoryTelemetryStorage, InMemoryTelemetryStorageAsync +from splitio_commons.engine.telemetry import TelemetryStorageProducer, TelemetryStorageProducerAsync +from splitio_commons.storage.inmemmory import InMemoryTelemetryStorage, InMemoryTelemetryStorageAsync class HttpClientKerberosTests(object): """Http Client test cases.""" diff --git a/tests/api/test_splits_api.py b/tests/api/test_splits_api.py index b1fcbd66..825f9590 100644 --- a/tests/api/test_splits_api.py +++ b/tests/api/test_splits_api.py @@ -6,8 +6,8 @@ from splitio.spec import SPEC_VERSION from splitio.api import splits -from harness_commons.api import client, APIException -from harness_commons.api.commons import FetchOptions +from splitio_commons.api import client, APIException +from splitio_commons.api.commons import FetchOptions from splitio.client.util import SdkMetadata class SplitAPITests(object): diff --git a/tests/client/test_client.py b/tests/client/test_client.py index bc571797..5c061957 100644 --- a/tests/client/test_client.py +++ b/tests/client/test_client.py @@ -8,25 +8,25 @@ from splitio.client.client import Client, _LOGGER as _logger, CONTROL, ClientAsync, EvaluationOptions from splitio.client.factory import SplitFactory, Status as FactoryStatus, SplitFactoryAsync -from harness_commons.events.events_manager import EventsManager, EventsManagerAsync -from harness_commons.models.fallback_config import FallbackTreatmentsConfiguration, FallbackTreatmentCalculator -from harness_commons.models.fallback_treatment import FallbackTreatment -from harness_commons.models.impressions import Impression, Label -from harness_commons.models.events import Event, EventWrapper, SdkEvent -from harness_commons.storage import SegmentStorage, ImpressionStorage, EventStorage, RuleBasedSegmentsStorage +from splitio_commons.events.events_manager import EventsManager, EventsManagerAsync +from splitio_commons.models.fallback_config import FallbackTreatmentsConfiguration, FallbackTreatmentCalculator +from splitio_commons.models.fallback_treatment import FallbackTreatment +from splitio_commons.models.impressions import Impression, Label +from splitio_commons.models.events import Event, EventWrapper, SdkEvent +from splitio_commons.storage import SegmentStorage, ImpressionStorage, EventStorage, RuleBasedSegmentsStorage from splitio.storage.inmemory import InMemorySplitStorage, InMemorySplitStorageAsync, SplitStorage -from harness_commons.storage.inmemmory import InMemorySegmentStorage, \ +from splitio_commons.storage.inmemmory import InMemorySegmentStorage, \ InMemoryImpressionStorage, InMemoryTelemetryStorage, \ InMemoryImpressionStorageAsync, InMemorySegmentStorageAsync, InMemoryTelemetryStorageAsync, InMemoryEventStorageAsync, \ InMemoryRuleBasedSegmentStorage, InMemoryRuleBasedSegmentStorageAsync from splitio.models.splits import Split, Status, from_raw -from harness_commons.engine.impressions.impressions import Manager as ImpressionManager -from harness_commons.engine.impressions.manager import Counter as ImpressionsCounter -from harness_commons.engine.impressions.unique_keys_tracker import UniqueKeysTracker, UniqueKeysTrackerAsync -from harness_commons.engine.telemetry import TelemetryStorageConsumer, TelemetryStorageProducer, TelemetryStorageProducerAsync -from harness_commons.engine.evaluator import Evaluator, EvaluationContext -from harness_commons.recorder.recorder import StandardRecorder, StandardRecorderAsync -from harness_commons.engine.impressions.strategies import StrategyDebugMode, StrategyNoneMode, StrategyOptimizedMode +from splitio_commons.engine.impressions.impressions import Manager as ImpressionManager +from splitio_commons.engine.impressions.manager import Counter as ImpressionsCounter +from splitio_commons.engine.impressions.unique_keys_tracker import UniqueKeysTracker, UniqueKeysTrackerAsync +from splitio_commons.engine.telemetry import TelemetryStorageConsumer, TelemetryStorageProducer, TelemetryStorageProducerAsync +from splitio_commons.engine.evaluator import Evaluator, EvaluationContext +from splitio_commons.recorder.recorder import StandardRecorder, StandardRecorderAsync +from splitio_commons.engine.impressions.strategies import StrategyDebugMode, StrategyNoneMode, StrategyOptimizedMode from tests.integration import splits_json @@ -1276,7 +1276,7 @@ def stop(*_): assert(telemetry_storage._method_latencies._track[0] == 1) factory.destroy() - @mock.patch('harness_commons.recorder.recorder.StandardRecorder.record_track_stats', side_effect=Exception()) + @mock.patch('splitio_commons.recorder.recorder.StandardRecorder.record_track_stats', side_effect=Exception()) def test_telemetry_track_exception(self, mocker): split_storage = mocker.Mock(spec=SplitStorage) segment_storage = mocker.Mock(spec=SegmentStorage) @@ -1437,7 +1437,7 @@ def synchronize_config(*_): assert client.get_treatments_with_config_by_flag_sets('some_key', ['set_1'], evaluation_options=EvaluationOptions({"prop": "value"})) == {'SPLIT_2': ('on', None)} assert impression_storage.pop_many(100) == [Impression('some_key', 'SPLIT_2', 'on', 'some_label', 123, None, 1000, None, '{"prop": "value"}')] - @mock.patch('harness_commons.engine.evaluator.Evaluator.eval_with_context', side_effect=RuntimeError()) + @mock.patch('splitio_commons.engine.evaluator.Evaluator.eval_with_context', side_effect=RuntimeError()) def test_fallback_treatment_eval_exception(self, mocker): # using fallback when the evaluator has RuntimeError exception split_storage = mocker.Mock(spec=SplitStorage) @@ -1578,7 +1578,7 @@ def get_feature_flag_names_by_flag_sets(*_): except: pass - @mock.patch('harness_commons.engine.evaluator.Evaluator.eval_with_context', side_effect=Exception()) + @mock.patch('splitio_commons.engine.evaluator.Evaluator.eval_with_context', side_effect=Exception()) def test_fallback_treatment_exception(self, mocker): # using fallback when the evaluator has RuntimeError exception split_storage = mocker.Mock(spec=SplitStorage) diff --git a/tests/client/test_config.py b/tests/client/test_config.py index 1f1a97dd..5fc38135 100644 --- a/tests/client/test_config.py +++ b/tests/client/test_config.py @@ -2,9 +2,9 @@ # pylint: disable=protected-access,no-self-use,line-too-long import pytest from splitio.client import config -from harness_commons.engine.impressions.impressions import ImpressionsMode -from harness_commons.models.fallback_treatment import FallbackTreatment -from harness_commons.models.fallback_config import FallbackTreatmentsConfiguration +from splitio_commons.engine.impressions.impressions import ImpressionsMode +from splitio_commons.models.fallback_treatment import FallbackTreatment +from splitio_commons.models.fallback_config import FallbackTreatmentsConfiguration class ConfigSanitizationTests(object): """Inmemory storage-based integration tests.""" diff --git a/tests/client/test_factory.py b/tests/client/test_factory.py index ab259c5a..15d9ee12 100644 --- a/tests/client/test_factory.py +++ b/tests/client/test_factory.py @@ -12,32 +12,32 @@ from splitio.client.factory import get_factory, get_factory_async, SplitFactory, _INSTANTIATED_FACTORIES, Status,\ _LOGGER as _logger, SplitFactoryAsync from splitio.client.config import DEFAULT_CONFIG -from harness_commons.engine.telemetry import TelemetryStorageConsumer, TelemetryStorageProducer, TelemetryStorageProducerAsync -from harness_commons.engine.impressions.impressions import Manager as ImpressionsManager -from harness_commons.engine.impressions.manager import Counter as ImpressionsCounter -from harness_commons.engine.impressions.unique_keys_tracker import UniqueKeysTracker, UniqueKeysTrackerAsync -from harness_commons.engine.telemetry import TelemetryStorageConsumer, TelemetryStorageProducer, TelemetryStorageProducerAsync -from harness_commons.engine.evaluator import Evaluator, EvaluationContext -from harness_commons.engine.impressions.strategies import StrategyDebugMode, StrategyNoneMode, StrategyOptimizedMode -from harness_commons.events.events_task import EventsTask -from harness_commons.events.events_manager import EventsManagerAsync +from splitio_commons.engine.telemetry import TelemetryStorageConsumer, TelemetryStorageProducer, TelemetryStorageProducerAsync +from splitio_commons.engine.impressions.impressions import Manager as ImpressionsManager +from splitio_commons.engine.impressions.manager import Counter as ImpressionsCounter +from splitio_commons.engine.impressions.unique_keys_tracker import UniqueKeysTracker, UniqueKeysTrackerAsync +from splitio_commons.engine.telemetry import TelemetryStorageConsumer, TelemetryStorageProducer, TelemetryStorageProducerAsync +from splitio_commons.engine.evaluator import Evaluator, EvaluationContext +from splitio_commons.engine.impressions.strategies import StrategyDebugMode, StrategyNoneMode, StrategyOptimizedMode +from splitio_commons.events.events_task import EventsTask +from splitio_commons.events.events_manager import EventsManagerAsync from splitio.models.splits import from_raw -from harness_commons.models.fallback_config import FallbackTreatmentsConfiguration, FallbackTreatmentCalculator -from harness_commons.models.fallback_treatment import FallbackTreatment -from harness_commons.models.events import SdkInternalEvent -from harness_commons.recorder.recorder import PipelinedRecorder, StandardRecorder, StandardRecorderAsync -from harness_commons.storage import inmemmory, EventStorage +from splitio_commons.models.fallback_config import FallbackTreatmentsConfiguration, FallbackTreatmentCalculator +from splitio_commons.models.fallback_treatment import FallbackTreatment +from splitio_commons.models.events import SdkInternalEvent +from splitio_commons.recorder.recorder import PipelinedRecorder, StandardRecorder, StandardRecorderAsync +from splitio_commons.storage import inmemmory, EventStorage from splitio.storage import inmemory, redis, pluggable from splitio.storage.inmemory import InMemorySplitStorage, InMemorySplitStorageAsync -from harness_commons.storage.inmemmory import InMemorySegmentStorage, InMemoryImpressionStorage, InMemoryTelemetryStorage, \ +from splitio_commons.storage.inmemmory import InMemorySegmentStorage, InMemoryImpressionStorage, InMemoryTelemetryStorage, \ InMemoryImpressionStorageAsync, InMemorySegmentStorageAsync, InMemoryTelemetryStorageAsync, InMemoryEventStorageAsync, \ InMemoryRuleBasedSegmentStorage, InMemoryRuleBasedSegmentStorageAsync -from harness_commons.sync.manager import Manager, ManagerAsync -from harness_commons.sync.synchronizer import Synchronizer, SynchronizerAsync, HarnessSynchronizers, HarnessTasks +from splitio_commons.sync.manager import Manager, ManagerAsync +from splitio_commons.sync.synchronizer import Synchronizer, SynchronizerAsync, HarnessSynchronizers, HarnessTasks from splitio.sync.split import SplitSynchronizer, SplitSynchronizerAsync -from harness_commons.sync.segment import SegmentSynchronizer, SegmentSynchronizerAsync +from splitio_commons.sync.segment import SegmentSynchronizer, SegmentSynchronizerAsync from splitio.storage.adapters.redis import RedisAdapter, RedisPipelineAdapter -from harness_commons.tasks.util import asynctask +from splitio_commons.tasks.util import asynctask from tests.storage.test_pluggable import StorageMockAdapter, StorageMockAdapterAsync from tests.integration import splits_json @@ -85,7 +85,7 @@ def _split_synchronizer(self, ready_flag, some, auth_api, streaming_enabled, sdk self._streaming_enabled = False self._telemetry_runtime_producer = telemetry_runtime_producer - mocker.patch('harness_commons.sync.manager.Manager.__init__', new=_split_synchronizer) + mocker.patch('splitio_commons.sync.manager.Manager.__init__', new=_split_synchronizer) # Start factory and make assertions factory = get_factory('some_api_key') @@ -275,7 +275,7 @@ def _split_synchronizer(self, ready_flag, some, auth_api, streaming_enabled, sdk self._synchronizer = synchronizer self._streaming_enabled = False self._telemetry_runtime_producer = telemetry_runtime_producer - mocker.patch('harness_commons.sync.manager.Manager.__init__', new=_split_synchronizer) + mocker.patch('splitio_commons.sync.manager.Manager.__init__', new=_split_synchronizer) # Start factory and make assertions # Using invalid key should result in a timeout exception @@ -380,7 +380,7 @@ def _split_synchronizer(self, ready_flag, some, auth_api, streaming_enabled, sdk self._synchronizer = synchronizer self._streaming_enabled = False self._telemetry_runtime_producer = telemetry_runtime_producer - mocker.patch('harness_commons.sync.manager.Manager.__init__', new=_split_synchronizer) + mocker.patch('splitio_commons.sync.manager.Manager.__init__', new=_split_synchronizer) # Start factory and make assertions factory = get_factory('some_api_key') @@ -454,15 +454,15 @@ def _init(self, ready_flag, some, auth_api, streaming_enabled, telemetry_runtime self._streaming_enabled = False self._telemetry_runtime_producer = telemetry_runtime_producer self._telemetry_init_consumer = telemetry_init_consumer - mocker.patch('harness_commons.sync.manager.Manager.__init__', new=_init) + mocker.patch('splitio_commons.sync.manager.Manager.__init__', new=_init) def _start(self, *args, **kwargs): sdk_ready_flag.set() - mocker.patch('harness_commons.sync.manager.Manager.start', new=_start) + mocker.patch('splitio_commons.sync.manager.Manager.start', new=_start) def _stop(self, *args, **kwargs): pass - mocker.patch('harness_commons.sync.manager.Manager.stop', new=_stop) + mocker.patch('splitio_commons.sync.manager.Manager.stop', new=_stop) mockManager = Manager(sdk_ready_flag, mocker.Mock(), mocker.Mock(), False, mocker.Mock(), mocker.Mock()) @@ -583,13 +583,13 @@ def _get_storage_mock(self, name): mocker.patch('splitio.client.factory.SplitFactory._get_storage', new=_get_storage_mock) sync_all_mock = mocker.Mock() - mocker.patch('harness_commons.sync.synchronizer.Synchronizer.sync_all', new=sync_all_mock) + mocker.patch('splitio_commons.sync.synchronizer.Synchronizer.sync_all', new=sync_all_mock) start_mock = mocker.Mock() - mocker.patch('harness_commons.sync.manager.Manager.start', new=start_mock) + mocker.patch('splitio_commons.sync.manager.Manager.start', new=start_mock) recreate_mock = mocker.Mock() - mocker.patch('harness_commons.sync.manager.Manager.recreate', new=recreate_mock) + mocker.patch('splitio_commons.sync.manager.Manager.recreate', new=recreate_mock) config = { 'preforkedInitialization': True, @@ -722,7 +722,7 @@ def _split_synchronizer(self, ready_flag, some, auth_api, streaming_enabled, sdk self._streaming_enabled = False self._telemetry_runtime_producer = telemetry_runtime_producer - mocker.patch('harness_commons.sync.manager.Manager.__init__', new=_split_synchronizer) + mocker.patch('splitio_commons.sync.manager.Manager.__init__', new=_split_synchronizer) # Start factory and make assertions @@ -850,11 +850,11 @@ def start_periodic_fetching(): self._streaming_enabled = False self._telemetry_runtime_producer = telemetry_runtime_producer - mocker.patch('harness_commons.sync.manager.ManagerAsync.__init__', new=_split_synchronizer) + mocker.patch('splitio_commons.sync.manager.ManagerAsync.__init__', new=_split_synchronizer) async def synchronize_config(*_): pass - mocker.patch('harness_commons.sync.telemetry.InMemoryTelemetrySubmitterAsync.synchronize_config', new=synchronize_config) + mocker.patch('splitio_commons.sync.telemetry.InMemoryTelemetrySubmitterAsync.synchronize_config', new=synchronize_config) # Start factory and make assertions factory2 = await get_factory_async('some_api_key', config={'streamingEmabled': False}) @@ -962,11 +962,11 @@ def _split_synchronizer(self, ready_flag, some, auth_api, streaming_enabled, sdk self._synchronizer = synchronizer self._streaming_enabled = False self._telemetry_runtime_producer = telemetry_runtime_producer - mocker.patch('harness_commons.sync.manager.ManagerAsync.__init__', new=_split_synchronizer) + mocker.patch('splitio_commons.sync.manager.ManagerAsync.__init__', new=_split_synchronizer) async def synchronize_config(*_): pass - mocker.patch('harness_commons.sync.telemetry.InMemoryTelemetrySubmitterAsync.synchronize_config', new=synchronize_config) + mocker.patch('splitio_commons.sync.telemetry.InMemoryTelemetrySubmitterAsync.synchronize_config', new=synchronize_config) # Start factory and make assertions # Using invalid key should result in a timeout exception factory = await get_factory_async('some_api_key') @@ -1084,20 +1084,20 @@ def start_periodic_data_recording(): self._streaming_enabled = False self._telemetry_runtime_producer = telemetry_runtime_producer - mocker.patch('harness_commons.sync.manager.ManagerAsync.__init__', new=_split_synchronizer) + mocker.patch('splitio_commons.sync.manager.ManagerAsync.__init__', new=_split_synchronizer) async def synchronize_config(*_): await asyncio.sleep(2) pass - mocker.patch('harness_commons.sync.telemetry.InMemoryTelemetrySubmitterAsync.synchronize_config', new=synchronize_config) + mocker.patch('splitio_commons.sync.telemetry.InMemoryTelemetrySubmitterAsync.synchronize_config', new=synchronize_config) async def record_ready_time(*_): pass - mocker.patch('harness_commons.models.telemetry.TelemetryConfigAsync.record_ready_time', new=record_ready_time) + mocker.patch('splitio_commons.models.telemetry.TelemetryConfigAsync.record_ready_time', new=record_ready_time) async def record_active_and_redundant_factories(*_): pass - mocker.patch('harness_commons.models.telemetry.TelemetryConfigAsync.record_active_and_redundant_factories', new=record_active_and_redundant_factories) + mocker.patch('splitio_commons.models.telemetry.TelemetryConfigAsync.record_active_and_redundant_factories', new=record_active_and_redundant_factories) # Start factory and make assertions factory = await get_factory_async('some_api_key', config={'streamingEmabled': False}) diff --git a/tests/client/test_input_validator.py b/tests/client/test_input_validator.py index b602939c..28aab806 100644 --- a/tests/client/test_input_validator.py +++ b/tests/client/test_input_validator.py @@ -6,19 +6,19 @@ from splitio.client.factory import SplitFactory, get_factory, SplitFactoryAsync, get_factory_async from splitio.client.client import CONTROL, Client, _LOGGER as _logger, ClientAsync from splitio.client.key import Key -from harness_commons.events.events_manager import EventsManagerAsync -from harness_commons.storage import DefinitionStorage, SegmentStorage, ImpressionStorage, EventStorage, RuleBasedSegmentsStorage +from splitio_commons.events.events_manager import EventsManagerAsync +from splitio_commons.storage import DefinitionStorage, SegmentStorage, ImpressionStorage, EventStorage, RuleBasedSegmentsStorage from splitio.storage.inmemory import InMemorySplitStorage, InMemorySplitStorageAsync -from harness_commons.storage.inmemmory import InMemoryTelemetryStorage, InMemoryTelemetryStorageAsync, \ +from splitio_commons.storage.inmemmory import InMemoryTelemetryStorage, InMemoryTelemetryStorageAsync, \ InMemoryRuleBasedSegmentStorage, InMemoryRuleBasedSegmentStorageAsync from splitio.models.splits import Split -from harness_commons.models.fallback_config import FallbackTreatmentCalculator +from splitio_commons.models.fallback_config import FallbackTreatmentCalculator from splitio.client import input_validator from splitio.client.manager import SplitManager, SplitManagerAsync -from harness_commons.recorder.recorder import StandardRecorder, StandardRecorderAsync -from harness_commons.engine.telemetry import TelemetryStorageProducer, TelemetryStorageProducerAsync -from harness_commons.engine.impressions.impressions import Manager as ImpressionManager -from harness_commons.models.fallback_treatment import FallbackTreatment +from splitio_commons.recorder.recorder import StandardRecorder, StandardRecorderAsync +from splitio_commons.engine.telemetry import TelemetryStorageProducer, TelemetryStorageProducerAsync +from splitio_commons.engine.impressions.impressions import Manager as ImpressionManager +from splitio_commons.models.fallback_treatment import FallbackTreatment class ClientInputValidationTests(object): """Input validation test cases.""" diff --git a/tests/client/test_localhost.py b/tests/client/test_localhost.py index 598b1e3d..7685af63 100644 --- a/tests/client/test_localhost.py +++ b/tests/client/test_localhost.py @@ -6,8 +6,8 @@ from splitio.sync.split import LocalSplitSynchronizer from splitio.models.splits import Split from splitio.storage.inmemory import SplitStorage -from harness_commons.models.grammar.matchers import AllKeysMatcher -from harness_commons.storage import RuleBasedSegmentsStorage +from splitio_commons.models.grammar.matchers import AllKeysMatcher +from splitio_commons.storage import RuleBasedSegmentsStorage class LocalHostStoragesTests(object): diff --git a/tests/client/test_manager.py b/tests/client/test_manager.py index 07cb6f3d..6491901e 100644 --- a/tests/client/test_manager.py +++ b/tests/client/test_manager.py @@ -7,10 +7,10 @@ from splitio.client.manager import SplitManager, SplitManagerAsync, _LOGGER as _logger from splitio.models import splits from splitio.storage.inmemory import InMemorySplitStorage, InMemorySplitStorageAsync -from harness_commons.storage.inmemmory import InMemoryTelemetryStorage, InMemoryTelemetryStorageAsync -from harness_commons.engine.impressions.impressions import Manager as ImpressionManager -from harness_commons.engine.telemetry import TelemetryStorageProducer, TelemetryStorageProducerAsync, TelemetryStorageConsumer, TelemetryStorageConsumerAsync -from harness_commons.recorder.recorder import StandardRecorder, StandardRecorderAsync +from splitio_commons.storage.inmemmory import InMemoryTelemetryStorage, InMemoryTelemetryStorageAsync +from splitio_commons.engine.impressions.impressions import Manager as ImpressionManager +from splitio_commons.engine.telemetry import TelemetryStorageProducer, TelemetryStorageProducerAsync, TelemetryStorageConsumer, TelemetryStorageConsumerAsync +from splitio_commons.recorder.recorder import StandardRecorder, StandardRecorderAsync from tests.integration import splits_json class SplitManagerTests(object): # pylint: disable=too-few-public-methods diff --git a/tests/integration/test_client_e2e.py b/tests/integration/test_client_e2e.py index c6354eb7..cab26578 100644 --- a/tests/integration/test_client_e2e.py +++ b/tests/integration/test_client_e2e.py @@ -17,29 +17,29 @@ from splitio.client.config import DEFAULT_CONFIG from splitio.client.client import EvaluationOptions -from harness_commons.engine.impressions.impressions import Manager as ImpressionsManager, ImpressionsMode -from harness_commons.engine.impressions.strategies import StrategyDebugMode, StrategyOptimizedMode, StrategyNoneMode -from harness_commons.engine.telemetry import TelemetryStorageConsumer, TelemetryStorageProducer, TelemetryStorageConsumerAsync,\ +from splitio_commons.engine.impressions.impressions import Manager as ImpressionsManager, ImpressionsMode +from splitio_commons.engine.impressions.strategies import StrategyDebugMode, StrategyOptimizedMode, StrategyNoneMode +from splitio_commons.engine.telemetry import TelemetryStorageConsumer, TelemetryStorageProducer, TelemetryStorageConsumerAsync,\ TelemetryStorageProducerAsync -from harness_commons.engine.impressions.manager import Counter as ImpressionsCounter -from harness_commons.engine.impressions.unique_keys_tracker import UniqueKeysTracker, UniqueKeysTrackerAsync -from harness_commons.events.events_delivery import EventsDelivery -from harness_commons.events.events_manager import EventsManager, EventsManagerAsync -from harness_commons.events.events_manager_config import EventsManagerConfig -from harness_commons.events.events_task import EventsTask, EventsTaskAsync -from harness_commons.engine.impressions.impressions import ImpressionsMode -from harness_commons.engine.impressions.strategies import StrategyNoneMode, StrategyDebugMode, StrategyOptimizedMode -from harness_commons.engine.impressions.adapters import InMemorySenderAdapter, RedisSenderAdapter, PluggableSenderAdapter, RedisSenderAdapterAsync, \ +from splitio_commons.engine.impressions.manager import Counter as ImpressionsCounter +from splitio_commons.engine.impressions.unique_keys_tracker import UniqueKeysTracker, UniqueKeysTrackerAsync +from splitio_commons.events.events_delivery import EventsDelivery +from splitio_commons.events.events_manager import EventsManager, EventsManagerAsync +from splitio_commons.events.events_manager_config import EventsManagerConfig +from splitio_commons.events.events_task import EventsTask, EventsTaskAsync +from splitio_commons.engine.impressions.impressions import ImpressionsMode +from splitio_commons.engine.impressions.strategies import StrategyNoneMode, StrategyDebugMode, StrategyOptimizedMode +from splitio_commons.engine.impressions.adapters import InMemorySenderAdapter, RedisSenderAdapter, PluggableSenderAdapter, RedisSenderAdapterAsync, \ InMemorySenderAdapterAsync, PluggableSenderAdapterAsync from splitio.models import splits -from harness_commons.models import segments, rule_based_segments -from harness_commons.models.events import SdkEvent -from harness_commons.models.fallback_config import FallbackTreatmentsConfiguration, FallbackTreatmentCalculator -from harness_commons.models.fallback_treatment import FallbackTreatment -from harness_commons.recorder.recorder import StandardRecorder, PipelinedRecorder, StandardRecorderAsync, PipelinedRecorderAsync +from splitio_commons.models import segments, rule_based_segments +from splitio_commons.models.events import SdkEvent +from splitio_commons.models.fallback_config import FallbackTreatmentsConfiguration, FallbackTreatmentCalculator +from splitio_commons.models.fallback_treatment import FallbackTreatment +from splitio_commons.recorder.recorder import StandardRecorder, PipelinedRecorder, StandardRecorderAsync, PipelinedRecorderAsync from splitio.storage.inmemory import InMemorySplitStorage, InMemorySplitStorageAsync -from harness_commons.storage.inmemmory import InMemoryEventStorage, InMemoryImpressionStorage, \ +from splitio_commons.storage.inmemmory import InMemoryEventStorage, InMemoryImpressionStorage, \ InMemorySegmentStorage, InMemoryTelemetryStorage, \ InMemoryEventStorageAsync, InMemoryImpressionStorageAsync, InMemorySegmentStorageAsync, \ InMemoryTelemetryStorageAsync, InMemoryRuleBasedSegmentStorage, InMemoryRuleBasedSegmentStorageAsync @@ -52,15 +52,15 @@ PluggableSegmentStorageAsync, PluggableSplitStorageAsync, PluggableTelemetryStorageAsync, \ PluggableRuleBasedSegmentsStorage, PluggableRuleBasedSegmentsStorageAsync from splitio.storage.adapters.redis import build, RedisAdapter, RedisAdapterAsync, build_async -from harness_commons.sync.synchronizer import HarnessTasks, HarnessSynchronizers, Synchronizer, RedisSynchronizer, SynchronizerAsync,\ +from splitio_commons.sync.synchronizer import HarnessTasks, HarnessSynchronizers, Synchronizer, RedisSynchronizer, SynchronizerAsync,\ RedisSynchronizerAsync -from harness_commons.sync.manager import Manager, RedisManager, ManagerAsync, RedisManagerAsync -from harness_commons.sync.synchronizer import PluggableSynchronizer, PluggableSynchronizerAsync -from harness_commons.sync.telemetry import RedisTelemetrySubmitter, RedisTelemetrySubmitterAsync -from harness_commons.sync.unique_keys import UniqueKeysSynchronizer, ClearFilterSynchronizer, UniqueKeysSynchronizerAsync, ClearFilterSynchronizerAsync -from harness_commons.sync.impression import ImpressionsCountSynchronizer, ImpressionsCountSynchronizerAsync -from harness_commons.tasks.unique_keys_sync import UniqueKeysSyncTask, ClearFilterSyncTask, UniqueKeysSyncTaskAsync, ClearFilterSyncTaskAsync -from harness_commons.tasks.impressions_sync import ImpressionsCountSyncTask, ImpressionsCountSyncTaskAsync +from splitio_commons.sync.manager import Manager, RedisManager, ManagerAsync, RedisManagerAsync +from splitio_commons.sync.synchronizer import PluggableSynchronizer, PluggableSynchronizerAsync +from splitio_commons.sync.telemetry import RedisTelemetrySubmitter, RedisTelemetrySubmitterAsync +from splitio_commons.sync.unique_keys import UniqueKeysSynchronizer, ClearFilterSynchronizer, UniqueKeysSynchronizerAsync, ClearFilterSynchronizerAsync +from splitio_commons.sync.impression import ImpressionsCountSynchronizer, ImpressionsCountSynchronizerAsync +from splitio_commons.tasks.unique_keys_sync import UniqueKeysSyncTask, ClearFilterSyncTask, UniqueKeysSyncTaskAsync, ClearFilterSyncTaskAsync +from splitio_commons.tasks.impressions_sync import ImpressionsCountSyncTask, ImpressionsCountSyncTaskAsync from tests.helpers.mockserver import SplitMockServer from tests.integration import splits_json @@ -5382,12 +5382,12 @@ def set_classes(storage_mode, impressions_mode, api_adapter, imp_counter, unique :type prefix: str :return: tuple of classes instances. - :rtype: (harness_commons.sync.unique_keys.UniqueKeysSynchronizer, - harness_commons.sync.unique_keys.ClearFilterSynchronizer, - harness_commons.tasks.unique_keys_sync.UniqueKeysTask, - harness_commons.tasks.unique_keys_sync.ClearFilterTask, - harness_commons.sync.impressions_sync.ImpressionsCountSynchronizer, - harness_commons.tasks.impressions_sync.ImpressionsCountSyncTask, + :rtype: (splitio_commons.sync.unique_keys.UniqueKeysSynchronizer, + splitio_commons.sync.unique_keys.ClearFilterSynchronizer, + splitio_commons.tasks.unique_keys_sync.UniqueKeysTask, + splitio_commons.tasks.unique_keys_sync.ClearFilterTask, + splitio_commons.sync.impressions_sync.ImpressionsCountSynchronizer, + splitio_commons.tasks.impressions_sync.ImpressionsCountSyncTask, splitio.engine.impressions.strategies.StrategyNoneMode/splitio.engine.impressions.strategies.StrategyDebugMode/splitio.engine.impressions.strategies.StrategyOptimizedMode) """ unique_keys_synchronizer = None @@ -5447,12 +5447,12 @@ def set_classes_async(storage_mode, impressions_mode, api_adapter, imp_counter, :type prefix: str :return: tuple of classes instances. - :rtype: (harness_commons.sync.unique_keys.UniqueKeysSynchronizerAsync, - harness_commons.sync.unique_keys.ClearFilterSynchronizerAsync, - harness_commons.tasks.unique_keys_sync.UniqueKeysTaskAsync, - harness_commons.tasks.unique_keys_sync.ClearFilterTaskAsync, - harness_commons.sync.impressions_sync.ImpressionsCountSynchronizerAsync, - harness_commons.tasks.impressions_sync.ImpressionsCountSyncTaskAsync, + :rtype: (splitio_commons.sync.unique_keys.UniqueKeysSynchronizerAsync, + splitio_commons.sync.unique_keys.ClearFilterSynchronizerAsync, + splitio_commons.tasks.unique_keys_sync.UniqueKeysTaskAsync, + splitio_commons.tasks.unique_keys_sync.ClearFilterTaskAsync, + splitio_commons.sync.impressions_sync.ImpressionsCountSynchronizerAsync, + splitio_commons.tasks.impressions_sync.ImpressionsCountSyncTaskAsync, splitio.engine.impressions.strategies.StrategyNoneMode/splitio.engine.impressions.strategies.StrategyDebugMode/splitio.engine.impressions.strategies.StrategyOptimizedMode) """ unique_keys_synchronizer = None diff --git a/tests/integration/test_pluggable_integration.py b/tests/integration/test_pluggable_integration.py index c5690b5b..92d4c17e 100644 --- a/tests/integration/test_pluggable_integration.py +++ b/tests/integration/test_pluggable_integration.py @@ -6,7 +6,7 @@ from splitio.client.util import get_metadata from splitio.models import splits -from harness_commons.models import impressions, events +from splitio_commons.models import impressions, events from splitio.storage.pluggable import PluggableEventsStorage, PluggableImpressionsStorage, PluggableSegmentStorage, \ PluggableSplitStorage, PluggableEventsStorageAsync, PluggableImpressionsStorageAsync, PluggableSegmentStorageAsync,\ PluggableSplitStorageAsync @@ -222,14 +222,14 @@ def test_put_fetch_contains(self): adapter = StorageMockAdapter() try: self._put_events(adapter, get_metadata({})) - evts = adapter.pop_items('harness_commons.events') + evts = adapter.pop_items('splitio_commons.events') assert len(evts) == 3 for rawEvent in evts: event = json.loads(rawEvent) assert event['m']['i'] != 'NA' assert event['m']['n'] != 'NA' finally: - adapter.delete('harness_commons.events') + adapter.delete('splitio_commons.events') def test_put_fetch_contains_ip_address_disabled(self): """Test storing and retrieving splits in pluggable.""" @@ -239,14 +239,14 @@ def test_put_fetch_contains_ip_address_disabled(self): cfg.update({'IPAddressesEnabled': False}) self._put_events(adapter, get_metadata(cfg)) - evts = adapter.pop_items('harness_commons.events') + evts = adapter.pop_items('splitio_commons.events') assert len(evts) == 3 for rawEvent in evts: event = json.loads(rawEvent) assert event['m']['i'] == 'NA' assert event['m']['n'] == 'NA' finally: - adapter.delete('harness_commons.events') + adapter.delete('splitio_commons.events') class PluggableSplitStorageIntegrationAsyncTests(object): @@ -416,14 +416,14 @@ async def test_put_fetch_contains(self): adapter = StorageMockAdapterAsync() try: await self._put_events(adapter, get_metadata({})) - evts = await adapter.pop_items('harness_commons.events') + evts = await adapter.pop_items('splitio_commons.events') assert len(evts) == 3 for rawEvent in evts: event = json.loads(rawEvent) assert event['m']['i'] != 'NA' assert event['m']['n'] != 'NA' finally: - await adapter.delete('harness_commons.events') + await adapter.delete('splitio_commons.events') @pytest.mark.asyncio async def test_put_fetch_contains_ip_address_disabled(self): @@ -434,11 +434,11 @@ async def test_put_fetch_contains_ip_address_disabled(self): cfg.update({'IPAddressesEnabled': False}) await self._put_events(adapter, get_metadata(cfg)) - evts = await adapter.pop_items('harness_commons.events') + evts = await adapter.pop_items('splitio_commons.events') assert len(evts) == 3 for rawEvent in evts: event = json.loads(rawEvent) assert event['m']['i'] == 'NA' assert event['m']['n'] == 'NA' finally: - await adapter.delete('harness_commons.events') + await adapter.delete('splitio_commons.events') diff --git a/tests/integration/test_redis_integration.py b/tests/integration/test_redis_integration.py index 0e5c06ce..8eb4d435 100644 --- a/tests/integration/test_redis_integration.py +++ b/tests/integration/test_redis_integration.py @@ -6,7 +6,7 @@ from splitio.client.util import get_metadata from splitio.models import splits -from harness_commons.models import impressions, events +from splitio_commons.models import impressions, events from splitio.storage.redis import RedisSplitStorage, RedisSegmentStorage, RedisImpressionsStorage, \ RedisEventsStorage, RedisEventsStorageAsync, RedisImpressionsStorageAsync, RedisSegmentStorageAsync, \ RedisSplitStorageAsync @@ -225,14 +225,14 @@ def test_put_fetch_contains(self): adapter = _build_default_client({}) try: self._put_events(adapter, get_metadata({})) - evts = adapter.lrange('harness_commons.events', 0, 2) + evts = adapter.lrange('splitio_commons.events', 0, 2) assert len(evts) == 3 for rawEvent in evts: event = json.loads(rawEvent) assert event['m']['i'] != 'NA' assert event['m']['n'] != 'NA' finally: - adapter.delete('harness_commons.events') + adapter.delete('splitio_commons.events') def test_put_fetch_contains_ip_address_disabled(self): """Test storing and retrieving splits in redis.""" @@ -242,14 +242,14 @@ def test_put_fetch_contains_ip_address_disabled(self): cfg.update({'IPAddressesEnabled': False}) self._put_events(adapter, get_metadata(cfg)) - evts = adapter.lrange('harness_commons.events', 0, 2) + evts = adapter.lrange('splitio_commons.events', 0, 2) assert len(evts) == 3 for rawEvent in evts: event = json.loads(rawEvent) assert event['m']['i'] == 'NA' assert event['m']['n'] == 'NA' finally: - adapter.delete('harness_commons.events') + adapter.delete('splitio_commons.events') class RedisSplitStorageAsyncTests(object): """Redis Split storage e2e tests.""" @@ -461,14 +461,14 @@ async def test_put_fetch_contains(self): adapter = await _build_default_client_async({}) try: await self._put_events(adapter, get_metadata({})) - evts = await adapter.lrange('harness_commons.events', 0, 2) + evts = await adapter.lrange('splitio_commons.events', 0, 2) assert len(evts) == 3 for rawEvent in evts: event = json.loads(rawEvent) assert event['m']['i'] != 'NA' assert event['m']['n'] != 'NA' finally: - await adapter.delete('harness_commons.events') + await adapter.delete('splitio_commons.events') @pytest.mark.asyncio async def test_put_fetch_contains_ip_address_disabled(self): @@ -479,11 +479,11 @@ async def test_put_fetch_contains_ip_address_disabled(self): cfg.update({'IPAddressesEnabled': False}) await self._put_events(adapter, get_metadata(cfg)) - evts = await adapter.lrange('harness_commons.events', 0, 2) + evts = await adapter.lrange('splitio_commons.events', 0, 2) assert len(evts) == 3 for rawEvent in evts: event = json.loads(rawEvent) assert event['m']['i'] == 'NA' assert event['m']['n'] == 'NA' finally: - await adapter.delete('harness_commons.events') + await adapter.delete('splitio_commons.events') diff --git a/tests/integration/test_streaming_e2e.py b/tests/integration/test_streaming_e2e.py index 521723ab..792616f6 100644 --- a/tests/integration/test_streaming_e2e.py +++ b/tests/integration/test_streaming_e2e.py @@ -10,11 +10,11 @@ from queue import Queue from splitio.optional.loaders import asyncio from splitio.client.factory import get_factory, get_factory_async -from harness_commons.models.events import SdkEvent -from harness_commons.events.events_metadata import SdkEventType +from splitio_commons.models.events import SdkEvent +from splitio_commons.events.events_metadata import SdkEventType from tests.helpers.mockserver import SSEMockServer, SplitMockServer from urllib.parse import parse_qs -from harness_commons.models.telemetry import StreamingEventTypes, SSESyncMode +from splitio_commons.models.telemetry import StreamingEventTypes, SSESyncMode class StreamingIntegrationTests(object): """Test streaming operation and failover.""" diff --git a/tests/models/test_splits.py b/tests/models/test_splits.py index 606a0921..40b32afd 100644 --- a/tests/models/test_splits.py +++ b/tests/models/test_splits.py @@ -2,7 +2,7 @@ import copy from splitio.models import splits -from harness_commons.models.grammar.condition import Condition +from splitio_commons.models.grammar.condition import Condition class SplitTests(object): """Split model tests.""" diff --git a/tests/push/test_split_worker.py b/tests/push/test_split_worker.py index af2a5575..de7b6187 100644 --- a/tests/push/test_split_worker.py +++ b/tests/push/test_split_worker.py @@ -4,13 +4,13 @@ import base64 import pytest -from harness_commons.api import APIException +from splitio_commons.api import APIException from splitio.push.workers import SplitWorker, SplitWorkerAsync -from harness_commons.models.notification import SplitChangeNotification -from harness_commons.optional.loaders import asyncio -from harness_commons.push.parser import SplitChangeUpdate, RBSChangeUpdate -from harness_commons.engine.telemetry import TelemetryStorageProducer, TelemetryStorageProducerAsync -from harness_commons.storage.inmemmory import InMemoryTelemetryStorage, InMemoryDefinitionStorage, InMemorySegmentStorage, \ +from splitio_commons.models.notification import SplitChangeNotification +from splitio_commons.optional.loaders import asyncio +from splitio_commons.push.parser import SplitChangeUpdate, RBSChangeUpdate +from splitio_commons.engine.telemetry import TelemetryStorageProducer, TelemetryStorageProducerAsync +from splitio_commons.storage.inmemmory import InMemoryTelemetryStorage, InMemoryDefinitionStorage, InMemorySegmentStorage, \ InMemoryTelemetryStorageAsync, InMemoryDefinitionStorageAsync, InMemorySegmentStorageAsync change_number_received = None diff --git a/tests/storage/test_pluggable.py b/tests/storage/test_pluggable.py index 84cbe70b..441a94e1 100644 --- a/tests/storage/test_pluggable.py +++ b/tests/storage/test_pluggable.py @@ -7,15 +7,15 @@ from splitio.optional.loaders import asyncio from splitio.models.splits import Split from splitio.models import splits -from harness_commons.models import rule_based_segments -from harness_commons.models.segments import Segment -from harness_commons.models.impressions import Impression -from harness_commons.models.events import Event, EventWrapper +from splitio_commons.models import rule_based_segments +from splitio_commons.models.segments import Segment +from splitio_commons.models.impressions import Impression +from splitio_commons.models.events import Event, EventWrapper from splitio.storage.pluggable import PluggableSplitStorage, PluggableSegmentStorage, PluggableImpressionsStorage, PluggableEventsStorage, \ PluggableTelemetryStorage, PluggableEventsStorageAsync, PluggableSegmentStorageAsync, PluggableImpressionsStorageAsync,\ PluggableSplitStorageAsync, PluggableTelemetryStorageAsync, PluggableRuleBasedSegmentsStorage, PluggableRuleBasedSegmentsStorageAsync from splitio.client.util import get_metadata, SdkMetadata -from harness_commons.models.telemetry import MAX_TAGS, MethodExceptionsAndLatencies, OperationMode +from splitio_commons.models.telemetry import MAX_TAGS, MethodExceptionsAndLatencies, OperationMode from tests.integration import splits_json, rbsegments_json class StorageMockAdapter(object): @@ -870,7 +870,7 @@ def test_init(self): else: prefix = '' pluggable_events_storage = PluggableEventsStorage(self.mock_adapter, self.metadata, prefix=sprefix) - assert(pluggable_events_storage._events_queue_key == prefix + "harness_commons.events") + assert(pluggable_events_storage._events_queue_key == prefix + "splitio_commons.events") assert(pluggable_events_storage._sdk_metadata == { 's': self.metadata.sdk_version, 'n': self.metadata.instance_name, @@ -892,15 +892,15 @@ def test_put(self): ] assert(pluggable_events_storage.put(events)) assert(pluggable_events_storage._events_queue_key in self.mock_adapter._keys) - assert(self.mock_adapter._keys[prefix + "harness_commons.events"] == pluggable_events_storage._wrap_events(events)) - assert(self.mock_adapter._expire[prefix + "harness_commons.events"] == PluggableEventsStorage._EVENTS_KEY_DEFAULT_TTL) + assert(self.mock_adapter._keys[prefix + "splitio_commons.events"] == pluggable_events_storage._wrap_events(events)) + assert(self.mock_adapter._expire[prefix + "splitio_commons.events"] == PluggableEventsStorage._EVENTS_KEY_DEFAULT_TTL) events2 = [ EventWrapper(event=Event('key5', 'user', 'purchase', 10, 123456, None), size=32768), EventWrapper(event=Event('key6', 'user', 'purchase', 10, 123456, None), size=32768), ] assert(pluggable_events_storage.put(events2)) - assert(self.mock_adapter._keys[prefix + "harness_commons.events"] == pluggable_events_storage._wrap_events(events + events2)) + assert(self.mock_adapter._keys[prefix + "splitio_commons.events"] == pluggable_events_storage._wrap_events(events + events2)) def test_wrap_events(self): for sprefix in [None, 'myprefix']: @@ -965,7 +965,7 @@ def mock_expire(impressions_event_key, ttl): pluggable_events_storage.expire_key(200, 200) assert(self.expired_called) - assert(self.key == prefix + "harness_commons.events") + assert(self.key == prefix + "splitio_commons.events") assert(self.ttl == pluggable_events_storage._EVENTS_KEY_DEFAULT_TTL) @@ -984,7 +984,7 @@ def test_init(self): else: prefix = '' pluggable_events_storage = PluggableEventsStorageAsync(self.mock_adapter, self.metadata, prefix=sprefix) - assert(pluggable_events_storage._events_queue_key == prefix + "harness_commons.events") + assert(pluggable_events_storage._events_queue_key == prefix + "splitio_commons.events") assert(pluggable_events_storage._sdk_metadata == { 's': self.metadata.sdk_version, 'n': self.metadata.instance_name, @@ -1007,15 +1007,15 @@ async def test_put(self): ] assert(await pluggable_events_storage.put(events)) assert(pluggable_events_storage._events_queue_key in self.mock_adapter._keys) - assert(self.mock_adapter._keys[prefix + "harness_commons.events"] == pluggable_events_storage._wrap_events(events)) - assert(self.mock_adapter._expire[prefix + "harness_commons.events"] == PluggableEventsStorageAsync._EVENTS_KEY_DEFAULT_TTL) + assert(self.mock_adapter._keys[prefix + "splitio_commons.events"] == pluggable_events_storage._wrap_events(events)) + assert(self.mock_adapter._expire[prefix + "splitio_commons.events"] == PluggableEventsStorageAsync._EVENTS_KEY_DEFAULT_TTL) events2 = [ EventWrapper(event=Event('key5', 'user', 'purchase', 10, 123456, None), size=32768), EventWrapper(event=Event('key6', 'user', 'purchase', 10, 123456, None), size=32768), ] assert(await pluggable_events_storage.put(events2)) - assert(self.mock_adapter._keys[prefix + "harness_commons.events"] == pluggable_events_storage._wrap_events(events + events2)) + assert(self.mock_adapter._keys[prefix + "splitio_commons.events"] == pluggable_events_storage._wrap_events(events + events2)) def test_wrap_events(self): for sprefix in [None, 'myprefix']: @@ -1081,7 +1081,7 @@ async def mock_expire(impressions_event_key, ttl): await pluggable_events_storage.expire_key(200, 200) assert(self.expired_called) - assert(self.key == prefix + "harness_commons.events") + assert(self.key == prefix + "splitio_commons.events") assert(self.ttl == pluggable_events_storage._EVENTS_KEY_DEFAULT_TTL) diff --git a/tests/storage/test_redis.py b/tests/storage/test_redis.py index d72b4f42..16ef9f35 100644 --- a/tests/storage/test_redis.py +++ b/tests/storage/test_redis.py @@ -10,17 +10,17 @@ from splitio.client.util import get_metadata, SdkMetadata from splitio.storage.adapters.redis import RedisAdapter, RedisAdapterAsync, RedisAdapterException, build from splitio.optional.loaders import asyncio -from harness_commons.storage import FlagSetsFilter +from splitio_commons.storage import FlagSetsFilter from splitio.storage.redis import RedisEventsStorage, RedisEventsStorageAsync, RedisImpressionsStorage, RedisImpressionsStorageAsync, \ RedisSegmentStorage, RedisSegmentStorageAsync, RedisSplitStorage, RedisSplitStorageAsync, RedisTelemetryStorage, RedisTelemetryStorageAsync, \ RedisRuleBasedSegmentsStorage, RedisRuleBasedSegmentsStorageAsync from splitio.storage.adapters.redis import RedisAdapter, RedisAdapterException, build from redis.asyncio.client import Redis as aioredis from splitio.storage.adapters import redis -from harness_commons.models.segments import Segment -from harness_commons.models.impressions import Impression -from harness_commons.models.events import Event, EventWrapper -from harness_commons.models.telemetry import MethodExceptions, MethodLatencies, TelemetryConfig, MethodExceptionsAndLatencies, TelemetryConfigAsync +from splitio_commons.models.segments import Segment +from splitio_commons.models.impressions import Impression +from splitio_commons.models.events import Event, EventWrapper +from splitio_commons.models.telemetry import MethodExceptions, MethodLatencies, TelemetryConfig, MethodExceptionsAndLatencies, TelemetryConfigAsync class RedisSplitStorageTests(object): """Redis split storage test cases.""" @@ -895,7 +895,7 @@ def test_add_events(self, mocker): for item in list_of_events_sent: assert item in list_of_events_called -# assert adapter.rpush.mock_calls == [mocker.call('harness_commons.events', to_validate)] +# assert adapter.rpush.mock_calls == [mocker.call('splitio_commons.events', to_validate)] # Assert that if an exception is thrown it's caught and False is returned adapter.reset_mock() @@ -917,7 +917,7 @@ def expire(key, ttl): adapter.expire = expire storage.expire_keys(2, 2) - assert self.key == 'harness_commons.events' + assert self.key == 'splitio_commons.events' assert self.ttl == 3600 self.key = None @@ -967,7 +967,7 @@ async def rpush(key, *events): }) for e in events] assert self.events == tuple(list_of_raw_events) - assert self.key == 'harness_commons.events' + assert self.key == 'splitio_commons.events' assert storage._wrap_events(events) == list_of_raw_events # Assert that if an exception is thrown it's caught and False is returned @@ -993,7 +993,7 @@ async def expire(key, ttl): adapter.expire = expire await storage.expire_keys(2, 2) - assert self.key == 'harness_commons.events' + assert self.key == 'splitio_commons.events' assert self.ttl == 3600 self.key = None @@ -1011,7 +1011,7 @@ def test_init(self, mocker): assert(isinstance(redis_telemetry._tel_config, TelemetryConfig)) assert(redis_telemetry._make_pipe is not None) - @mock.patch('harness_commons.models.telemetry.TelemetryConfig.record_config') + @mock.patch('splitio_commons.models.telemetry.TelemetryConfig.record_config') def test_record_config(self, mocker): redis_telemetry = RedisTelemetryStorage(mocker.Mock(), mocker.Mock()) redis_telemetry.record_config(mocker.Mock(), mocker.Mock(), 0, 0) diff --git a/tests/sync/test_splits_synchronizer.py b/tests/sync/test_splits_synchronizer.py index 8cf3250a..4edf8eb3 100644 --- a/tests/sync/test_splits_synchronizer.py +++ b/tests/sync/test_splits_synchronizer.py @@ -6,15 +6,15 @@ import copy import queue -from harness_commons.util.backoff import Backoff -from harness_commons.api import APIException -from harness_commons.api.commons import FetchOptions -from harness_commons.storage import DefinitionStorage, RuleBasedSegmentsStorage +from splitio_commons.util.backoff import Backoff +from splitio_commons.api import APIException +from splitio_commons.api.commons import FetchOptions +from splitio_commons.storage import DefinitionStorage, RuleBasedSegmentsStorage from splitio.storage.inmemory import InMemorySplitStorage, InMemorySplitStorageAsync -from harness_commons.storage.inmemmory import InMemoryRuleBasedSegmentStorage, InMemoryRuleBasedSegmentStorageAsync -from harness_commons.storage import FlagSetsFilter +from splitio_commons.storage.inmemmory import InMemoryRuleBasedSegmentStorage, InMemoryRuleBasedSegmentStorageAsync +from splitio_commons.storage import FlagSetsFilter from splitio.models.splits import Split -from harness_commons.models.rule_based_segments import RuleBasedSegment +from splitio_commons.models.rule_based_segments import RuleBasedSegment from splitio.sync.split import SplitSynchronizer, SplitSynchronizerAsync, LocalSplitSynchronizer, LocalSplitSynchronizerAsync, LocalhostMode from splitio.optional.loaders import aiofiles, asyncio from tests.integration import splits_json, rbsegments_json @@ -305,7 +305,7 @@ def get_changes(*args, **kwargs): def test_synchronize_definitions_cdn(self, mocker): """Test split sync with bypassing cdn.""" - mocker.patch('harness_commons.sync.definition._ON_DEMAND_FETCH_BACKOFF_MAX_RETRIES', new=3) + mocker.patch('splitio_commons.sync.definition._ON_DEMAND_FETCH_BACKOFF_MAX_RETRIES', new=3) storage = mocker.Mock(spec=InMemorySplitStorage) rbs_storage = mocker.Mock(spec=InMemoryRuleBasedSegmentStorage) @@ -665,7 +665,7 @@ async def get_changes(*args, **kwargs): @pytest.mark.asyncio async def test_synchronize_definitions_cdn(self, mocker): """Test split sync with bypassing cdn.""" - mocker.patch('harness_commons.sync.definition._ON_DEMAND_FETCH_BACKOFF_MAX_RETRIES', new=3) + mocker.patch('splitio_commons.sync.definition._ON_DEMAND_FETCH_BACKOFF_MAX_RETRIES', new=3) storage = mocker.Mock(spec=InMemorySplitStorageAsync) rbs_storage = mocker.Mock(spec=InMemoryRuleBasedSegmentStorageAsync) async def change_number_mock(): diff --git a/tests/tasks/test_split_sync.py b/tests/tasks/test_split_sync.py index 3f075b57..99dcb771 100644 --- a/tests/tasks/test_split_sync.py +++ b/tests/tasks/test_split_sync.py @@ -3,10 +3,10 @@ import time import pytest -from harness_commons.api import APIException -from harness_commons.api.commons import FetchOptions +from splitio_commons.api import APIException +from splitio_commons.api.commons import FetchOptions from splitio.tasks import split_sync -from harness_commons.storage import DefinitionStorage, RuleBasedSegmentsStorage +from splitio_commons.storage import DefinitionStorage, RuleBasedSegmentsStorage from splitio.models.splits import Split from splitio.sync.split import SplitSynchronizer, SplitSynchronizerAsync from splitio.tasks.split_sync import SplitSynchronizationTask, SplitSynchronizationTaskAsync