Enhance Makefile and update metrics handling in bot

- Added new commands in the Makefile for restarting individual services: `restart-bot`, `restart-prometheus`, and `restart-grafana`.
- Updated Prometheus and Grafana dashboard expressions for better metrics aggregation.
- Removed the `main_with_metrics.py` file and integrated metrics handling directly into the main bot file.
- Refactored middleware to improve metrics tracking and error handling across message and callback processing.
- Optimized metrics recording with enhanced bucket configurations for better performance monitoring.

helper_bot/handlers/group/group_handlers.py

@@ -16,6 +16,12 @@ from .exceptions import UserNotFoundError
 # Local imports - utilities
 from logs.custom_logger import logger
 
+# Local imports - metrics
+from helper_bot.utils.metrics import (
+    metrics, 
+    track_time, 
+    track_errors
+)
 
 class GroupHandlers:
     """Main handler class for group messages"""
@@ -41,6 +47,7 @@ class GroupHandlers:
     @error_handler
     async def handle_message(self, message: types.Message, state: FSMContext):
         """Handle admin reply to user through group chat"""
+
         logger.info(
             f'Получено сообщение в группе {message.chat.title} (ID: {message.chat.id}) '
             f'от пользователя {message.from_user.full_name} (ID: {message.from_user.id}): "{message.text}"'

helper_bot/handlers/group/services.py

@@ -11,6 +11,14 @@ from helper_bot.utils.helper_func import send_text_message
 from .exceptions import NoReplyToMessageError, UserNotFoundError
 from logs.custom_logger import logger
 
+# Local imports - metrics
+from helper_bot.utils.metrics import (
+    metrics, 
+    track_time, 
+    track_errors, 
+    db_query_time
+)
+
 
 class DatabaseProtocol(Protocol):
     """Protocol for database operations"""

helper_bot/handlers/private/private_handlers.py

@@ -28,8 +28,7 @@ from helper_bot.utils.helper_func import (
 from helper_bot.utils.metrics import (
     metrics, 
     track_time, 
-    track_errors, 
-    db_query_time
+    track_errors
 )
 
 # Local imports - modular components
@@ -99,14 +98,8 @@ class PrivateHandlers:
         await message.answer('Я перезапущен!', reply_markup=markup, parse_mode='HTML')
     
     @error_handler
-    @track_time("start_message_handler", "private_handler")
-    @track_errors("private_handler", "start_message_handler")
     async def handle_start_message(self, message: types.Message, state: FSMContext, **kwargs):
         """Handle start command and return to bot button with metrics tracking"""
-        # Record start command metrics
-        metrics.record_command("start", "private_handler", "user" if not message.from_user.is_bot else "bot")
-        metrics.record_message("command", "private", "private_handler")
-        
         # User service operations with metrics
         await self.user_service.log_user_message(message)
         await self.user_service.ensure_user_exists(message)
@@ -123,6 +116,7 @@ class PrivateHandlers:
     @error_handler
     async def suggest_post(self, message: types.Message, state: FSMContext, **kwargs):
         """Handle suggest post button"""
+        # User service operations with metrics
         await self.user_service.update_user_activity(message.from_user.id)
         await self.user_service.log_user_message(message)
         await state.set_state(FSM_STATES["SUGGEST"])
@@ -134,6 +128,7 @@ class PrivateHandlers:
     @error_handler
     async def end_message(self, message: types.Message, state: FSMContext, **kwargs):
         """Handle goodbye button"""
+        # User service operations with metrics
         await self.user_service.update_user_activity(message.from_user.id)
         await self.user_service.log_user_message(message)
         
@@ -149,6 +144,7 @@ class PrivateHandlers:
     @error_handler
     async def suggest_router(self, message: types.Message, state: FSMContext, album: list = None, **kwargs):
         """Handle post submission in suggest state"""
+        # Post service operations with metrics
         await self.post_service.process_post(message, album)
         
         # Send success message and return to start state
@@ -160,6 +156,7 @@ class PrivateHandlers:
     @error_handler
     async def stickers(self, message: types.Message, state: FSMContext, **kwargs):
         """Handle stickers request"""
+        # User service operations with metrics
         markup = get_reply_keyboard(self.db, message.from_user.id)
         self.db.update_info_about_stickers(user_id=message.from_user.id)
         await self.user_service.log_user_message(message)
@@ -172,6 +169,7 @@ class PrivateHandlers:
     @error_handler
     async def connect_with_admin(self, message: types.Message, state: FSMContext, **kwargs):
         """Handle connect with admin button"""
+        # User service operations with metrics
         await self.user_service.update_user_activity(message.from_user.id)
         admin_message = messages.get_message(get_first_name(message), 'CONNECT_WITH_ADMIN')
         await message.answer(admin_message, parse_mode="html")
@@ -181,6 +179,7 @@ class PrivateHandlers:
     @error_handler
     async def resend_message_in_group_for_message(self, message: types.Message, state: FSMContext, **kwargs):
         """Handle messages in admin chat states"""
+        # User service operations with metrics
         await self.user_service.update_user_activity(message.from_user.id)
         await message.forward(chat_id=self.settings.group_for_message)
         

helper_bot/handlers/private/services.py

@@ -138,6 +138,8 @@ class PostService:
         self.db = db
         self.settings = settings
     
+    @track_time("handle_text_post", "post_service")
+    @track_errors("post_service", "handle_text_post")
     async def handle_text_post(self, message: types.Message, first_name: str) -> None:
         """Handle text post submission"""
         post_text = get_text_message(message.text.lower(), first_name, message.from_user.username)
@@ -146,6 +148,8 @@ class PostService:
         sent_message_id = await send_text_message(self.settings.group_for_posts, message, post_text, markup)
         self.db.add_post_in_db(sent_message_id, message.text, message.from_user.id)
     
+    @track_time("handle_photo_post", "post_service")
+    @track_errors("post_service", "handle_photo_post")
     async def handle_photo_post(self, message: types.Message, first_name: str) -> None:
         """Handle photo post submission"""
         post_caption = ""
@@ -160,6 +164,8 @@ class PostService:
         self.db.add_post_in_db(sent_message.message_id, sent_message.caption, message.from_user.id)
         await add_in_db_media(sent_message, self.db)
     
+    @track_time("handle_video_post", "post_service")
+    @track_errors("post_service", "handle_video_post")
     async def handle_video_post(self, message: types.Message, first_name: str) -> None:
         """Handle video post submission"""
         post_caption = ""
@@ -174,6 +180,8 @@ class PostService:
         self.db.add_post_in_db(sent_message.message_id, sent_message.caption, message.from_user.id)
         await add_in_db_media(sent_message, self.db)
     
+    @track_time("handle_video_note_post", "post_service")
+    @track_errors("post_service", "handle_video_note_post")
     async def handle_video_note_post(self, message: types.Message) -> None:
         """Handle video note post submission"""
         markup = get_reply_keyboard_for_post()
@@ -184,6 +192,8 @@ class PostService:
         self.db.add_post_in_db(sent_message.message_id, sent_message.caption, message.from_user.id)
         await add_in_db_media(sent_message, self.db)
     
+    @track_time("handle_audio_post", "post_service")
+    @track_errors("post_service", "handle_audio_post")
     async def handle_audio_post(self, message: types.Message, first_name: str) -> None:
         """Handle audio post submission"""
         post_caption = ""
@@ -198,6 +208,8 @@ class PostService:
         self.db.add_post_in_db(sent_message.message_id, sent_message.caption, message.from_user.id)
         await add_in_db_media(sent_message, self.db)
     
+    @track_time("handle_voice_post", "post_service")
+    @track_errors("post_service", "handle_voice_post")
     async def handle_voice_post(self, message: types.Message) -> None:
         """Handle voice post submission"""
         markup = get_reply_keyboard_for_post()
@@ -208,6 +220,8 @@ class PostService:
         self.db.add_post_in_db(sent_message.message_id, sent_message.caption, message.from_user.id)
         await add_in_db_media(sent_message, self.db)
     
+    @track_time("handle_media_group_post", "post_service")
+    @track_errors("post_service", "handle_media_group_post")
     async def handle_media_group_post(self, message: types.Message, album: list, first_name: str) -> None:
         """Handle media group post submission"""
         post_caption = " "
@@ -229,6 +243,8 @@ class PostService:
             message_id=media_group_message_id, helper_message_id=help_message_id
         )
     
+    @track_time("process_post", "post_service")
+    @track_errors("post_service", "process_post")
     async def process_post(self, message: types.Message, album: Union[list, None] = None) -> None:
         """Process post based on content type"""
         first_name = get_first_name(message)