aury-boot 0.0.39__py3-none-any.whl → 0.0.40__py3-none-any.whl

aury/boot/common/logging/setup.py

@@ -100,7 +100,7 @@ def register_log_sink(
         level=level,
         format=sink_format or default_format,
         encoding="utf-8",
-        enqueue=True,
+        enqueue=_log_config.get("enqueue", False),
         delay=True,
         filter=sink_filter,
     )
@@ -165,6 +165,7 @@ def setup_logging(
     rotation_size: str = "50 MB",
     enable_console: bool = True,
     logger_levels: list[tuple[str, str]] | None = None,
+    enqueue: bool = False,
 ) -> None:
     """设置日志配置。
 
@@ -189,6 +190,9 @@ def setup_logging(
         enable_console: 是否输出到控制台
         logger_levels: 需要设置特定级别的 logger 列表，格式: [("name", "LEVEL"), ...]
             例如: [("sse_starlette", "WARNING"), ("httpx", "INFO")]
+        enqueue: 是否启用多进程安全队列（默认 False）。
+            启用后日志通过 multiprocessing.Queue 传输，
+            可能导致事件循环阻塞。建议在 asyncio 应用中保持 False。
     """
     log_level = log_level.upper()
     log_dir = log_dir or "logs"
@@ -208,6 +212,7 @@ def setup_logging(
         "log_dir": log_dir,
         "rotation": rotation,
         "retention_days": retention_days,
+        "enqueue": enqueue,
         "initialized": True,
     })
 
@@ -252,7 +257,7 @@ def setup_logging(
             retention=f"{retention_days} days",
             level=log_level,  # >= INFO 都写入（包含 WARNING/ERROR/CRITICAL）
             encoding="utf-8",
-            enqueue=True,
+            enqueue=enqueue,
             filter=lambda record, c=ctx: (
                 record["extra"].get("service") == c
                 and not record["extra"].get("access", False)
@@ -271,7 +276,7 @@ def setup_logging(
             retention=f"{retention_days} days",
             level="ERROR",
             encoding="utf-8",
-            enqueue=True,
+            enqueue=enqueue,
             filter=lambda record, c=ctx: record["extra"].get("service") == c,
         )
 

aury/boot/infrastructure/database/manager.py

@@ -226,6 +226,9 @@ class DatabaseManager:
     async def session(self) -> AsyncGenerator[AsyncSession]:
         """获取数据库会话（上下文管理器）。
         
+        连接校验由 pool_pre_ping=True 在引擎层自动处理，
+        无需手动检查。
+        
         Yields:
             AsyncSession: 数据库会话
             
@@ -235,7 +238,6 @@ class DatabaseManager:
         """
         session = self.session_factory()
         try:
-            await self._check_session_connection(session)
             yield session
         except SQLAlchemyError as exc:
             # 只捕获数据库相关异常
@@ -253,15 +255,15 @@ class DatabaseManager:
     async def create_session(self) -> AsyncSession:
         """创建新的数据库会话（需要手动关闭）。
         
+        连接校验由 pool_pre_ping=True 在引擎层自动处理。
+        
         Returns:
             AsyncSession: 数据库会话
             
         注意：使用后需要手动调用 await session.close()
         建议使用 session() 上下文管理器代替此方法。
         """
-        session = self.session_factory()
-        await self._check_session_connection(session)
-        return session
+        return self.session_factory()
     
     async def get_session(self) -> AsyncGenerator[AsyncSession]:
         """FastAPI 依赖注入专用的会话获取器。

aury/boot/infrastructure/monitoring/__init__.py

@@ -5,6 +5,7 @@
 
 from __future__ import annotations
 
+import traceback
 from abc import ABC, abstractmethod
 from collections.abc import Callable
 from functools import wraps
@@ -13,6 +14,11 @@ import time
 from aury.boot.common.logging import logger
 
 
+def _format_exception_stacktrace(exc: Exception) -> str:
+    """格式化异常堆栈为字符串。"""
+    return "".join(traceback.format_exception(type(exc), exc, exc.__traceback__))
+
+
 class MonitorContext:
     """监控上下文。
     
@@ -262,6 +268,7 @@ async def _emit_http_exception_alert(
             method=method,
             error_type=type(exception).__name__,
             error_message=str(exception),
+            stacktrace=_format_exception_stacktrace(exception),
         )
     except ImportError:
         pass
@@ -369,8 +376,9 @@ class ErrorReporterComponent(MonitorComponent):
                 source="service",
                 duration=context.duration,
                 service=context.service_name,
-                exception_type=type(context.exception).__name__,
-                exception_message=str(context.exception),
+                error_type=type(context.exception).__name__,
+                error_message=str(context.exception),
+                stacktrace=_format_exception_stacktrace(context.exception),
             )
         except ImportError:
             pass  # alerting 模块未加载

aury/boot/infrastructure/monitoring/alerting/notifiers/feishu.py

@@ -11,7 +11,7 @@ import hmac
 import time
 from typing import TYPE_CHECKING, Any
 
-import httpx
+import aiohttp
 
 from aury.boot.common.logging import logger
 
@@ -118,6 +118,24 @@ class FeishuNotifier(AlertNotifier):
                 details.append(f"**错误信息**: {notification.metadata['error_message']}")
             if "task_name" in notification.metadata:
                 details.append(f"**任务**: {notification.metadata['task_name']}")
+            
+            # 事件循环阻塞检测专用字段
+            if "blocked_ms" in notification.metadata:
+                details.append(f"**阻塞时间**: {notification.metadata['blocked_ms']:.0f}ms")
+            if "threshold_ms" in notification.metadata:
+                details.append(f"**阈值**: {notification.metadata['threshold_ms']:.0f}ms")
+            if "total_blocks" in notification.metadata:
+                details.append(f"**累计阻塞**: {notification.metadata['total_blocks']} 次")
+            if "block_rate" in notification.metadata:
+                details.append(f"**阻塞率**: {notification.metadata['block_rate']}")
+            if "process_stats" in notification.metadata:
+                stats = notification.metadata["process_stats"]
+                if stats:
+                    stats_str = f"CPU {stats.get('cpu_percent', 'N/A')}%, "
+                    stats_str += f"RSS {stats.get('memory_rss_mb', 'N/A')}MB, "
+                    stats_str += f"线程 {stats.get('num_threads', 'N/A')}"
+                    details.append(f"**进程状态**: {stats_str}")
+            
             # SQL 和堆栈单独处理
             if "sql" in notification.metadata:
                 sql_content = notification.metadata["sql"]
@@ -155,11 +173,10 @@ class FeishuNotifier(AlertNotifier):
                 "content": f"**堆栈**:\n```python\n{stacktrace_content}\n```",
             })
         
-        # 构建 JSON 2.0 卡片消息
+        # 构建卡片消息（飞书自定义机器人格式）
         card = {
             "msg_type": "interactive",
             "card": {
-                "schema": "2.0",
                 "config": {
                     "wide_screen_mode": True,
                 },
@@ -170,9 +187,7 @@ class FeishuNotifier(AlertNotifier):
                         "content": notification.title,
                     },
                 },
-                "body": {
-                    "elements": elements,
-                },
+                "elements": elements,
             },
         }
         
@@ -191,16 +206,17 @@ class FeishuNotifier(AlertNotifier):
                 message["sign"] = self._generate_sign(timestamp)
             
             # 发送请求
-            async with httpx.AsyncClient(timeout=10) as client:
-                response = await client.post(self.webhook, json=message)
-                result = response.json()
-                
-                if result.get("code") == 0 or result.get("StatusCode") == 0:
-                    logger.debug(f"飞书通知发送成功: {notification.title}")
-                    return True
-                else:
-                    logger.error(f"飞书通知发送失败: {result}")
-                    return False
+            timeout = aiohttp.ClientTimeout(total=10)
+            async with aiohttp.ClientSession(timeout=timeout) as session:
+                async with session.post(self.webhook, json=message) as response:
+                    result = await response.json()
+                    
+                    if result.get("code") == 0 or result.get("StatusCode") == 0:
+                        logger.debug(f"飞书通知发送成功: {notification.title}")
+                        return True
+                    else:
+                        logger.error(f"飞书通知发送失败: {result}")
+                        return False
         except Exception as e:
             logger.error(f"飞书通知发送异常: {e}")
             return False

aury/boot/infrastructure/monitoring/alerting/notifiers/webhook.py

@@ -7,7 +7,7 @@ from __future__ import annotations
 
 from typing import TYPE_CHECKING, Any
 
-import httpx
+import aiohttp
 
 from aury.boot.common.logging import logger
 
@@ -87,21 +87,22 @@ class WebhookNotifier(AlertNotifier):
         try:
             payload = self._build_payload(notification)
             
-            async with httpx.AsyncClient(timeout=self.timeout) as client:
-                response = await client.post(
+            timeout = aiohttp.ClientTimeout(total=self.timeout)
+            async with aiohttp.ClientSession(timeout=timeout) as session:
+                async with session.post(
                     self.url,
                     json=payload,
                     headers=self.headers,
-                )
-                
-                if response.is_success:
-                    logger.debug(f"Webhook 通知发送成功: {notification.title}")
-                    return True
-                else:
-                    logger.error(
-                        f"Webhook 通知发送失败: {response.status_code} - {response.text}"
-                    )
-                    return False
+                ) as response:
+                    if response.status < 400:
+                        logger.debug(f"Webhook 通知发送成功: {notification.title}")
+                        return True
+                    else:
+                        text = await response.text()
+                        logger.error(
+                            f"Webhook 通知发送失败: {response.status} - {text}"
+                        )
+                        return False
         except Exception as e:
             logger.error(f"Webhook 通知发送异常: {e}")
             return False