Merge pull request #3412 from AlexsLemonade/ark/3410-fix-stage-enviro…

…nment-variables Use STAGE variable for Sentry environment tag
AlexsLemonade · Oct 12, 2023 · 760fdc3 · 760fdc3
2 parents 06f1610 + 15d7142
commit 760fdc3
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/api/data_refinery_api/settings.py b/api/data_refinery_api/settings.py
@@ -199,7 +199,7 @@
 }
 
 APP_NAME = "Refine.bio API"
-ENVIRONMENT = get_env_variable_gracefully("ENVIRONMENT")
+STAGE = get_env_variable_gracefully("STAGE")
 SYSTEM_VERSION = get_env_variable_gracefully("SYSTEM_VERSION")
 
 # Setting the RAVEN_CONFIG when SENTRY_DSN isn't set will cause the
@@ -216,7 +216,7 @@
 if SENTRY_DSN:
     RAVEN_CONFIG = {
         "dsn": SENTRY_DSN,
-        "environment": "-".join((ENVIRONMENT, *(APP_NAME.replace(".", "").lower().split()))),
+        "environment": "-".join((STAGE, *(APP_NAME.replace(".", "").lower().split()))),
         "release": SYSTEM_VERSION,
         # Only send 5% of errors for the API, since we aren't going to
         # be interested in any single one.

diff --git a/common/data_refinery_common/settings.py b/common/data_refinery_common/settings.py
@@ -147,7 +147,7 @@
 }
 
 APP_NAME = "Refine.bio Common"
-ENVIRONMENT = get_env_variable_gracefully("ENVIRONMENT")
+STAGE = get_env_variable_gracefully("STAGE")
 SYSTEM_VERSION = get_env_variable_gracefully("SYSTEM_VERSION")
 
 # Setting the RAVEN_CONFIG when SENTRY_DSN isn't set will cause the
@@ -164,7 +164,7 @@
 if SENTRY_DSN:
     RAVEN_CONFIG = {
         "dsn": SENTRY_DSN,
-        "environment": "-".join((ENVIRONMENT, *(APP_NAME.replace(".", "").lower().split()))),
+        "environment": "-".join((STAGE, *(APP_NAME.replace(".", "").lower().split()))),
         "release": SYSTEM_VERSION,
     }
 else:

diff --git a/foreman/data_refinery_foreman/settings.py b/foreman/data_refinery_foreman/settings.py
@@ -155,7 +155,7 @@
 }
 
 APP_NAME = "Refine.bio Foreman"
-ENVIRONMENT = get_env_variable_gracefully("ENVIRONMENT")
+STAGE = get_env_variable_gracefully("STAGE")
 SYSTEM_VERSION = get_env_variable_gracefully("SYSTEM_VERSION")
 
 
@@ -173,7 +173,7 @@
 if SENTRY_DSN:
     RAVEN_CONFIG = {
         "dsn": SENTRY_DSN,
-        "environment": "-".join((ENVIRONMENT, *(APP_NAME.replace(".", "").lower().split()))),
+        "environment": "-".join((STAGE, *(APP_NAME.replace(".", "").lower().split()))),
         "release": SYSTEM_VERSION,
     }
 else:

diff --git a/workers/data_refinery_workers/settings.py b/workers/data_refinery_workers/settings.py
@@ -132,7 +132,7 @@
 STATIC_URL = "/static/"
 
 APP_NAME = "Refine.bio Workers"
-ENVIRONMENT = get_env_variable_gracefully("ENVIRONMENT")
+STAGE = get_env_variable_gracefully("STAGE")
 SYSTEM_VERSION = get_env_variable_gracefully("SYSTEM_VERSION")
 
 # Setting the RAVEN_CONFIG when SENTRY_DSN isn't set will cause the
@@ -149,7 +149,7 @@
 if SENTRY_DSN:
     RAVEN_CONFIG = {
         "dsn": SENTRY_DSN,
-        "environment": "-".join((ENVIRONMENT, *(APP_NAME.replace(".", "").lower().split()))),
+        "environment": "-".join((STAGE, *(APP_NAME.replace(".", "").lower().split()))),
         "release": SYSTEM_VERSION,
     }
 else: