Merge branch 'master' into lcian/feat/add-logs

Author: lcian

CHANGELOG.md

@@ -1,5 +1,14 @@
 # Changelog
 
+## 25.6.1
+
+### Various fixes & improvements
+
+- feat(capman): Fix model ID for workflow querying referrer (#7243) by @kcons
+- Revert "feat(capman): Fix model ID for workflow querying referrer (#7239)" (b8889e71) by @getsentry-bot
+- feat(capman): Fix model ID for workflow querying referrer (#7239) by @kcons
+- meta: Bump new development version (57f19402)
+
 ## 25.6.0
 
 ### Various fixes & improvements

devservices/config.yml

@@ -44,6 +44,10 @@ x-sentry-service-config:
     containerized-uptime: [clickhouse, redis, kafka, snuba, uptime-consumer]
     containerized-metrics-dev: [clickhouse, redis, kafka, snuba, metrics-consumer, generic-metrics-distributions-consumer, generic-metrics-sets-consumer, generic-metrics-counters-consumer, generic-metrics-gauges-consumer]
 
+x-programs:
+  devserver:
+    command: snuba devserver
+
 services:
   clickhouse:
     image: ghcr.io/getsentry/image-mirror-altinity-clickhouse-server:23.8.11.29.altinitystable

devservices/programs.conf

@@ -6,7 +6,7 @@ click==8.1.7
 clickhouse-driver==0.2.9
 confluent-kafka==2.7.0
 datadog==0.21.0
-devservices==1.1.5
+devservices==1.2.1
 flake8==7.0.0
 Flask==2.2.5
 google-cloud-storage==2.18.0
@@ -29,7 +29,7 @@ python-rapidjson==1.8
 redis==4.5.4
 sentry-arroyo==2.22.0
 sentry-kafka-schemas==1.3.7
-sentry-protos==0.2.0
+sentry-protos==0.3.0
 sentry-redis-tools==0.5.0
 sentry-relay==0.9.5
 sentry-sdk==2.18.0

requirements.txt

@@ -35,7 +35,6 @@ md5 = "0.7.0"
 parking_lot = "0.12.1"
 procspawn = { version = "1.0.0", features = ["json"] }
 prost = "0.13"
-prost-types = "0.13.3"
 pyo3 = { version = "0.18.1", features = ["chrono"] }
 regex = "1.11.1"
 reqwest = { version = "0.11.11", features = ["stream"] }
@@ -54,7 +53,7 @@ sentry = { version = "0.41.0", default-features = false, features = [
 ] }
 sentry-kafka-schemas = "1.3.7"
 sentry_arroyo = { version = "2.22.0", features = ["ssl"] }
-sentry_protos = "0.2.0"
+sentry_protos = "0.3.0"
 sentry_usage_accountant = { version = "0.1.0", features = ["kafka"] }
 seq-macro = "0.3"
 serde = { version = "1.0", features = ["derive"] }
@@ -65,7 +64,6 @@ statsdproxy = { version = "0.1.2", features = ["cadence-adapter", "sentry"] }
 thiserror = "1.0"
 tokio = { version = "1.38.2", features = ["full"] }
 tokio-stream = "0.1.15"
-tonic = "0.12.3"
 tracing = "0.1.40"
 tracing-subscriber = { version = "0.3.18", features = ["env-filter", "json"] }
 uuid = { version = "1.5.0", features = ["v4", "v7"] }
@@ -76,6 +74,7 @@ zstd = "0.12.3"
 scopeguard = "1.2.0"
 criterion = "0.5.1"
 httpmock = "0.7.0"
+prost-types = "0.13.3"
 insta = { version = "1.34.0", features = ["json", "redactions"] }
 once_cell = "1.18.0"
 procspawn = { version = "1.0.0", features = ["test-support", "json"] }

rust_snuba/Cargo.lock

@@ -157,7 +157,9 @@ def execute(self, in_msg: Tin) -> Tout:
         span = scope.span
         if span is not None:
             span.description = self.config_key()
-        self.routing_context = RoutingContext(timer=self._timer, in_msg=in_msg)
+        self.routing_decision.routing_context = RoutingContext(
+            timer=self._timer, in_msg=in_msg
+        )
 
         self.__before_execute(in_msg)
         error = None
@@ -218,7 +220,7 @@ def __before_execute(self, in_msg: Tin) -> None:
         )
         self.routing_decision.strategy = selected_strategy
         self.routing_decision = selected_strategy.get_routing_decision(
-            self.routing_context
+            self.routing_decision.routing_context
         )
         self._timer.mark("rpc_start")
         self._before_execute(in_msg)

rust_snuba/Cargo.toml

@@ -6,7 +6,9 @@
 import sentry_sdk
 from google.protobuf.message import Message as ProtobufMessage
 
+from snuba import settings
 from snuba.state import get_config
+from snuba.web.rpc.storage_routing.common import extract_message_meta
 from snuba.web.rpc.storage_routing.routing_strategies.outcomes_based import (
     OutcomesBasedRoutingStrategy,
 )
@@ -88,7 +90,8 @@ class RoutingStrategySelector:
     def get_storage_routing_config(
         self, in_msg: ProtobufMessage
     ) -> StorageRoutingConfig:
-        organization_id = str(in_msg.meta.organization_id)  # type: ignore
+        in_msg_meta = extract_message_meta(in_msg)
+        organization_id = str(in_msg_meta.organization_id)
         try:
             overrides = json.loads(
                 str(get_config(_STORAGE_ROUTING_CONFIG_OVERRIDE_KEY, "{}"))
@@ -106,7 +109,8 @@ def select_routing_strategy(
         self, routing_context: RoutingContext
     ) -> BaseRoutingStrategy:
         try:
-            combined_org_and_project_ids = f"{routing_context.in_msg.meta.organization_id}:{'.'.join(str(pid) for pid in sorted(routing_context.in_msg.meta.project_ids))}"  # type: ignore
+            in_msg_meta = extract_message_meta(routing_context.in_msg)
+            combined_org_and_project_ids = f"{in_msg_meta.organization_id}:{'.'.join(str(pid) for pid in sorted(in_msg_meta.project_ids))}"
             bucket = (
                 int(hashlib.md5(combined_org_and_project_ids.encode()).hexdigest(), 16)
                 % _NUM_BUCKETS
@@ -121,6 +125,8 @@ def select_routing_strategy(
                 if bucket < cumulative_buckets:
                     return BaseRoutingStrategy.get_from_name(strategy_name)()
         except Exception as e:
+            if settings.RAISE_ON_ROUTING_STRATEGY_FAILURES:
+                raise e
             sentry_sdk.capture_message(f"Error selecting routing strategy: {e}")
             return OutcomesBasedRoutingStrategy()
 

snuba/web/rpc/__init__.py

@@ -37,8 +37,8 @@
     ]
 )
 
-# MAX 15 minute granularity over 28 days
-_MAX_BUCKETS_IN_REQUEST = 2688
+# MAX 15 minute granularity over 28 days (2688 buckets) + 1 bucket to allow for partial time buckets on
+_MAX_BUCKETS_IN_REQUEST = 2689
 
 
 def _enforce_no_duplicate_labels(request: TimeSeriesRequest) -> None: