Merge branch 'master' into mia/aci/data-conditions-endpoint

Author: ameliahsu

.github/CODEOWNERS

@@ -612,7 +612,7 @@ tests/sentry/api/endpoints/test_organization_dashboard_widget_details.py     @ge
 /static/app/components/events/autofix/                      @getsentry/machine-learning-ai
 /static/app/components/modals/autofixSetupModal.spec.tsx    @getsentry/machine-learning-ai
 /static/app/components/modals/autofixSetupModal.tsx         @getsentry/machine-learning-ai
-/src/sentry/seer/fetch_issues_given_patches.py              @getsentry/machine-learning-ai
+/src/sentry/seer/                                           @getsentry/machine-learning-ai
 ## End of ML & AI
 
 ## Processing

.github/workflows/scripts/getsentry-dispatch.js

@@ -7,10 +7,6 @@
  *              deleted/renamed in `getsentry`, this will fail
  */
 const DISPATCHES = [
-  {
-    workflow: 'js-build-and-lint.yml',
-    pathFilterName: 'frontend_all',
-  },
   {
     workflow: 'backend.yml',
     pathFilterName: 'backend_all',

migrations_lockfile.txt

@@ -17,12 +17,12 @@ remote_subscriptions: 0003_drop_remote_subscription
 
 replays: 0004_index_together
 
-sentry: 0842_create_organization_member_invite_table
+sentry: 0843_make_groupsearchview_postition_nullable_for_deletion
 
 social_auth: 0002_default_auto_field
 
 tempest: 0002_make_message_type_nullable
 
 uptime: 0031_translate_uptime_object_headers_to_lists_take_three
 
-workflow_engine: 0036_action_remove_legacy_fields
+workflow_engine: 0037_rm_workflow_name_unique_constraint

requirements-base.txt

@@ -65,7 +65,7 @@ requests>=2.32.3
 rfc3339-validator>=0.1.2
 rfc3986-validator>=0.1.1
 # [end] jsonschema format validators
-sentry-arroyo>=2.19.9
+sentry-arroyo>=2.20.0
 sentry-kafka-schemas>=1.1.2
 sentry-ophio==1.0.0
 sentry-protos>=0.1.62

requirements-dev-frozen.txt

@@ -29,7 +29,7 @@ click==8.1.7
 click-didyoumean==0.3.0
 click-plugins==1.1.1
 click-repl==0.3.0
-confluent-kafka==2.3.0
+confluent-kafka==2.8.0
 covdefaults==2.3.0
 coverage==7.6.4
 cronsim==2.6
@@ -180,7 +180,7 @@ rpds-py==0.20.0
 rsa==4.8
 s3transfer==0.10.0
 selenium==4.16.0
-sentry-arroyo==2.19.9
+sentry-arroyo==2.20.0
 sentry-cli==2.16.0
 sentry-covdefaults-disable-branch-coverage==1.0.2
 sentry-devenv==1.16.0

requirements-frozen.txt

@@ -26,7 +26,7 @@ click==8.1.7
 click-didyoumean==0.3.0
 click-plugins==1.1.1
 click-repl==0.3.0
-confluent-kafka==2.3.0
+confluent-kafka==2.8.0
 cronsim==2.6
 cryptography==43.0.1
 cssselect==1.0.3
@@ -123,7 +123,7 @@ rfc3986-validator==0.1.1
 rpds-py==0.20.0
 rsa==4.8
 s3transfer==0.10.0
-sentry-arroyo==2.19.9
+sentry-arroyo==2.20.0
 sentry-forked-email-reply-parser==0.5.12.post1
 sentry-kafka-schemas==1.1.2
 sentry-ophio==1.0.0

src/sentry/api/endpoints/group_ai_summary.py

@@ -245,9 +245,10 @@ def post(self, request: Request, group: Group) -> Response:
                         group=group, event_id=event.event_id, user=request.user
                     )
 
-            if response.status_code != 202:
-                # If autofix trigger fails, we don't cache to let it error and we can run again, this is only temporary for when we're testing this internally.
-                return response
+                    if response.status_code != 202:
+                        # If autofix trigger fails, we don't cache to let it error and we can run again
+                        # This is only temporary for when we're testing this internally.
+                        return response
 
         summary_dict = issue_summary.dict()
         summary_dict["event_id"] = event.event_id

src/sentry/api/event_search.py

@@ -6,7 +6,7 @@
 from collections.abc import Callable, Generator, Mapping, Sequence
 from dataclasses import asdict, dataclass, field
 from datetime import datetime
-from typing import TYPE_CHECKING, Any, Literal, NamedTuple, TypeIs, Union
+from typing import TYPE_CHECKING, Any, Literal, NamedTuple, TypeIs, Union, overload
 
 from django.utils.functional import cached_property
 from parsimonious.exceptions import IncompleteParseError
@@ -574,8 +574,8 @@ def __str__(self) -> str:
             return f"{self.key.name}{self.operator}{self.value.raw_value}"
 
 
-@dataclass
-class SearchConfig:
+@dataclass  # pycqa/pycodestyle#1277
+class SearchConfig[TAllowBoolean: (Literal[True], Literal[False]) = Literal[True]]:  # noqa: E251
     """
     Configures how the search parser interprets a search query
     """
@@ -604,7 +604,7 @@ class SearchConfig:
     is_filter_translation: Mapping[str, tuple[str, Any]] = field(default_factory=dict)
 
     # Enables boolean filtering (AND / OR)
-    allow_boolean = True
+    allow_boolean: TAllowBoolean = True  # type: ignore[assignment]  # python/mypy#18812
 
     # Allows us to specify an allowlist of keys we will accept for this search.
     # If empty, allow all keys.
@@ -619,8 +619,32 @@ class SearchConfig:
     # Whether to wrap free_text_keys in asterisks
     wildcard_free_text: bool = False
 
+    @overload
     @classmethod
-    def create_from(cls, search_config: SearchConfig, **overrides):
+    def create_from[
+        TBool: (Literal[True], Literal[False])
+    ](
+        cls: type[SearchConfig[Any]],
+        search_config: SearchConfig[Any],
+        *,
+        allow_boolean: TBool,
+        **overrides: Any,
+    ) -> SearchConfig[TBool]: ...
+
+    @overload
+    @classmethod
+    def create_from[
+        TBool: (Literal[True], Literal[False])
+    ](
+        cls: type[SearchConfig[Any]],
+        search_config: SearchConfig[TBool],
+        **overrides: Any,
+    ) -> SearchConfig[TBool]: ...
+
+    @classmethod
+    def create_from(
+        cls: type[SearchConfig[Any]], search_config: SearchConfig[Any], **overrides: Any
+    ) -> SearchConfig[Any]:
         config = cls(**asdict(search_config))
         for key, val in overrides.items():
             setattr(config, key, val)
@@ -632,15 +656,13 @@ class SearchVisitor(NodeVisitor):
 
     def __init__(
         self,
-        config: SearchConfig | None = None,
+        config: SearchConfig[Any],
         params: ParamsType | None = None,
         get_field_type: Callable[[str], str | None] | None = None,
         get_function_result_type: Callable[[str], str | None] | None = None,
     ) -> None:
         super().__init__()
 
-        if config is None:
-            config = SearchConfig()
         self.config = config
         self.params = params if params is not None else {}
 
@@ -1335,7 +1357,7 @@ def generic_visit(self, node, children):
 def parse_search_query(
     query: str,
     *,
-    config: SearchConfig | None = None,
+    config: SearchConfig[Any] | None = None,
     params=None,
     get_field_type: Callable[[str], str | None] | None = None,
     get_function_result_type: Callable[[str], str | None] | None = None,

src/sentry/api/helpers/group_index/index.py

@@ -20,6 +20,7 @@
 from sentry.models.environment import Environment
 from sentry.models.group import Group, looks_like_short_id
 from sentry.models.groupsearchview import GroupSearchView
+from sentry.models.groupsearchviewstarred import GroupSearchViewStarred
 from sentry.models.organization import Organization
 from sentry.models.project import Project
 from sentry.models.release import Release
@@ -104,11 +105,12 @@ def build_query_params_from_request(
             if selected_view_id:
                 default_view = GroupSearchView.objects.filter(id=int(selected_view_id)).first()
             else:
-                default_view = GroupSearchView.objects.filter(
+                first_starred_view = GroupSearchViewStarred.objects.filter(
                     organization=organization,
                     user_id=request.user.id,
                     position=0,
                 ).first()
+                default_view = first_starred_view.group_search_view if first_starred_view else None
 
             if default_view:
                 query_kwargs["sort_by"] = default_view.query_sort

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

@@ -50,7 +50,10 @@ def get_attrs(self, item_list, user, **kwargs):
             )
         )
 
-        pull_request_by_commit = {pr.merge_commit_sha: serialize(pr) for pr in pull_requests}
+        pull_request_by_commit = {
+            pr.merge_commit_sha: serialized_pr
+            for (pr, serialized_pr) in zip(pull_requests, serialize(pull_requests))
+        }
 
         result = {}
         for item in item_list:

src/sentry/incidents/metric_alert_detector.py

@@ -51,6 +51,7 @@ def validate(self, attrs):
             raise serializers.ValidationError("Too many conditions")
         return attrs
 
+    # TODO - @saponifi3d - we can make this more generic and move it into the base Detector
     def update_data_conditions(self, instance: Detector, data_conditions: list[DataConditionType]):
         """
         Update the data condition if it already exists, create one if it does not
@@ -116,6 +117,7 @@ def update_data_source(self, instance: Detector, data_source: SnubaQueryDataSour
             event_types=data_source.get("event_types", [event_type for event_type in event_types]),
         )
 
+    # TODO - @saponifi3d - we can make this more generic and move it into the base Detector
     def update(self, instance: Detector, validated_data: dict[str, Any]):
         instance.name = validated_data.get("name", instance.name)
         instance.type = validated_data.get("detector_type", instance.group_type).slug

src/sentry/incidents/subscription_processor.py

@@ -411,18 +411,6 @@ def process_update(self, subscription_update: QuerySubscriptionUpdate) -> None:
             )
 
         aggregation_value = self.get_aggregation_value(subscription_update)
-        if features.has(
-            "organizations:failure-rate-metric-alert-logging",
-            self.subscription.project.organization,
-        ):
-            logger.info(
-                "Update value in subscription processor",
-                extra={
-                    "result": subscription_update,
-                    "aggregation_value": aggregation_value,
-                    "rule_id": self.alert_rule.id,
-                },
-            )
 
         has_anomaly_detection = features.has(
             "organizations:anomaly-detection-alerts", self.subscription.project.organization
@@ -444,18 +432,6 @@ def process_update(self, subscription_update: QuerySubscriptionUpdate) -> None:
                     last_update=self.last_update.timestamp(),
                     aggregation_value=aggregation_value,
                 )
-            # XXX (mifu67): log problematic rule, to be deleted later
-            if features.has(
-                "feature.organizations:failure-rate-metric-alert-logging",
-                self.subscription.project.organization,
-            ):
-                logger.info(
-                    "Received this response from Seer",
-                    extra={
-                        "potential_anomalies": potential_anomalies,
-                        "alert_rule_id": self.alert_rule.id,
-                    },
-                )
             if potential_anomalies is None:
                 logger.info(
                     "No potential anomalies found",

src/sentry/incidents/utils/metric_issue_poc.py

@@ -6,8 +6,9 @@
 from django.utils.translation import gettext as _
 
 from sentry import features
-from sentry.incidents.models.alert_rule import AlertRule, AlertRuleThresholdType
-from sentry.incidents.models.incident import Incident, IncidentStatus
+from sentry.constants import CRASH_RATE_ALERT_AGGREGATE_ALIAS
+from sentry.incidents.models.alert_rule import AlertRule, AlertRuleThresholdType, AlertRuleTrigger
+from sentry.incidents.models.incident import INCIDENT_STATUS, Incident, IncidentStatus
 from sentry.incidents.utils.format_duration import format_duration_idiomatic
 from sentry.integrations.metric_alerts import TEXT_COMPARISON_DELTA
 from sentry.issues.grouptype import MetricIssuePOC
@@ -43,16 +44,21 @@ def to_dict(self) -> dict[str, Any]:
     "count_unique(tags[sentry:user])": "Number of users affected",
     "percentage(sessions_crashed, sessions)": "Crash free session rate",
     "percentage(users_crashed, users)": "Crash free user rate",
+    "failure_rate()": "Failure rate",
+    "apdex()": "Apdex score",
 }
 
 
-def construct_title(alert_rule: AlertRule) -> str:
+def construct_title(alert_rule: AlertRule, status: int) -> str:
     # Parse the aggregate key from the alert rule
     agg_display_key = alert_rule.snuba_query.aggregate
     if is_mri_field(agg_display_key):
-        agg_text = format_mri_field(agg_display_key)
+        aggregate = format_mri_field(agg_display_key)
+    elif CRASH_RATE_ALERT_AGGREGATE_ALIAS in agg_display_key:
+        agg_display_key = agg_display_key.split(f"AS {CRASH_RATE_ALERT_AGGREGATE_ALIAS}")[0].strip()
+        aggregate = QUERY_AGGREGATION_DISPLAY.get(agg_display_key, agg_display_key)
     else:
-        agg_text = QUERY_AGGREGATION_DISPLAY.get(agg_display_key, alert_rule.snuba_query.aggregate)
+        aggregate = QUERY_AGGREGATION_DISPLAY.get(agg_display_key, alert_rule.snuba_query.aggregate)
 
     # Determine the higher or lower comparison
     higher_or_lower = ""
@@ -61,19 +67,35 @@ def construct_title(alert_rule: AlertRule) -> str:
     else:
         higher_or_lower = "less than" if alert_rule.comparison_delta else "below"
 
+    label = INCIDENT_STATUS[IncidentStatus(status)]
+
     # Format the time window for the threshold
-    time_window = alert_rule.snuba_query.time_window // 60
-    title = f"{agg_text} in the last {format_duration_idiomatic(time_window)} {higher_or_lower}"
+    time_window = format_duration_idiomatic(alert_rule.snuba_query.time_window // 60)
 
     # If the alert rule has a comparison delta, format the comparison string
+    comparison: str | int | float = "threshold"
     if alert_rule.comparison_delta:
         comparison_delta_minutes = alert_rule.comparison_delta // 60
-        comparison_string = TEXT_COMPARISON_DELTA.get(
-            comparison_delta_minutes, f"same time {comparison_delta_minutes} minutes ago"
+        comparison = TEXT_COMPARISON_DELTA.get(
+            comparison_delta_minutes, f"same time {comparison_delta_minutes} minutes ago "
         )
-        return _(f"{title} {comparison_string}")
-
-    return _(f"{title} threshold")
+    else:
+        # Otherwise, check if there is a trigger with a threshold
+        trigger = AlertRuleTrigger.objects.filter(id=alert_rule.id, label=label.lower()).first()
+        if trigger:
+            threshold = trigger.alert_threshold
+            comparison = int(threshold) if threshold % 1 == 0 else threshold
+
+    template = "{label}: {metric} in the last {time_window} {higher_or_lower} {comparison}"
+    return _(
+        template.format(
+            label=label.capitalize(),
+            metric=aggregate,
+            higher_or_lower=higher_or_lower,
+            comparison=comparison,
+            time_window=time_window,
+        )
+    )
 
 
 def _build_occurrence_from_incident(
@@ -88,7 +110,7 @@ def _build_occurrence_from_incident(
         else PriorityLevel.MEDIUM
     )
     fingerprint = [str(incident.alert_rule.id)]
-    title = construct_title(incident.alert_rule)
+    title = construct_title(incident.alert_rule, incident.status)
     return IssueOccurrence(
         id=uuid4().hex,
         project_id=project.id,

src/sentry/integrations/bitbucket/client.py

@@ -7,7 +7,6 @@
 
 from requests import PreparedRequest
 
-from sentry.integrations.base import IntegrationFeatureNotImplementedError
 from sentry.integrations.client import ApiClient
 from sentry.integrations.models.integration import Integration
 from sentry.integrations.services.integration.model import RpcIntegration
@@ -182,4 +181,13 @@ def check_file(self, repo: Repository, path: str, version: str | None) -> object
     def get_file(
         self, repo: Repository, path: str, ref: str | None, codeowners: bool = False
     ) -> str:
-        raise IntegrationFeatureNotImplementedError
+        response = self.get_cached(
+            path=BitbucketAPIPath.source.format(
+                repo=repo.name,
+                sha=ref,
+                path=path,
+            ),
+            allow_redirects=True,
+            raw_response=True,
+        )
+        return response.text