Merge branch 'master' into server-py

Author: lynnagara

.github/CODEOWNERS

@@ -248,6 +248,7 @@ pnpm-lock.yaml                                           @getsentry/owners-js-de
 /src/sentry/snuba/subscriptions.py                        @getsentry/alerts-notifications
 /src/sentry/snuba/tasks.py                                @getsentry/alerts-notifications
 /tests/snuba/incidents/                                   @getsentry/alerts-notifications
+/src/sentry/rules/                                        @getsentry/alerts-notifications
 /tests/sentry/rules/                                      @getsentry/alerts-notifications
 /tests/sentry/snuba/test_query_subscription_consumer.py   @getsentry/alerts-notifications
 /tests/sentry/snuba/test_subscriptions.py                 @getsentry/alerts-notifications
@@ -462,11 +463,11 @@ tests/sentry/api/endpoints/test_organization_attribute_mappings.py          @get
 /src/sentry/identity/                                                @getsentry/enterprise
 
 /src/sentry/integrations/                                            @getsentry/product-owners-settings-integrations @getsentry/ecosystem
-/src/sentry/integrations/api/endpoints/organization_code_mapping*.py                            @getsentry/issue-detection-backend
+/src/sentry/integrations/api/endpoints/organization_code_mapping*.py                            @getsentry/coding-workflows-sentry-backend
 /src/sentry/integrations/api/endpoints/organization_coding_agents.py                            @getsentry/machine-learning-ai
 /src/sentry/integrations/coding_agent/                                      @getsentry/machine-learning-ai
 /src/sentry/integrations/utils/codecov.py                            @getsentry/codecov
-/src/sentry/integrations/utils/stacktrace_link.py                            @getsentry/issue-detection-backend
+/src/sentry/integrations/utils/stacktrace_link.py                            @getsentry/coding-workflows-sentry-backend
 
 /src/sentry/mail/                                                    @getsentry/alerts-notifications
 /src/sentry/notifications/                                           @getsentry/alerts-notifications @getsentry/ecosystem
@@ -609,6 +610,7 @@ tests/sentry/api/endpoints/test_organization_attribute_mappings.py          @get
 /static/app/gettingStartedDocs/                                                  @getsentry/value-discovery
 /static/app/types/project.tsx                                                    @getsentry/value-discovery
 /static/app/views/onboarding/                                                    @getsentry/value-discovery
+/tests/acceptance/test_scm_onboarding.py                                         @getsentry/value-discovery
 /tests/js/fixtures/detectedPlatform.ts                                           @getsentry/value-discovery
 /static/app/views/projectInstall/                                                @getsentry/value-discovery
 /src/sentry/onboarding_tasks/                                                    @getsentry/value-discovery
@@ -643,15 +645,14 @@ tests/sentry/api/endpoints/test_organization_attribute_mappings.py          @get
 /src/sentry/api/helpers/group_index/                        @getsentry/issue-workflow
 /src/sentry/api/helpers/source_map_helper.py                @getsentry/issue-workflow
 /src/sentry/api/endpoints/                                  @getsentry/issue-workflow
-/src/sentry/rules/                                          @getsentry/issue-detection-backend
 /src/sentry/processing_errors/                              @getsentry/issue-detection-backend
 /src/sentry/api/helpers/group_index/delete.py               @getsentry/issue-detection-backend
 /src/sentry/deletions/defaults/group.py                     @getsentry/issue-detection-backend
 /src/sentry/deletions/tasks/groups.py                       @getsentry/issue-detection-backend
 /src/sentry/event_manager.py                                @getsentry/issue-detection-backend
 /src/sentry/eventstore/models.py                            @getsentry/issue-detection-backend
 /src/sentry/grouping/                                       @getsentry/issue-detection-backend
-/src/sentry/issues/auto_source_code_config/                 @getsentry/issue-detection-backend
+/src/sentry/issues/auto_source_code_config/                 @getsentry/coding-workflows-sentry-backend
 /src/sentry/issues/endpoints/related_issues.py              @getsentry/issue-detection-backend
 /src/sentry/issues/ingest.py                                @getsentry/issue-detection-backend
 /src/sentry/issues/issue_occurrence.py                      @getsentry/issue-detection-backend
@@ -671,16 +672,16 @@ tests/sentry/api/endpoints/test_organization_attribute_mappings.py          @get
 /src/sentry/tasks/auto_ongoing_issues.py                    @getsentry/issue-detection-backend
 /src/sentry/tasks/auto_remove_inbox.py                      @getsentry/issue-detection-backend
 /src/sentry/tasks/auto_resolve_issues.py                    @getsentry/issue-detection-backend
-/src/sentry/tasks/auto_source_code_config.py                @getsentry/issue-detection-backend
+/src/sentry/tasks/auto_source_code_config.py                @getsentry/coding-workflows-sentry-backend
 /src/sentry/tasks/check_new_issue_threshold_met.py          @getsentry/issue-detection-backend
 /src/sentry/tasks/clear_expired_resolutions.py              @getsentry/issue-detection-backend
 /src/sentry/tasks/clear_expired_rulesnoozes.py              @getsentry/issue-detection-backend
 /src/sentry/tasks/clear_expired_snoozes.py                  @getsentry/issue-detection-backend
-/src/sentry/tasks/codeowners/                               @getsentry/issue-detection-backend
-/src/sentry/tasks/commit_context.py                         @getsentry/issue-detection-backend
+/src/sentry/tasks/codeowners/                               @getsentry/coding-workflows-sentry-backend
+/src/sentry/tasks/commit_context.py                         @getsentry/coding-workflows-sentry-backend
 /src/sentry/tasks/seer/delete_seer_grouping_records.py      @getsentry/issue-detection-backend
 /src/sentry/tasks/embeddings_grouping/                      @getsentry/issue-detection-backend
-/src/sentry/tasks/groupowner.py                             @getsentry/issue-detection-backend
+/src/sentry/tasks/groupowner.py                             @getsentry/coding-workflows-sentry-backend
 /src/sentry/tasks/merge.py                                  @getsentry/issue-detection-backend
 /src/sentry/tasks/unmerge.py                                @getsentry/issue-detection-backend
 /src/sentry/tasks/weekly_escalating_forecast.py             @getsentry/issue-detection-backend
@@ -703,7 +704,7 @@ tests/sentry/api/endpoints/test_organization_attribute_mappings.py          @get
 /tests/sentry/deletions/test_group.py                       @getsentry/issue-detection-backend
 /tests/sentry/event_manager/                                @getsentry/issue-detection-backend
 /tests/sentry/grouping/                                     @getsentry/issue-detection-backend
-/tests/sentry/issues/auto_source_code_config/               @getsentry/issue-detection-backend
+/tests/sentry/issues/auto_source_code_config/               @getsentry/coding-workflows-sentry-backend
 /tests/sentry/issues/endpoints/                             @getsentry/issue-workflow
 /tests/sentry/issues/endpoints/test_related_issues.py       @getsentry/issue-detection-backend
 /tests/sentry/issues/test_ingest.py                         @getsentry/issue-detection-backend
@@ -726,9 +727,9 @@ tests/sentry/api/endpoints/test_organization_attribute_mappings.py          @get
 /tests/sentry/tasks/test_clear_expired_resolutions.py       @getsentry/issue-detection-backend
 /tests/sentry/tasks/test_clear_expired_rulesnoozes.py       @getsentry/issue-detection-backend
 /tests/sentry/tasks/test_clear_expired_snoozes.py           @getsentry/issue-detection-backend
-/tests/sentry/tasks/test_code_owners.py                     @getsentry/issue-detection-backend
-/tests/sentry/tasks/test_commit_context.py                  @getsentry/issue-detection-backend
-/tests/sentry/tasks/test_groupowner.py                      @getsentry/issue-detection-backend
+/tests/sentry/tasks/test_code_owners.py                     @getsentry/coding-workflows-sentry-backend
+/tests/sentry/tasks/test_commit_context.py                  @getsentry/coding-workflows-sentry-backend
+/tests/sentry/tasks/test_groupowner.py                      @getsentry/coding-workflows-sentry-backend
 /tests/sentry/tasks/test_merge.py                           @getsentry/issue-detection-backend
 /tests/sentry/tasks/test_post_process.py                    @getsentry/issue-detection-backend
 /tests/sentry/tasks/test_weekly_escalating_forecast.py      @getsentry/issue-detection-backend

package.json

@@ -66,6 +66,7 @@
     "@emotion/is-prop-valid": "^1.3.0",
     "@emotion/react": "^11.14.0",
     "@emotion/styled": "^11.14.0",
+    "@intercom/messenger-js-sdk": "^0.0.18",
     "@mdx-js/loader": "^3.1.0",
     "@popperjs/core": "^2.11.5",
     "@r4ai/remark-callout": "^0.6.2",
@@ -170,7 +171,7 @@
     "echarts-for-react": "3.0.6",
     "esbuild": "0.25.10",
     "focus-trap": "7.6.5",
-    "framer-motion": "12.23.12",
+    "framer-motion": "12.38.0",
     "fuse.js": "^6.6.2",
     "gettext-parser": "7.0.1",
     "gl-matrix": "3.4.4",

pnpm-lock.yaml

@@ -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",

pyproject.toml

@@ -920,8 +920,3 @@ def serialize(  # type: ignore[override]
         )
 
         return context
-
-
-# Backwards-compatible aliases for getsentry
-DetailedOrganizationSerializer = OrganizationSerializer
-DetailedOrganizationSerializerWithProjectsAndTeams = OrganizationWithProjectsAndTeamsSerializer

src/sentry/api/serializers/models/organization.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)