patch release commit

Author: haotianw465

CHANGELOG.rst

@@ -2,6 +2,10 @@
 CHANGELOG
 =========
 
+2.0.1
+=====
+* bugfix: Fixed a issue where manually `begin_segment` might break when making sampling decisions. `PR82 <https://github.com/aws/aws-xray-sdk-python/pull/82>`_.
+
 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: https://docs.aws.amazon.com/xray/latest/devguide/xray-sdk-python-configuration.html#xray-sdk-python-configuration-sampling.

aws_xray_sdk/core/sampling/sampler.py

@@ -57,6 +57,8 @@ def should_trace(self, sampling_req=None):
         now = int(time.time())
         if sampling_req and not sampling_req.get('service_type', None):
             sampling_req['service_type'] = self._origin
+        elif sampling_req is None:
+            sampling_req = {'service_type': self._origin}
         matched_rule = self._cache.get_matched_rule(sampling_req, now)
         if matched_rule:
             log.debug('Rule %s is selected to make a sampling decision.', matched_rule.name)

aws_xray_sdk/version.py

@@ -1 +1 @@
-VERSION = '2.0'
+VERSION = '2.0.1'

tests/test_recorder.py

@@ -112,3 +112,11 @@ def my_func():
 
     actual = my_func()
     assert actual == value
+
+
+def test_first_begin_segment_sampled():
+    xray_recorder = get_new_stubbed_recorder()
+    xray_recorder.configure(sampling=False)
+    segment = xray_recorder.begin_segment('name')
+
+    assert segment.sampled