Merge remote-tracking branch 'origin/master' into kafka-no-zookeeper

Author: joshuarli

.pre-commit-config.yaml

@@ -58,6 +58,11 @@ repos:
       types: [python]
       exclude: ^src/sentry/metrics/minimetrics.py$
 
+-   repo: https://github.com/pre-commit/pygrep-hooks
+    rev: v1.10.0
+    hooks:
+    -   id: python-use-type-annotations
+
 -   repo: https://github.com/python-jsonschema/check-jsonschema
     rev: 0.24.1
     hooks:

pyproject.toml

@@ -809,7 +809,6 @@ module = [
     "tests.sentry.api.endpoints.test_organization_metrics",
     "tests.sentry.api.helpers.test_group_index",
     "tests.sentry.api.serializers.test_project",
-    "tests.sentry.api.serializers.test_team",
     "tests.sentry.api.test_authentication",
     "tests.sentry.api.test_base",
     "tests.sentry.api.test_event_search",
@@ -819,11 +818,6 @@ module = [
     "tests.sentry.eventstore.test_base",
     "tests.sentry.grouping.test_result",
     "tests.sentry.identity.test_oauth2",
-    "tests.sentry.incidents.endpoints.test_organization_alert_rule_details",
-    "tests.sentry.incidents.endpoints.test_organization_alert_rule_index",
-    "tests.sentry.incidents.endpoints.test_organization_incident_details",
-    "tests.sentry.incidents.endpoints.test_organization_incident_subscription_index",
-    "tests.sentry.incidents.endpoints.test_project_alert_rule_index",
     "tests.sentry.incidents.test_logic",
     "tests.sentry.ingest.test_slicing",
     "tests.sentry.integrations.github.test_client",
@@ -834,8 +828,6 @@ module = [
     "tests.sentry.models.test_organizationmember",
     "tests.sentry.models.test_project",
     "tests.sentry.release_health.release_monitor",
-    "tests.sentry.release_health.test_tasks",
-    "tests.sentry.replays.consumers.test_recording",
     "tests.sentry.replays.test_project_replay_recording_segment_details",
     "tests.sentry.replays.test_project_replay_recording_segment_index",
     "tests.sentry.replays.unit.test_dead_click_issue",
@@ -849,7 +841,6 @@ module = [
     "tests.sentry.snuba.metrics.test_snql",
     "tests.sentry.snuba.test_tasks",
     "tests.sentry.tagstore.test_types",
-    "tests.sentry.tasks.deletion.test_scheduled",
     "tests.sentry.tasks.test_post_process",
     "tests.sentry.web.test_client_config",
     "tests.snuba.rules.conditions.test_event_frequency",

src/sentry/api/endpoints/codeowners/__init__.py

@@ -27,8 +27,7 @@ class Meta:
         fields = ["raw", "code_mapping_id", "organization_integration_id"]
 
     def get_max_length(self) -> int:
-        # typecast needed for typing, though these will always be ints
-        return int(MAX_RAW_LENGTH)
+        return MAX_RAW_LENGTH
 
     def validate(self, attrs: Mapping[str, Any]) -> Mapping[str, Any]:
         # If it already exists, set default attrs with existing values

src/sentry/api/endpoints/notifications/notification_actions_index.py

@@ -2,6 +2,7 @@
 from typing import Dict
 
 from django.db.models import Q
+from drf_spectacular.utils import extend_schema
 from rest_framework import status
 from rest_framework.exceptions import PermissionDenied
 from rest_framework.request import Request
@@ -14,7 +15,11 @@
 from sentry.api.bases.organization import OrganizationEndpoint, OrganizationPermission
 from sentry.api.paginator import OffsetPaginator
 from sentry.api.serializers.base import serialize
+from sentry.api.serializers.models.notification_action import OutgoingNotificationActionSerializer
 from sentry.api.serializers.rest_framework.notification_action import NotificationActionSerializer
+from sentry.apidocs.constants import RESPONSE_BAD_REQUEST, RESPONSE_FORBIDDEN
+from sentry.apidocs.examples import notification_examples
+from sentry.apidocs.parameters import GlobalParams, NotificationParams, OrganizationParams
 from sentry.models.notificationaction import NotificationAction
 from sentry.models.organization import Organization
 
@@ -43,10 +48,11 @@ class NotificationActionsPermission(OrganizationPermission):
 
 
 @region_silo_endpoint
+@extend_schema(tags=["Notifications"])
 class NotificationActionsIndexEndpoint(OrganizationEndpoint):
     publish_status = {
-        "GET": ApiPublishStatus.EXPERIMENTAL,
-        "POST": ApiPublishStatus.EXPERIMENTAL,
+        "GET": ApiPublishStatus.PUBLIC,
+        "POST": ApiPublishStatus.PUBLIC,
     }
 
     owner = ApiOwner.ENTERPRISE
@@ -59,7 +65,29 @@ class NotificationActionsIndexEndpoint(OrganizationEndpoint):
 
     permission_classes = (NotificationActionsPermission,)
 
+    @extend_schema(
+        operation_id="List Spike Protection Notifications",
+        parameters=[
+            GlobalParams.ORG_SLUG,
+            OrganizationParams.PROJECT,
+            OrganizationParams.PROJECT_SLUG,
+            NotificationParams.TRIGGER_TYPE,
+        ],
+        responses={
+            201: OutgoingNotificationActionSerializer,
+            400: RESPONSE_BAD_REQUEST,
+            403: RESPONSE_FORBIDDEN,
+        },
+        examples=notification_examples.CREATE_NOTIFICATION_ACTION,
+    )
     def get(self, request: Request, organization: Organization) -> Response:
+        """
+        Returns all Spike Protection Notification Actions for an organization.
+
+        Notification Actions notify a set of members through a service such as Slack or Sentry when an action has been triggered. For example, you can email the organization owner when the spike protection threshold has been reached.
+
+        You can use either the `project` or `projectSlug` query parameter to filter for certain projects. Note that if both are present, `projectSlug` takes priority.
+        """
         queryset = NotificationAction.objects.filter(organization_id=organization.id)
         # If a project query is specified, filter out non-project-specific actions
         # otherwise, include them but still ensure project permissions are enforced
@@ -89,7 +117,25 @@ def get(self, request: Request, organization: Organization) -> Response:
             paginator_cls=OffsetPaginator,
         )
 
+    @extend_schema(
+        operation_id="Create a Spike Protection Notification Action",
+        parameters=[
+            GlobalParams.ORG_SLUG,
+        ],
+        request=NotificationActionSerializer,
+        responses={
+            201: OutgoingNotificationActionSerializer,
+            400: RESPONSE_BAD_REQUEST,
+            403: RESPONSE_FORBIDDEN,
+        },
+        examples=notification_examples.CREATE_NOTIFICATION_ACTION,
+    )
     def post(self, request: Request, organization: Organization) -> Response:
+        """
+        Creates a new Notification Action for Spike Protection.
+
+        Notification Actions notify a set of members through a service such as Slack or Sentry when an action has been triggered. For example, you can email the organization owner when the spike protection threshold has been reached.
+        """
         # team admins and regular org members don't have project:write on an org level
         if not request.access.has_scope("project:write"):
             # check if user has access to create notification actions for all requested projects

src/sentry/api/endpoints/organization_events.py

@@ -15,7 +15,7 @@
 from sentry.api.utils import InvalidParams
 from sentry.apidocs import constants as api_constants
 from sentry.apidocs.examples.discover_performance_examples import DiscoverAndPerformanceExamples
-from sentry.apidocs.parameters import GlobalParams, VisibilityParams
+from sentry.apidocs.parameters import GlobalParams, OrganizationParams, VisibilityParams
 from sentry.apidocs.utils import inline_sentry_response_serializer
 from sentry.models.organization import Organization
 from sentry.ratelimits.config import RateLimitConfig
@@ -170,7 +170,7 @@ def get_features(self, organization: Organization, request: Request) -> Mapping[
             GlobalParams.END,
             GlobalParams.ENVIRONMENT,
             GlobalParams.ORG_SLUG,
-            GlobalParams.PROJECT,
+            OrganizationParams.PROJECT,
             GlobalParams.START,
             GlobalParams.STATS_PERIOD,
             VisibilityParams.FIELD,

src/sentry/api/endpoints/organization_profiling_functions.py

@@ -4,7 +4,6 @@
 from enum import Enum
 from typing import Any, List
 
-import sentry_sdk
 from rest_framework import serializers
 from rest_framework.request import Request
 from rest_framework.response import Response
@@ -16,7 +15,6 @@
 from sentry.api.paginator import GenericOffsetPaginator
 from sentry.exceptions import InvalidSearchQuery
 from sentry.models.organization import Organization
-from sentry.profiles.utils import get_from_profiling_service
 from sentry.search.events.builder import ProfileTopFunctionsTimeseriesQueryBuilder
 from sentry.search.events.types import QueryBuilderConfig
 from sentry.seer.utils import BreakpointData, detect_breakpoints
@@ -223,17 +221,6 @@ def get_trends_data(stats_data) -> List[BreakpointData]:
             reverse=data["trend"] is TrendType.REGRESSION,
         )
 
-        if data["trend"] is TrendType.REGRESSION:
-            try:
-                if features.has(
-                    "organizations:profile-function-regression-exp-ingest",
-                    organization,
-                    actor=request.user,
-                ):
-                    forward_regression_occurrences(organization, trending_functions, stats_data)
-            except Exception as e:
-                sentry_sdk.capture_exception(e)
-
         def paginate_trending_events(offset, limit):
             return {"data": trending_functions[offset : limit + offset]}
 
@@ -322,48 +309,3 @@ def get_interval_from_range(date_range: timedelta) -> str:
         return "2h"
 
     return "1h"
-
-
-def forward_regression_occurrences(
-    organization: Organization,
-    regressions: List[BreakpointData],
-    stats_data: Any,
-):
-    payloads = []
-
-    for entry in regressions:
-        project_id = int(entry["project"])
-        fingerprint = int(entry["transaction"])
-
-        profile_id = None
-        examples = (
-            stats_data.get(f"{project_id},{fingerprint}", {}).get("worst()", {}).get("data", [])
-        )
-        for row in reversed(examples):
-            example = row[1][0]["count"]
-            if isinstance(example, str):
-                profile_id = example
-                break
-
-        if profile_id is None:
-            continue
-
-        payloads.append(
-            {
-                "organization_id": organization.id,
-                "project_id": project_id,
-                "profile_id": profile_id,
-                "fingerprint": fingerprint,
-                "absolute_percentage_change": entry["absolute_percentage_change"],
-                "aggregate_range_1": entry["aggregate_range_1"],
-                "aggregate_range_2": entry["aggregate_range_2"],
-                "breakpoint": int(entry["breakpoint"]),
-                "trend_difference": entry["trend_difference"],
-                "trend_percentage": entry["trend_percentage"],
-                "unweighted_p_value": entry["unweighted_p_value"],
-                "unweighted_t_value": entry["unweighted_t_value"],
-            }
-        )
-
-    if payloads:
-        get_from_profiling_service(method="POST", path="/regressed", json_data=payloads)

src/sentry/api/endpoints/project_stacktrace_link.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import logging
 from typing import Dict, List, Mapping, Optional
 
@@ -157,7 +159,7 @@ def get_code_mapping_configs(project: Project) -> List[RepositoryProjectPathConf
         project=project, organization_integration_id__isnull=False
     )
 
-    sorted_configs = []  # type: List[RepositoryProjectPathConfig]
+    sorted_configs: list[RepositoryProjectPathConfig] = []
 
     try:
         for config in configs:

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

@@ -1,4 +1,4 @@
-from typing import Dict, Sequence
+from typing import Any, Dict, Sequence
 
 from django.contrib.auth.models import AnonymousUser
 
@@ -34,7 +34,7 @@ def get_attrs(self, item_list: Sequence[NotificationAction], user):
             for item in item_list
         }
 
-    def serialize(self, obj: NotificationAction, attrs, user, **kwargs):
+    def serialize(self, obj: NotificationAction, attrs, user, **kwargs) -> Dict[str, Any]:
         return {
             "id": obj.id,
             "organizationId": obj.organization_id,

src/sentry/api/serializers/rest_framework/dashboard.py

@@ -1,5 +1,6 @@
 import re
 from datetime import datetime, timedelta
+from enum import Enum
 
 from django.db.models import Max
 from rest_framework import serializers
@@ -236,6 +237,11 @@ def _get_attr(self, data, attr, empty_value=None):
         return empty_value
 
 
+class ThresholdMaxKeys(Enum):
+    MAX_1 = "max1"
+    MAX_2 = "max2"
+
+
 class DashboardWidgetSerializer(CamelSnakeSerializer):
     # Is a string because output serializers also make it a string.
     id = serializers.CharField(required=False)
@@ -301,6 +307,49 @@ def validate(self, data):
                 raise serializers.ValidationError(
                     {"displayType": "displayType is required during creation."}
                 )
+
+        # Validate widget thresholds
+        thresholds = data.get("thresholds")
+        if thresholds:
+            max_values = thresholds.get("max_values")
+            allowed_max_keys = [key.value for key in ThresholdMaxKeys]
+            if max_values:
+                for i in range(len(max_values)):
+                    max_key = f"max{i+1}"
+
+                    if max_key not in allowed_max_keys:
+                        raise serializers.ValidationError(
+                            {"thresholds": f"Invalid maximum key {max_key}"}
+                        )
+
+                    if max_values.get(max_key):
+                        if max_values.get(max_key) < 0:
+                            raise serializers.ValidationError(
+                                {"thresholds": {max_key: "Maximum values can not be negative"}}
+                            )
+                        elif i > 0:
+                            prev_max_key = f"max{i}"
+                            if max_values.get(prev_max_key) and max_values.get(
+                                prev_max_key
+                            ) >= max_values.get(max_key):
+                                raise serializers.ValidationError(
+                                    {
+                                        "thresholds": {
+                                            max_key: "Maximum value must be greater than minimum."
+                                        }
+                                    }
+                                )
+
+                if len(max_values) < len(ThresholdMaxKeys):
+                    for key in allowed_max_keys:
+                        if max_values.get(key) is None:
+                            raise serializers.ValidationError(
+                                {
+                                    "thresholds": {
+                                        key: "Must set all threshold maximums or none at all."
+                                    }
+                                }
+                            )
         return data