Skip to content

Commit 8dcaba7

Browse files
committed
fix sampling_rule default values
1 parent 1cca2e5 commit 8dcaba7

File tree

2 files changed

+9
-8
lines changed

2 files changed

+9
-8
lines changed

aws-opentelemetry-distro/src/amazon/opentelemetry/distro/sampler/_sampling_rule.py

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,16 @@ def __init__(
2222
Version=None,
2323
):
2424
self.Attributes = Attributes if Attributes is not None else {}
25-
self.FixedRate = FixedRate if FixedRate is not None else ""
25+
self.FixedRate = FixedRate if FixedRate is not None else 0.0
2626
self.HTTPMethod = HTTPMethod if HTTPMethod is not None else ""
2727
self.Host = Host if Host is not None else ""
28-
self.Priority = Priority if Priority is not None else ""
29-
self.ReservoirSize = ReservoirSize if ReservoirSize is not None else ""
28+
# Default to value with lower priority than default rule
29+
self.Priority = Priority if Priority is not None else 10001
30+
self.ReservoirSize = ReservoirSize if ReservoirSize is not None else 0
3031
self.ResourceARN = ResourceARN if ResourceARN is not None else ""
3132
self.RuleARN = RuleARN if RuleARN is not None else ""
3233
self.RuleName = RuleName if RuleName is not None else ""
3334
self.ServiceName = ServiceName if ServiceName is not None else ""
3435
self.ServiceType = ServiceType if ServiceType is not None else ""
3536
self.URLPath = URLPath if URLPath is not None else ""
36-
self.Version = Version if Version is not None else ""
37+
self.Version = Version if Version is not None else 0

aws-opentelemetry-distro/tests/amazon/opentelemetry/distro/sampler/test_aws_xray_sampling_client.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,18 +48,18 @@ def test_default_values_used_when_missing_properties_in_sampling_rule(self, mock
4848

4949
sampling_rule = sampling_rules[0]
5050
self.assertEqual(sampling_rule.Attributes, {})
51-
self.assertEqual(sampling_rule.FixedRate, "")
51+
self.assertEqual(sampling_rule.FixedRate, 0.0)
5252
self.assertEqual(sampling_rule.HTTPMethod, "")
5353
self.assertEqual(sampling_rule.Host, "")
54-
self.assertEqual(sampling_rule.Priority, "")
55-
self.assertEqual(sampling_rule.ReservoirSize, "")
54+
self.assertEqual(sampling_rule.Priority, 10001)
55+
self.assertEqual(sampling_rule.ReservoirSize, 0)
5656
self.assertEqual(sampling_rule.ResourceARN, "")
5757
self.assertEqual(sampling_rule.RuleARN, "")
5858
self.assertEqual(sampling_rule.RuleName, "")
5959
self.assertEqual(sampling_rule.ServiceName, "")
6060
self.assertEqual(sampling_rule.ServiceType, "")
6161
self.assertEqual(sampling_rule.URLPath, "")
62-
self.assertEqual(sampling_rule.Version, "")
62+
self.assertEqual(sampling_rule.Version, 0)
6363

6464
@patch("requests.post")
6565
def test_get_three_sampling_rules(self, mock_post=None):

0 commit comments

Comments
 (0)