Skip to content

Commit 20d7d33

Browse files
Revert "chore(sentry apps): Move logic to new Sentry App tasks (#78347)"
This reverts commit 3016618. Co-authored-by: markstory <[email protected]>
1 parent 9e36c51 commit 20d7d33

21 files changed

+566
-572
lines changed

src/sentry/celery.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
[
1515
# basic tasks that must be passed models still
1616
"sentry.tasks.process_buffer.process_incr",
17-
"sentry.sentry_apps.tasks.sentry_apps.process_resource_change_bound",
18-
"sentry.sentry_apps.tasks.sentry_apps.send_alert_event",
17+
"sentry.tasks.process_resource_change_bound",
18+
"sentry.tasks.sentry_apps.send_alert_event",
1919
"sentry.tasks.unmerge",
2020
"src.sentry.notifications.utils.async_send_notification",
2121
# basic tasks that can already deal with primary keys passed

src/sentry/receivers/outbox/control.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
from sentry.receivers.outbox import maybe_process_tombstone
2525
from sentry.relocation.services.relocation_export.service import region_relocation_export_service
2626
from sentry.sentry_apps.models.sentry_app import SentryApp
27-
from sentry.sentry_apps.tasks.sentry_apps import clear_region_cache
27+
from sentry.tasks.sentry_apps import clear_region_cache
2828

2929
logger = logging.getLogger(__name__)
3030

src/sentry/receivers/sentry_apps.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
from sentry.models.team import Team
1313
from sentry.sentry_apps.logic import consolidate_events
1414
from sentry.sentry_apps.services.app import RpcSentryAppInstallation, app_service
15-
from sentry.sentry_apps.tasks.sentry_apps import build_comment_webhook, workflow_notification
1615
from sentry.signals import (
1716
comment_created,
1817
comment_deleted,
@@ -23,6 +22,7 @@
2322
issue_resolved,
2423
issue_unresolved,
2524
)
25+
from sentry.tasks.sentry_apps import build_comment_webhook, workflow_notification
2626
from sentry.users.models.user import User
2727
from sentry.users.services.user import RpcUser
2828

src/sentry/rules/actions/notify_event_service.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
from sentry.rules.base import CallbackFuture
2121
from sentry.sentry_apps.api.serializers.app_platform_event import AppPlatformEvent
2222
from sentry.sentry_apps.services.app import RpcSentryAppService, app_service
23-
from sentry.sentry_apps.tasks.sentry_apps import notify_sentry_app
23+
from sentry.tasks.sentry_apps import notify_sentry_app
2424
from sentry.utils import json, metrics
2525
from sentry.utils.forms import set_field_choices
2626

src/sentry/rules/actions/sentry_apps/notify_event.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
RpcSentryAppEventData,
1616
app_service,
1717
)
18-
from sentry.sentry_apps.tasks.sentry_apps import notify_sentry_app
18+
from sentry.tasks.sentry_apps import notify_sentry_app
1919

2020
ValidationError = serializers.ValidationError
2121

src/sentry/sentry_apps/installations.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
from sentry.sentry_apps.models.sentry_app_installation import SentryAppInstallation
1818
from sentry.sentry_apps.models.sentry_app_installation_token import SentryAppInstallationToken
1919
from sentry.sentry_apps.services.hook import hook_service
20-
from sentry.sentry_apps.tasks.sentry_apps import installation_webhook
20+
from sentry.tasks.sentry_apps import installation_webhook
2121
from sentry.users.models.user import User
2222
from sentry.users.services.user.model import RpcUser
2323
from sentry.utils import metrics

src/sentry/sentry_apps/logic.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
)
3838
from sentry.sentry_apps.models.sentry_app_component import SentryAppComponent
3939
from sentry.sentry_apps.models.sentry_app_installation import SentryAppInstallation
40-
from sentry.sentry_apps.tasks.sentry_apps import create_or_update_service_hooks_for_sentry_app
40+
from sentry.tasks.sentry_apps import create_or_update_service_hooks_for_sentry_app
4141
from sentry.users.models.user import User
4242
from sentry.users.services.user.model import RpcUser
4343
from sentry.utils.sentry_apps.service_hook_manager import (

0 commit comments

Comments
 (0)