diff --git a/.deploy/deploy-dev.yaml b/.deploy/deploy-dev.yaml index 227877a..f59cd31 100644 --- a/.deploy/deploy-dev.yaml +++ b/.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 diff --git a/.deploy/deploy-prod.yaml b/.deploy/deploy-prod.yaml index 0043ede..535826f 100644 --- a/.deploy/deploy-prod.yaml +++ b/.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 diff --git a/utils/queues.py b/utils/queues.py index dc0f219..076dbfa 100644 --- a/utils/queues.py +++ b/utils/queues.py @@ -1,3 +1,4 @@ +import datetime import os import requests import time @@ -27,17 +28,36 @@ class TasksHandlerMixin: if not task: time.sleep(0.2) continue + start = datetime.datetime.now() try: self.process(task['payload']) + success = True except Exception as exc: print(f'Error processing message id={task["id"]}, payload={task["payload"]}, exc={exc}') - continue + success = False + end = datetime.datetime.now() try: resp = requests.post(f'{QUEUES_URL}/api/v1/finish', json={'id': task['id']}) if resp.status_code != 202: raise QueuesException except: print(f'Failed to finish task id={task["id"]}') + try: + metric = requests.post('http://monitoring:1237/api/v1/metrics/task', json={ + 'timestamp': start.isoformat(), + 'service': 'botalka', + 'environment': stage, + 'queue': self.queue_name, + 'success': success, + '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}') + @property def queue_name(self):