bdd-trace 0.5.3__tar.gz → 0.5.5__tar.gz

{bdd_trace-0.5.3 → bdd_trace-0.5.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: bdd-trace
-Version: 0.5.3
+Version: 0.5.5
 Summary: BDD项目日志和追踪SDK
 Author: 蔡涛
 Author-email: 蔡涛 <caitao@zhejianglab.cn>

{bdd_trace-0.5.3 → bdd_trace-0.5.5}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
   name = "bdd-trace"
-  version = "0.5.3"
+  version = "0.5.5"
   description = "BDD项目日志和追踪SDK"
   readme = "README.md"
   authors = [{ name = "蔡涛", email = "caitao@zhejianglab.cn" }]

{bdd_trace-0.5.3 → bdd_trace-0.5.5}/src/bdd_trace/log.py

@@ -5,21 +5,25 @@ from queue import Queue
 
 from opentelemetry.sdk._logs import LoggingHandler
 
-from bdd_trace.trace import Profile
+from .trace import Profile, _get_profile
 
 _log_queue: Queue | None = None
 _log_listener: QueueListener | None = None
 
 
 def setup_logging(
-    profile: Profile,
     modules: list[str],
+    profile: Profile | None = None,
     level: str | int = INFO,
     enable_console_log: bool = True,
     trace_id_format: str = "%(asctime)s|%(levelname)s|%(name)s|%(otelTraceID)s|%(message)s",
     no_trace_id_format: str = "%(asctime)s|%(levelname)s|%(name)s|%(message)s",
     extra_handlers: list[Handler] | None = None,
 ) -> None:
+    profile = _get_profile(profile)
+    if profile is None:
+        raise ValueError("profile is not set")
+
     global _log_queue, _log_listener
     if _log_queue is not None or _log_listener is not None:
         raise RuntimeError("logging is already setup")
@@ -28,10 +32,14 @@ def setup_logging(
     root_logger.handlers = []
 
     _log_queue = Queue(1000)
+    log_process_handlers = extra_handlers or []
+
     for module in modules:
-        _setup_module_logger(level, module)
+        origin_handlers = _setup_module_logger(level, module)
+        for handler in origin_handlers:
+            handler.addFilter(ModulePrefixFilter([module]))
+            log_process_handlers.append(handler)
 
-    log_process_handlers = extra_handlers or []
     if enable_console_log:
         format = trace_id_format if profile != Profile.NO_TRACE else no_trace_id_format
         console_handler = _create_console_handler(modules, format)
@@ -52,26 +60,28 @@ def stop_logging() -> None:
     _log_queue = None
 
 
-def _create_console_handler(modules: list[str], format: str) -> Handler:
-    class ModulePrefixFilter:
-        def __init__(self, module_prefixes: list[str]):
-            self.module_prefixes: set[str] = set(module_prefixes)
-            self.module_prefixes_with_dot: tuple[str, ...] = tuple(f"{prefix}." for prefix in module_prefixes)
+class ModulePrefixFilter:
+    def __init__(self, module_prefixes: list[str]):
+        self.module_prefixes: set[str] = set(module_prefixes)
+        self.module_prefixes_with_dot: tuple[str, ...] = tuple(f"{prefix}." for prefix in module_prefixes)
 
-        def filter(self, record: LogRecord) -> bool:
-            return record.name in self.module_prefixes or record.name.startswith(self.module_prefixes_with_dot)
+    def filter(self, record: LogRecord) -> bool:
+        return record.name in self.module_prefixes or record.name.startswith(self.module_prefixes_with_dot)
 
+
+class SingleLineFormatter(Formatter):
+    def formatMessage(self, record: LogRecord) -> str:
+        return super().formatMessage(record).replace("\n", " ").replace("\r", "")
+
+
+def _create_console_handler(modules: list[str], format: str) -> Handler:
     handler = StreamHandler(sys.stderr)
     handler.setFormatter(Formatter(format))
     handler.addFilter(ModulePrefixFilter(modules))
     return handler
 
 
-def _setup_module_logger(level: str | int, module: str) -> None:
-    class SingleLineFormatter(Formatter):
-        def formatMessage(self, record: LogRecord) -> str:
-            return super().formatMessage(record).replace("\n", " ").replace("\r", "")
-
+def _setup_module_logger(level: str | int, module: str) -> list[Handler]:
     logger = getLogger(module)
     logger.setLevel(level)
     logger.propagate = False
@@ -81,4 +91,6 @@ def _setup_module_logger(level: str | int, module: str) -> None:
         raise RuntimeError("log queue is not initialized")
     handler = QueueHandler(queue)
     handler.setFormatter(SingleLineFormatter())
+    origin_handlers = logger.handlers
     logger.handlers = [handler]
+    return origin_handlers or []

{bdd_trace-0.5.3 → bdd_trace-0.5.5}/src/bdd_trace/trace.py

@@ -12,6 +12,7 @@ class Profile(str, Enum):
     PROD = "prod"
 
 
+_TRACE_PROFILE_KEY = "BDD_TRACE_PROFILE"
 _TRACES_EXPORTER_KEY = "traces_exporter"
 _METRICS_EXPORTER_KEY = "metrics_exporter"
 _LOGS_EXPORTER_KEY = "logs_exporter"
@@ -73,9 +74,9 @@ def init_trace(
     for key, value in kwargs.items():
         _set_env(key, value)
 
-    if profile:
+    if profile := _get_profile(profile):
         if profile == Profile.NO_TRACE:
-            logger.debug("NO_TRACE profile is set, skip auto instrumentation")
+            logger.info("NO_TRACE profile is set, skip auto instrumentation")
             return
         for key, value in _profile_config[profile].items():
             _set_env(key, value)
@@ -95,6 +96,18 @@ def init_trace(
     auto_instrumentation.initialize()
 
 
+def _get_profile(profile: Profile | None) -> Profile | None:
+    if profile:
+        return profile
+    profile_env = os.getenv(_TRACE_PROFILE_KEY)
+    if profile_env:
+        try:
+            return Profile(profile_env)
+        except ValueError:
+            raise ValueError(f"invalid profile from env {_TRACE_PROFILE_KEY}: {profile_env}")
+    return None
+
+
 def _set_env(key: str, value: str | None) -> None:
     if value is None:
         return