Merge branch 'ivana/span-first-15-ignore-spans' into ivana/span-first-16-thread-attrs

Author: sentrivana

.github/workflows/codeql-analysis.yml

@@ -1422,7 +1422,7 @@ def _make_sampling_decision(
     traces_sampler_defined = callable(client.options.get("traces_sampler"))
     if traces_sampler_defined:
         sampling_context = {
-            "span": {
+            "span_context": {
                 "name": name,
                 "trace_id": propagation_context.trace_id,
                 "parent_span_id": propagation_context.parent_span_id,
@@ -1490,7 +1490,7 @@ def is_ignored_span(name: str, attributes: "Optional[Attributes]") -> bool:
     def _matches(rule: "Any", value: "Any") -> bool:
         if isinstance(rule, Pattern):
             if isinstance(value, str):
-                return bool(rule.match(value))
+                return bool(rule.fullmatch(value))
             else:
                 return False
 
@@ -1501,7 +1501,7 @@ def _matches(rule: "Any", value: "Any") -> bool:
             if _matches(rule, name):
                 return True
 
-        elif isinstance(rule, dict) and rule:
+        elif isinstance(rule, dict) and ("name" in rule or "attributes" in rule):
             name_matches = True
             attributes_match = True
 

sentry_sdk/tracing_utils.py

@@ -121,7 +121,7 @@ def test_span_sampled_when_created(sentry_init, capture_envelopes):
     # at start_span() time
 
     def traces_sampler(sampling_context):
-        assert "delayed_attribute" not in sampling_context["span"]["attributes"]
+        assert "delayed_attribute" not in sampling_context["span_context"]["attributes"]
         return 1.0
 
     sentry_init(
@@ -170,9 +170,11 @@ def test_start_span_attributes(sentry_init, capture_envelopes):
 
 def test_start_span_attributes_in_traces_sampler(sentry_init, capture_envelopes):
     def traces_sampler(sampling_context):
-        assert "attributes" in sampling_context["span"]
-        assert "my_attribute" in sampling_context["span"]["attributes"]
-        assert sampling_context["span"]["attributes"]["my_attribute"] == "my_value"
+        assert "attributes" in sampling_context["span_context"]
+        assert "my_attribute" in sampling_context["span_context"]["attributes"]
+        assert (
+            sampling_context["span_context"]["attributes"]["my_attribute"] == "my_value"
+        )
         return 1.0
 
     sentry_init(
@@ -203,16 +205,16 @@ def test_sampling_context(sentry_init, capture_envelopes):
     def traces_sampler(sampling_context):
         nonlocal received_trace_id
 
-        assert "trace_id" in sampling_context["span"]
-        received_trace_id = sampling_context["span"]["trace_id"]
+        assert "trace_id" in sampling_context["span_context"]
+        received_trace_id = sampling_context["span_context"]["trace_id"]
 
-        assert "parent_span_id" in sampling_context["span"]
-        assert sampling_context["span"]["parent_span_id"] is None
+        assert "parent_span_id" in sampling_context["span_context"]
+        assert sampling_context["span_context"]["parent_span_id"] is None
 
-        assert "parent_sampled" in sampling_context["span"]
-        assert sampling_context["span"]["parent_sampled"] is None
+        assert "parent_sampled" in sampling_context["span_context"]
+        assert sampling_context["span_context"]["parent_sampled"] is None
 
-        assert "attributes" in sampling_context["span"]
+        assert "attributes" in sampling_context["span_context"]
 
         return 1.0
 
@@ -264,7 +266,7 @@ def traces_sampler(sampling_context):
 
 def test_custom_sampling_context_update_to_context_value_persists(sentry_init):
     def traces_sampler(sampling_context):
-        if sampling_context["span"]["attributes"]["first"] is True:
+        if sampling_context["span_context"]["attributes"]["first"] is True:
             assert sampling_context["custom_value"] == 1
         else:
             assert sampling_context["custom_value"] == 2
@@ -362,10 +364,10 @@ class Class:
 
 def test_traces_sampler_drops_span(sentry_init, capture_envelopes):
     def traces_sampler(sampling_context):
-        assert "attributes" in sampling_context["span"]
-        assert "drop" in sampling_context["span"]["attributes"]
+        assert "attributes" in sampling_context["span_context"]
+        assert "drop" in sampling_context["span_context"]["attributes"]
 
-        if sampling_context["span"]["attributes"]["drop"] is True:
+        if sampling_context["span_context"]["attributes"]["drop"] is True:
             return 0.0
 
         return 1.0
@@ -399,7 +401,7 @@ def test_traces_sampler_called_once_per_segment(sentry_init):
     def traces_sampler(sampling_context):
         nonlocal traces_sampler_called, span_name_in_traces_sampler
         traces_sampler_called += 1
-        span_name_in_traces_sampler = sampling_context["span"]["name"]
+        span_name_in_traces_sampler = sampling_context["span_context"]["name"]
         return 1.0
 
     sentry_init(