fix: Unstable PROMETHEUS_MULTIPROC_DIR

Author: khvn26

src/common/core/main.py

@@ -1,6 +1,7 @@
 import contextlib
 import logging
 import os
+import shutil
 import sys
 import typing
 
@@ -10,7 +11,7 @@
 from environs import Env
 
 from common.core.cli import healthcheck
-from common.core.utils import TemporaryDirectory
+from common.prometheus.constants import DEFAULT_PROMETHEUS_MULTIPROC_DIR
 
 logger = logging.getLogger(__name__)
 
@@ -45,16 +46,25 @@ def ensure_cli_env() -> typing.Generator[None, None, None]:
     os.environ.setdefault("DJANGO_SETTINGS_MODULE", "settings.dev")
 
     # Set up Prometheus' multiprocess mode
-    if not env.str("PROMETHEUS_MULTIPROC_DIR", ""):
-        delete = not env.bool("PROMETHEUS_MULTIPROC_DIR_KEEP", False)
-        prometheus_multiproc_dir_name = ctx.enter_context(
-            TemporaryDirectory(delete=delete)
-        )
+    prometheus_multiproc_dir_name = os.environ.setdefault(
+        "PROMETHEUS_MULTIPROC_DIR",
+        DEFAULT_PROMETHEUS_MULTIPROC_DIR,
+    )
+    prometheus_multiproc_dir_keep = env.bool(
+        "PROMETHEUS_MULTIPROC_DIR_KEEP",
+        default=False,
+    )
+    if not prometheus_multiproc_dir_keep:
+        shutil.rmtree(prometheus_multiproc_dir_name, ignore_errors=True)
         logger.info(
-            "Created %s for Prometheus multi-process mode",
+            "Removed %s to ensure a clean state for Prometheus multi-process mode",
             prometheus_multiproc_dir_name,
         )
-        os.environ["PROMETHEUS_MULTIPROC_DIR"] = prometheus_multiproc_dir_name
+    os.makedirs(prometheus_multiproc_dir_name, exist_ok=True)
+    logger.info(
+        "Created %s for Prometheus multi-process mode",
+        prometheus_multiproc_dir_name,
+    )
 
     if "docgen" in sys.argv:
         os.environ["DOCGEN_MODE"] = "true"

src/common/core/utils.py

@@ -2,8 +2,6 @@
 import logging
 import pathlib
 import random
-import sys
-import tempfile
 from functools import lru_cache
 from itertools import cycle
 from typing import (
@@ -200,40 +198,3 @@ def using_database_replica(
         return manager
 
     return manager.db_manager(chosen_replica)
-
-
-if sys.version_info >= (3, 12):
-    # Already has the desired behavior; re-export for uniform imports.
-    TemporaryDirectory = tempfile.TemporaryDirectory
-else:
-    import contextlib
-    from typing import ContextManager, Generator
-
-    def TemporaryDirectory(
-        suffix: str | None = None,
-        prefix: str | None = None,
-        dir: str | None = None,
-        *,
-        delete: bool = True,
-    ) -> ContextManager[str]:
-        """
-        Create a temporary directory with optional cleanup control.
-
-        This wrapper exists because Python 3.12 changed TemporaryDirectory's behavior
-        by adding a 'delete' parameter, which doesn't exist in Python 3.11. This
-        function provides a consistent API across both versions.
-
-        When delete=True, uses the stdlib's TemporaryDirectory (auto-cleanup).
-        When delete=False, creates a directory with mkdtemp that persists after
-        the context manager exits, matching Python 3.12's delete=False behavior.
-
-        See https://docs.python.org/3.12/library/tempfile.html#tempfile.TemporaryDirectory for usage details.
-        """
-        if delete:
-            return tempfile.TemporaryDirectory(suffix, prefix, dir)
-
-        @contextlib.contextmanager
-        def _tmpdir() -> Generator[str, None, None]:
-            yield tempfile.mkdtemp(suffix, prefix, dir)
-
-        return _tmpdir()

src/common/prometheus/constants.py

@@ -0,0 +1 @@
+DEFAULT_PROMETHEUS_MULTIPROC_DIR = "/tmp/flagsmith-prometheus"