merge with master

Author: mredolatti

CHANGES.txt

@@ -1,9 +1,9 @@
 8.1.6 (Oct 31, 2019)
  - Fixed input validation performance issue.
 
-8.1.4 (Oct 14, 2019)
+8.1.5 (Oct 15, 2019)
  - Added logic to fetch multiple splits at once on get_treatments/get_treatments_with_config.
- - Added flag `ipAddressesEnabled` into config to enable/disable sending machineName and machineIp when data is posted in headers.
+ - Added flag `IPAddressesEnabled` into config to enable/disable sending machineName and machineIp when data is posted in headers.
 
 8.1.3 (Oct 4, 2019)
  - Fixed race condition related to segment fetching and SDK_READY event

splitio/client/config.py

@@ -16,7 +16,7 @@
     'eventsBulkSize': 5000,
     'eventsQueueSize': 10000,
     'labelsEnabled': True,
-    'ipAddressesEnabled': True,
+    'IPAddressesEnabled': True,
     'impressionListener': None,
     'redisHost': 'localhost',
     'redisPort': 6379,

splitio/client/util.py

@@ -29,7 +29,7 @@ def _get_hostname(ip_address):
 
 
 def _get_hostname_and_ip(config):
-    if config.get('ipAddressesEnabled') is False:
+    if config.get('IPAddressesEnabled') is False:
         return 'NA', 'NA'
     ip_from_config = config.get('machineIp')
     machine_from_config = config.get('machineName')

tests/api/test_events.py

@@ -28,7 +28,7 @@ def test_post_events(self, mocker):
         httpclient = mocker.Mock(spec=client.HttpClient)
         httpclient.post.return_value = client.HttpResponse(200, '')
         cfg = DEFAULT_CONFIG.copy()
-        cfg.update({'ipAddressesEnabled': True, 'machineName': 'some_machine_name', 'machineIp': '123.123.123.123'})
+        cfg.update({'IPAddressesEnabled': True, 'machineName': 'some_machine_name', 'machineIp': '123.123.123.123'})
         sdk_metadata = get_metadata(cfg)
         events_api = events.EventsAPI(httpclient, 'some_api_key', sdk_metadata)
         response = events_api.flush_events(self.events)
@@ -62,7 +62,7 @@ def test_post_events_ip_address_disabled(self, mocker):
         httpclient = mocker.Mock(spec=client.HttpClient)
         httpclient.post.return_value = client.HttpResponse(200, '')
         cfg = DEFAULT_CONFIG.copy()
-        cfg.update({'ipAddressesEnabled': False})
+        cfg.update({'IPAddressesEnabled': False})
         sdk_metadata = get_metadata(cfg)
         events_api = events.EventsAPI(httpclient, 'some_api_key', sdk_metadata)
         response = events_api.flush_events(self.events)

tests/api/test_impressions_api.py

@@ -33,7 +33,7 @@ def test_post_impressions(self, mocker):
         httpclient = mocker.Mock(spec=client.HttpClient)
         httpclient.post.return_value = client.HttpResponse(200, '')
         cfg = DEFAULT_CONFIG.copy()
-        cfg.update({'ipAddressesEnabled': True, 'machineName': 'some_machine_name', 'machineIp': '123.123.123.123'})
+        cfg.update({'IPAddressesEnabled': True, 'machineName': 'some_machine_name', 'machineIp': '123.123.123.123'})
         sdk_metadata = get_metadata(cfg)
         impressions_api = impressions.ImpressionsAPI(httpclient, 'some_api_key', sdk_metadata)
         response = impressions_api.flush_impressions(self.impressions)
@@ -67,7 +67,7 @@ def test_post_impressions_ip_address_disabled(self, mocker):
         httpclient = mocker.Mock(spec=client.HttpClient)
         httpclient.post.return_value = client.HttpResponse(200, '')
         cfg = DEFAULT_CONFIG.copy()
-        cfg.update({'ipAddressesEnabled': False})
+        cfg.update({'IPAddressesEnabled': False})
         sdk_metadata = get_metadata(cfg)
         impressions_api = impressions.ImpressionsAPI(httpclient, 'some_api_key', sdk_metadata)
         response = impressions_api.flush_impressions(self.impressions)

tests/client/test_utils.py

@@ -30,7 +30,7 @@ def test_get_metadata(self, mocker):
         assert get_host_mock.mock_calls == [mocker.call(mocker.ANY)]
 
         cfg = DEFAULT_CONFIG.copy()
-        cfg.update({'ipAddressesEnabled': False})
+        cfg.update({'IPAddressesEnabled': False})
         meta = util.get_metadata(cfg)
         assert meta.instance_ip == 'NA'
         assert meta.instance_name == 'NA'

tests/integration/test_redis_integration.py

@@ -180,7 +180,7 @@ def test_put_fetch_contains_ip_address_disabled(self):
         adapter = _build_default_client({})
         try:
             cfg = DEFAULT_CONFIG.copy()
-            cfg.update({'ipAddressesEnabled': False})
+            cfg.update({'IPAddressesEnabled': False})
             self._put_impressions(adapter, get_metadata(cfg))
 
             imps = adapter.lrange('SPLITIO.impressions', 0, 2)
@@ -231,7 +231,7 @@ def test_put_fetch_contains_ip_address_disabled(self):
         adapter = _build_default_client({})
         try:
             cfg = DEFAULT_CONFIG.copy()
-            cfg.update({'ipAddressesEnabled': False})
+            cfg.update({'IPAddressesEnabled': False})
             self._put_events(adapter, get_metadata(cfg))
 
             evts = adapter.lrange('SPLITIO.events', 0, 2)
@@ -251,7 +251,7 @@ def test_put_fetch_contains(self):
         """Test storing and retrieving splits in redis."""
         adapter = _build_default_client({})
         cfg = DEFAULT_CONFIG.copy()
-        cfg.update({'ipAddressesEnabled': False})
+        cfg.update({'IPAddressesEnabled': False})
         metadata = get_metadata(cfg)
         storage = RedisTelemetryStorage(adapter, metadata)
         try:
@@ -287,7 +287,7 @@ def test_put_fetch_contains_ip_address_disabled(self):
         """Test storing and retrieving splits in redis."""
         adapter = _build_default_client({})
         cfg = DEFAULT_CONFIG.copy()
-        cfg.update({'ipAddressesEnabled': False})
+        cfg.update({'IPAddressesEnabled': False})
         metadata = get_metadata(cfg)
         storage = RedisTelemetryStorage(adapter, metadata)
         try: