Merge pull request 'fix' (#65) from metric into dev

Reviewed-on: #65

.deploy/deploy-dev.yaml

@@ -22,6 +22,7 @@ services:
     networks:
       - configurator
       - queues-development
+      - monitoring
     environment:
       STAGE: "development"
     command: mailbox
@@ -38,3 +39,5 @@ networks:
     external: true
   queues-development:
     external: true
+  monitoring:
+    external: true

.deploy/deploy-prod.yaml

@@ -22,6 +22,7 @@ services:
     networks:
       - configurator
       - queues
+      - monitoring
     environment:
       STAGE: "production"
     command: mailbox
@@ -38,3 +39,5 @@ networks:
     external: true
   queues:
     external: true
+  monitoring:
+    external: true

utils/queues.py

@@ -1,9 +1,6 @@
 from concurrent.futures import ThreadPoolExecutor
 import datetime
-import json
 import os
-import traceback
-import uuid
 import zoneinfo
 import requests
 import time
@@ -16,18 +13,17 @@ else:
     QUEUES_URL = 'http://queues:1239'
 
 
+executor = ThreadPoolExecutor(max_workers=1)
+
+
 class QueuesException(Exception):
     ...
 
 
 class TasksHandlerMixin:
-    def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)
-        self.executor = ThreadPoolExecutor(max_workers=1)
-
     def _send_metric(self, start: datetime.datetime, end: datetime.datetime, success: bool):
-        def send():
+        try:
-            requests.post(f'{QUEUES_URL}/api/v1/metric', json={
+            resp = requests.post('http://monitoring:1237/api/v1/metrics/task', json={
                 'service': 'botalka',
                 'queue': self.queue_name,
                 'success': success,
@@ -36,8 +32,16 @@ class TasksHandlerMixin:
                 "execution_time_ms": (end - start).microseconds // 1000,
                 "environment": stage,
             })
+            if resp.status_code == 202:
+                print("Metric ok")
+            else:
+                print(f'metric not ok: {resp.status_code}')
+        except Exception as e:
+            print(f"Error sending metric: {e}")
 
-        self.executor.submit(send)
+    def send_metric(self, start: datetime.datetime, end: datetime.datetime, success: bool):
+        # executor.submit(self._send_metric, start, end, success)
+        self._send_metric(start, end, success)
 
     def poll(self):
         while True:
@@ -53,12 +57,10 @@ class TasksHandlerMixin:
                 continue
             start = datetime.datetime.now(zoneinfo.ZoneInfo("Europe/Moscow"))
             try:
-                print(f'process task with id {task["id"]}, attempt {task["attempt"]}')
                 self.process(task['payload'])
                 success = True
             except Exception as exc:
                 print(f'Error processing message id={task["id"]}, payload={task["payload"]}, exc={exc}')
-                traceback.print_stack()
                 success = False
             end = datetime.datetime.now(zoneinfo.ZoneInfo("Europe/Moscow"))
             if success:
@@ -66,10 +68,9 @@ class TasksHandlerMixin:
                     resp = requests.post(f'{QUEUES_URL}/api/v1/finish', json={'id': task['id']})
                     if resp.status_code != 202:
                         raise QueuesException
-                    print(f'finish task with id {task["id"]}')
                 except:
                     print(f'Failed to finish task id={task["id"]}')
-            self._send_metric(start, end, success)
+            self.send_metric(start, end, success)
 
     @property
     def queue_name(self):