make tests pass

snuba/web/rpc/__init__.py

@@ -0,0 +1,51 @@
+from typing import Any, Callable, Mapping, Tuple
+
+from google.protobuf.message import Message as ProtobufMessage
+from sentry_protos.snuba.v1alpha.endpoint_aggregate_bucket_pb2 import (
+    AggregateBucketRequest,
+)
+from sentry_protos.snuba.v1alpha.endpoint_span_samples_pb2 import SpanSamplesRequest
+from sentry_protos.snuba.v1alpha.endpoint_tags_list_pb2 import (
+    AttributeValuesRequest,
+    TraceItemAttributesRequest,
+)
+
+from snuba.utils.metrics.timer import Timer
+from snuba.web.rpc.v1alpha.span_samples import span_samples_query
+from snuba.web.rpc.v1alpha.timeseries import timeseries_query
+from snuba.web.rpc.v1alpha.trace_item_attribute_list import (
+    trace_item_attribute_list_query,
+)
+from snuba.web.rpc.v1alpha.trace_item_attribute_values import (
+    trace_item_attribute_values_query,
+)
+
+Version = str
+EndpointName = str
+
+ALL_RPCS: Mapping[
+    Version,
+    Mapping[
+        EndpointName,
+        Tuple[Callable[[Any, Timer], ProtobufMessage], type[ProtobufMessage]],
+    ],
+] = {
+    "v1alpha": {
+        "AggregateBucketRequest": (timeseries_query, AggregateBucketRequest),
+        "SpanSamplesRequest": (span_samples_query, SpanSamplesRequest),
+        "TraceItemAttributesRequest": (
+            trace_item_attribute_list_query,
+            TraceItemAttributesRequest,
+        ),
+        "AttributeValuesRequest": (
+            trace_item_attribute_values_query,
+            AttributeValuesRequest,
+        ),
+    }
+}
+
+
+def get_rpc_endpoint(
+    name: str, version: str
+) -> Tuple[Callable[[Any, Timer], ProtobufMessage], type[ProtobufMessage]]:
+    return ALL_RPCS[version][name]

snuba/web/rpc/v1alpha/__init__.py

@@ -1,32 +0,0 @@
-from typing import Any, Callable, Mapping, Tuple
-
-from google.protobuf.message import Message as ProtobufMessage
-from sentry_protos.snuba.v1alpha.endpoint_aggregate_bucket_pb2 import (
-    AggregateBucketRequest,
-)
-from sentry_protos.snuba.v1alpha.endpoint_span_samples_pb2 import SpanSamplesRequest
-from sentry_protos.snuba.v1alpha.endpoint_tags_list_pb2 import (
-    AttributeValuesRequest,
-    TraceItemAttributesRequest,
-)
-
-from snuba.utils.metrics.timer import Timer
-from snuba.web.rpc.span_samples import span_samples_query
-from snuba.web.rpc.timeseries import timeseries_query
-from snuba.web.rpc.trace_item_attribute_list import trace_item_attribute_list_query
-from snuba.web.rpc.trace_item_attribute_values import trace_item_attribute_values_query
-
-ALL_RPCS: Mapping[
-    str, Tuple[Callable[[Any, Timer], ProtobufMessage], type[ProtobufMessage]]
-] = {
-    "AggregateBucketRequest": (timeseries_query, AggregateBucketRequest),
-    "SpanSamplesRequest": (span_samples_query, SpanSamplesRequest),
-    "TraceItemAttributesRequest": (
-        trace_item_attribute_list_query,
-        TraceItemAttributesRequest,
-    ),
-    "AttributeValuesRequest": (
-        trace_item_attribute_values_query,
-        AttributeValuesRequest,
-    ),
-}

snuba/web/views.py

@@ -75,7 +75,7 @@
 from snuba.web.converters import DatasetConverter, EntityConverter, StorageConverter
 from snuba.web.delete_query import DeletesNotEnabledError, delete_from_storage
 from snuba.web.query import parse_and_run_query
-from snuba.web.rpc import ALL_RPCS
+from snuba.web.rpc import get_rpc_endpoint
 from snuba.web.rpc.exceptions import BadSnubaRPCRequestException
 from snuba.writer import BatchWriterEncoderWrapper, WriterTableRow
 
@@ -272,11 +272,11 @@ def unqualified_query_view(*, timer: Timer) -> Union[Response, str, WerkzeugResp
         assert False, "unexpected fallthrough"
 
 
-@application.route("/rpc/<version>/<name>", methods=["POST"])
+@application.route("/rpc/<name>/<version>", methods=["POST"])
 @util.time_request("rpc")
-def rpc(*, name: str, timer: Timer) -> Response:
+def rpc(*, name: str, version: str, timer: Timer) -> Response:
     try:
-        endpoint, req_class = ALL_RPCS[name]
+        endpoint, req_class = get_rpc_endpoint(name, version)
 
         req = req_class()
         req.ParseFromString(http_request.data)

tests/web/rpc/test_span_samples.py

@@ -21,7 +21,7 @@
 
 from snuba.datasets.storages.factory import get_storage
 from snuba.datasets.storages.storage_key import StorageKey
-from snuba.web.rpc.span_samples import span_samples_query
+from snuba.web.rpc.v1alpha.span_samples import span_samples_query
 from tests.base import BaseApiTest
 from tests.helpers import write_raw_unprocessed_events
 
@@ -141,7 +141,7 @@ def test_basic(self) -> None:
             limit=10,
         )
         response = self.app.post(
-            "/rpc/SpanSamplesRequest", data=message.SerializeToString()
+            "/rpc/SpanSamplesRequest/v1alpha", data=message.SerializeToString()
         )
         assert response.status_code == 200, response.text
 

tests/web/rpc/test_timeseries_api.py

@@ -13,7 +13,7 @@
 
 from snuba.datasets.storages.factory import get_storage
 from snuba.datasets.storages.storage_key import StorageKey
-from snuba.web.rpc.timeseries import timeseries_query
+from snuba.web.rpc.v1alpha.timeseries import timeseries_query
 from tests.base import BaseApiTest
 from tests.helpers import write_raw_unprocessed_events
 
@@ -127,7 +127,7 @@ def test_basic(self) -> None:
             granularity_secs=60,
         )
         response = self.app.post(
-            "/rpc/AggregateBucketRequest", data=message.SerializeToString()
+            "/rpc/AggregateBucketRequest/v1alpha", data=message.SerializeToString()
         )
         assert response.status_code == 200
 

tests/web/rpc/test_trace_item_attribute_list.py

@@ -13,7 +13,9 @@
 
 from snuba.datasets.storages.factory import get_storage
 from snuba.datasets.storages.storage_key import StorageKey
-from snuba.web.rpc.trace_item_attribute_list import trace_item_attribute_list_query
+from snuba.web.rpc.v1alpha.trace_item_attribute_list import (
+    trace_item_attribute_list_query,
+)
 from tests.base import BaseApiTest
 from tests.helpers import write_raw_unprocessed_events
 

tests/web/rpc/test_trace_item_attribute_values.py

@@ -9,7 +9,9 @@
 
 from snuba.datasets.storages.factory import get_storage
 from snuba.datasets.storages.storage_key import StorageKey
-from snuba.web.rpc.trace_item_attribute_values import trace_item_attribute_values_query
+from snuba.web.rpc.v1alpha.trace_item_attribute_values import (
+    trace_item_attribute_values_query,
+)
 from tests.base import BaseApiTest
 from tests.helpers import write_raw_unprocessed_events