From c1d1e437cc02d0802a3a27ca8ae176c97ddb931e Mon Sep 17 00:00:00 2001 From: Raphael Michel Date: Mon, 31 Oct 2022 12:26:35 +0100 Subject: [PATCH] Attempt downgrade to sentry-sdk 1.8.* --- src/pretix/sentry.py | 15 ++++++++++++--- src/setup.py | 2 +- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/src/pretix/sentry.py b/src/pretix/sentry.py index 83a67fed9..e496472b7 100644 --- a/src/pretix/sentry.py +++ b/src/pretix/sentry.py @@ -27,9 +27,14 @@ from functools import wraps from celery.exceptions import Retry from django.dispatch import Signal from sentry_sdk import Hub -from sentry_sdk.consts import OP +try: + from sentry_sdk.consts import OP + from sentry_sdk.integrations.django.signals_handlers import _get_receiver_name +except ImportError: + # sentry-sdk<1.10 + class OP: + EVENT_DJANGO = "event.django" from sentry_sdk.integrations import django as djangosentry -from sentry_sdk.integrations.django.signals_handlers import _get_receiver_name from sentry_sdk.utils import capture_internal_exceptions MASK = '*' * 8 @@ -152,7 +157,11 @@ class PretixSentryIntegration(djangosentry.DjangoIntegration): # This is a workaround for https://github.com/getsentry/sentry-python/issues/1700 # that needs to stay until it is fixed djangosentry.patch_signals = patched_patch_signals - djangosentry.signals_handlers.patch_signals = patched_patch_signals + try: + djangosentry.signals_handlers.patch_signals = patched_patch_signals + except AttributeError: + # sentry-sdk < 1.10.* + pass djangosentry.DjangoIntegration.setup_once() from django.core.handlers.base import BaseHandler diff --git a/src/setup.py b/src/setup.py index c1e9a3ff2..2f088f1b4 100644 --- a/src/setup.py +++ b/src/setup.py @@ -221,7 +221,7 @@ setup( 'redis==4.3.*', 'reportlab==3.6.*', 'requests==2.28.*', - 'sentry-sdk==1.10.*', # when upgrading, check https://github.com/getsentry/sentry-python/issues/1700 + 'sentry-sdk==1.8.*', # when upgrading, check https://github.com/getsentry/sentry-python/issues/1700 'sepaxml==2.5.*', 'slimit', 'static3==0.7.*',