chore: bump sentry-sdk 2.35.0 (#7357)

okay so I had to add a fix
(getsentry/sentry-python#4688) to the earlier
change (getsentry/sentry-python#4598) I made in
the sentry-python sdk.

so now I'm bumping the sentry-sdk to `2.35.0` to grab that fix. I added
the `update_current_span ` convenience funtion that was also in this
release getsentry/sentry-python#4673

**testing:**
going to test this out in S4S first before moving on to de and us

Author: MeredithAnya

requirements.txt

@@ -25,7 +25,7 @@ sentry-kafka-schemas==2.0.4
 sentry-protos==0.3.3
 sentry-redis-tools==0.5.0
 sentry-relay==0.9.5
-sentry-sdk==2.33.2
+sentry-sdk==2.35.0
 simplejson==3.17.6
 snuba-sdk==3.0.39
 structlog==22.3.0

snuba/web/db_query.py

@@ -293,15 +293,12 @@ def execute_query_with_readthrough_caching(
     query_id: str,
     referrer: str,
 ) -> Result:
-    span = sentry_sdk.get_current_span()
-
     if referrer in settings.BYPASS_CACHE_REFERRERS and state.get_config(
         "enable_bypass_cache_referrers"
     ):
         query_id = f"randomized-{uuid.uuid4().hex}"
         clickhouse_query_settings["query_id"] = query_id
-        if span:
-            span.set_data("query_id", query_id)
+        sentry_sdk.update_current_span(attributes={"query_id": query_id})
         return execute_query(
             clickhouse_query,
             query_settings,
@@ -315,8 +312,7 @@ def execute_query_with_readthrough_caching(
 
     clickhouse_query_settings["query_id"] = f"randomized-{uuid.uuid4().hex}"
 
-    if span:
-        span.set_data("query_id", query_id)
+    sentry_sdk.update_current_span(attributes={"query_id": query_id})
 
     def record_cache_hit_type(hit_type: int) -> None:
         span_tag = "cache_miss"
@@ -329,8 +325,7 @@ def record_cache_hit_type(hit_type: int) -> None:
         elif hit_type == SIMPLE_READTHROUGH:
             stats["cache_hit_simple"] = 1
         sentry_sdk.set_tag("cache_status", span_tag)
-        if span:
-            span.set_data("cache_status", span_tag)
+        sentry_sdk.update_current_span(attributes={"cache_status": span_tag})
 
     cache_partition = _get_cache_partition(reader)
     metrics.increment(

snuba/web/rpc/storage_routing/routing_strategies/outcomes_based.py

@@ -152,7 +152,6 @@ def _get_min_timerange_to_query_outcomes(self) -> int:
         )
 
     def _get_routing_decision(self, routing_context: RoutingContext) -> RoutingDecision:
-        span = sentry_sdk.get_current_span()
         routing_decision = RoutingDecision(
             routing_context=routing_context,
             strategy=self,
@@ -161,15 +160,15 @@ def _get_routing_decision(self, routing_context: RoutingContext) -> RoutingDecis
             can_run=True,
         )
         in_msg_meta = extract_message_meta(routing_decision.routing_context.in_msg)
-        if span:
-            span.set_data(
-                "downsampling_mode",
-                (
+        sentry_sdk.update_current_span(
+            attributes={
+                "downsampling_mode": (
                     "highest_accuracy"
                     if self._is_highest_accuracy_mode(in_msg_meta)
                     else "normal"
                 ),
-            )
+            }
+        )
         if self._is_highest_accuracy_mode(in_msg_meta) or (
             # unspecified item type will be assumed as spans when querying
             # for GetTraces, there is no type specified so we assume spans because
@@ -216,11 +215,12 @@ def _get_routing_decision(self, routing_context: RoutingContext) -> RoutingDecis
         elif ingested_items > max_items_before_downsampling * 100:
             routing_decision.tier = Tier.TIER_512
 
-        if span:
-            span.set_data("ingested_items", ingested_items)
-            span.set_data(
-                "max_items_before_downsampling", max_items_before_downsampling
-            )
-            span.set_data("tier", routing_decision.tier.name)
+        sentry_sdk.update_current_span(
+            attributes={
+                "ingested_items": ingested_items,
+                "max_items_before_downsampling": max_items_before_downsampling,
+                "tier": routing_decision.tier.name,
+            }
+        )
 
         return routing_decision

snuba/web/rpc/storage_routing/routing_strategies/storage_routing.py

@@ -252,14 +252,12 @@ def _record_value_in_span_and_DD(
     ) -> None:
         name = _SAMPLING_IN_STORAGE_PREFIX + name
         metrics_backend_func(name, value, tags, None)
-        span = sentry_sdk.get_current_span()
         routing_context.extra_info[name] = {
             "type": metrics_backend_func.__name__,
             "value": value,
             "tags": tags,
         }
-        if span is not None:
-            span.set_data(name, value)
+        sentry_sdk.update_current_span(attributes={name: value})
 
     def _get_routing_decision(self, routing_context: RoutingContext) -> RoutingDecision:
         raise NotImplementedError