Merge branch 'master' into tkdodo/ref/knip-zero

Author: TkDodo

rspack.config.ts

@@ -784,7 +784,8 @@ appConfig.plugins?.push(
       create: false,
     },
     reactComponentAnnotation: {
-      enabled: true,
+      // Enabled only in production because annotating is slow
+      enabled: IS_PRODUCTION,
     },
     bundleSizeOptimizations: {
       // This is enabled so that our SDKs send exceptions to Sentry

src/sentry/api/endpoints/group_ai_summary.py

@@ -10,7 +10,6 @@
 from sentry.api.api_publish_status import ApiPublishStatus
 from sentry.api.base import region_silo_endpoint
 from sentry.api.bases.group import GroupAiEndpoint
-from sentry.autofix.utils import SeerAutomationSource
 from sentry.models.group import Group
 from sentry.seer.issue_summary import get_issue_summary
 from sentry.types.ratelimit import RateLimit, RateLimitCategory
@@ -38,10 +37,7 @@ def post(self, request: Request, group: Group) -> Response:
         force_event_id = data.get("event_id", None)
 
         summary_data, status_code = get_issue_summary(
-            group=group,
-            user=request.user,
-            force_event_id=force_event_id,
-            source=SeerAutomationSource.ISSUE_DETAILS,
+            group=group, user=request.user, force_event_id=force_event_id, source="issue_details"
         )
 
         return Response(summary_data, status=status_code)

src/sentry/api/endpoints/group_autofix_setup_check.py

@@ -7,13 +7,12 @@
 from django.conf import settings
 from rest_framework.response import Response
 
-from sentry import quotas
 from sentry.api.api_owners import ApiOwner
 from sentry.api.api_publish_status import ApiPublishStatus
 from sentry.api.base import region_silo_endpoint
 from sentry.api.bases.group import GroupAiEndpoint
 from sentry.autofix.utils import get_autofix_repos_from_project_code_mappings
-from sentry.constants import DataCategory, ObjectStatus
+from sentry.constants import ObjectStatus
 from sentry.integrations.services.integration import integration_service
 from sentry.models.group import Group
 from sentry.models.organization import Organization
@@ -127,11 +126,6 @@ def get(self, request: Request, group: Group) -> Response:
         if not user_acknowledgement:  # If the user has acknowledged, the org must have too.
             org_acknowledgement = get_seer_org_acknowledgement(org_id=org.id)
 
-        # TODO return BOTH trial status and autofix quota
-        has_autofix_quota: bool = quotas.backend.has_available_reserved_budget(
-            org_id=org.id, data_category=DataCategory.SEER_AUTOFIX
-        )
-
         return Response(
             {
                 "integration": {
@@ -143,8 +137,5 @@ def get(self, request: Request, group: Group) -> Response:
                     "orgHasAcknowledged": org_acknowledgement,
                     "userHasAcknowledged": user_acknowledgement,
                 },
-                "billing": {
-                    "hasAutofixQuota": has_autofix_quota,
-                },
             }
         )

src/sentry/api/endpoints/project_details.py

@@ -128,9 +128,6 @@ class ProjectMemberSerializer(serializers.Serializer):
         "copy_from_project",
         "targetSampleRate",
         "dynamicSamplingBiases",
-        "performanceIssueCreationRate",
-        "performanceIssueCreationThroughPlatform",
-        "performanceIssueSendToPlatform",
         "tempestFetchScreenshots",
         "tempestFetchDumps",
         "autofixAutomationTuning",
@@ -223,9 +220,6 @@ class ProjectAdminSerializer(ProjectMemberSerializer):
     copy_from_project = serializers.IntegerField(required=False)
     targetSampleRate = serializers.FloatField(required=False, min_value=0, max_value=1)
     dynamicSamplingBiases = DynamicSamplingBiasSerializer(required=False, many=True)
-    performanceIssueCreationRate = serializers.FloatField(required=False, min_value=0, max_value=1)
-    performanceIssueCreationThroughPlatform = serializers.BooleanField(required=False)
-    performanceIssueSendToPlatform = serializers.BooleanField(required=False)
     tempestFetchScreenshots = serializers.BooleanField(required=False)
     tempestFetchDumps = serializers.BooleanField(required=False)
     autofixAutomationTuning = serializers.ChoiceField(

src/sentry/api/endpoints/project_performance_issue_settings.py

@@ -34,72 +34,84 @@
 SETTINGS_PROJECT_OPTION_KEY = "sentry:performance_issue_settings"
 
 
-# These options should only be accessible internally and used by
-# support to enable/disable performance issue detection for an outlying project
-# on a case-by-case basis.
 class InternalProjectOptions(Enum):
-    N_PLUS_ONE_DB = "n_plus_one_db_queries_detection_enabled"
-    UNCOMPRESSED_ASSET = "uncompressed_assets_detection_enabled"
-    CONSECUTIVE_HTTP_SPANS = "consecutive_http_spans_detection_enabled"
-    LARGE_HTTP_PAYLOAD = "large_http_payload_detection_enabled"
-    N_PLUS_ONE_API_CALLS = "n_plus_one_api_calls_detection_enabled"
-    DB_ON_MAIN_THREAD = "db_on_main_thread_detection_enabled"
-    FILE_IO_MAIN_THREAD = "file_io_on_main_thread_detection_enabled"
-    CONSECUTIVE_DB_QUERIES = "consecutive_db_queries_detection_enabled"
-    RENDER_BLOCKING_ASSET = "large_render_blocking_asset_detection_enabled"
-    SLOW_DB_QUERY = "slow_db_queries_detection_enabled"
-    HTTP_OVERHEAD = "http_overhead_detection_enabled"
+    """
+    Settings that are only accessible to superusers.
+    """
+
     TRANSACTION_DURATION_REGRESSION = "transaction_duration_regression_detection_enabled"
     FUNCTION_DURATION_REGRESSION = "function_duration_regression_detection_enabled"
 
 
 class ConfigurableThresholds(Enum):
+    """
+    All the settings that can be configured by users with the appropriate permissions.
+    """
+
+    N_PLUS_ONE_DB = "n_plus_one_db_queries_detection_enabled"
     N_PLUS_ONE_DB_DURATION = "n_plus_one_db_duration_threshold"
     N_PLUS_ONE_DB_COUNT = "n_plus_one_db_count"
+    UNCOMPRESSED_ASSET = "uncompressed_assets_detection_enabled"
     UNCOMPRESSED_ASSET_DURATION = "uncompressed_asset_duration_threshold"
     UNCOMPRESSED_ASSET_SIZE = "uncompressed_asset_size_threshold"
+    LARGE_HTTP_PAYLOAD = "large_http_payload_detection_enabled"
     LARGE_HTTP_PAYLOAD_SIZE = "large_http_payload_size_threshold"
+    DB_ON_MAIN_THREAD = "db_on_main_thread_detection_enabled"
     DB_ON_MAIN_THREAD_DURATION = "db_on_main_thread_duration_threshold"
+    FILE_IO_MAIN_THREAD = "file_io_on_main_thread_detection_enabled"
     FILE_IO_MAIN_THREAD_DURATION = "file_io_on_main_thread_duration_threshold"
+    CONSECUTIVE_DB_QUERIES = "consecutive_db_queries_detection_enabled"
     CONSECUTIVE_DB_QUERIES_MIN_TIME_SAVED = "consecutive_db_min_time_saved_threshold"
+    RENDER_BLOCKING_ASSET = "large_render_blocking_asset_detection_enabled"
     RENDER_BLOCKING_ASSET_FCP_RATIO = "render_blocking_fcp_ratio"
+    SLOW_DB_QUERY = "slow_db_queries_detection_enabled"
     SLOW_DB_QUERY_DURATION = "slow_db_query_duration_threshold"
+    N_PLUS_ONE_API_CALLS = "n_plus_one_api_calls_detection_enabled"
     N_PLUS_API_CALLS_DURATION = "n_plus_one_api_calls_total_duration_threshold"
+    CONSECUTIVE_HTTP_SPANS = "consecutive_http_spans_detection_enabled"
     CONSECUTIVE_HTTP_SPANS_MIN_TIME_SAVED = "consecutive_http_spans_min_time_saved_threshold"
+    HTTP_OVERHEAD = "http_overhead_detection_enabled"
     HTTP_OVERHEAD_REQUEST_DELAY = "http_request_delay_threshold"
 
 
-internal_only_project_settings_to_group_map: dict[str, type[GroupType]] = {
-    InternalProjectOptions.UNCOMPRESSED_ASSET.value: PerformanceUncompressedAssetsGroupType,
-    InternalProjectOptions.CONSECUTIVE_HTTP_SPANS.value: PerformanceConsecutiveHTTPQueriesGroupType,
-    InternalProjectOptions.LARGE_HTTP_PAYLOAD.value: PerformanceLargeHTTPPayloadGroupType,
-    InternalProjectOptions.N_PLUS_ONE_DB.value: PerformanceNPlusOneGroupType,
-    InternalProjectOptions.N_PLUS_ONE_API_CALLS.value: PerformanceNPlusOneAPICallsGroupType,
-    InternalProjectOptions.DB_ON_MAIN_THREAD.value: PerformanceDBMainThreadGroupType,
-    InternalProjectOptions.FILE_IO_MAIN_THREAD.value: PerformanceFileIOMainThreadGroupType,
-    InternalProjectOptions.CONSECUTIVE_DB_QUERIES.value: PerformanceConsecutiveDBQueriesGroupType,
-    InternalProjectOptions.RENDER_BLOCKING_ASSET.value: PerformanceRenderBlockingAssetSpanGroupType,
-    InternalProjectOptions.SLOW_DB_QUERY.value: PerformanceSlowDBQueryGroupType,
-    InternalProjectOptions.HTTP_OVERHEAD.value: PerformanceHTTPOverheadGroupType,
+project_settings_to_group_map: dict[str, type[GroupType]] = {
+    ConfigurableThresholds.UNCOMPRESSED_ASSET.value: PerformanceUncompressedAssetsGroupType,
+    ConfigurableThresholds.CONSECUTIVE_HTTP_SPANS.value: PerformanceConsecutiveHTTPQueriesGroupType,
+    ConfigurableThresholds.LARGE_HTTP_PAYLOAD.value: PerformanceLargeHTTPPayloadGroupType,
+    ConfigurableThresholds.N_PLUS_ONE_DB.value: PerformanceNPlusOneGroupType,
+    ConfigurableThresholds.N_PLUS_ONE_API_CALLS.value: PerformanceNPlusOneAPICallsGroupType,
+    ConfigurableThresholds.DB_ON_MAIN_THREAD.value: PerformanceDBMainThreadGroupType,
+    ConfigurableThresholds.FILE_IO_MAIN_THREAD.value: PerformanceFileIOMainThreadGroupType,
+    ConfigurableThresholds.CONSECUTIVE_DB_QUERIES.value: PerformanceConsecutiveDBQueriesGroupType,
+    ConfigurableThresholds.RENDER_BLOCKING_ASSET.value: PerformanceRenderBlockingAssetSpanGroupType,
+    ConfigurableThresholds.SLOW_DB_QUERY.value: PerformanceSlowDBQueryGroupType,
+    ConfigurableThresholds.HTTP_OVERHEAD.value: PerformanceHTTPOverheadGroupType,
     InternalProjectOptions.TRANSACTION_DURATION_REGRESSION.value: PerformanceP95EndpointRegressionGroupType,
     InternalProjectOptions.FUNCTION_DURATION_REGRESSION.value: ProfileFunctionRegressionType,
 }
-
-configurable_thresholds_to_internal_settings_map: dict[str, str] = {
-    ConfigurableThresholds.N_PLUS_ONE_DB_DURATION.value: InternalProjectOptions.N_PLUS_ONE_DB.value,
-    ConfigurableThresholds.N_PLUS_ONE_DB_COUNT.value: InternalProjectOptions.N_PLUS_ONE_DB.value,
-    ConfigurableThresholds.UNCOMPRESSED_ASSET_DURATION.value: InternalProjectOptions.UNCOMPRESSED_ASSET.value,
-    ConfigurableThresholds.UNCOMPRESSED_ASSET_SIZE.value: InternalProjectOptions.UNCOMPRESSED_ASSET.value,
-    ConfigurableThresholds.LARGE_HTTP_PAYLOAD_SIZE.value: InternalProjectOptions.LARGE_HTTP_PAYLOAD.value,
-    ConfigurableThresholds.DB_ON_MAIN_THREAD_DURATION.value: InternalProjectOptions.DB_ON_MAIN_THREAD.value,
-    ConfigurableThresholds.FILE_IO_MAIN_THREAD_DURATION.value: InternalProjectOptions.FILE_IO_MAIN_THREAD.value,
-    ConfigurableThresholds.CONSECUTIVE_DB_QUERIES_MIN_TIME_SAVED.value: InternalProjectOptions.CONSECUTIVE_DB_QUERIES.value,
-    ConfigurableThresholds.RENDER_BLOCKING_ASSET_FCP_RATIO.value: InternalProjectOptions.RENDER_BLOCKING_ASSET.value,
-    ConfigurableThresholds.SLOW_DB_QUERY_DURATION.value: InternalProjectOptions.SLOW_DB_QUERY.value,
-    ConfigurableThresholds.N_PLUS_API_CALLS_DURATION.value: InternalProjectOptions.N_PLUS_ONE_API_CALLS.value,
-    ConfigurableThresholds.CONSECUTIVE_HTTP_SPANS_MIN_TIME_SAVED.value: InternalProjectOptions.CONSECUTIVE_HTTP_SPANS.value,
-    ConfigurableThresholds.HTTP_OVERHEAD_REQUEST_DELAY.value: InternalProjectOptions.HTTP_OVERHEAD.value,
+"""
+A mapping of the management settings to the group type that the detector spawns.
+"""
+
+thresholds_to_manage_map: dict[str, str] = {
+    ConfigurableThresholds.N_PLUS_ONE_DB_DURATION.value: ConfigurableThresholds.N_PLUS_ONE_DB.value,
+    ConfigurableThresholds.N_PLUS_ONE_DB_COUNT.value: ConfigurableThresholds.N_PLUS_ONE_DB.value,
+    ConfigurableThresholds.UNCOMPRESSED_ASSET_DURATION.value: ConfigurableThresholds.UNCOMPRESSED_ASSET.value,
+    ConfigurableThresholds.UNCOMPRESSED_ASSET_SIZE.value: ConfigurableThresholds.UNCOMPRESSED_ASSET.value,
+    ConfigurableThresholds.LARGE_HTTP_PAYLOAD_SIZE.value: ConfigurableThresholds.LARGE_HTTP_PAYLOAD.value,
+    ConfigurableThresholds.DB_ON_MAIN_THREAD_DURATION.value: ConfigurableThresholds.DB_ON_MAIN_THREAD.value,
+    ConfigurableThresholds.FILE_IO_MAIN_THREAD_DURATION.value: ConfigurableThresholds.FILE_IO_MAIN_THREAD.value,
+    ConfigurableThresholds.CONSECUTIVE_DB_QUERIES_MIN_TIME_SAVED.value: ConfigurableThresholds.CONSECUTIVE_DB_QUERIES.value,
+    ConfigurableThresholds.RENDER_BLOCKING_ASSET_FCP_RATIO.value: ConfigurableThresholds.RENDER_BLOCKING_ASSET.value,
+    ConfigurableThresholds.SLOW_DB_QUERY_DURATION.value: ConfigurableThresholds.SLOW_DB_QUERY.value,
+    ConfigurableThresholds.N_PLUS_API_CALLS_DURATION.value: ConfigurableThresholds.N_PLUS_ONE_API_CALLS.value,
+    ConfigurableThresholds.CONSECUTIVE_HTTP_SPANS_MIN_TIME_SAVED.value: ConfigurableThresholds.CONSECUTIVE_HTTP_SPANS.value,
+    ConfigurableThresholds.HTTP_OVERHEAD_REQUEST_DELAY.value: ConfigurableThresholds.HTTP_OVERHEAD.value,
 }
+"""
+A mapping of threshold setting to the parent setting that manages it's detection.
+Used to determine if a threshold setting can be modified.
+"""
 
 
 class ProjectPerformanceIssueSettingsSerializer(serializers.Serializer):
@@ -155,15 +167,26 @@ class ProjectPerformanceIssueSettingsSerializer(serializers.Serializer):
     function_duration_regression_detection_enabled = serializers.BooleanField(required=False)
 
 
+def get_management_options() -> list[str]:
+    """
+    Returns the option keys that control whether a performance issue detector is enabled.
+    """
+    return [
+        *[setting.value for setting in InternalProjectOptions],
+        *list(thresholds_to_manage_map.values()),
+    ]
+
+
 def get_disabled_threshold_options(payload, current_settings):
+    """
+    Returns the option keys that are disabled, based on the current management settings.
+    """
     options = []
-    internal_only_settings = [setting.value for setting in InternalProjectOptions]
+    management_options = get_management_options()
     for option in payload:
-        if option not in internal_only_settings:
-            internal_setting_for_option = configurable_thresholds_to_internal_settings_map.get(
-                option
-            )
-            is_threshold_enabled = current_settings.get(internal_setting_for_option)
+        if option not in management_options:
+            manage_detector_setting = thresholds_to_manage_map.get(option)
+            is_threshold_enabled = current_settings.get(manage_detector_setting)
             if not is_threshold_enabled:
                 options.append(option)
     return options
@@ -222,15 +245,7 @@ def put(self, request: Request, project) -> Response:
             )
 
         body_has_admin_options = any([option in request.data for option in internal_only_settings])
-        if (
-            body_has_admin_options
-            and not superuser_has_permission(request)
-            and not features.has(
-                "organizations:performance-manage-detectors",
-                project.organization,
-                actor=request.user,
-            )
-        ):
+        if body_has_admin_options and not superuser_has_permission(request):
             return Response(
                 {
                     "detail": {
@@ -241,6 +256,9 @@ def put(self, request: Request, project) -> Response:
                 status=status.HTTP_403_FORBIDDEN,
             )
 
+        body_has_management_options = any(
+            [option in get_management_options() for option in request.data]
+        )
         serializer = ProjectPerformanceIssueSettingsSerializer(data=request.data)
 
         if not serializer.is_valid():
@@ -273,7 +291,7 @@ def put(self, request: Request, project) -> Response:
             {**performance_issue_settings_default, **performance_issue_settings, **data},
         )
 
-        if body_has_admin_options:
+        if body_has_admin_options or body_has_management_options:
             self.create_audit_entry(
                 request=self.request,
                 actor=request.user,
@@ -290,16 +308,16 @@ def delete(self, request: Request, project) -> Response:
             return self.respond(status=status.HTTP_404_NOT_FOUND)
 
         project_settings = project.get_option(SETTINGS_PROJECT_OPTION_KEY, default={})
+        management_options = get_management_options()
         threshold_options = [setting.value for setting in ConfigurableThresholds]
-        internal_only_settings = [setting.value for setting in InternalProjectOptions]
         disabled_options = get_disabled_threshold_options(threshold_options, project_settings)
 
         if project_settings:
             unchanged_options = (
-                {  # internal settings and disabled threshold settings can not be reset
+                {  # Management settings and disabled threshold settings can not be reset
                     option: project_settings[option]
                     for option in project_settings
-                    if option in internal_only_settings or option in disabled_options
+                    if option in management_options or option in disabled_options
                 }
             )
             project.update_option(SETTINGS_PROJECT_OPTION_KEY, unchanged_options)

src/sentry/audit_log/events.py

@@ -181,7 +181,7 @@ def __init__(self):
 
     def render(self, audit_log_entry: AuditLogEntry):
         from sentry.api.endpoints.project_performance_issue_settings import (
-            internal_only_project_settings_to_group_map as map,
+            project_settings_to_group_map as map,
         )
 
         data = audit_log_entry.data

src/sentry/autofix/utils.py

@@ -146,9 +146,3 @@ def get_autofix_state_from_pr_id(provider: str, pr_id: int) -> AutofixState | No
         return None
 
     return AutofixState.validate(result.get("state", None))
-
-
-class SeerAutomationSource(enum.Enum):
-    ISSUE_DETAILS = "issue_details"
-    ALERT = "alert"
-    POST_PROCESS = "post_process"

src/sentry/integrations/utils/issue_summary_for_alerts.py

@@ -5,7 +5,6 @@
 import sentry_sdk
 
 from sentry import features, options
-from sentry.autofix.utils import SeerAutomationSource
 from sentry.issues.grouptype import GroupCategory
 from sentry.models.group import Group
 from sentry.seer.issue_summary import get_issue_summary
@@ -33,9 +32,7 @@ def fetch_issue_summary(group: Group) -> dict[str, Any] | None:
     try:
         with sentry_sdk.start_span(op="ai_summary.fetch_issue_summary_for_alert"):
             with concurrent.futures.ThreadPoolExecutor() as executor:
-                future = executor.submit(
-                    get_issue_summary, group, source=SeerAutomationSource.ALERT
-                )
+                future = executor.submit(get_issue_summary, group, source="alert")
                 summary_result, status_code = future.result(timeout=timeout)
 
                 if status_code == 200:

src/sentry/seer/autofix.py

@@ -11,10 +11,10 @@
 from django.utils import timezone
 from rest_framework.response import Response
 
-from sentry import eventstore, features, quotas
+from sentry import eventstore, features
 from sentry.api.serializers import EventSerializer, serialize
 from sentry.autofix.utils import get_autofix_repos_from_project_code_mappings
-from sentry.constants import DataCategory, ObjectStatus
+from sentry.constants import ObjectStatus
 from sentry.eventstore.models import Event, GroupEvent
 from sentry.models.group import Group
 from sentry.models.project import Project
@@ -855,14 +855,6 @@ def trigger_autofix(
             403,
         )
 
-    # check billing quota for autofix
-    has_budget: bool = quotas.backend.has_available_reserved_budget(
-        org_id=group.organization.id,
-        data_category=DataCategory.SEER_AUTOFIX,
-    )
-    if not has_budget:
-        return _respond_with_error("No budget for Seer Autofix.", 402)
-
     if event_id is None:
         event: Event | GroupEvent | None = group.get_recommended_event_for_environments()
         if not event:
@@ -932,11 +924,6 @@ def trigger_autofix(
 
     group.update(seer_autofix_last_triggered=timezone.now())
 
-    # log billing event for seer autofix
-    quotas.backend.record_seer_run(
-        group.organization.id, group.project.id, DataCategory.SEER_AUTOFIX
-    )
-
     return Response(
         {
             "run_id": run_id,