Capture SoftTimeLimitExceeded errors (#1099)

Author: Swatinem

helpers/sentry.py

@@ -1,7 +1,6 @@
 import os
 
 import sentry_sdk
-from celery.exceptions import SoftTimeLimitExceeded
 from sentry_sdk.integrations.celery import CeleryIntegration
 from sentry_sdk.integrations.django import DjangoIntegration
 from sentry_sdk.integrations.httpx import HttpxIntegration
@@ -12,14 +11,6 @@
 from helpers.version import get_current_version
 
 
-def before_send(event, hint):
-    if "exc_info" in hint:
-        exc_type, exc_value, tb = hint["exc_info"]
-        if isinstance(exc_value, SoftTimeLimitExceeded):
-            return None
-    return event
-
-
 def is_sentry_enabled() -> bool:
     return bool(get_config("services", "sentry", "server_dsn"))
 
@@ -30,7 +21,6 @@ def initialize_sentry() -> None:
     sentry_dsn = get_config("services", "sentry", "server_dsn")
     sentry_sdk.init(
         sentry_dsn,
-        before_send=before_send,
         sample_rate=float(os.getenv("SENTRY_PERCENTAGE", 1.0)),
         environment=os.getenv("DD_ENV", "production"),
         traces_sample_rate=float(os.environ.get("SERVICES__SENTRY__SAMPLE_RATE", 1)),

helpers/tests/unit/test_sentry.py

@@ -1,6 +1,6 @@
 import os
 
-from helpers.sentry import before_send, initialize_sentry
+from helpers.sentry import initialize_sentry
 
 
 class TestSentry(object):
@@ -16,7 +16,6 @@ def test_initialize_sentry(self, mocker, mock_configuration):
         assert initialize_sentry() is None
         mocked_init.assert_called_with(
             "this_dsn",
-            before_send=before_send,
             release="worker-FAKE_VERSION_FOR_YOU",
             sample_rate=1.0,
             traces_sample_rate=1.0,

tasks/base.py

@@ -363,7 +363,7 @@ def on_success(self, retval, task_id, args, kwargs):
 
     def on_failure(self, exc, task_id, args, kwargs, einfo):
         """
-        Includes SoftTimeoutLimitException, for example
+        Includes SoftTimeLimitExceeded, for example
         """
         res = super().on_failure(exc, task_id, args, kwargs, einfo)
         self.task_failure_counter.inc()