Merge pull request 'fix' (#51) from master into dev

Reviewed-on: #51

.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/metrics.py

@@ -0,0 +1,27 @@
+from queue import Queue
+from threading import Thread
+
+
+class MetricsSender(Thread):
+    queue: Queue = Queue()
+
+    def put(self, metric):
+        self.queue.put(metric)
+    
+    def run(self):
+        while True:
+            metric = self.queue.get()
+            if not metric:
+                continue
+
+            try:
+                metric = metric()
+                if metric.status_code == 202:
+                    print('metric ok')
+                else:
+                    print(f'metric failed: {metric.status_code}')
+            except Exception as e:
+                print(f'metric failed: {e}')
+
+metrics_sender = MetricsSender()
+metrics_sender.start()

utils/queues.py

@@ -1,12 +1,8 @@
-from concurrent.futures import ThreadPoolExecutor
 import datetime
-import json
 import os
-import traceback
-import uuid
-import zoneinfo
 import requests
 import time
+from utils.metrics import metrics_sender
 
 
 stage = os.getenv("STAGE", 'local')
@@ -21,24 +17,6 @@ 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():
-            requests.post(f'{QUEUES_URL}/api/v1/metric', json={
-                'service': 'botalka',
-                'queue': self.queue_name,
-                'success': success,
-                'timestamp': start.strftime("%Y-%m-%dT%H:%M:%S") + "Z",
-                "success": success,
-                "execution_time_ms": (end - start).microseconds // 1000,
-                "environment": stage,
-            })
-        
-        self.executor.submit(send)
-
     def poll(self):
         while True:
             try:
@@ -51,25 +29,30 @@ class TasksHandlerMixin:
             if not task:
                 time.sleep(0.2)
                 continue
-            start = datetime.datetime.now(zoneinfo.ZoneInfo("Europe/Moscow"))
+            start = datetime.datetime.now()
             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"))
+            end = datetime.datetime.now()
-            if success:
+            try:
-                try:
+                resp = requests.post(f'{QUEUES_URL}/api/v1/finish', json={'id': task['id']})
-                    resp = requests.post(f'{QUEUES_URL}/api/v1/finish', json={'id': task['id']})
+                if resp.status_code != 202:
-                    if resp.status_code != 202:
+                    raise QueuesException
-                        raise QueuesException
+            except:
-                    print(f'finish task with id {task["id"]}')
+                print(f'Failed to finish task id={task["id"]}')
-                except:
+
-                    print(f'Failed to finish task id={task["id"]}')
+            metrics_sender.put(lambda: requests.post('http://monitoring:1237/api/v1/metrics/task', json={
-            self._send_metric(start, end, success)
+                'timestamp': start.strftime("%Y-%m-%dT%H:%M:%S") + "Z",
+                'service': 'botalka',
+                'environment': stage,
+                'queue': self.queue_name,
+                'success': success,
+                'execution_time_ms': (end - start).microseconds // 1000,
+            }))
+
 
     @property
     def queue_name(self):