Merge pull request 'metric' (#82) from metric into master

Reviewed-on: #82

.deploy/deploy-dev.yaml

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

.deploy/deploy-prod.yaml

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

Dockerfile

@@ -5,6 +5,4 @@ COPY requirements.txt requirements.txt
 RUN pip install -r requirements.txt
 COPY . .
 ENV PYTHONUNBUFFERED 1
-RUN mkdir /usr/src/metrics
-RUN chmod 777 run.sh
-ENTRYPOINT ["./run.sh"]
+ENTRYPOINT ["python", "main.py"]

daemons/metrics.py

@@ -1,22 +0,0 @@
-import os
-
-from requests import post
-import json
-
-from daemons import base
-
-
-class Daemon(base.Daemon):
-
-    def execute(self):
-        while True:
-            for file in os.listdir('/usr/src/metrics'):
-                data = open(f'/usr/src/metrics/{file}', 'r').read()
-                payload = json.loads(data)
-                resp = post('http://monitoring:1237/api/v1/metrics/task', json=payload)
-                if resp.status_code == 202:
-                    print("Metric ok")
-                else:
-                    print(f'metric not ok: {resp.status_code}')
-                    os.remove(f'/usr/src/metrics/{file}')
-                break

main.py

@@ -11,9 +11,6 @@ if __name__ == '__main__':
     elif arg == 'mailbox':
         print("mailbox is starting")
         from daemons.mailbox import Daemon
-    elif arg == 'metrics':
-        print("metrics is starting")
-        from daemons.metrics import Daemon
     else:
         raise ValueError(f"Unknown param {arg}")
 

run.sh

@@ -1,13 +0,0 @@
-#!/bin/bash
-
-# Start the first process
-python3 main.py $1 &
-
-# Start the second process
-# python3 main.py metrics &
-
-# Wait for any process to exit
-wait -n
-
-# Exit with status of process that exited first
-exit $?

utils/queues.py

@@ -1,6 +1,8 @@
+from concurrent.futures import ThreadPoolExecutor
 import datetime
 import json
 import os
+import traceback
 import uuid
 import zoneinfo
 import requests
@@ -19,9 +21,13 @@ 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):
-        with open(f'/usr/src/{uuid.uuid4()}.json', 'w') as fp:
-            fp.write(json.dumps({
+        def send():
+            requests.post(f'{QUEUES_URL}/api/v1/metric', json={
                 'service': 'botalka',
                 'queue': self.queue_name,
                 'success': success,
@@ -29,7 +35,9 @@ class TasksHandlerMixin:
                 "success": success,
                 "execution_time_ms": (end - start).microseconds // 1000,
                 "environment": stage,
-            }))
+            })
+        
+        self.executor.submit(send)
 
     def poll(self):
         while True:
@@ -50,6 +58,7 @@ class TasksHandlerMixin:
                 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: