fix

src/sentry/snuba/entity_subscription.py

@@ -16,11 +16,12 @@
 from sentry.models.environment import Environment
 from sentry.models.organization import Organization
 from sentry.models.project import Project
+from sentry.search.eap.types import SearchResolverConfig
 from sentry.search.events.builder.base import BaseQueryBuilder
 from sentry.search.events.builder.discover import DiscoverQueryBuilder
 from sentry.search.events.builder.metrics import AlertMetricsQueryBuilder
 from sentry.search.events.builder.spans_indexed import SpansEAPQueryBuilder
-from sentry.search.events.types import ParamsType, QueryBuilderConfig
+from sentry.search.events.types import ParamsType, QueryBuilderConfig, SnubaParams
 from sentry.sentry_metrics.use_case_id_registry import UseCaseID
 from sentry.sentry_metrics.utils import (
     resolve,
@@ -29,12 +30,11 @@
     resolve_tag_values,
 )
 from sentry.snuba.dataset import Dataset, EntityKey
-from sentry.snuba.discover import SnubaParams
 from sentry.snuba.metrics.extraction import MetricSpecType
 from sentry.snuba.metrics.naming_layer.mri import SessionMRI
 from sentry.snuba.models import SnubaQuery, SnubaQueryEventType
 from sentry.snuba.referrer import Referrer
-from sentry.snuba.spans_rpc import TraceItemTableRequest, get_timeseries_query
+from sentry.snuba.spans_rpc import get_timeseries_query
 from sentry.utils import metrics
 
 # TODO: If we want to support security events here we'll need a way to
@@ -161,7 +161,7 @@ def build_rpc_request(
         environment: Environment | None,
         params: ParamsType | None = None,
         skip_field_validation_for_entity_subscription_deletion: bool = False,
-    ) -> TraceItemTableRequest:
+    ) -> TimeSeriesRequest:
         raise NotImplementedError
 
 
@@ -317,9 +317,7 @@ def build_rpc_request(
             y_axes=[self.aggregate],
             groupby=[],
             referrer=Referrer.API_ALERTS_ALERT_RULE_CHART.value,
-            config=QueryBuilderConfig(
-                skip_time_conditions=True,
-            ),
+            config=SearchResolverConfig(),
             granularity_secs=self.time_window,
         )
 

src/sentry/snuba/spans_rpc.py

@@ -118,8 +118,16 @@ def get_timeseries_query(
     return TimeSeriesRequest(
         meta=meta,
         filter=query,
-        aggregations=[agg.proto_definition for agg in aggregations],
-        group_by=[groupby.proto_definition for groupby in groupbys],
+        aggregations=[
+            agg.proto_definition
+            for agg in aggregations
+            if isinstance(agg.proto_definition, AttributeAggregation)
+        ],
+        group_by=[
+            groupby.proto_definition
+            for groupby in groupbys
+            if isinstance(groupby.proto_definition, AttributeAggregation)
+        ],
         granularity_secs=granularity_secs,
     )
 

src/sentry/utils/snuba_rpc.py

@@ -7,14 +7,14 @@
 import sentry_sdk
 import sentry_sdk.scope
 from google.protobuf.message import Message as ProtobufMessage
+from sentry_protos.snuba.v1.endpoint_create_subscription_pb2 import CreateSubscriptionRequest
 from sentry_protos.snuba.v1.endpoint_trace_item_table_pb2 import (
     TraceItemTableRequest,
     TraceItemTableResponse,
 )
 from sentry_protos.snuba.v1.error_pb2 import Error as ErrorProto
 from urllib3.response import BaseHTTPResponse
 
-from sentry.snuba.referrer import Referrer
 from sentry.utils.snuba import SnubaError, _snuba_pool
 
 RPCResponseType = TypeVar("RPCResponseType", bound=ProtobufMessage)
@@ -59,7 +59,9 @@ def table_rpc(req: TraceItemTableRequest) -> TraceItemTableResponse:
 
 
 def rpc(
-    req: SnubaRPCRequest, resp_type: type[RPCResponseType], referrer: Referrer | None = None
+    req: SnubaRPCRequest | CreateSubscriptionRequest,
+    resp_type: type[RPCResponseType],
+    referrer: str | None = None,
 ) -> RPCResponseType:
     """
     You want to call a snuba RPC. Here's how you do it:
@@ -102,7 +104,10 @@ def rpc(
 
 
 def _make_rpc_request(
-    endpoint_name: str, class_version: str, req: SnubaRPCRequest, referrer: Referrer | None = None
+    endpoint_name: str,
+    class_version: str,
+    req: SnubaRPCRequest | CreateSubscriptionRequest,
+    referrer: str | None = None,
 ) -> BaseHTTPResponse:
     referrer = referrer if referrer else req.meta.referrer
     if SNUBA_INFO:

tests/sentry/snuba/test_entity_subscriptions.py

@@ -2,7 +2,6 @@
 from unittest.mock import patch
 
 import pytest
-from google.protobuf.json_format import MessageToDict
 from snuba_sdk import And, Column, Condition, Entity, Function, Join, Op, Relationship
 
 from sentry.exceptions import (
@@ -677,19 +676,9 @@ def test_get_entity_subscription_for_eap_rpc_query(self) -> None:
             query, [self.project.id], None
         )
 
-        time_series_request_dict = MessageToDict(rpc_timeseries_request)
-
-        assert time_series_request_dict.get("granularitySecs") == "3600"
-        assert (
-            time_series_request_dict.get("filter")
-            .get("comparisonFilter")
-            .get("value")
-            .get("valStr")
-            == "http.client"
-        )
-        assert (
-            time_series_request_dict.get("aggregations")[0].get("label") == "count(span.duration)"
-        )
+        assert rpc_timeseries_request.granularity_secs == 3600
+        assert rpc_timeseries_request.filter.comparison_filter.value.val_str == "http.client"
+        assert rpc_timeseries_request.aggregations[0].label == "count(span.duration)"
 
 
 class GetEntitySubscriptionFromSnubaQueryTest(TestCase):