minor doc update and CI fixes

Author: haotianw465

CHANGELOG.rst

@@ -4,11 +4,12 @@ CHANGELOG
 
 2.0.0
 =====
-* **Breaking**: The default sampler now launches background tasks to poll sampling rules from X-Ray backend. See the new default sampling strategy in more details here: 
+* **Breaking**: The default sampler now launches background tasks to poll sampling rules from X-Ray backend. See the new default sampling strategy in more details here: https://docs.aws.amazon.com/xray/latest/devguide/xray-sdk-python-configuration.html#xray-sdk-python-configuration-sampling.
 * **Breaking**: The `should_trace` function in the sampler now takes a dictionary for sampling rule matching.
 * **Breaking**: The original sampling modules for local defined rules are moved from `models.sampling` to `models.sampling.local`.
 * **Breaking**: The default behavior of `patch_all` changed to selectively patches libraries to avoid double patching. You can use `patch_all(double_patch=True)` to force it to patch ALL supported libraries. See more details on `ISSUE63 <https://github.com/aws/aws-xray-sdk-python/issues/63>`_
-* **Breaking** The latest `botocore` that has new X-Ray service API `GetSamplingRules` and `GetSamplingTargets` are required.
+* **Breaking**: The latest `botocore` that has new X-Ray service API `GetSamplingRules` and `GetSamplingTargets` are required.
+* **Breaking**: Version 2.x doesn't support pynamodb and aiobotocore as it requires botocore >= 1.11.3 which isn’t currently supported by the pynamodb and aiobotocore libraries. Please continue to use version 1.x if you’re using pynamodb or aiobotocore until those haven been updated to use botocore > = 1.11.3. 
 * feature: Environment variable `AWS_XRAY_DAEMON_ADDRESS` now takes an additional notation in `tcp:127.0.0.1:2000 udp:127.0.0.2:2001` to set TCP and UDP destination separately. By default it assumes a X-Ray daemon listening to both UDP and TCP traffic on `127.0.0.1:2000`.
 * feature: Added MongoDB python client support. `PR65 <https://github.com/aws/aws-xray-sdk-python/pull/65>`_.
 * bugfix: Support binding connection in sqlalchemy as well as engine. `PR78 <https://github.com/aws/aws-xray-sdk-python/pull/78>`_. 

aws_xray_sdk/core/patcher.py

@@ -4,9 +4,7 @@
 log = logging.getLogger(__name__)
 
 SUPPORTED_MODULES = (
-    'aiobotocore',
     'botocore',
-    'pynamodb',
     'requests',
     'sqlite3',
     'mysql',
@@ -15,9 +13,7 @@
 )
 
 NO_DOUBLE_PATCH = (
-    'aiobotocore',
     'botocore',
-    'pynamodb',
     'requests',
     'sqlite3',
     'mysql',
@@ -41,12 +37,12 @@ def patch(modules_to_patch, raise_errors=True):
         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')
-            modules.add(module_to_patch)
+        # elif module_to_patch == 'pynamodb':
+        #     modules.add('botocore')
+        #     modules.add(module_to_patch)
         else:
             modules.add(module_to_patch)
     unsupported_modules = modules - set(SUPPORTED_MODULES)

aws_xray_sdk/core/sampling/connector.py

@@ -142,5 +142,6 @@ def _create_xray_client(self, ip='127.0.0.1', port='2000'):
         session = botocore.session.get_session()
         url = 'http://%s:%s' % (ip, port)
         return session.create_client('xray', endpoint_url=url,
+                                     region_name='us-west-2',
                                      config=Config(signature_version=UNSIGNED)
                                      )

tox.ini

@@ -11,7 +11,6 @@ skip_missing_interpreters = True
 deps =
     pytest > 3.0.0
     coverage
-    botocore
     requests
     flask >= 0.10
     sqlalchemy
@@ -30,8 +29,8 @@ deps =
     py{35,36}: aiobotocore
 
 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
+    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 --ignore tests/ext/pynamodb
+    py{35,36}: coverage run --source aws_xray_sdk -m py.test tests --ignore tests/ext/aiobotocore --ignore tests/ext/pynamodb
 
 setenv =
     DJANGO_SETTINGS_MODULE = tests.ext.django.app.settings