Merge remote-tracking branch 'upstream/master'

Author: jasonyuezhang

migrations_lockfile.txt

@@ -31,12 +31,12 @@ releases: 0003_real_delete_dual_written_commit_tables
 
 replays: 0006_add_bulk_delete_job
 
-sentry: 1005_add_groupemailthread_project_date_index
+sentry: 1006_drop_legacy_incidentseen_incidentsubscription
 
 social_auth: 0003_social_auth_json_field
 
 tempest: 0003_use_encrypted_char_field
 
 uptime: 0048_delete_uptime_status_columns
 
-workflow_engine: 0100_move_is_single_written_to_pending
+workflow_engine: 0101_remove_is_single_written_field

src/sentry/api/endpoints/organization_events_timeseries.py

@@ -252,10 +252,14 @@ def get_rpc_config():
 
         if top_events > 0:
             raw_groupby = self.get_field_list(organization, request, param_name="groupBy")
+            raw_orderby = self.get_orderby(request)
             if len(raw_groupby) == 0:
                 raise ParseError("groupBy is a required parameter when doing topEvents")
             if "timestamp" in raw_groupby:
                 raise ParseError("Cannot group by timestamp")
+            if raw_orderby:
+                if "timestamp" in [col.strip("-") for col in raw_orderby]:
+                    raise ParseError("Cannot order by timestamp")
             if dataset in RPC_DATASETS:
                 return dataset.run_top_events_timeseries_query(
                     params=snuba_params,

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

@@ -542,7 +542,6 @@ class DetailedOrganizationSerializerResponse(_DetailedOrganizationSerializerResp
     githubPRBot: bool
     githubNudgeInvite: bool
     gitlabPRBot: bool
-    gitlabOpenPRBot: bool
     aggregatedDataConsent: bool
     genAIConsent: bool
     isDynamicallySampled: bool
@@ -665,9 +664,6 @@ def serialize(  # type: ignore[override]
                 obj.get_option("sentry:github_nudge_invite", GITHUB_COMMENT_BOT_DEFAULT)
             ),
             "gitlabPRBot": bool(obj.get_option("sentry:gitlab_pr_bot", GITLAB_COMMENT_BOT_DEFAULT)),
-            "gitlabOpenPRBot": bool(
-                obj.get_option("sentry:gitlab_open_pr_bot", GITLAB_COMMENT_BOT_DEFAULT)
-            ),
             "genAIConsent": bool(
                 obj.get_option("sentry:gen_ai_consent_v2024_11_14", DATA_CONSENT_DEFAULT)
             ),

src/sentry/apidocs/examples/organization_examples.py

@@ -290,10 +290,9 @@ class OrganizationExamples:
                 "relayPiiConfig": None,
                 "codecovAccess": False,
                 "hideAiFeatures": False,
-                "githubPRBot": True,
+                "githubPRBot": False,
                 "githubNudgeInvite": True,
-                "gitlabPRBot": True,
-                "gitlabOpenPRBot": True,
+                "gitlabPRBot": False,
                 "aggregatedDataConsent": False,
                 "defaultAutofixAutomationTuning": AutofixAutomationTuningSettings.OFF,
                 "defaultSeerScannerAutomation": True,

src/sentry/constants.py

@@ -122,6 +122,7 @@ def get_all_languages() -> list[str]:
         "corp",
         "customers",
         "de",
+        "de2",
         "debug",
         "devinfra",
         "docs",
@@ -213,6 +214,7 @@ def get_all_languages() -> list[str]:
         "themonitor",
         "trust",
         "us",
+        "us2",
         "vs",
         "welcome",
         "www",
@@ -704,8 +706,8 @@ class InsightModules(Enum):
 SCRAPE_JAVASCRIPT_DEFAULT = True
 JOIN_REQUESTS_DEFAULT = True
 HIDE_AI_FEATURES_DEFAULT = False
-GITHUB_COMMENT_BOT_DEFAULT = True
-GITLAB_COMMENT_BOT_DEFAULT = True
+GITHUB_COMMENT_BOT_DEFAULT = False
+GITLAB_COMMENT_BOT_DEFAULT = False
 ISSUE_ALERTS_THREAD_DEFAULT = True
 METRIC_ALERTS_THREAD_DEFAULT = True
 DATA_CONSENT_DEFAULT = False

src/sentry/core/endpoints/organization_details.py

@@ -194,12 +194,6 @@
         bool,
         GITLAB_COMMENT_BOT_DEFAULT,
     ),
-    (
-        "gitlabOpenPRBot",
-        "sentry:gitlab_open_pr_bot",
-        bool,
-        GITLAB_COMMENT_BOT_DEFAULT,
-    ),
     (
         "issueAlertsThreadFlag",
         "sentry:issue_alerts_thread_flag",
@@ -307,7 +301,6 @@ class OrganizationSerializer(BaseOrganizationSerializer):
     githubNudgeInvite = serializers.BooleanField(required=False)
     githubPRBot = serializers.BooleanField(required=False)
     gitlabPRBot = serializers.BooleanField(required=False)
-    gitlabOpenPRBot = serializers.BooleanField(required=False)
     issueAlertsThreadFlag = serializers.BooleanField(required=False)
     metricAlertsThreadFlag = serializers.BooleanField(required=False)
     require2FA = serializers.BooleanField(required=False)
@@ -894,10 +887,6 @@ class OrganizationDetailsPutSerializer(serializers.Serializer):
         help_text="Specify `true` to allow Sentry to comment on recent pull requests suspected of causing issues. Requires a GitLab integration.",
         required=False,
     )
-    gitlabOpenPRBot = serializers.BooleanField(
-        help_text="Specify `true` to allow Sentry to comment on open pull requests to show recent error issues for the code being changed. Requires a GitLab integration.",
-        required=False,
-    )
 
     # slack features
     issueAlertsThreadFlag = serializers.BooleanField(

src/sentry/db/router.py

@@ -70,6 +70,8 @@ class SiloRouter:
         "authprovider_duplicate": SiloMode.CONTROL,
         "sentry_actor": SiloMode.REGION,
         "sentry_alertruleactivations": SiloMode.REGION,
+        "sentry_incidentseen": SiloMode.REGION,
+        "sentry_incidentsubscription": SiloMode.REGION,
         "sentry_monitorlocation": SiloMode.REGION,
         "sentry_notificationsetting": SiloMode.CONTROL,
         "sentry_pagerdutyservice": SiloMode.REGION,

src/sentry/deletions/tasks/nodestore.py

@@ -215,38 +215,33 @@ def delete_events_from_eap(
     group_ids: Sequence[int],
     dataset: Dataset,
 ) -> None:
-    eap_deletion_allowlist = options.get("eventstream.eap.deletion_enabled.organization_allowlist")
-    if organization_id not in eap_deletion_allowlist:
+    if not options.get("eventstream.eap.deletion-enabled"):
         return
 
     try:
-        response = delete_groups_from_eap_rpc(
+        delete_groups_from_eap_rpc(
             organization_id=organization_id,
             project_id=project_id,
             group_ids=group_ids,
             referrer="deletions.group.eap",
         )
-        logger.info(
-            "eap.delete_groups.completed",
-            extra={
-                "organization_id": organization_id,
-                "project_id": project_id,
-                "group_count": len(group_ids),
-                "matching_items_count": response.matching_items_count,
-            },
+        metrics.incr(
+            "deletions.group.eap.success",
+            tags={"dataset": dataset.value},
+            sample_rate=1.0,
         )
-    except Exception as e:
+    except Exception:
         logger.exception(
-            "eap.delete_groups.failed",
+            "Failed to delete groups from EAP",
             extra={
                 "organization_id": organization_id,
                 "project_id": project_id,
                 "group_ids": group_ids[:10],
-                "error": str(e),
+                "dataset": dataset.value,
             },
         )
         metrics.incr(
-            "deletions.eap.failed",
+            "deletions.group.eap.failure",
             tags={"dataset": dataset.value},
             sample_rate=1.0,
         )

src/sentry/features/temporary.py

@@ -50,6 +50,8 @@ def register_temporary_features(manager: FeatureManager) -> None:
     manager.add("organizations:ai-insights-generations-page", OrganizationFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=True)
     # Enables alert creation on indexed events in UI (use for PoC/testing only)
     manager.add("organizations:alert-allow-indexed", OrganizationFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=True)
+    # Enables flag for org specific runs on alerts comparison script for spans migration
+    manager.add("organizations:alerts-timeseries-comparison", OrganizationFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=False)
     # Enable anomaly detection feature for EAP spans
     manager.add("organizations:anomaly-detection-eap", OrganizationFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=True)
     # Enable anr frame analysis