From 61854596c2c00cd64b26a7d83779c9168fd962ff Mon Sep 17 00:00:00 2001
From: Cristhian Garcia <crisgarta8@gmail.com>
Date: Fri, 19 Jul 2024 13:06:02 -0500
Subject: [PATCH] fix: drop sentry support

---
 .github/environments/disabled/config.yml |  1 -
 .github/environments/enabled/config.yml  |  1 -
 README.md                                |  3 ---
 drydock/patches/cms-env                  | 22 ----------------------
 drydock/patches/lms-env                  | 19 -------------------
 drydock/plugin.py                        |  2 --
 6 files changed, 48 deletions(-)

diff --git a/.github/environments/disabled/config.yml b/.github/environments/disabled/config.yml
index a6bde126..e49f2237 100644
--- a/.github/environments/disabled/config.yml
+++ b/.github/environments/disabled/config.yml
@@ -11,7 +11,6 @@ DRYDOCK_DEBUG: false
 DRYDOCK_ENABLE_CELERY_TUNING: false
 DRYDOCK_ENABLE_MULTITENANCY: false
 DRYDOCK_ENABLE_SCORM: false
-DRYDOCK_ENABLE_SENTRY: false
 DRYDOCK_POD_LIFECYCLE: false
 DRYDOCK_AUTO_TLS: false
 DRYDOCK_NEWRELIC_LICENSE_KEY: ""
diff --git a/.github/environments/enabled/config.yml b/.github/environments/enabled/config.yml
index f29ac007..9f8fe610 100644
--- a/.github/environments/enabled/config.yml
+++ b/.github/environments/enabled/config.yml
@@ -12,7 +12,6 @@ DRYDOCK_DEBUG: true
 DRYDOCK_ENABLE_CELERY_TUNING: true
 DRYDOCK_ENABLE_MULTITENANCY: true
 DRYDOCK_ENABLE_SCORM: true
-DRYDOCK_ENABLE_SENTRY: true
 DRYDOCK_POD_LIFECYCLE: true
 DRYDOCK_AUTO_TLS: true
 DRYDOCK_NEWRELIC_LICENSE_KEY: "your_newrelic_license_key"
diff --git a/README.md b/README.md
index 7aa50ec9..2c3e152a 100644
--- a/README.md
+++ b/README.md
@@ -16,7 +16,6 @@ Extra plugins added:
 - A patch that allows for the tuning of celery workers via `DRYDOCK_ENABLE_CELERY_TUNING`
 - Allows caddy to catch requests for multiple domains through `DRYDOCK_ENABLE_MULTITENANCY`
 - Add scorm matcher to caddy through `DRYDOCK_ENABLE_SCORM`
-- A patch that allows for the use of sentry via `DRYDOCK_ENABLE_SENTRY` and `DRYDOCK_SENTRY_DSN`
 - Patch for cms and lms worker pods to allow pod probes and lifecycle to work properly. Enabled via `DRYDOCK_POD_LIFECYCLE`
 
 Version compatibility matrix
@@ -70,8 +69,6 @@ The following configuration options are available:
 - `DRYDOCK_ENABLE_CELERY_TUNING`: Whether to enable celery tuning. Defaults to `true`.
 - `DRYDOCK_ENABLE_MULTITENANCY`: Whether to enable multitennacy. Defaults to `true`.
 - `DRYDOCK_ENABLE_SCORM`: Whether to enable scorm. Defaults to `true`.
-- `DRYDOCK_ENABLE_SENTRY`: Whether to enable sentry. Defaults to `true`.
-- `DRYDOCK_SENTRY_DSN`: The sentry DSN. Defaults to `""`.
 - `DRYDOCK_POD_LIFECYCLE`: Whether to enable pod lifecycle. Defaults to `true`.
 - `NGINX_STATIC_CACHE_CONFIG`: A list of dictionaries with settings for different services to cache their assets in NGINX.
   The following is an example of the expected values:
diff --git a/drydock/patches/cms-env b/drydock/patches/cms-env
index a71d9e4e..f0475835 100644
--- a/drydock/patches/cms-env
+++ b/drydock/patches/cms-env
@@ -1,25 +1,3 @@
 {% if DRYDOCK_ENABLE_CELERY_TUNING -%}
 CELERY_ACKS_LATE: true
 {% endif %}
-{% if DRYDOCK_ENABLE_SENTRY -%}
-# eox plugin settings must be defined in the ENV patches. If defined in python settings patches, they won't
-# take effect since plugins settings are loaded before Tutor loads its settings.
-EOX_CORE_SENTRY_INTEGRATION_DSN: "{{ DRYDOCK_SENTRY_DSN }}"
-EOX_CORE_SENTRY_IGNORED_ERRORS: [
-    {
-      "exc_class": "xmodule.exceptions.NotFoundError"
-    },
-    {
-    "exc_class": "openedx.core.djangoapps.user_authn.exceptions.AuthFailedError",
-    "exc_text": [".*Email or password is incorrect"]
-    },
-    {
-    "exc_class": "opaque_keys.InvalidKeyError",
-    "exc_text": [".*No enrollment found for user.*"]
-    },
-    {
-    "exc_class": "opaque_keys.NotFoundError",
-    "exc_text": [".*No course found by course id.*"]
-    },
-]
-{% endif %}
diff --git a/drydock/patches/lms-env b/drydock/patches/lms-env
index d8a82b60..f0475835 100644
--- a/drydock/patches/lms-env
+++ b/drydock/patches/lms-env
@@ -1,22 +1,3 @@
 {% if DRYDOCK_ENABLE_CELERY_TUNING -%}
 CELERY_ACKS_LATE: true
 {% endif %}
-{% if DRYDOCK_ENABLE_SENTRY -%}
-# eox plugin settings must be defined in the ENV patches. If defined in python settings patches, they won't
-# take effect since plugins settings are loaded before Tutor loads its settings.
-EOX_CORE_SENTRY_INTEGRATION_DSN: "{{ DRYDOCK_SENTRY_DSN }}"
-EOX_CORE_SENTRY_IGNORED_ERRORS: [
-  {
-    "exc_class": "openedx.core.djangoapps.user_authn.exceptions.AuthFailedError",
-    "exc_text": ["AuthFailedError.*Email or password is incorrect"]
-  },
-  {
-    "exc_class": "opaque_keys.InvalidKeyError",
-    "exc_text": [".*No enrollment found for user.*"]
-  },
-  {
-    "exc_class": "opaque_keys.NotFoundError",
-    "exc_text": [".*No course found by course id.*"]
-  },
-]
-{% endif %}
diff --git a/drydock/plugin.py b/drydock/plugin.py
index 2db59196..f9b6a031 100644
--- a/drydock/plugin.py
+++ b/drydock/plugin.py
@@ -144,8 +144,6 @@ def get_sync_waves_for_resource(resource_name: str) -> SYNC_WAVES_ORDER_ATTRS_TY
         "ENABLE_CELERY_TUNING": True,
         "ENABLE_MULTITENANCY": True,
         "ENABLE_SCORM": True,
-        "ENABLE_SENTRY": True,
-        "SENTRY_DSN": "",
         "POD_LIFECYCLE": True,
         "BYPASS_CADDY": False,
         "PDB_MINAVAILABLE_PERCENTAGE_LMS": 0,