Merge branch 'potel-base' into ivana/potel/fix-strawberry

Author: sentrivana

sentry_sdk/integrations/opentelemetry/sampler.py

@@ -48,10 +48,13 @@ def get_parent_sampled(parent_context, trace_id):
 
 def dropped_result(span_context, attributes, sample_rate=None):
     # type: (SpanContext, Attributes, Optional[float]) -> SamplingResult
-    # note that trace_state.add will NOT overwrite existing entries
-    # so these will only be added the first time in a root span sampling decision
-    trace_state = span_context.trace_state.add(TRACESTATE_SAMPLED_KEY, "false")
-    if sample_rate:
+    # these will only be added the first time in a root span sampling decision
+    trace_state = span_context.trace_state
+
+    if TRACESTATE_SAMPLED_KEY not in trace_state:
+        trace_state = trace_state.add(TRACESTATE_SAMPLED_KEY, "false")
+
+    if sample_rate and TRACESTATE_SAMPLE_RATE_KEY not in trace_state:
         trace_state = trace_state.add(TRACESTATE_SAMPLE_RATE_KEY, str(sample_rate))
 
     return SamplingResult(
@@ -63,11 +66,13 @@ def dropped_result(span_context, attributes, sample_rate=None):
 
 def sampled_result(span_context, attributes, sample_rate):
     # type: (SpanContext, Attributes, float) -> SamplingResult
-    # note that trace_state.add will NOT overwrite existing entries
-    # so these will only be added the first time in a root span sampling decision
-    trace_state = span_context.trace_state.add(TRACESTATE_SAMPLED_KEY, "true").add(
-        TRACESTATE_SAMPLE_RATE_KEY, str(sample_rate)
-    )
+    # these will only be added the first time in a root span sampling decision
+    trace_state = span_context.trace_state
+
+    if TRACESTATE_SAMPLED_KEY not in trace_state:
+        trace_state = trace_state.add(TRACESTATE_SAMPLED_KEY, "true")
+    if TRACESTATE_SAMPLE_RATE_KEY not in trace_state:
+        trace_state = trace_state.add(TRACESTATE_SAMPLE_RATE_KEY, str(sample_rate))
 
     return SamplingResult(
         Decision.RECORD_AND_SAMPLE,

tox.ini

@@ -117,6 +117,7 @@ envlist =
     # Falcon
     {py3.7}-falcon-v{1,1.4,2}
     {py3.7,py3.11,py3.12}-falcon-v{3}
+    {py3.8,py3.11,py3.12}-falcon-v{4}
     {py3.7,py3.11,py3.12}-falcon-latest
 
     # FastAPI
@@ -427,6 +428,8 @@ deps =
     falcon-v1: falcon~=1.0
     falcon-v2: falcon~=2.0
     falcon-v3: falcon~=3.0
+    # TODO: update to 4.0 stable when out
+    falcon-v4: falcon==4.0.0b3
     falcon-latest: falcon
 
     # FastAPI