bdd-trace 0.5.2__tar.gz → 0.5.4__tar.gz

{bdd_trace-0.5.2 → bdd_trace-0.5.4}/PKG-INFO

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

{bdd_trace-0.5.2 → bdd_trace-0.5.4}/pyproject.toml

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

{bdd_trace-0.5.2 → bdd_trace-0.5.4}/src/bdd_trace/log.py

@@ -15,6 +15,7 @@ def setup_logging(
     profile: Profile,
     modules: list[str],
     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,
@@ -27,13 +28,18 @@ def setup_logging(
     root_logger.handlers = []
 
     _log_queue = Queue(1000)
-    for module in modules:
-        _setup_module_logger(level, module)
-
     log_process_handlers = extra_handlers or []
-    format = trace_id_format if profile != Profile.NO_TRACE else no_trace_id_format
-    console_handler = _create_console_handler(modules, format)
-    log_process_handlers.append(console_handler)
+
+    for module in modules:
+        origin_handlers = _setup_module_logger(level, module)
+        for handler in origin_handlers:
+            handler.addFilter(ModulePrefixFilter([module]))
+            log_process_handlers.append(handler)
+
+    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)
+        log_process_handlers.append(console_handler)
     if profile != Profile.NO_TRACE:
         otel_handler = LoggingHandler()
         log_process_handlers.append(otel_handler)
@@ -50,26 +56,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
@@ -79,4 +87,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 []