Merge branch 'master' into jb/node/24

Author: natemoo-re

src/sentry/api/urls.py

@@ -217,6 +217,7 @@
     SourceMapDebugEndpoint,
     TeamGroupsOldEndpoint,
 )
+from sentry.issues.endpoints.browser_reporting_collector import BrowserReportingCollectorEndpoint
 from sentry.issues.endpoints.organization_group_search_view_starred_order import (
     OrganizationGroupSearchViewStarredOrderEndpoint,
 )
@@ -3491,6 +3492,12 @@ def create_group_urls(name_prefix: str) -> list[URLPattern | URLResolver]:
         SecretScanningGitHubEndpoint.as_view(),
         name="sentry-api-0-secret-scanning-github",
     ),
+    # Temporary public endpoint for proxying browser reports to GCP, to gather real-world data
+    re_path(
+        r"^reporting-api-experiment/$",
+        BrowserReportingCollectorEndpoint.as_view(),
+        name="sentry-api-0-reporting-api-experiment",
+    ),
     # Catch all
     re_path(
         r"^$",

src/sentry/apidocs/parameters.py

@@ -1059,7 +1059,7 @@ class PreventParams:
         location="query",
         required=False,
         type=str,
-        description="""The branch to search for results by. If not specified, the default branch is returned.
+        description="""The branch to search for results by. If not specified, the default is `main`.
         """,
     )
     TEST_RESULTS_FILTER_BY = OpenApiParameter(
@@ -1081,7 +1081,7 @@ class PreventParams:
         location="query",
         required=False,
         type=str,
-        description="""The property to sort results by. If not specified, all results are returned. Use `-`
+        description="""The property to sort results by. If not specified, the default is `COMMITS_WHERE_FAIL` in descending order. Use `-`
         for descending order.
 
 Available fields are:

src/sentry/codecov/endpoints/TestResults/test_results.py

@@ -50,7 +50,9 @@ def has_pagination(self, response):
     def get(self, request: Request, owner: str, repository: str, **kwargs) -> Response:
         """Retrieves the list of test results for a given repository and owner. Also accepts a number of query parameters to filter the results."""
 
-        sort_by = request.query_params.get("sortBy", OrderingParameter.COMMITS_WHERE_FAIL.value)
+        sort_by = request.query_params.get(
+            "sortBy", f"-{OrderingParameter.COMMITS_WHERE_FAIL.value}"
+        )
 
         if sort_by and sort_by.startswith("-"):
             sort_by = sort_by[1:]

src/sentry/features/temporary.py

@@ -422,6 +422,8 @@ def register_temporary_features(manager: FeatureManager):
     manager.add("organizations:transaction-name-normalize", OrganizationFeature, FeatureHandlerStrategy.INTERNAL, default=True, api_expose=False)
     # Enables automatically triggering autofix on issue summary
     manager.add("organizations:trigger-autofix-on-issue-summary", OrganizationFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=True)
+    # Enables unlimited auto-triggered autofix runs
+    manager.add("organizations:unlimited-auto-triggered-autofix-runs", OrganizationFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=False)
     # Enables automatic hostname detection in uptime
     manager.add("organizations:uptime-automatic-hostname-detection", OrganizationFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=False)
     # Enables automatic subscription creation in uptime

src/sentry/integrations/github/webhook.py

@@ -64,9 +64,6 @@ def get_file_language(filename: str) -> str | None:
     if extension != filename:
         language = EXTENSION_LANGUAGE_MAP.get(extension)
 
-        if language is None:
-            logger.info("github.unaccounted_file_lang", extra={"extension": extension})
-
     return language
 
 

src/sentry/integrations/source_code_management/commit_context.py

@@ -223,42 +223,34 @@ def queue_pr_comment_task_if_needed(
         except NotImplementedError:
             return
 
+        if not OrganizationOption.objects.get_value(
+            organization=project.organization,
+            key=pr_comment_workflow.organization_option_key,
+            default=True,
+        ):
+            return
+
+        repo_query = Repository.objects.filter(id=commit.repository_id).order_by("-date_added")
+        group = Group.objects.get_from_cache(id=group_id)
+        if not (
+            group.level is not logging.INFO and repo_query.exists()
+        ):  # Don't comment on info level issues
+            return
+
         with CommitContextIntegrationInteractionEvent(
             interaction_type=SCMIntegrationInteractionType.QUEUE_COMMENT_TASK,
             provider_key=self.integration_name,
             organization=project.organization,
             project=project,
             commit=commit,
         ).capture() as lifecycle:
-            if not OrganizationOption.objects.get_value(
-                organization=project.organization,
-                key=pr_comment_workflow.organization_option_key,
-                default=True,
-            ):
-                # TODO: remove logger in favor of the log recorded in  lifecycle.record_halt
-                logger.info(
-                    _pr_comment_log(integration_name=self.integration_name, suffix="disabled"),
-                    extra={"organization_id": project.organization_id},
-                )
-                lifecycle.record_halt(CommitContextHaltReason.PR_BOT_DISABLED)
-                return
-
-            repo_query = Repository.objects.filter(id=commit.repository_id).order_by("-date_added")
-            group = Group.objects.get_from_cache(id=group_id)
-            if not (
-                group.level is not logging.INFO and repo_query.exists()
-            ):  # Don't comment on info level issues
-                logger.info(
-                    _pr_comment_log(
-                        integration_name=self.integration_name, suffix="incorrect_repo_config"
-                    ),
-                    extra={"organization_id": project.organization_id},
-                )
-                lifecycle.record_halt(CommitContextHaltReason.INCORRECT_REPO_CONFIG)
-                return
-
             repo: Repository = repo_query.get()
-            lifecycle.add_extra("repository_id", repo.id)
+            lifecycle.add_extras(
+                {
+                    "repository_id": repo.id,
+                    "group_id": group_id,
+                }
+            )
 
             logger.info(
                 _pr_comment_log(
@@ -282,37 +274,18 @@ def queue_pr_comment_task_if_needed(
                 return
 
             if merge_commit_sha is None:
-                logger.info(
-                    _pr_comment_log(
-                        integration_name=self.integration_name,
-                        suffix="queue_comment_workflow.commit_not_in_default_branch",
-                    ),
-                    extra={
-                        "organization_id": commit.organization_id,
-                        "repository_id": repo.id,
-                        "commit_sha": commit.key,
-                    },
-                )
+                lifecycle.add_extra("commit_sha", commit.key)
                 lifecycle.record_halt(CommitContextHaltReason.COMMIT_NOT_IN_DEFAULT_BRANCH)
                 return
 
+            lifecycle.add_extra("merge_commit_sha", merge_commit_sha)
+
             pr_query = PullRequest.objects.filter(
                 organization_id=commit.organization_id,
                 repository_id=commit.repository_id,
                 merge_commit_sha=merge_commit_sha,
             )
             if not pr_query.exists():
-                logger.info(
-                    _pr_comment_log(
-                        integration_name=self.integration_name,
-                        suffix="queue_comment_workflow.missing_pr",
-                    ),
-                    extra={
-                        "organization_id": commit.organization_id,
-                        "repository_id": repo.id,
-                        "commit_sha": commit.key,
-                    },
-                )
                 lifecycle.record_halt(CommitContextHaltReason.MISSING_PR)
                 return
 

src/sentry/integrations/source_code_management/metrics.py

@@ -105,8 +105,6 @@ def get_extras(self) -> Mapping[str, Any]:
 class CommitContextHaltReason(StrEnum):
     """Common reasons why a commit context integration may halt without success/failure."""
 
-    PR_BOT_DISABLED = "pr_bot_disabled"
-    INCORRECT_REPO_CONFIG = "incorrect_repo_config"
     COMMIT_NOT_IN_DEFAULT_BRANCH = "commit_not_in_default_branch"
     MISSING_PR = "missing_pr"
     ALREADY_QUEUED = "already_queued"

src/sentry/integrations/source_code_management/tasks.py

@@ -143,10 +143,6 @@ def pr_comment_workflow(pr_id: int, project_id: int):
     top_5_issue_ids = [issue["group_id"] for issue in top_5_issues]
 
     comment_body = pr_comment_workflow.get_comment_body(issue_ids=top_5_issue_ids)
-    logger.info(
-        _pr_comment_log(integration_name=integration_name, suffix="comment_body"),
-        extra={"body": comment_body},
-    )
 
     top_24_issue_ids = issue_ids[:24]  # 24 is the P99 for issues-per-PR
 

src/sentry/issues/endpoints/browser_reporting_collector.py

@@ -0,0 +1,47 @@
+import logging
+
+from django.http import HttpResponse
+from django.views.decorators.csrf import csrf_exempt
+from rest_framework.parsers import JSONParser
+from rest_framework.request import Request
+
+from sentry import options
+from sentry.api.api_owners import ApiOwner
+from sentry.api.api_publish_status import ApiPublishStatus
+from sentry.api.base import Endpoint, all_silo_endpoint, allow_cors_options
+from sentry.utils import metrics
+
+logger = logging.getLogger(__name__)
+
+
+@all_silo_endpoint
+class BrowserReportingCollectorEndpoint(Endpoint):
+    """
+    An experimental endpoint which is a proxy for browser Reporting API reports. For now just
+    records metrics and forwards data to GCP, so we can collect real-world data on what gets sent,
+    how much gets sent, etc.
+    """
+
+    permission_classes = ()
+    # TODO: Do we need to specify this parser? Content type will be `application/reports+json`, so
+    # it might just work automatically.
+    parser_classes = [JSONParser]
+    publish_status = {
+        "POST": ApiPublishStatus.PRIVATE,
+    }
+    owner = ApiOwner.ISSUES
+
+    # TODO: It's unclear if either of these decorators is necessary
+    @csrf_exempt
+    @allow_cors_options
+    def post(self, request: Request, *args, **kwargs) -> HttpResponse:
+        if not options.get("issues.browser_reporting.collector_endpoint_enabled"):
+            return HttpResponse(status=404)
+
+        logger.info("browser_report_received", extra={"request_body": request.data})
+
+        metrics.incr(
+            "browser_reporting.raw_report_received", tags={"type": request.data.get("type")}
+        )
+
+        return HttpResponse(status=200)

src/sentry/options/defaults.py

@@ -599,6 +599,8 @@
 
 # Issue Summary on Alerts (timeout in seconds)
 register("alerts.issue_summary_timeout", default=5, flags=FLAG_AUTOMATOR_MODIFIABLE)
+# Issue Summary Auto-trigger rate (max number of autofix runs auto-triggered per project per hour)
+register("seer.max_num_autofix_autotriggered_per_hour", default=20, flags=FLAG_AUTOMATOR_MODIFIABLE)
 
 # Codecov Integration
 register("codecov.client-secret", flags=FLAG_CREDENTIAL | FLAG_PRIORITIZE_DISK)
@@ -3449,3 +3451,12 @@
     default=[],
     flags=FLAG_ALLOW_EMPTY | FLAG_AUTOMATOR_MODIFIABLE,
 )
+
+# Enable the collection of Reporting API reports via the `/api/0/reporting-api-experiment/`
+# endpoint. When this is false, the endpoint will just 404.
+register(
+    "issues.browser_reporting.collector_endpoint_enabled",
+    type=Bool,
+    default=False,
+    flags=FLAG_AUTOMATOR_MODIFIABLE,
+)

src/sentry/rules/processing/delayed_processing.py

@@ -549,7 +549,7 @@ def fire_rules(
                                 "group_id": group.id,
                             },
                         )
-                        break
+                        continue
 
                     updated = (
                         GroupRuleStatus.objects.filter(id=status.id)
@@ -567,7 +567,7 @@ def fire_rules(
                                 "group_id": group.id,
                             },
                         )
-                        break
+                        continue
 
                     notification_uuid = str(uuid.uuid4())
                     groupevent = group_to_groupevent[group]