Merge pull request #3581 from rtibbles/never_flitting_still_is_sitting

Remove deprecated Raven pip dependency.

contentcuration/contentcuration/views/internal.py

@@ -23,7 +23,6 @@
 from le_utils.constants.labels.resource_type import RESOURCETYPELIST
 from le_utils.constants.labels.subjects import SUBJECTSLIST
 from past.builtins import basestring
-from raven.contrib.django.raven_compat.models import client
 from rest_framework import status
 from rest_framework.authentication import SessionAuthentication
 from rest_framework.authentication import TokenAuthentication
@@ -32,6 +31,7 @@
 from rest_framework.decorators import permission_classes
 from rest_framework.permissions import IsAuthenticated
 from rest_framework.response import Response
+from sentry_sdk import capture_exception
 
 from contentcuration import ricecooker_versions as rc
 from contentcuration.api import activate_channel
@@ -79,8 +79,8 @@ class NodeValidationError(ValidationError):
     pass
 
 
-def handle_server_error(request):
-    client.captureException(stack=True, tags={"url": request.path})
+def handle_server_error(e, request):
+    capture_exception(e, tags={"url": request.path})
 
 
 @api_view(["POST", "GET"])
@@ -177,7 +177,7 @@ def api_file_upload(request):
     except KeyError:
         return HttpResponseBadRequest("Invalid file upload request")
     except Exception as e:
-        handle_server_error(request)
+        handle_server_error(e, request)
         return HttpResponseServerError(content=str(e), reason=str(e))
 
 
@@ -200,7 +200,7 @@ def api_create_channel_endpoint(request):
     except KeyError:
         return HttpResponseBadRequest("Required attribute missing from data: {}".format(data))
     except Exception as e:
-        handle_server_error(request)
+        handle_server_error(e, request)
         return HttpResponseServerError(content=str(e), reason=str(e))
 
 
@@ -261,7 +261,7 @@ def api_commit_channel(request):
     except KeyError:
         return HttpResponseBadRequest("Required attribute missing from data: {}".format(data))
     except Exception as e:
-        handle_server_error(request)
+        handle_server_error(e, request)
         return HttpResponseServerError(content=str(e), reason=str(e))
 
 
@@ -307,7 +307,7 @@ def api_add_nodes_to_tree(request):
     except NodeValidationError as e:
         return HttpResponseBadRequest(str(e))
     except Exception as e:
-        handle_server_error(request)
+        handle_server_error(e, request)
         return HttpResponseServerError(content=str(e), reason=str(e))
 
 
@@ -336,7 +336,7 @@ def api_publish_channel(request):
     except (KeyError, Channel.DoesNotExist):
         return HttpResponseNotFound("No channel matching: {}".format(data))
     except Exception as e:
-        handle_server_error(request)
+        handle_server_error(e, request)
         return HttpResponseServerError(content=str(e), reason=str(e))
 
 
@@ -353,7 +353,7 @@ def activate_channel_internal(request):
     except Channel.DoesNotExist:
         return HttpResponseNotFound("No channel matching: {}".format(channel_id))
     except Exception as e:
-        handle_server_error(request)
+        handle_server_error(e, request)
         return HttpResponseServerError(content=str(e), reason=str(e))
 
 
@@ -402,7 +402,7 @@ def get_tree_data(request):
     except ValueError:
         return HttpResponseNotFound("No tree name matching: {}".format(tree_name))
     except Exception as e:
-        handle_server_error(request)
+        handle_server_error(e, request)
         return HttpResponseServerError(content=str(e), reason=str(e))
 
 
@@ -442,7 +442,7 @@ def get_node_tree_data(request):
     except Channel.DoesNotExist:
         return HttpResponseNotFound("No channel matching: {}".format(channel_id))
     except Exception as e:
-        handle_server_error(request)
+        handle_server_error(e, request)
         return HttpResponseServerError(content=str(e), reason=str(e))
 
 
@@ -467,7 +467,7 @@ def get_channel_status_bulk(request):
     except KeyError:
         raise ObjectDoesNotExist("Missing attribute from data: {}".format(data))
     except Exception as e:
-        handle_server_error(request)
+        handle_server_error(e, request)
         return HttpResponseServerError(content=str(e), reason=str(e))
 
 

contentcuration/contentcuration/views/zip.py

@@ -19,7 +19,7 @@
 from django.views.decorators.clickjacking import xframe_options_exempt
 from django.views.generic.base import View
 from le_utils.constants import exercises
-from raven.contrib.django.raven_compat.models import client
+from sentry_sdk import capture_message
 from webpack_loader.utils import get_files
 
 from contentcuration.models import generate_object_storage_name
@@ -112,7 +112,7 @@ def options(self, request, *args, **kwargs):
         return response
 
     @xframe_options_exempt  # noqa
-    def get(self, request, zipped_filename, embedded_filepath):
+    def get(self, request, zipped_filename, embedded_filepath):  # noqa: C901
         """
         Handles GET requests and serves a static file from within the zip file.
         """
@@ -174,7 +174,7 @@ def get(self, request, zipped_filename, embedded_filepath):
                     file_size = len(content_with_path)
         except zipfile.BadZipfile:
             just_downloaded = getattr(zf_obj, 'just_downloaded', "Unknown (Most likely local file)")
-            client.captureMessage("Unable to open zip file. File info: name={}, size={}, mode={}, just_downloaded={}".format(
+            capture_message("Unable to open zip file. File info: name={}, size={}, mode={}, just_downloaded={}".format(
                 zf_obj.name, zf_obj.size, zf_obj.mode, just_downloaded))
             return HttpResponseServerError(
                 "Attempt to open zip file failed. Please try again, and if you continue to receive this message, please check that the zip file is valid."

requirements.in

@@ -34,7 +34,6 @@ django-redis
 django-prometheus
 future
 sentry-sdk
-raven
 django-bulk-update
 html5lib==1.1
 pillow==9.2.0

requirements.txt

@@ -225,8 +225,6 @@ pytz==2022.1
     #   django
     #   django-postmark
     #   google-api-core
-raven==6.10.0
-    # via -r requirements.in
 redis==3.5.3
     # via
     #   -r requirements.in