cleanup

Author: volokluev

pyproject.toml

@@ -29,7 +29,6 @@ dependencies = [
     "redis>=4.5.4",
     "sentry-arroyo>=2.29.1",
     "sentry-kafka-schemas>=2.0.4",
-    "sentry-protos>=0.3.6",
     "sentry-protos>=0.3.9",
     "sentry-redis-tools>=0.5.0",
     "sentry-relay>=0.9.5",

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

@@ -0,0 +1,16 @@
+from sentry_protos.snuba.v1.request_common_pb2 import TraceItemType
+
+
+class OutcomeCategory:
+    SPAN_INDEXED = 16
+    LOG_ITEM = 23
+
+
+class Outcome:
+    ACCEPTED = 0
+
+
+ITEM_TYPE_TO_OUTCOME_CATEGORY = {
+    TraceItemType.TRACE_ITEM_TYPE_SPAN: OutcomeCategory.SPAN_INDEXED,
+    TraceItemType.TRACE_ITEM_TYPE_LOG: OutcomeCategory.LOG_ITEM,
+}

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

@@ -155,7 +155,7 @@ def get_ingested_items_for_timerange(
         routing_context.extra_info["estimation_sql"] = res.extra.get("sql", "")
         return cast(int, res.result.get("data", [{}])[0].get("num_items", 0))
 
-    def _adjust_time_window(self, routing_context: RoutingContext) -> TimeWindow | None:
+    def _adjust_time_window(self, routing_context: RoutingContext) -> TimeWindow:
         """Adjust the time window to ensure we don't exceed MAX_ITEMS_TO_QUERY."""
         original_time_window = _get_request_time_window(routing_context)
         original_end_ts = original_time_window.end_timestamp.seconds
@@ -189,7 +189,7 @@ def _get_routing_decision(self, routing_context: RoutingContext) -> RoutingDecis
 
         in_msg_meta = extract_message_meta(routing_decision.routing_context.in_msg)
 
-        # Check if we need to handle time window adjustment for unknown item types
+        # if type is unknown, just route to tier 1, no adjustment
         if (
             in_msg_meta.trace_item_type != TraceItemType.TRACE_ITEM_TYPE_UNSPECIFIED
             and in_msg_meta.trace_item_type not in ITEM_TYPE_TO_OUTCOME_CATEGORY