Expand limit for custom attributes to 128. (#144) (#145)

* Expand limit for custom attributes to 128. #144

* Fix failing pika tests. #144

Author: TimPansino

newrelic/core/attribute.py

@@ -73,7 +73,7 @@
         'peer.address',
 ))
 
-MAX_NUM_USER_ATTRIBUTES = 64
+MAX_NUM_USER_ATTRIBUTES = 128
 MAX_ATTRIBUTE_LENGTH = 255
 MAX_64_BIT_INT = 2 ** 63 - 1
 

tests/agent_features/test_attribute.py

@@ -299,17 +299,17 @@ def test_custom_params_value_too_long():
     assert result
 
 
-_required_custom_params_too_many = [('key-63', 'value')]
-_forgone_custom_params_too_many = [('key-64', 'value')]
+_required_custom_params_too_many = [('key-127', 'value')]
+_forgone_custom_params_too_many = [('key-128', 'value')]
 
 
 @validate_custom_parameters(_required_custom_params_too_many,
         _forgone_custom_params_too_many)
 @background_task()
 def test_custom_param_too_many():
-    for i in range(65):
+    for i in range(129):
         result = add_custom_parameter('key-%02d' % i, 'value')
-        if i < 64:
+        if i < 128:
             assert result
         else:
             assert not result   # Last one fails
@@ -319,7 +319,7 @@ def test_custom_param_too_many():
         _forgone_custom_params_too_many)
 @background_task()
 def test_custom_params_too_many():
-    item_list = [('key-%02d' % i, 'value') for i in range(65)]
+    item_list = [('key-%02d' % i, 'value') for i in range(129)]
     result = add_custom_parameters(item_list)
     assert not result
 

tests/agent_features/test_span_events.py

@@ -529,13 +529,13 @@ def test_span_custom_attribute_limit():
     txn_custom_attrs = []
     unexpected_txn_attrs = []
 
-    for i in range(64):
-        if i < 32:
+    for i in range(128):
+        if i < 64:
             span_custom_attrs.append('span_attr%i' % i)
         txn_custom_attrs.append('txn_attr%i' % i)
 
     unexpected_txn_attrs.extend(span_custom_attrs)
-    span_custom_attrs.extend(txn_custom_attrs[:32])
+    span_custom_attrs.extend(txn_custom_attrs[:64])
     expected_txn_attrs = {'user': txn_custom_attrs, 'agent': [],
                                    'intrinsic': []}
     expected_absent_txn_attrs = {'agent': [],
@@ -547,15 +547,15 @@ def test_span_custom_attribute_limit():
                                            expected_absent_txn_attrs)
     @validate_span_events(count=1,
                           expected_users=span_custom_attrs,
-                          unexpected_users=txn_custom_attrs[32:])
+                          unexpected_users=txn_custom_attrs[64:])
     @dt_enabled
     @background_task(name='test_span_attribute_limit')
     def _test():
         transaction = current_transaction()
 
-        for i in range(64):
+        for i in range(128):
             transaction.add_custom_parameter('txn_attr%i' % i, 'txnValue')
-            if i < 32:
+            if i < 64:
                 add_custom_span_attribute('span_attr%i' % i, 'spanValue')
     _test()
 

tox.ini

@@ -122,8 +122,7 @@ envlist =
     python-framework_starlette-{py36,py37,py38,py39,pypy3},
     libcurl-framework_tornado-{py36,py37,py38,py39,pypy3}-tornado0600,
     libcurl-framework_tornado-{py36,py37,py38,py39,pypy3}-tornadomaster,
-    rabbitmq-messagebroker_pika-{py27,py36,py37,py38,py39}-pika{0.13,1.1},
-    rabbitmq-messagebroker_pika-{pypy}-pika1.1,
+    rabbitmq-messagebroker_pika-{py27,py36,py37,py38,py39,pypy,pypy3}-pika{0.13,latest},
     python-template_mako-{py27,py36,py37,py38,py39}
 
 [pytest]
@@ -250,8 +249,9 @@ deps =
     framework_tornado-tornadomaster: https://github.com/tornadoweb/tornado/archive/master.zip
     framework-tornado: pycurl
     messagebroker_pika-pika0.13: pika<0.14
-    messagebroker_pika-pika1.1: pika
+    messagebroker_pika-pikalatest: pika
     messagebroker_pika: tornado<5
+    messagebroker_pika-{py27,pypy}: enum34
     template_mako: mako<1.2
 
 setenv =