fix(code_review): event_type does not define the webhook type by armenzg · Pull Request #105548 · getsentry/sentry

armenzg · 2025-12-30T20:47:34Z

This fixes the check_run re-run case since I regressed it in #105393 when we switched the event_type to ci_check.

Standardizes webhook event type handling by replacing the custom EventType enum with the existing GithubWebhookType from the GitHub integration package.

Changes:

Pass github_event from X-GitHub-Event header through webhook chain
Remove custom EventType enum and use GithubWebhookType throughout
Update webhook processor signatures to accept github_event parameter
Simplify event routing logic in process_github_webhook_event task
Update all webhook processors and tests to use new signature

This makes the code more consistent with the GitHub integration package and removes duplicate event type definitions.

This fixes the `check_run` re-run case since we were incorrectly checking `ci_check`. Standardizes webhook event type handling by replacing the custom `EventType` enum with the existing `GithubWebhookType` from the GitHub integration package. Changes: - Pass `github_event` from `X-GitHub-Event` header through webhook chain - Remove custom `EventType` enum and use `GithubWebhookType` throughout - Update webhook processor signatures to accept `github_event` parameter - Simplify event routing logic in `process_github_webhook_event` task - Update all webhook processors and tests to use new signature This makes the code more consistent with the GitHub integration package and removes duplicate event type definitions.

armenzg · 2025-12-30T20:48:23Z

src/sentry/integrations/github/webhook.py

    def __call__(
        self,
        *,
-        event_type: str,


All the functions implementing this protocol will be updated to this new signature.

armenzg · 2025-12-30T20:48:47Z

src/sentry/integrations/github/webhook.py

        *,
-        event_type: str,
+        # This comes from the X-GitHub-Event header
+        github_event: GithubWebhookType,


Renaming the variable to make it dead obvious. event_type refers to an internal integrations metric.

armenzg · 2025-12-30T20:54:35Z

src/sentry/integrations/github/webhook.py

+    *,
+    github_event: GithubWebhookType,
+    event: Mapping[str, Any],
+    organization: Organization,


TODO: The signature here should have always had organization and repo. This is likely because we need a mechanism to enforce the typing. I will follow-up.

armenzg · 2025-12-30T20:55:02Z

src/sentry/integrations/github/webhook.py

    # without needing to implement _handle()
    def _handle(
        self,
+        github_event: GithubWebhookType,


This is now passed here:

armenzg · 2025-12-30T20:55:52Z

src/sentry/integrations/github/webhook.py

                continue

    def __call__(self, event: Mapping[str, Any], **kwargs: Any) -> None:
+        github_event = kwargs["github_event"]


We pass this as a kwargs since we don't want to touch the signature of the base class.

armenzg · 2025-12-30T20:57:10Z

src/sentry/integrations/github/webhook.py

@@ -154,6 +162,7 @@
    # without needing to implement _handle()
    def _handle(


For extra visibility, this belongs to GitHubWebhook:

sentry/src/sentry/integrations/github/webhook.py

Line 155 in 4ffbe61

def _handle(

armenzg · 2025-12-30T20:57:58Z

src/sentry/integrations/github/webhook.py


    def _handle(
        self,
+        github_event: GithubWebhookType,


All children classes will have this value but only the ones for the code_review code will take advantage of it.

armenzg · 2025-12-30T20:59:32Z

src/sentry/integrations/github/webhook.py


        try:
-            handler = self.get_handler(request.META["HTTP_X_GITHUB_EVENT"])
+            github_event = request.META["HTTP_X_GITHUB_EVENT"]


This is the real way we can distinguish events.

Yesterday I regressed check_run when I started looking at an event_type of ci_run.

src/sentry/seer/code_review/webhooks/handlers.py

suejung-sentry

nice improvement 🚀

suejung-sentry · 2025-12-30T21:40:02Z

tests/sentry/seer/code_review/test_webhooks.py

        assert isinstance(call_kwargs["enqueued_at_str"], str)

    @patch("sentry.seer.code_review.webhooks.task.process_github_webhook_event")
+    @with_feature(CODE_REVIEW_FEATURES)


technically this test probably wants this decorator omitted (i.e., all features disabled)

I will have to fix this test as it should have failed.

TODO: follow-up.

src/sentry/integrations/github/webhook.py

armenzg · 2025-12-31T13:21:25Z

src/sentry/integrations/github/webhook.py

                    event=event,
                    organization=organization,
                    repo=repo,
                    **kwargs,


Matches the new signature:

src/sentry/integrations/github/webhook.py

armenzg · 2025-12-31T14:16:50Z

src/sentry/integrations/utils/metrics.py

    """

-    CI_CHECK = "ci_check"
+    CI_CHECK = "ci_check"  # e.g. GitHub Check Runs


Renaming this from check_run to ci_check became the source of the bug.

armenzg · 2025-12-31T14:17:42Z

src/sentry/seer/code_review/webhooks/check_run.py


 from ..permissions import has_code_review_enabled
 from ..utils import SeerEndpoint, make_seer_request
-from .types import EventType


We're consolidating and using GithubWebhookType instead of this.

armenzg · 2025-12-31T14:18:34Z

src/sentry/seer/code_review/webhooks/check_run.py

-def process_check_run_task_event(
-    *, event_type: str, event_payload: Mapping[str, Any], **kwargs: Any
-) -> None:
+def process_check_run_task_event(*, event_payload: Mapping[str, Any], **kwargs: Any) -> None:


The event_type or github_event is not passed since the task is already calling the function which handles this event.

armenzg · 2025-12-31T14:18:43Z

src/sentry/seer/code_review/webhooks/check_run.py

-    Only processes events with event_type='check_run'.
    This allows the task to be shared by multiple webhook types without conflicts.
    """
-    if event_type != EventType.CHECK_RUN:


No need to check anymore.

armenzg · 2025-12-31T14:25:31Z

src/sentry/seer/code_review/webhooks/task.py

-    assert event_type != EventType.CHECK_RUN
-    assert event_payload is not None
+    assert github_event != GithubWebhookType.CHECK_RUN
+    # XXX: Add checking options to prevent sending events to Seer by mistake.


I will follow-up in a different PR. We should not call Seer by mistake. We need to map the GitHub events and the options correctly.

armenzg · 2025-12-31T14:26:35Z

src/sentry/seer/code_review/webhooks/task.py


-EVENT_TYPE_TO_PROCESSOR = {
-    EventType.CHECK_RUN: process_check_run_task_event,
-    EventType.ISSUE_COMMENT: _call_seer_request,


The fallback function call is now handled directly in the task:

armenzg self-assigned this Dec 30, 2025

github-actions bot added the Scope: Backend Automatically applied to PRs that change backend components label Dec 30, 2025

vercel bot deployed to Preview December 30, 2025 20:48 View deployment

armenzg commented Dec 30, 2025

View reviewed changes

armenzg requested a review from suejung-sentry December 30, 2025 21:00

cursor bot reviewed Dec 30, 2025

View reviewed changes

src/sentry/seer/code_review/webhooks/handlers.py Show resolved Hide resolved

suejung-sentry approved these changes Dec 30, 2025

View reviewed changes

suejung-sentry mentioned this pull request Dec 30, 2025

ref(code_review): Centralized config, prevent Seer calls and better types #105537

Closed

Fix GH enterprise

5be2151

vercel bot deployed to Preview December 31, 2025 13:39 View deployment

armenzg added 5 commits December 31, 2025 08:48

Fix event type

de4c316

Do not call seer

9cc1b25

Fix typing

533f4c0

Minor feedback

5552f5e

Restore tests

8c2b1c9

armenzg commented Dec 31, 2025

View reviewed changes

Fix test

65db487

vercel bot deployed to Preview December 31, 2025 14:12 View deployment

armenzg commented Dec 31, 2025

View reviewed changes

armenzg marked this pull request as ready for review December 31, 2025 14:28

armenzg requested a review from a team as a code owner December 31, 2025 14:28

armenzg requested a review from a team December 31, 2025 14:28

armenzg requested review from a team as code owners December 31, 2025 14:28

armenzg merged commit daf853d into master Dec 31, 2025
65 checks passed

armenzg deleted the 12_30/fix_bug/check_run/armenzg branch December 31, 2025 14:34

github-actions bot mentioned this pull request Jan 10, 2026

ci(release): Switch from action-prepare-release to Craft #106005

Merged

github-actions bot locked and limited conversation to collaborators Jan 18, 2026

		@@ -154,6 +162,7 @@
		# without needing to implement _handle()
		def _handle(

Uh oh!

Conversation

armenzg commented Dec 30, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

suejung-sentry left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

armenzg commented Dec 30, 2025 •

edited

Loading