Merge branch 'master' into mihir/fix/explorer-chat-thinking-block-flicker

Author: Mihir-Mavalankar

.github/CODEOWNERS

@@ -571,7 +571,9 @@ tests/sentry/api/endpoints/test_organization_attribute_mappings.py          @get
 /src/sentry/dynamic_sampling/                                                    @getsentry/telemetry-experience
 /tests/sentry/dynamic_sampling/                                                  @getsentry/telemetry-experience
 /src/sentry/release_health/metrics_sessions_v2.py                                @getsentry/telemetry-experience
+/src/sentry/release_health/eap_sessions_rollout.py                               @getsentry/telemetry-experience
 /tests/sentry/release_health/test_metrics_sessions_v2.py                         @getsentry/telemetry-experience
+/tests/sentry/release_health/test_eap_sessions_rollout.py                        @getsentry/telemetry-experience
 /src/sentry/utils/platform_categories.py                                         @getsentry/telemetry-experience
 /src/sentry/sentry_metrics/querying/                                             @getsentry/telemetry-experience
 /tests/sentry/sentry_metrics/querying/                                           @getsentry/telemetry-experience
@@ -794,6 +796,7 @@ tests/sentry/api/endpoints/test_organization_attribute_mappings.py          @get
 /src/sentry/preprod/                                   @getsentry/emerge-tools
 /static/app/views/preprod/                             @getsentry/emerge-tools
 /tests/sentry/preprod/                                 @getsentry/emerge-tools
+/static/app/components/events/eventInsightDiff.tsx     @getsentry/emerge-tools
 /bin/preprod/                                          @getsentry/emerge-tools
 # End of preprod
 

.github/codeowners-coverage-baseline.txt

@@ -46,10 +46,6 @@ bin/load-integration-data
 bin/load-mocks
 bin/merge-catalogs
 bin/model-dependency-graphviz
-bin/preprod/test_pr_details
-bin/preprod/trigger_pr_comment
-bin/preprod/trigger_size_status_check
-bin/preprod/trigger_snapshot_status_check
 bin/run-model-tests
 bin/save-integration-data
 bin/send_metrics.py
@@ -1507,6 +1503,8 @@ static/gsAdmin/components/addGiftBudgetAction.tsx
 static/gsAdmin/components/addGiftEventsAction.spec.tsx
 static/gsAdmin/components/addGiftEventsAction.tsx
 static/gsAdmin/components/addOrRemoveOrgModal.tsx
+static/gsAdmin/components/addToStartupProgramAction.spec.tsx
+static/gsAdmin/components/addToStartupProgramAction.tsx
 static/gsAdmin/components/adminConfirmationModal.spec.tsx
 static/gsAdmin/components/adminConfirmationModal.tsx
 static/gsAdmin/components/beacons/beaconCheckins.tsx

src/sentry/api/bases/organization_events.py

@@ -831,6 +831,7 @@ def get_additional_queries(self, request: Request) -> AdditionalQueries:
             span=request.GET.getlist("spanQuery"),
             log=request.GET.getlist("logQuery"),
             metric=request.GET.getlist("metricQuery"),
+            occurrences=request.GET.getlist("occurrencesQuery"),
         )
 
 

src/sentry/api/endpoints/organization_trace_item_attributes.py

@@ -818,7 +818,7 @@ def string_autocomplete_function(self) -> list[TagValue]:
 
         values: Sequence[str] = rpc_response.values
         if self.context_definition:
-            context = self.context_definition.constructor(self.snuba_params)
+            context = self.context_definition.constructor(self.snuba_params, self.resolver)
             values = [context.value_map.get(value, value) for value in values]
 
         return [

src/sentry/api/serializers/models/organization.py

@@ -34,6 +34,7 @@
     AUTO_ENABLE_CODE_REVIEW,
     AUTO_OPEN_PRS_DEFAULT,
     CONSOLE_SDK_INVITE_QUOTA_DEFAULT,
+    DASHBOARDS_ASYNC_QUEUE_PARALLEL_LIMIT_DEFAULT,
     DATA_CONSENT_DEFAULT,
     DEBUG_FILES_ROLE_DEFAULT,
     DEFAULT_AUTOFIX_AUTOMATION_TUNING_DEFAULT,
@@ -511,6 +512,7 @@ class _DetailedOrganizationSerializerResponseOptional(OrganizationSerializerResp
     ingestThroughTrustedRelaysOnly: bool
     enabledConsolePlatforms: list[str]
     consoleSdkInviteQuota: int
+    dashboardsAsyncQueueParallelLimit: int
 
 
 @extend_schema_serializer(exclude_fields=["availableRoles"])
@@ -793,6 +795,11 @@ def serialize(  # type: ignore[override]
             CONSOLE_SDK_INVITE_QUOTA_DEFAULT,
         )
 
+        context["dashboardsAsyncQueueParallelLimit"] = obj.get_option(
+            "sentry:dashboards-async-queue-parallel-limit",
+            DASHBOARDS_ASYNC_QUEUE_PARALLEL_LIMIT_DEFAULT,
+        )
+
         if access.role is not None:
             context["role"] = access.role  # Deprecated
             context["orgRole"] = access.role
@@ -824,6 +831,7 @@ def serialize(  # type: ignore[override]
         "ingestThroughTrustedRelaysOnly",
         "enabledConsolePlatforms",
         "consoleSdkInviteQuota",
+        "dashboardsAsyncQueueParallelLimit",
         "hasGranularReplayPermissions",
         "replayAccessMembers",
     ]

src/sentry/constants.py

@@ -733,6 +733,7 @@ class InsightModules(Enum):
 SEER_AUTOMATED_RUN_STOPPING_POINT_DEFAULT = "code_changes"
 ENABLED_CONSOLE_PLATFORMS_DEFAULT: list[str] = []
 CONSOLE_SDK_INVITE_QUOTA_DEFAULT = 0
+DASHBOARDS_ASYNC_QUEUE_PARALLEL_LIMIT_DEFAULT = 20
 
 INGEST_THROUGH_TRUSTED_RELAYS_ONLY_DEFAULT = "disabled"
 

src/sentry/core/endpoints/organization_details.py

@@ -46,6 +46,7 @@
     AUTO_ENABLE_CODE_REVIEW,
     AUTO_OPEN_PRS_DEFAULT,
     CONSOLE_SDK_INVITE_QUOTA_DEFAULT,
+    DASHBOARDS_ASYNC_QUEUE_PARALLEL_LIMIT_DEFAULT,
     DEBUG_FILES_ROLE_DEFAULT,
     DEFAULT_AUTOFIX_AUTOMATION_TUNING_DEFAULT,
     DEFAULT_CODE_REVIEW_TRIGGERS,
@@ -289,6 +290,12 @@
         int,
         CONSOLE_SDK_INVITE_QUOTA_DEFAULT,
     ),
+    (
+        "dashboardsAsyncQueueParallelLimit",
+        "sentry:dashboards-async-queue-parallel-limit",
+        int,
+        DASHBOARDS_ASYNC_QUEUE_PARALLEL_LIMIT_DEFAULT,
+    ),
 )
 
 DELETION_STATUSES = frozenset(
@@ -361,6 +368,7 @@ class OrganizationSerializer(BaseOrganizationSerializer):
         allow_empty=True,
     )
     consoleSdkInviteQuota = serializers.IntegerField(required=False, min_value=0)
+    dashboardsAsyncQueueParallelLimit = serializers.IntegerField(required=False, min_value=1)
     enableSeerEnhancedAlerts = serializers.BooleanField(required=False)
     enableSeerCoding = serializers.BooleanField(required=False)
     defaultCodingAgent = serializers.CharField(required=False, allow_null=True)

src/sentry/deletions/models/scheduleddeletion.py

@@ -33,7 +33,7 @@ class BaseScheduledDeletion(Model):
     the tasks/deletion/scheduled.py job in the future.  They are cancellable, and provide automatic, batched cascade
     in an async way for performance reasons.
 
-    Note that BOTH region AND control silos need to be able to schedule deletions of different records that will be
+    Note that BOTH cell AND control silos need to be able to schedule deletions of different records that will be
     reconciled in different places.  For that reason, the ScheduledDeletion model is split into two identical models
     representing this split.  Use the corresponding ScheduledDeletion based on the silo of the model being scheduled
     for deletion.
@@ -139,9 +139,9 @@ def get_actor(self) -> RpcUser | None:
 class ScheduledDeletion(BaseScheduledDeletion):
     """
     This model schedules deletions to be processed in control and monolith silo modes.  All historic schedule deletions
-    occur in this table.  In the future, when RegionScheduledDeletions have proliferated for the appropriate models,
-    we will allow any region models scheduled in this table to finish processing before ensuring that all models discretely
-    process in either this table or the region table.
+    occur in this table.  In the future, when CellScheduledDeletions have proliferated for the appropriate models,
+    we will allow any cell models scheduled in this table to finish processing before ensuring that all models discretely
+    process in either this table or the cell table.
     """
 
     class Meta:
@@ -165,7 +165,7 @@ class Meta:
         db_table = "sentry_regionscheduleddeletion"
 
 
-def get_regional_scheduled_deletion(mode: SiloMode) -> type[BaseScheduledDeletion]:
+def get_cell_scheduled_deletion(mode: SiloMode) -> type[BaseScheduledDeletion]:
     if mode != SiloMode.CONTROL:
         return CellScheduledDeletion
     return ScheduledDeletion

src/sentry/features/temporary.py

@@ -223,6 +223,8 @@ def register_temporary_features(manager: FeatureManager) -> None:
     manager.add("organizations:performance-transaction-deprecation-banner", OrganizationFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=True)
     # Enable preprod frontend routes
     manager.add("organizations:preprod-frontend-routes", OrganizationFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=True)
+    # Enable preprod_artifact webhook subscription UI in Sentry App settings
+    manager.add("organizations:preprod-artifact-webhooks", OrganizationFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=True)
     # Enable preprod issue reporting
     manager.add("organizations:preprod-issues", OrganizationFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=True)
     # Enable preprod PR comments for build distribution
@@ -324,6 +326,8 @@ def register_temporary_features(manager: FeatureManager) -> None:
     # Enable GitLab as a supported SCM provider for Seer
     manager.add("organizations:seer-gitlab-support", OrganizationFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=True)
     # Disable select orgs from ingesting mobile replay events.
+    # Enable double-read from EAP for session health data validation
+    manager.add("organizations:session-health-eap", OrganizationFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=False)
     manager.add("organizations:session-replay-video-disabled", OrganizationFeature, FeatureHandlerStrategy.INTERNAL, api_expose=False)
     # Enable data scrubbing of replay recording payloads in Relay.
     manager.add("organizations:session-replay-recording-scrubbing", OrganizationFeature, FeatureHandlerStrategy.INTERNAL, api_expose=False)
@@ -427,6 +431,9 @@ def register_temporary_features(manager: FeatureManager) -> None:
     # Use workflow engine exclusively for ProjectRuleDetailsEndpoint.get results.
     # See src/sentry/workflow_engine/docs/legacy_backport.md for context.
     manager.add("organizations:workflow-engine-projectruledetailsendpoint-get", OrganizationFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=False)
+    # Use workflow engine exclusively for OrganizationCombinedRuleIndexEndpoint.get results.
+    # See src/sentry/workflow_engine/docs/legacy_backport.md for context.
+    manager.add("organizations:workflow-engine-combinedruleindex-get", OrganizationFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=False)
     # Enable metric detector limits by plan type
     manager.add("organizations:workflow-engine-metric-detector-limit", OrganizationFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=True)
     # Enable EventUniqueUserFrequencyConditionWithConditions special alert condition

src/sentry/hybridcloud/services/organization_mapping/model.py

@@ -4,10 +4,8 @@
 # defined, because we want to reflect on type annotations and avoid forward references.
 
 from datetime import datetime
-from typing import Any
 
 from django.utils import timezone
-from pydantic import root_validator
 from pydantic.fields import Field
 
 from sentry.hybridcloud.rpc import RpcModel
@@ -25,19 +23,6 @@ class RpcOrganizationMapping(RpcOrganizationSummary):
     status: int | None = None
     flags: RpcOrganizationMappingFlags = Field(default_factory=RpcOrganizationMappingFlags)
 
-    # TODO(cells): remove once region_name -> cell_name rename is complete
-    @property
-    def region_name(self) -> str:
-        return self.cell_name
-
-    # TODO(cells): temporary code to accept `cell_name` and `region_name` before property rename is complete
-    @root_validator(pre=True)
-    @classmethod
-    def _accept_region_name(cls, values: dict[str, Any]) -> dict[str, Any]:
-        if "region_name" in values and "cell_name" not in values:
-            values["cell_name"] = values.pop("region_name")
-        return values
-
 
 class CustomerId(RpcModel):
     value: str | None
@@ -49,19 +34,6 @@ class RpcOrganizationMappingUpdate(RpcModel):
     slug: str = ""
     cell_name: str = ""
 
-    # TODO(cells): remove once region_name -> cell_name rename is complete
-    @property
-    def region_name(self) -> str:
-        return self.cell_name
-
-    # TODO(cells): temporary code to accept `cell_name` and `region_name` before property rename is complete
-    @root_validator(pre=True)
-    @classmethod
-    def _accept_region_name(cls, values: dict[str, Any]) -> dict[str, Any]:
-        if "region_name" in values and "cell_name" not in values:
-            values["cell_name"] = values.pop("region_name")
-        return values
-
     # When not set, no change to customer id performed,
     # when set with a CustomerId, the customer_id set to either None or string
     customer_id: CustomerId | None = None