raven is outdated for py3.13 replace it with sentry_sdk to make it possible to build MFR 3.13 image and create containers afterward

Author: mkovalua

mfr/server/app.py

@@ -7,7 +7,10 @@
 import tornado.web
 import tornado.httpserver
 import tornado.platform.asyncio
-from raven.contrib.tornado import AsyncSentryClient
+
+import sentry_sdk
+from sentry_sdk.integrations.tornado import TornadoIntegration
+from sentry_sdk.integrations.logging import LoggingIntegration
 
 from mfr import settings
 from mfr.server import settings as server_settings
@@ -46,6 +49,15 @@ def almost_apache_style_log(handler):
 
 
 def make_app(debug):
+    sentry_logging = LoggingIntegration(
+        level=logging.INFO,  # Capture INFO level and above as breadcrumbs
+        event_level=None,  # Do not send logs of any level as events
+    )
+    sentry_sdk.init(
+        dsn=settings.SENTRY_DSN,
+        release=__version__,
+        integrations=[TornadoIntegration(), sentry_logging, ],
+    )
     app = tornado.web.Application(
         [
             (r'/static/(.*)', tornado.web.StaticFileHandler, {'path': server_settings.STATIC_PATH}),
@@ -59,7 +71,6 @@ def make_app(debug):
         debug=debug,
         log_function=almost_apache_style_log,
     )
-    app.sentry_client = AsyncSentryClient(settings.SENTRY_DSN, release=__version__)
     return app
 
 

mfr/server/handlers/core.py

@@ -7,7 +7,7 @@
 
 import tornado.web
 import tornado.iostream
-from raven.contrib.tornado import SentryMixin
+import sentry_sdk
 
 import waterbutler.core.utils
 import waterbutler.server.utils
@@ -76,7 +76,7 @@ def options(self):
             self.set_header('Access-Control-Allow-Methods', 'GET, PUT, POST, DELETE'),
 
 
-class BaseHandler(CorsMixin, tornado.web.RequestHandler, SentryMixin):
+class BaseHandler(CorsMixin, tornado.web.RequestHandler):
     """Base class for the Render and Export handlers.  Fetches the file metadata for the file
     indicated by the ``url`` query parameter and builds the provider caches.  Also handles
     writing output and errors.
@@ -159,8 +159,11 @@ async def write_stream(self, stream):
             return
 
     def write_error(self, status_code, exc_info):
-        self.captureException(exc_info)  # Log all non 2XX codes to sentry
         etype, exc, _ = exc_info
+        scope = sentry_sdk.get_current_scope()
+        scope.set_tag('class', etype.__name_)
+        scope.set_tag('status_code', status_code)
+        sentry_sdk.capture_exception(exc)  # Log all non 2XX codes to sentry
 
         if issubclass(etype, exceptions.PluginError):
             try:  # clever errors shouldn't break other things