Merge branch 'master' into locality-category

Author: lynnagara

src/sentry/api/bases/organization_events.py

@@ -156,9 +156,7 @@ def get_dataset(self, request: Request, organization: Organization) -> Any:
             and not EAPOccurrencesComparator.should_use_experimental_data("api.events.endpoints")
         ):
             raise ParseError(detail=f"{dataset_label} is not supported currently")
-        elif dataset_label == SupportedTraceItemType.REPLAYS.value and not features.has(
-            "organizations:events-use-replays-dataset", organization, actor=request.user
-        ):
+        elif dataset_label == SupportedTraceItemType.REPLAYS.value:
             raise ParseError(detail=f"dataset must be one of: {', '.join(PUBLIC_DATASET_LABELS)}")
         result = get_dataset(dataset_label)
         if result is None:

src/sentry/deletions/tasks/hybrid_cloud.py

@@ -46,6 +46,9 @@
 ROW_WATERMARK = "row"
 WATERMARK_PREFIXES = (TOMBSTONE_WATERMARK, ROW_WATERMARK)
 
+WRITE_WATERMARK_TO_POSTGRES_OPTION = "hybrid_cloud.write_deletion_watermark_to_postgres"
+READ_WATERMARK_FROM_POSTGRES_OPTION = "hybrid_cloud.read_deletion_watermark_from_postgres"
+
 
 @dataclass
 class WatermarkBatch:
@@ -96,7 +99,7 @@ def _write_watermark(
     )
 
     # Dual-write deletion watermarks to Redis and Postgres
-    if options.get("hybrid_cloud.write_deletion_watermark_to_postgres"):
+    if options.get(WRITE_WATERMARK_TO_POSTGRES_OPTION):
         try:
             _watermark_model(field).objects.update_or_create(
                 prefix=prefix,
@@ -116,20 +119,54 @@ def _write_watermark(
             )
 
 
-def get_watermark(prefix: str, field: HybridCloudForeignKey[Any, Any]) -> tuple[int, str]:
-    client = _get_redis_client()
-    key = get_watermark_key(prefix, field)
-    v = client.get(key)
+def _watermark_row_lookup(prefix: str, field: HybridCloudForeignKey[Any, Any]) -> dict[str, str]:
+    return dict(
+        prefix=prefix,
+        table_name=field.model._meta.db_table,
+        field_name=field.name,
+    )
+
+
+def _read_redis_watermark(
+    prefix: str, field: HybridCloudForeignKey[Any, Any]
+) -> tuple[int, str] | None:
+    v = _get_redis_client().get(get_watermark_key(prefix, field))
     if v is None:
-        result = (0, uuid4().hex)
-        _write_watermark(prefix, field, *result)
-        return result
+        return None
     lower, transaction_id = json.loads(v)
     if not (isinstance(lower, int) and isinstance(transaction_id, str)):
         raise TypeError("Expected watermarks data to be a tuple of (int, str)")
     return lower, transaction_id
 
 
+def _read_postgres_watermark(
+    prefix: str, field: HybridCloudForeignKey[Any, Any]
+) -> tuple[int, str] | None:
+    row = _watermark_model(field).objects.filter(**_watermark_row_lookup(prefix, field)).first()
+    if row is None:
+        return None
+    return row.low_bound, row.transaction_id
+
+
+def _postgres_is_source_of_truth() -> bool:
+    return bool(options.get(WRITE_WATERMARK_TO_POSTGRES_OPTION)) and bool(
+        options.get(READ_WATERMARK_FROM_POSTGRES_OPTION)
+    )
+
+
+def get_watermark(prefix: str, field: HybridCloudForeignKey[Any, Any]) -> tuple[int, str]:
+    if _postgres_is_source_of_truth():
+        watermark = _read_postgres_watermark(prefix, field)
+    else:
+        watermark = _read_redis_watermark(prefix, field)
+
+    if watermark is None:
+        result = (0, uuid4().hex)
+        _write_watermark(prefix, field, *result)
+        return result
+    return watermark
+
+
 def set_watermark(
     prefix: str, field: HybridCloudForeignKey[Any, Any], value: int, prev_transaction_id: str
 ) -> None:

src/sentry/features/temporary.py

@@ -234,8 +234,6 @@ def register_temporary_features(manager: FeatureManager) -> None:
     manager.add("organizations:replay-ai-summaries", OrganizationFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=True)
     # Enable reading replay details using EAP query
     manager.add("organizations:replay-details-eap-query", OrganizationFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=False)
-    # Enable using the events replays dataset
-    manager.add("organizations:events-use-replays-dataset", OrganizationFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=False)
     # Verify a recommended event's replay exists in the replays dataset before it is surfaced on issue details
     manager.add("organizations:issue-details-verify-recommended-replay", OrganizationFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=False)
     # Enable using the events api with a sql interface

src/sentry/notifications/notification_action/action_handler_registry/sentry_app_handler.py

@@ -33,7 +33,7 @@ class SentryAppActionHandler(ActionHandler):
         "description": "The data schema for a Sentry App Action",
         "type": "object",
         "properties": {
-            "settings": {"type": ["array", "object"]},
+            "settings": {"type": "array"},
         },
         "additionalProperties": False,
     }

src/sentry/options/defaults.py

@@ -2530,6 +2530,11 @@
     default=False,
     flags=FLAG_AUTOMATOR_MODIFIABLE,
 )
+register(
+    "hybrid_cloud.read_deletion_watermark_from_postgres",
+    default=False,
+    flags=FLAG_AUTOMATOR_MODIFIABLE,
+)
 
 # List of event IDs to pass through
 register(

src/sentry/organizations/services/organization/model.py

@@ -163,23 +163,24 @@ def get_audit_log_metadata(self, user_email: str | None = None) -> dict[str, Any
         }
 
 
-# Add new organization flags to RpcOrganizationFlags first, only add them here after
-# they have been replicated via Organization.handle_async_replication logic
+# Only flags that `serialize_organization_mapping_flags` populates belong here; anything else
+# silently reads as its default. Declare new organization flags on `RpcOrganizationFlags` below.
 class RpcOrganizationMappingFlags(RpcModel):
     early_adopter: bool = False
     require_2fa: bool = False
     allow_joinleave: bool = False
     enhanced_privacy: bool = False
     disable_shared_issues: bool = False
     disable_new_visibility_features: bool = False
-    require_email_verification: bool = False
-    codecov_access: bool = False
     disable_member_project_creation: bool = False
     prevent_superuser_access: bool = False
     disable_member_invite: bool = False
 
 
 class RpcOrganizationFlags(RpcOrganizationMappingFlags):
+    require_email_verification: bool = False
+    codecov_access: bool = False
+
     def as_int(self) -> int:
         # Must maintain the same order as the ORM's `Organization.flags` fields
         return flags_to_bits(

src/sentry/seer/agent/client_models.py

@@ -269,7 +269,6 @@ class SeerRunState(BaseModel):
     # plain str so a new Seer reason does not fail validation mid-deploy.
     failure_reason: str | None = None
     updated_at: str
-    failure_reason: str | None = None
     owner_user_id: int | None = None
     pending_user_input: PendingUserInput | None = None
     repo_pr_states: dict[str, RepoPRState] = Field(default_factory=dict)

src/sentry/seer/smart_assignment/delivery.py

@@ -126,7 +126,7 @@ def _validate_resolve_verdict(
 
         if candidate.identifier_kind == "email":
             users = user_service.get_many_by_email(
-                emails=[value], organization_id=organization_id, is_verified=True
+                emails=[value], organization_id=organization_id, is_verified=False
             )
             resolved.append(users[0].id if users else None)
             continue

static/app/components/forms/jsonForm.spec.tsx

@@ -72,50 +72,6 @@ describe('JsonForm', () => {
       expect(screen.queryByText('Field Label 2')).not.toBeVisible();
     });
 
-    it('initiallyCollapsed prop from children form groups override json form initiallyCollapsed prop', () => {
-      const forms: JsonFormObject[] = [
-        {
-          title: 'Form1 title',
-          fields: [
-            {
-              name: 'name',
-              type: 'string',
-              required: true,
-              label: 'Field Label 1 ',
-              placeholder: 'e.g. John Doe',
-            },
-          ],
-        },
-        {
-          title: 'Form2 title',
-          fields: [
-            {
-              name: 'name',
-              type: 'string',
-              required: true,
-              label: 'Field Label 2',
-              placeholder: 'e.g. Abdullah Khan',
-            },
-          ],
-          initiallyCollapsed: false, // Prevents this form group from being collapsed
-        },
-      ];
-      render(
-        <JsonForm
-          forms={forms}
-          additionalFieldProps={{user}}
-          collapsible
-          initiallyCollapsed
-        />
-      );
-
-      expect(screen.getByText('Form1 title')).toBeInTheDocument();
-      expect(screen.getByText('Form2 title')).toBeInTheDocument();
-
-      expect(screen.queryByText('Field Label 1')).not.toBeVisible();
-      expect(screen.queryByText('Field Label 2')).toBeVisible();
-    });
-
     it('should ALWAYS hide panel, if all fields have visible set to false AND there is no renderHeader & renderFooter', () => {
       const hiddenFields: JsonFormObject[] = [
         {

static/app/components/forms/jsonForm.tsx

@@ -106,11 +106,9 @@ function JsonForm({
     fields,
     formPanelProps,
     title: formTitle,
-    initiallyCollapsed: formInitiallyCollapsed,
   }: {
     fields: FieldObject[];
     formPanelProps: ChildFormPanelProps;
-    initiallyCollapsed?: boolean;
     title?: React.ReactNode;
   }) => {
     const displayForm = shouldDisplayForm(fields);
@@ -124,7 +122,7 @@ function JsonForm({
         title={formTitle}
         fields={fields}
         {...formPanelProps}
-        initiallyCollapsed={formInitiallyCollapsed ?? formPanelProps.initiallyCollapsed}
+        initiallyCollapsed={formPanelProps.initiallyCollapsed}
       />
     );
   };