Merge branch 'master' into tony/cleanup-dist-payloads

Author: lvthanh03

.agents/skills/hybrid-cloud-outboxes/references/signal-receivers.md

@@ -79,13 +79,13 @@ def process_my_category(object_identifier: int, payload: Any, **kwds: Any) -> No
 
 ## Control Outbox Receivers
 
-Control outbox signals include an additional `region_name` argument:
+Control outbox signals include an additional `cell_name` argument:
 
 - `sender`: `OutboxCategory` enum value
 - `payload`: `dict | None`
 - `object_identifier`: `int`
 - `shard_identifier`: `int`
-- `region_name`: `str` — the target region
+- `cell_name`: `str` — the target cell
 - `shard_scope`: `int`
 - `date_added`: `datetime`
 - `scheduled_for`: `datetime`
@@ -100,13 +100,13 @@ from sentry.receivers.outbox import maybe_process_tombstone
 
 
 @receiver(process_control_outbox, sender=OutboxCategory.MY_CATEGORY)
-def process_my_category(object_identifier: int, region_name: str, **kwds: Any) -> None:
+def process_my_category(object_identifier: int, cell_name: str, **kwds: Any) -> None:
     if (instance := maybe_process_tombstone(
-        MyModel, object_identifier, cell_name=region_name
+        MyModel, object_identifier, cell_name=cell_name
     )) is None:
         return
     # Replicate to the specific cell
-    my_cell_service.sync(cell_name=region_name, data=serialize(instance))
+    my_cell_service.sync(cell_name=cell_name, data=serialize(instance))
 ```
 
 ### Template: Control Pure-RPC Receiver
@@ -118,7 +118,7 @@ For categories where the receiver makes an RPC call without looking up a model:
 def process_my_category(
     payload: Mapping[str, Any], shard_identifier: int, **kwds: Any
 ) -> None:
-    my_region_service.do_something(
+    my_cell_service.do_something(
         organization_id=shard_identifier,
         data=payload["data"],
     )
@@ -144,4 +144,4 @@ The tombstone system drives `HybridCloudForeignKey` cascade deletes across silos
 
 **When to use**: Any receiver that needs to distinguish between "object was created/updated" and "object was deleted". Not needed for payload-only categories (audit logs, IP events) where the payload carries all necessary data.
 
-**`region_name` parameter**: Pass `region_name` for control outbox receivers (tombstone goes to the cell). Omit for cell outbox receivers (tombstone goes to control).
+**`cell_name` parameter**: Pass `cell_name` for control outbox receivers (tombstone goes to the cell). Omit for cell outbox receivers (tombstone goes to control).

.agents/skills/hybrid-cloud-rpc/SKILL.md

@@ -41,7 +41,7 @@ The service's `local_mode` determines where the database-backed implementation r
 
 | Data lives in...                                  | `local_mode`       | Decorator on methods            | Example                            |
 | ------------------------------------------------- | ------------------ | ------------------------------- | ---------------------------------- |
-| Region silo (projects, events, issues, org data)  | `SiloMode.CELL`    | `@cell_rpc_method(resolve=...)` | `OrganizationService`              |
+| Cell silo (projects, events, issues, org data)    | `SiloMode.CELL`    | `@cell_rpc_method(resolve=...)` | `OrganizationService`              |
 | Control silo (users, auth, billing, org mappings) | `SiloMode.CONTROL` | `@rpc_method`                   | `OrganizationMemberMappingService` |
 
 **Decision rule**: If the Django models you need to query live in the cell database, use `SiloMode.CELL`. If they live in the control database, use `SiloMode.CONTROL`.
@@ -95,7 +95,7 @@ If your service doesn't fit any of these, add a new entry to the `service_packag
 
 ## Step 4: Add or Update Methods
 
-### For REGION silo services
+### For CELL silo services
 
 Load `references/resolvers.md` for resolver details.
 
@@ -217,11 +217,11 @@ Every RPC service needs three categories of tests: **silo mode compatibility**,
 
 ### 7.1 Silo mode compatibility with `@all_silo_test`
 
-Every service test class MUST use `@all_silo_test` so tests run in all three modes (MONOLITH, REGION, CONTROL). This ensures the delegation layer works for both local and remote dispatch paths.
+Every service test class MUST use `@all_silo_test` so tests run in all three modes (MONOLITH, CELL, CONTROL). This ensures the delegation layer works for both local and remote dispatch paths.
 
 ```python
 from sentry.testutils.cases import TestCase, TransactionTestCase
-from sentry.testutils.silo import all_silo_test, assume_test_silo_mode, create_test_regions
+from sentry.testutils.silo import all_silo_test, assume_test_silo_mode, create_test_cells
 
 @all_silo_test
 class MyServiceTest(TestCase):
@@ -234,8 +234,8 @@ class MyServiceTest(TestCase):
 For tests that need named cells (e.g., testing cell resolution):
 
 ```python
-@all_silo_test(regions=create_test_regions("us", "eu"))
-class MyServiceRegionTest(TransactionTestCase):
+@all_silo_test(cells=create_test_cells("us", "eu"))
+class MyServiceCellTest(TransactionTestCase):
     ...
 ```
 
@@ -403,7 +403,7 @@ from sentry.testutils.silo import (
     cell_silo_test,
     assume_test_silo_mode,
     assume_test_silo_mode_of,
-    create_test_regions,
+    create_test_cells,
 )
 from sentry.testutils.outbox import outbox_runner
 from sentry.testutils.hybrid_cloud import HybridCloudTestMixin
@@ -423,7 +423,7 @@ Before submitting your PR, verify:
 - [ ] All RPC method parameters are keyword-only (`*` separator)
 - [ ] All parameters have explicit type annotations
 - [ ] All types are serializable (primitives, RpcModel, list, Optional, dict, Enum, datetime)
-- [ ] Region service methods have `@cell_rpc_method` with appropriate resolver
+- [ ] Cell service methods have `@cell_rpc_method` with appropriate resolver
 - [ ] Control service methods have `@rpc_method`
 - [ ] `@cell_rpc_method` / `@rpc_method` comes BEFORE `@abstractmethod`
 - [ ] `create_delegation()` is called at module level at the bottom of service.py

.agents/skills/hybrid-cloud-test-gen/SKILL.md

@@ -65,17 +65,17 @@ RPC service tests must cover:
 
 ### Quick Reference — Decorator & Base Class
 
-| Scenario                           | Decorator                                           | Base Class                       |
-| ---------------------------------- | --------------------------------------------------- | -------------------------------- |
-| Standard RPC service               | `@all_silo_test`                                    | `TestCase`                       |
-| RPC with named regions             | `@all_silo_test(regions=create_test_regions("us"))` | `TestCase`                       |
-| RPC with member mapping assertions | `@all_silo_test`                                    | `TestCase, HybridCloudTestMixin` |
+| Scenario                           | Decorator                                       | Base Class                       |
+| ---------------------------------- | ----------------------------------------------- | -------------------------------- |
+| Standard RPC service               | `@all_silo_test`                                | `TestCase`                       |
+| RPC with named cells               | `@all_silo_test(cells=create_test_cells("us"))` | `TestCase`                       |
+| RPC with member mapping assertions | `@all_silo_test`                                | `TestCase, HybridCloudTestMixin` |
 
 ## Step 4: Generate API Gateway Tests
 
 Load `references/api-gateway-tests.md` for complete templates and patterns.
 
-API gateway tests verify that requests to control-silo endpoints are correctly proxied to the appropriate region. They must cover:
+API gateway tests verify that requests to control-silo endpoints are correctly proxied to the appropriate cell. They must cover:
 
 - **Proxy pass-through**: Requests forwarded with correct params, headers, body
 - **Query parameter forwarding**: Multi-value params preserved
@@ -84,9 +84,9 @@ API gateway tests verify that requests to control-silo endpoints are correctly p
 
 ### Quick Reference — Decorator & Base Class
 
-| Scenario              | Decorator                                                                            | Base Class           |
-| --------------------- | ------------------------------------------------------------------------------------ | -------------------- |
-| Standard gateway test | `@control_silo_test(regions=[ApiGatewayTestCase.REGION], include_monolith_run=True)` | `ApiGatewayTestCase` |
+| Scenario              | Decorator                                                                        | Base Class           |
+| --------------------- | -------------------------------------------------------------------------------- | -------------------- |
+| Standard gateway test | `@control_silo_test(cells=[ApiGatewayTestCase.CELL], include_monolith_run=True)` | `ApiGatewayTestCase` |
 
 ## Step 5: Generate Outbox Pattern Tests
 
@@ -120,12 +120,12 @@ Endpoint silo tests verify that API endpoints work correctly under their declare
 
 ### Quick Reference — Decorator Mapping
 
-| Endpoint Decorator                    | Test Decorator                                          |
-| ------------------------------------- | ------------------------------------------------------- |
-| `@cell_silo_endpoint  `               | `@cell_silo_test`                                       |
-| `@control_silo_endpoint`              | `@control_silo_test`                                    |
-| `@control_silo_endpoint` (with proxy) | `@control_silo_test(regions=create_test_regions("us"))` |
-| No decorator (monolith-only)          | `@no_silo_test`                                         |
+| Endpoint Decorator                    | Test Decorator                                      |
+| ------------------------------------- | --------------------------------------------------- |
+| `@cell_silo_endpoint  `               | `@cell_silo_test`                                   |
+| `@control_silo_endpoint`              | `@control_silo_test`                                |
+| `@control_silo_endpoint` (with proxy) | `@control_silo_test(cells=create_test_cells("us"))` |
+| No decorator (monolith-only)          | `@no_silo_test`                                     |
 
 ## Step 7: Validate
 
@@ -153,7 +153,7 @@ from sentry.testutils.silo import (
     no_silo_test,
     assume_test_silo_mode,
     assume_test_silo_mode_of,
-    create_test_regions,
+    create_test_cells,
 )
 
 # Base classes

.agents/skills/hybrid-cloud-test-gen/references/api-gateway-tests.md

@@ -26,7 +26,7 @@ from sentry.utils import json
 ## Template: Standard API Gateway Test
 
 ```python
-@control_silo_test(regions=[ApiGatewayTestCase.REGION], include_monolith_run=True)
+@control_silo_test(cells=[ApiGatewayTestCase.CELL], include_monolith_run=True)
 class Test{Feature}ApiGateway(ApiGatewayTestCase):
 
     @responses.activate
@@ -36,7 +36,7 @@ class Test{Feature}ApiGateway(ApiGatewayTestCase):
         headers = dict(example="this")
         responses.add_callback(
             responses.GET,
-            f"{self.REGION.address}/organizations/{self.organization.slug}/{endpoint_path}/",
+            f"{self.CELL.address}/organizations/{self.organization.slug}/{endpoint_path}/",
             verify_request_params(query_params, headers),
         )
 
@@ -58,7 +58,7 @@ class Test{Feature}ApiGateway(ApiGatewayTestCase):
         headers = {"content-type": "application/json"}
         responses.add_callback(
             responses.POST,
-            f"{self.REGION.address}/organizations/{self.organization.slug}/{endpoint_path}/",
+            f"{self.CELL.address}/organizations/{self.organization.slug}/{endpoint_path}/",
             verify_request_body(request_body, headers),
         )
 
@@ -80,7 +80,7 @@ class Test{Feature}ApiGateway(ApiGatewayTestCase):
         """Verify upstream errors are forwarded to the client."""
         responses.add(
             responses.GET,
-            f"{self.REGION.address}/organizations/{self.organization.slug}/{endpoint_path}/",
+            f"{self.CELL.address}/organizations/{self.organization.slug}/{endpoint_path}/",
             status=400,
             json={"detail": "Bad request"},
         )
@@ -104,7 +104,7 @@ In CONTROL mode, proxied responses are streamed. Use `close_streaming_response()
         """Verify proxied response content is correct."""
         responses.add_callback(
             responses.GET,
-            f"{self.REGION.address}/organizations/{self.organization.slug}/{endpoint_path}/",
+            f"{self.CELL.address}/organizations/{self.organization.slug}/{endpoint_path}/",
             verify_request_params({}, {}),
         )
 
@@ -128,20 +128,20 @@ In CONTROL mode, proxied responses are streamed. Use `close_streaming_response()
 ## Template: SiloLimit Availability Check
 
 ```python
-    def test_control_only_endpoint_unavailable_in_region(self):
+    def test_control_only_endpoint_unavailable_in_cell(self):
         """Verify control-only endpoints raise AvailabilityError outside their silo."""
         with pytest.raises(SiloLimit.AvailabilityError):
             self.client.get("/api/0/{control-only-path}/")
 ```
 
 ## Key Patterns
 
-- **`ApiGatewayTestCase`** sets up a test region, mock HTTP callbacks, and the API gateway middleware. It extends `APITestCase`.
-- **`@control_silo_test(regions=[...], include_monolith_run=True)`** runs the test in both CONTROL and MONOLITH modes.
-- **Every test method MUST use `@responses.activate`** because gateway tests mock HTTP calls to the region address.
+- **`ApiGatewayTestCase`** sets up a test cell, mock HTTP callbacks, and the API gateway middleware. It extends `APITestCase`.
+- **`@control_silo_test(cells=[...], include_monolith_run=True)`** runs the test in both CONTROL and MONOLITH modes.
+- **Every test method MUST use `@responses.activate`** because gateway tests mock HTTP calls to the cell address.
 - **`verify_request_params(params, headers)`** is a callback that asserts query params and headers match.
 - **`verify_request_body(body, headers)`** asserts POST body matches.
 - **`close_streaming_response(resp)`** reads a streaming response to bytes — required for proxied responses in CONTROL mode.
 - **`override_settings(MIDDLEWARE=tuple(self.middleware))`** ensures the API gateway middleware is active.
-- **`self.REGION`** is a pre-configured `Region` object with address `http://us.internal.sentry.io`.
-- **`self.organization`** is pre-created in `setUp` and bound to `self.REGION`.
+- **`self.CELL`** is a pre-configured `Cell` object with address `http://us.internal.sentry.io`.
+- **`self.organization`** is pre-created in `setUp` and bound to `self.CELL`.

.agents/skills/hybrid-cloud-test-gen/references/endpoint-silo-tests.md

@@ -10,7 +10,7 @@ from sentry.testutils.silo import (
     no_silo_test,
     assume_test_silo_mode,
     assume_test_silo_mode_of,
-    create_test_regions,
+    create_test_cells,
 )
 from sentry.silo.base import SiloMode
 ```
@@ -19,14 +19,14 @@ from sentry.silo.base import SiloMode
 
 Match the endpoint's silo decorator to the test's silo decorator:
 
-| Endpoint Decorator                           | Test Decorator                                          |
-| -------------------------------------------- | ------------------------------------------------------- |
-| `@cell_silo_endpoint`                        | `@cell_silo_test`                                       |
-| `@control_silo_endpoint`                     | `@control_silo_test`                                    |
-| `@control_silo_endpoint` (proxies to region) | `@control_silo_test(regions=create_test_regions("us"))` |
-| No silo decorator                            | `@no_silo_test`                                         |
+| Endpoint Decorator                         | Test Decorator                                      |
+| ------------------------------------------ | --------------------------------------------------- |
+| `@cell_silo_endpoint`                      | `@cell_silo_test`                                   |
+| `@control_silo_endpoint`                   | `@control_silo_test`                                |
+| `@control_silo_endpoint` (proxies to cell) | `@control_silo_test(cells=create_test_cells("us"))` |
+| No silo decorator                          | `@no_silo_test`                                     |
 
-## Template: Region Silo Endpoint Test
+## Template: Cell Silo Endpoint Test
 
 ```python
 @cell_silo_test

.agents/skills/hybrid-cloud-test-gen/references/rpc-service-tests.md

@@ -27,7 +27,7 @@ from sentry.testutils.silo import (
     all_silo_test,
     assume_test_silo_mode,
     assume_test_silo_mode_of,
-    create_test_regions,
+    create_test_cells,
 )
 ```
 
@@ -92,7 +92,7 @@ class Test{ServiceName}Service(TestCase):
 Prefer `assume_test_silo_mode_of(Model)` over `assume_test_silo_mode(SiloMode.X)` when checking a single model:
 
 ```python
-@all_silo_test(regions=create_test_regions("us"))
+@all_silo_test(cells=create_test_cells("us"))
 class Test{ServiceName}CrossSilo(TestCase, HybridCloudTestMixin):
     def test_{method_name}_creates_mapping(self):
         with outbox_runner():