Refactor metrics handling and remove scheduler

- Removed the metrics scheduler functionality from the bot, transitioning to real-time metrics updates via middleware. - Enhanced logging for metrics operations across various handlers to improve monitoring and debugging capabilities. - Integrated metrics tracking for user activities and database errors, providing better insights into bot performance. - Cleaned up code by removing obsolete comments and unused imports, improving overall readability and maintainability.
2025-09-03 19:18:04 +03:00
parent 650acd5bce
commit ae7bd476bb
14 changed files with 248 additions and 219 deletions
--- a/helper_bot/handlers/admin/admin_handlers.py
+++ b/helper_bot/handlers/admin/admin_handlers.py
@@ -25,6 +25,13 @@ from helper_bot.handlers.admin.utils import (
 )
 from logs.custom_logger import logger

+# Local imports - metrics
+from helper_bot.utils.metrics import (
+    metrics, 
+    track_time, 
+    track_errors
+)
+
 # Создаем роутер с middleware для проверки доступа
 admin_router = Router()
 admin_router.message.middleware(AdminAccessMiddleware())
@@ -38,6 +45,8 @@ admin_router.message.middleware(AdminAccessMiddleware())
    ChatTypeFilter(chat_type=["private"]),
    Command('admin')
 )
+@track_time("admin_panel", "admin_handlers")
+@track_errors("admin_handlers", "admin_panel")
 async def admin_panel(
    message: types.Message, 
    state: FSMContext,
@@ -62,6 +71,8 @@ async def admin_panel(
    StateFilter("AWAIT_BAN_TARGET", "AWAIT_BAN_DETAILS", "AWAIT_BAN_DURATION", "BAN_CONFIRMATION"),
    F.text == 'Отменить'
 )
+@track_time("cancel_ban_process", "admin_handlers")
+@track_errors("admin_handlers", "cancel_ban_process")
 async def cancel_ban_process(
    message: types.Message, 
    state: FSMContext,
@@ -81,6 +92,8 @@ async def cancel_ban_process(
    StateFilter("ADMIN"),
    F.text == 'Бан (Список)'
 )
+@track_time("get_last_users", "admin_handlers")
+@track_errors("admin_handlers", "get_last_users")
 async def get_last_users(
    message: types.Message, 
    state: FSMContext,
@@ -112,6 +125,8 @@ async def get_last_users(
    StateFilter("ADMIN"),
    F.text == 'Разбан (список)'
 )
+@track_time("get_banned_users", "admin_handlers")
+@track_errors("admin_handlers", "get_banned_users")
 async def get_banned_users(
    message: types.Message, 
    state: FSMContext, 
@@ -141,6 +156,8 @@ async def get_banned_users(
    StateFilter("ADMIN"),
    F.text.in_(['Бан по нику', 'Бан по ID'])
 )
+@track_time("start_ban_process", "admin_handlers")
+@track_errors("admin_handlers", "start_ban_process")
 async def start_ban_process(
    message: types.Message, 
    state: FSMContext,
@@ -162,6 +179,8 @@ async def start_ban_process(
    ChatTypeFilter(chat_type=["private"]),
    StateFilter("AWAIT_BAN_TARGET")
 )
+@track_time("process_ban_target", "admin_handlers")
+@track_errors("admin_handlers", "process_ban_target")
 async def process_ban_target(
    message: types.Message, 
    state: FSMContext,
@@ -232,6 +251,8 @@ async def process_ban_target(
    ChatTypeFilter(chat_type=["private"]),
    StateFilter("AWAIT_BAN_DETAILS")
 )
+@track_time("process_ban_reason", "admin_handlers")
+@track_errors("admin_handlers", "process_ban_reason")
 async def process_ban_reason(
    message: types.Message, 
    state: FSMContext,
@@ -272,6 +293,8 @@ async def process_ban_reason(
    ChatTypeFilter(chat_type=["private"]),
    StateFilter("AWAIT_BAN_DURATION")
 )
+@track_time("process_ban_duration", "admin_handlers")
+@track_errors("admin_handlers", "process_ban_duration")
 async def process_ban_duration(
    message: types.Message, 
    state: FSMContext,
@@ -315,6 +338,8 @@ async def process_ban_duration(
    StateFilter("BAN_CONFIRMATION"),
    F.text == 'Подтвердить'
 )
+@track_time("confirm_ban", "admin_handlers")
+@track_errors("admin_handlers", "confirm_ban")
 async def confirm_ban(
    message: types.Message, 
    state: FSMContext,
--- a/helper_bot/handlers/admin/services.py
+++ b/helper_bot/handlers/admin/services.py
@@ -5,6 +5,14 @@ from helper_bot.utils.helper_func import add_days_to_date, get_banned_users_butt
 from helper_bot.handlers.admin.exceptions import UserAlreadyBannedError, InvalidInputError
 from logs.custom_logger import logger

+# Local imports - metrics
+from helper_bot.utils.metrics import (
+    metrics, 
+    track_time, 
+    track_errors,
+    db_query_time
+)
+

 class User:
    """Модель пользователя"""
@@ -29,6 +37,8 @@ class AdminService:
    def __init__(self, bot_db):
        self.bot_db = bot_db
    
+    @track_time("get_last_users", "admin_service")
+    @track_errors("admin_service", "get_last_users")
    async def get_last_users(self) -> List[User]:
        """Получить список последних пользователей"""
        try:
@@ -45,6 +55,8 @@ class AdminService:
            logger.error(f"Ошибка при получении списка последних пользователей: {e}")
            raise
    
+    @track_time("get_banned_users", "admin_service")
+    @track_errors("admin_service", "get_banned_users")
    async def get_banned_users(self) -> List[BannedUser]:
        """Получить список заблокированных пользователей"""
        try:
@@ -68,6 +80,8 @@ class AdminService:
            logger.error(f"Ошибка при получении списка заблокированных пользователей: {e}")
            raise
    
+    @track_time("get_user_by_username", "admin_service")
+    @track_errors("admin_service", "get_user_by_username")
    async def get_user_by_username(self, username: str) -> Optional[User]:
        """Получить пользователя по username"""
        try:
@@ -85,6 +99,8 @@ class AdminService:
            logger.error(f"Ошибка при поиске пользователя по username {username}: {e}")
            raise
    
+    @track_time("get_user_by_id", "admin_service")
+    @track_errors("admin_service", "get_user_by_id")
    async def get_user_by_id(self, user_id: int) -> Optional[User]:
        """Получить пользователя по ID"""
        try:
@@ -101,6 +117,8 @@ class AdminService:
            logger.error(f"Ошибка при поиске пользователя по ID {user_id}: {e}")
            raise
    
+    @track_time("ban_user", "admin_service")
+    @track_errors("admin_service", "ban_user")
    async def ban_user(self, user_id: int, username: str, reason: str, ban_days: Optional[int]) -> None:
        """Заблокировать пользователя"""
        try:
@@ -122,6 +140,8 @@ class AdminService:
            logger.error(f"Ошибка при блокировке пользователя {user_id}: {e}")
            raise
    
+    @track_time("unban_user", "admin_service")
+    @track_errors("admin_service", "unban_user")
    async def unban_user(self, user_id: int) -> None:
        """Разблокировать пользователя"""
        try:
@@ -131,6 +151,8 @@ class AdminService:
            logger.error(f"Ошибка при разблокировке пользователя {user_id}: {e}")
            raise
    
+    @track_time("validate_user_input", "admin_service")
+    @track_errors("admin_service", "validate_user_input")
    async def validate_user_input(self, input_text: str) -> int:
        """Валидация введенного ID пользователя"""
        try:
@@ -141,6 +163,8 @@ class AdminService:
        except ValueError:
            raise InvalidInputError("ID пользователя должен быть числом")
    
+    @track_time("get_banned_users_for_display", "admin_service")
+    @track_errors("admin_service", "get_banned_users_for_display")
    async def get_banned_users_for_display(self, page: int = 0) -> tuple[str, list]:
        """Получить данные заблокированных пользователей для отображения"""
        try: