Merge pull request #125 from yan12125/reenable-aiobotocore

Bring aiobotocore support back

Author: chanchiem

aws_xray_sdk/core/patcher.py

@@ -12,6 +12,7 @@
 log = logging.getLogger(__name__)
 
 SUPPORTED_MODULES = (
+    'aiobotocore',
     'botocore',
     'pynamodb',
     'requests',
@@ -24,6 +25,7 @@
 )
 
 NO_DOUBLE_PATCH = (
+    'aiobotocore',
     'botocore',
     'pynamodb',
     'requests',
@@ -66,8 +68,8 @@ def patch(modules_to_patch, raise_errors=True, ignore_module_patterns=None):
         if module_to_patch == 'boto3':
             modules.add('botocore')
         # aioboto3 depends on aiobotocore and patching aiobotocore is sufficient
-        # elif module_to_patch == 'aioboto3':
-        #     modules.add('aiobotocore')
+        elif module_to_patch == 'aioboto3':
+            modules.add('aiobotocore')
         # pynamodb requires botocore to be patched as well
         elif module_to_patch == 'pynamodb':
             modules.add('botocore')

tox.ini

@@ -30,11 +30,11 @@ deps =
     # Python3.5+ only deps
     py{35,36}: aiohttp >= 3.0.0
     py{35,36}: pytest-aiohttp
-    py{35,36}: aiobotocore
+    py{35,36}: aiobotocore >= 0.10.0
 
 commands =
     py{27,34}: coverage run --source aws_xray_sdk -m py.test tests --ignore tests/ext/aiohttp --ignore tests/ext/aiobotocore --ignore tests/test_async_local_storage.py --ignore tests/test_async_recorder.py
-    py{35,36}: coverage run --source aws_xray_sdk -m py.test tests --ignore tests/ext/aiobotocore
+    py{35,36}: coverage run --source aws_xray_sdk -m py.test tests
 
 setenv =
     DJANGO_SETTINGS_MODULE = tests.ext.django.app.settings