Fixed leftover poller threads on CI

Author: haotianw465

CHANGELOG.rst

@@ -8,7 +8,7 @@ CHANGELOG
 * feature: Added support for `pynamodb` >= 3.3.1. `PR88 <https://github.com/aws/aws-xray-sdk-python/pull/88>`_.
 * improvement: Improved stack trace recording when exception is thrown in decorators. `PR70 <https://github.com/aws/aws-xray-sdk-python/pull/70>`_.
 * bugfix: Argument `sampling_req` in LocalSampler `should_trace` method now becomes optional. `PR89 <https://github.com/aws/aws-xray-sdk-python/pull/89>`_.
-* bugfix: Fixed a wrong test setup in recorder unit test.
+* bugfix: Fixed a wrong test setup and leftover poller threads in recorder unit test.
 
 2.0.1
 =====

aws_xray_sdk/ext/botocore/patch.py

@@ -30,8 +30,8 @@ def patch():
 def _xray_traced_botocore(wrapped, instance, args, kwargs):
     service = instance._service_model.metadata["endpointPrefix"]
     if service == 'xray':
-        # skip tracing for SDK built-in centralized sampling pollers
-        if 'GetCentralizedSamplingRules' in args or 'GetSamplingTargets' in args:
+        # skip tracing for SDK built-in sampling pollers
+        if 'GetSamplingRules' in args or 'GetSamplingTargets' in args:
             return wrapped(*args, **kwargs)
     return xray_recorder.record_subsegment(
         wrapped, instance, args, kwargs,

tests/util.py

@@ -4,6 +4,7 @@
 
 from aws_xray_sdk.core.recorder import AWSXRayRecorder
 from aws_xray_sdk.core.emitters.udp_emitter import UDPEmitter
+from aws_xray_sdk.core.sampling.sampler import DefaultSampler
 from aws_xray_sdk.core.utils.compat import PY35
 
 
@@ -26,6 +27,12 @@ def pop(self):
         return entity
 
 
+class StubbedSampler(DefaultSampler):
+
+    def start(self):
+        pass
+
+
 def get_new_stubbed_recorder():
     """
     Returns a new AWSXRayRecorder object with emitter stubbed
@@ -36,7 +43,7 @@ def get_new_stubbed_recorder():
         from aws_xray_sdk.core.async_recorder import AsyncAWSXRayRecorder
         recorder = AsyncAWSXRayRecorder()
 
-    recorder.emitter = StubbedEmitter()
+    recorder.configure(emitter=StubbedEmitter(), sampler=StubbedSampler())
     return recorder