Move Sentry configuration to settings

realsuayip · Nov 7, 2024 · a75bbbd · a75bbbd
1 parent bc12a79
commit a75bbbd
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 11 deletions.
diff --git a/asu/apps.py b/asu/apps.py
@@ -1,8 +1,8 @@
 from django.apps import AppConfig
+from django.conf import settings
 from django.utils.translation import pgettext_lazy
 
 import sentry_sdk
-from envanter import env
 from sentry_sdk.integrations.celery import CeleryIntegration
 from sentry_sdk.integrations.django import DjangoIntegration
 from sentry_sdk.integrations.logging import ignore_logger
@@ -17,13 +17,11 @@ class AsuConfig(AppConfig):
     verbose_name = pgettext_lazy("app name", "asu")
 
     def ready(self) -> None:
-        enabled = env.bool("SENTRY_ENABLED")
-
-        if enabled:
+        if settings.SENTRY_ENABLED:
             sentry_sdk.init(  # pragma: no cover
-                dsn=env.str("SENTRY_DSN"),
-                environment=env.str("SENTRY_ENVIRONMENT"),
-                traces_sample_rate=env.float("SENTRY_TRACES_SAMPLE_RATE"),
+                dsn=settings.SENTRY_DSN,
+                environment=settings.PROJECT_ENVIRONMENT,
+                traces_sample_rate=settings.SENTRY_TRACES_SAMPLE_RATE,
                 integrations=[DjangoIntegration(), CeleryIntegration()],
                 send_default_pii=True,
             )

diff --git a/asu/settings/apps.py b/asu/settings/apps.py
@@ -118,18 +118,25 @@
 }
 
 THUMBNAIL_REDIS_URL = REDIS_URL
+THUMBNAIL_FORCE_OVERWRITE = True
 
 AWS_ACCESS_KEY_ID = env.str("AWS_ACCESS_KEY_ID")
 AWS_SECRET_ACCESS_KEY = env.str("AWS_SECRET_ACCESS_KEY")
 AWS_STORAGE_BUCKET_NAME = env.str("AWS_STORAGE_BUCKET_NAME")
 AWS_S3_ENDPOINT_URL = env.str("AWS_S3_ENDPOINT_URL")
 AWS_S3_REGION_NAME = env.str("AWS_S3_REGION_NAME")
 
-THUMBNAIL_FORCE_OVERWRITE = True
+SENTRY_ENABLED = env.bool("SENTRY_ENABLED")
+SENTRY_DSN = env.str("SENTRY_DSN")
+SENTRY_TRACES_SAMPLE_RATE = env.float("SENTRY_TRACES_SAMPLE_RATE")
+
 
 # ----- Local apps -----
 
 PROJECT_BRAND = env.str("PROJECT_BRAND")
+PROJECT_ENVIRONMENT = env.choice(
+    "PROJECT_ENVIRONMENT", choices=("dev", "stage", "production")
+)
 PROJECT_SUPPORT_EMAIL = env.str("PROJECT_SUPPORT_EMAIL")
 PROJECT_URL_ACCOUNT_CREATION = env.str("PROJECT_URL_ACCOUNT_CREATION")
 PROJECT_URL_PASSWORD_RESET = env.str("PROJECT_URL_PASSWORD_RESET")

diff --git a/asu/settings/test.py b/asu/settings/test.py
@@ -11,3 +11,5 @@
 INSTALLED_APPS.remove("debug_toolbar")  # noqa: F405
 EMAIL_BACKEND = "django.core.mail.backends.locmem.EmailBackend"
 CELERY_TASK_ALWAYS_EAGER = True
+
+PROJECT_ENVIRONMENT = "production"
diff --git a/conf/dev/django.env b/conf/dev/django.env
@@ -18,6 +18,7 @@ EMAIL_USE_TLS=false
 DEFAULT_FROM_EMAIL=webmaster@localhost
 
 PROJECT_BRAND=asu
+PROJECT_ENVIRONMENT=dev
 PROJECT_SUPPORT_EMAIL=support@example.com
 PROJECT_URL_ACCOUNT_CREATION="#Stub-AccountCreation"
 PROJECT_URL_PASSWORD_RESET="#Stub-PasswordReset"
@@ -42,8 +43,7 @@ CORS_ALLOWED_ORIGINS=http://127.0.0.1
 
 SENTRY_ENABLED=false
 SENTRY_DSN=
-SENTRY_ENVIRONMENT=dev
-SENTRY_TRACES_SAMPLE_RATE=0.1
+SENTRY_TRACES_SAMPLE_RATE=0
 
 DEFAULT_FILE_STORAGE=django.core.files.storage.FileSystemStorage
 STATICFILES_STORAGE=django.contrib.staticfiles.storage.StaticFilesStorage

diff --git a/conf/prod/django.env b/conf/prod/django.env
@@ -18,6 +18,7 @@ EMAIL_USE_TLS=false
 DEFAULT_FROM_EMAIL=webmaster@localhost
 
 PROJECT_BRAND=asu
+PROJECT_ENVIRONMENT=production
 PROJECT_SUPPORT_EMAIL=support@example.com
 PROJECT_URL_ACCOUNT_CREATION="#Stub-AccountCreation"
 PROJECT_URL_PASSWORD_RESET="#Stub-PasswordReset"
@@ -43,7 +44,6 @@ SECURE_PROXY_SSL_HEADER=HTTP_X_FORWARDED_PROTO,https
 
 SENTRY_ENABLED=false
 SENTRY_DSN=
-SENTRY_ENVIRONMENT=production
 SENTRY_TRACES_SAMPLE_RATE=0.1
 
 DEFAULT_FILE_STORAGE=django.core.files.storage.FileSystemStorage