Rename APP_NAME, APP_VERSION, APP_LOG_LEVEL, APP_LOG_FORMAT, PLAIN_LOG_LEVEL settings

Author: davegaeddert

plain-admin/plain/admin/views/base.py

@@ -63,7 +63,7 @@ def get_template_context(self) -> dict[str, Any]:
         context["render_card"] = lambda card: card().render(self, self.request)
         context["time_zone"] = timezone.get_current_timezone_name()
         context["view_class"] = self.__class__
-        context["app_name"] = settings.APP_NAME
+        context["app_name"] = settings.NAME
         context["get_gravatar_url"] = get_gravatar_url
         return context
 

plain-dev/plain/dev/core.py

@@ -70,8 +70,8 @@ def setup(self, *, port, hostname, log_level):
         }
 
         if log_level:
+            self.plain_env["PLAIN_FRAMEWORK_LOG_LEVEL"] = log_level.upper()
             self.plain_env["PLAIN_LOG_LEVEL"] = log_level.upper()
-            self.plain_env["APP_LOG_LEVEL"] = log_level.upper()
 
         self.custom_process_env = {
             **self.plain_env,

plain-observer/plain/observer/config.py

@@ -36,8 +36,8 @@ def ready(self):
             # Start our own provider, new sampler, and span processor
             resource = Resource.create(
                 {
-                    service_attributes.SERVICE_NAME: settings.APP_NAME,
-                    service_attributes.SERVICE_VERSION: settings.APP_VERSION,
+                    service_attributes.SERVICE_NAME: settings.NAME,
+                    service_attributes.SERVICE_VERSION: settings.VERSION,
                 }
             )
             provider = TracerProvider(sampler=sampler, resource=resource)

plain-observer/plain/observer/models.py

@@ -182,8 +182,8 @@ def from_opentelemetry_spans(cls, spans):
             request_id=request_id,
             user_id=user_id,
             session_id=session_id,
-            app_name=app_name or getattr(settings, "APP_NAME", ""),
-            app_version=app_version or getattr(settings, "APP_VERSION", ""),
+            app_name=app_name or settings.NAME,
+            app_version=app_version or settings.VERSION,
             root_span_name=root_span.name if root_span else "",
         )
 

plain-toolbar/plain/toolbar/toolbar.py

@@ -13,7 +13,7 @@ class Toolbar:
     def __init__(self, context):
         self.context = context
         self.request = context["request"]
-        self.version = settings.APP_VERSION
+        self.version = settings.VERSION
 
     def should_render(self):
         if settings.DEBUG:

plain/plain/runtime/__init__.py

@@ -64,9 +64,9 @@ def setup() -> None:
         sys.path.insert(0, APP_PATH.parent.as_posix())
 
     configure_logging(
-        plain_log_level=settings.PLAIN_LOG_LEVEL,
-        app_log_level=settings.APP_LOG_LEVEL,
-        app_log_format=settings.APP_LOG_FORMAT,
+        plain_log_level=settings.FRAMEWORK_LOG_LEVEL,
+        app_log_level=settings.LOG_LEVEL,
+        app_log_format=settings.LOG_FORMAT,
     )
 
     packages_registry.populate(settings.INSTALLED_PACKAGES)

plain/plain/runtime/global_settings.py

@@ -3,17 +3,15 @@
 by the PLAIN_SETTINGS_MODULE environment variable.
 """
 
-from os import environ
-
 from .utils import get_app_info_from_pyproject
 
 # MARK: Core Settings
 
 DEBUG: bool = False
 
 name, version = get_app_info_from_pyproject()
-APP_NAME: str = name
-APP_VERSION: str = version
+NAME: str = name
+VERSION: str = version
 
 # List of strings representing installed packages.
 INSTALLED_PACKAGES: list[str] = []
@@ -135,11 +133,10 @@
 CSRF_EXEMPT_PATHS: list[str] = []
 
 # MARK: Logging
-# (Uses some custom env names in addition to PLAIN_ prefixed )
 
-PLAIN_LOG_LEVEL: str = environ.get("PLAIN_LOG_LEVEL", "INFO")
-APP_LOG_LEVEL: str = environ.get("APP_LOG_LEVEL", "INFO")
-APP_LOG_FORMAT: str = environ.get("APP_LOG_FORMAT", "keyvalue")
+FRAMEWORK_LOG_LEVEL: str = "INFO"
+LOG_LEVEL: str = "INFO"
+LOG_FORMAT: str = "keyvalue"
 
 # MARK: Assets