[pull] master from getsentry:master

.github/CODEOWNERS

@@ -435,6 +435,7 @@ tests/sentry/api/endpoints/test_organization_attribute_mappings.py          @get
 ## Frontend
 /static/app/components/analyticsArea.spec.tsx  @getsentry/app-frontend
 /static/app/components/analyticsArea.tsx       @getsentry/app-frontend
+/static/app/components/loading/                @getsentry/app-frontend
 /static/app/components/events/interfaces/      @getsentry/app-frontend
 /static/app/components/forms/                  @getsentry/app-frontend
 /static/app/locale.tsx                         @getsentry/app-frontend

.github/workflows/label-pullrequest.yml

@@ -24,13 +24,13 @@ jobs:
           filters: .github/file-filters.yml
 
       - name: Add frontend label
-        uses: getsentry/action-add-labels@54d0cba498c1eaf8bd34985d715504d1b6e2935f
+        uses: getsentry/action-add-labels@ca568508c6e91387909cb3661e4cd965aa2f3a89
         if: steps.changes.outputs.frontend_all == 'true'
         with:
           labels: 'Scope: Frontend'
 
       - name: Add backend label
-        uses: getsentry/action-add-labels@54d0cba498c1eaf8bd34985d715504d1b6e2935f
+        uses: getsentry/action-add-labels@ca568508c6e91387909cb3661e4cd965aa2f3a89
         if: steps.changes.outputs.backend_src == 'true'
         with:
           labels: 'Scope: Backend'

pyproject.toml

@@ -87,7 +87,7 @@ dependencies = [
   "sentry-forked-email-reply-parser>=0.5.12.post1",
   "sentry-kafka-schemas>=2.1.27",
   "sentry-ophio>=1.1.3",
-  "sentry-protos>=0.8.8",
+  "sentry-protos>=0.8.10",
   "sentry-redis-tools>=0.5.0",
   "sentry-relay>=0.9.25",
   "sentry-sdk[http2]>=2.47.0",
@@ -683,6 +683,7 @@ module = [
   "sentry.tasks.codeowners.*",
   "sentry.tasks.commit_context",
   "sentry.tasks.on_demand_metrics",
+  "sentry.tasks.post_process",
   "sentry.tasks.reprocessing2",
   "sentry.tasks.seer.delete_seer_grouping_records",
   "sentry.tasks.store",

src/sentry/billing/platform/services/category_mapping.py

@@ -0,0 +1,67 @@
+from __future__ import annotations
+
+from sentry_protos.billing.v1.data_category_pb2 import DataCategory as ProtoDataCategory
+
+from sentry.constants import DataCategory
+from sentry.utils import metrics
+
+SENTRY_TO_PROTO_CATEGORY: dict[int, int] = {
+    int(DataCategory.ERROR): ProtoDataCategory.DATA_CATEGORY_ERROR,
+    int(DataCategory.TRANSACTION): ProtoDataCategory.DATA_CATEGORY_TRANSACTION,
+    int(DataCategory.ATTACHMENT): ProtoDataCategory.DATA_CATEGORY_ATTACHMENT,
+    int(DataCategory.PROFILE): ProtoDataCategory.DATA_CATEGORY_PROFILE,
+    int(DataCategory.REPLAY): ProtoDataCategory.DATA_CATEGORY_REPLAY,
+    int(DataCategory.MONITOR): ProtoDataCategory.DATA_CATEGORY_MONITOR,
+    int(DataCategory.SPAN): ProtoDataCategory.DATA_CATEGORY_SPAN,
+    int(DataCategory.USER_REPORT_V2): ProtoDataCategory.DATA_CATEGORY_USER_REPORT_V2,
+    int(DataCategory.PROFILE_DURATION): ProtoDataCategory.DATA_CATEGORY_PROFILE_DURATION,
+    int(DataCategory.LOG_BYTE): ProtoDataCategory.DATA_CATEGORY_LOG_BYTE,
+    int(DataCategory.PROFILE_DURATION_UI): ProtoDataCategory.DATA_CATEGORY_PROFILE_DURATION_UI,
+    int(DataCategory.SEER_AUTOFIX): ProtoDataCategory.DATA_CATEGORY_SEER_AUTOFIX,
+    int(DataCategory.SEER_SCANNER): ProtoDataCategory.DATA_CATEGORY_SEER_SCANNER,
+    int(DataCategory.SIZE_ANALYSIS): ProtoDataCategory.DATA_CATEGORY_SIZE_ANALYSIS,
+    int(DataCategory.INSTALLABLE_BUILD): ProtoDataCategory.DATA_CATEGORY_INSTALLABLE_BUILD,
+    int(DataCategory.TRACE_METRIC): ProtoDataCategory.DATA_CATEGORY_TRACE_METRIC,
+    int(DataCategory.DEFAULT): ProtoDataCategory.DATA_CATEGORY_DEFAULT,
+    int(DataCategory.SECURITY): ProtoDataCategory.DATA_CATEGORY_SECURITY,
+    int(DataCategory.PROFILE_CHUNK): ProtoDataCategory.DATA_CATEGORY_PROFILE_CHUNK,
+    int(DataCategory.PROFILE_CHUNK_UI): ProtoDataCategory.DATA_CATEGORY_PROFILE_CHUNK_UI,
+}
+
+
+PROTO_TO_SENTRY_CATEGORY: dict[int, int] = {v: k for k, v in SENTRY_TO_PROTO_CATEGORY.items()}
+
+
+def proto_to_sentry_category(proto_category: int) -> int:
+    """Convert a proto DataCategory to its Sentry equivalent.
+
+    For categories with a known mapping, returns the sentry int value.
+    For unmapped categories, passes through the original int value and
+    emits a metric so we can track how often this happens.
+    """
+    result = PROTO_TO_SENTRY_CATEGORY.get(proto_category)
+    if result is None:
+        metrics.incr(
+            "billing.proto_category_mapping.unmapped_reverse",
+            tags={"proto_category": str(proto_category)},
+        )
+        return proto_category
+    return result
+
+
+def sentry_to_proto_category(category: int | DataCategory) -> ProtoDataCategory.ValueType:
+    """Convert a Sentry DataCategory to its proto equivalent.
+
+    For categories with a known mapping, returns the proto enum value.
+    For unmapped categories, passes through the original int value and
+    emits a metric so we can track how often this happens.
+    """
+    cat_int = int(category)
+    result = SENTRY_TO_PROTO_CATEGORY.get(cat_int)
+    if result is None:
+        metrics.incr(
+            "billing.proto_category_mapping.unmapped",
+            tags={"sentry_category": str(cat_int)},
+        )
+        return ProtoDataCategory.ValueType(cat_int)
+    return ProtoDataCategory.ValueType(result)

src/sentry/billing/platform/services/usage/_outcomes_query.py

@@ -28,7 +28,7 @@
 )
 from snuba_sdk.orderby import Direction
 
-from sentry.billing.platform.services.usage._category_mapping import proto_to_relay_category
+from sentry.billing.platform.services.category_mapping import proto_to_sentry_category
 from sentry.snuba.referrer import Referrer
 from sentry.utils import metrics
 from sentry.utils.outcomes import Outcome
@@ -58,7 +58,7 @@ def query_outcomes_usage(request: GetUsageRequest) -> GetUsageResponse:
     end = _timestamp_to_datetime(request.end) + timedelta(days=1)
     # Proto categories use different int values from Relay/ClickHouse
     # (e.g., proto ATTACHMENT=3 vs Relay ATTACHMENT=4). Convert before querying.
-    categories = [proto_to_relay_category(c) for c in request.categories]
+    categories = [proto_to_sentry_category(c) for c in request.categories]
 
     snuba_request = _build_query(org_id, start, end, categories, total_outcomes=_BILLABLE_OUTCOMES)
     result = raw_snql_query(snuba_request, referrer=_REFERRER)

src/sentry/conf/server.py

@@ -3273,9 +3273,6 @@ def custom_parameter_sort(parameter: dict) -> tuple[str, int]:
     ]
     SENTRY_MONOLITH_REGION = SENTRY_CELLS[0]["name"]
 
-    # TODO(cells): remove after getsentry updated
-    SENTRY_REGION_CONFIG = SENTRY_CELLS
-
     # Cross region RPC authentication
     RPC_SHARED_SECRET = [
         "a-long-value-that-is-shared-but-also-secret",

src/sentry/integrations/api/endpoints/organization_integration_request.py

@@ -1,5 +1,7 @@
 from __future__ import annotations
 
+from typing import TYPE_CHECKING
+
 from rest_framework.request import Request
 from rest_framework.response import Response
 
@@ -15,8 +17,11 @@
 from sentry.plugins.base import plugins
 from sentry.sentry_apps.services.app import app_service
 
+if TYPE_CHECKING:
+    from django.utils.functional import _StrPromise
+
 
-def get_provider_name(provider_type: str, provider_slug: str) -> str | None:
+def get_provider_name(provider_type: str, provider_slug: str) -> str | _StrPromise | None:
     """
     The things that users think of as "integrations" are actually three
     different things: integrations, plugins, and sentryapps. A user requesting

src/sentry/integrations/github/webhook_types.py

@@ -22,7 +22,10 @@ class GithubWebhookType(StrEnum):
 
 
 # Event type strings (X-GitHub-Event header values) that the cell webhook endpoint processes.
-# INSTALLATION is handled in control only.
+# INSTALLATION and INSTALLATION_REPOSITORIES are handled in control only.
+_CONTROL_ONLY_EVENTS = frozenset(
+    {GithubWebhookType.INSTALLATION, GithubWebhookType.INSTALLATION_REPOSITORIES}
+)
 CELL_PROCESSED_GITHUB_EVENTS = frozenset(
-    t.value for t in GithubWebhookType if t != GithubWebhookType.INSTALLATION
+    t.value for t in GithubWebhookType if t not in _CONTROL_ONLY_EVENTS
 )

src/sentry/middleware/integrations/parsers/github.py

@@ -15,9 +15,9 @@
     get_github_external_id,
 )
 from sentry.integrations.github.webhook_types import (
+    _CONTROL_ONLY_EVENTS,
     CELL_PROCESSED_GITHUB_EVENTS,
     GITHUB_WEBHOOK_TYPE_HEADER,
-    GithubWebhookType,
 )
 from sentry.integrations.middleware.hybrid_cloud.parser import BaseRequestParser
 from sentry.integrations.models.integration import Integration
@@ -77,7 +77,7 @@ def get_mailbox_identifier(
     def should_route_to_control_silo(
         self, parsed_event: Mapping[str, Any], request: HttpRequest
     ) -> bool:
-        return request.META.get(GITHUB_WEBHOOK_TYPE_HEADER) == GithubWebhookType.INSTALLATION
+        return request.META.get(GITHUB_WEBHOOK_TYPE_HEADER) in _CONTROL_ONLY_EVENTS
 
     @control_silo_function
     def get_integration_from_request(self) -> Integration | None: