Merge pull request 'master' (#57) from master into dev

Reviewed-on: #57

.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,28 +13,33 @@ 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():
-            requests.post(f'{QUEUES_URL}/api/v1/metric', json={
+    def _send_metric(self, start, success, end):
+        try:
+            metric = requests.post('http://monitoring:1237/api/v1/metrics/task', json={
+                'timestamp': start.strftime("%Y-%m-%dT%H:%M:%S") + "Z",
                 'service': 'botalka',
+                'environment': stage,
                 '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,
+                'execution_time_ms': (end - start).microseconds // 1000,
             })
+            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}')
 
-        self.executor.submit(send)
+    def send_metric(self, start, success, end):
+        executor.submit(self._send_metric, start, success, end)
 
     def poll(self):
         while True:
@@ -51,25 +53,21 @@ class TasksHandlerMixin:
             if not task:
                 time.sleep(0.2)
                 continue
-            start = datetime.datetime.now(zoneinfo.ZoneInfo("Europe/Moscow"))
+            start = datetime.datetime.now().astimezone(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:
+            end = datetime.datetime.now().astimezone(zoneinfo.ZoneInfo("Europe/Moscow"))
             try:
                 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, success, end)
 
     @property
     def queue_name(self):