From 64ef3ff7760534394e12105c45826da8589d467e Mon Sep 17 00:00:00 2001 From: Egor Matveev Date: Mon, 16 Jun 2025 16:27:07 +0300 Subject: [PATCH] fix --- .deploy/deploy-dev.yaml | 3 +++ .deploy/deploy-prod.yaml | 3 +++ app/middlewares/__init__.py | 0 app/middlewares/metrics.py | 14 ++++++++++++++ app/utils/monitoring.py | 24 ++++++++++++++++++++++++ 5 files changed, 44 insertions(+) create mode 100644 app/middlewares/__init__.py create mode 100644 app/middlewares/metrics.py create mode 100644 app/utils/monitoring.py diff --git a/.deploy/deploy-dev.yaml b/.deploy/deploy-dev.yaml index f1816fd..54064d7 100644 --- a/.deploy/deploy-dev.yaml +++ b/.deploy/deploy-dev.yaml @@ -6,6 +6,7 @@ services: image: mathwave/sprint-repo:configurator networks: - configurator-development + - monitoring environment: MONGO_HOST: "mongo.develop.sprinthub.ru" MONGO_PASSWORD: $MONGO_PASSWORD_DEV @@ -20,3 +21,5 @@ services: networks: configurator-development: external: true + monitoring: + external: true diff --git a/.deploy/deploy-prod.yaml b/.deploy/deploy-prod.yaml index 84153e5..dcfffc0 100644 --- a/.deploy/deploy-prod.yaml +++ b/.deploy/deploy-prod.yaml @@ -6,6 +6,7 @@ services: image: mathwave/sprint-repo:configurator networks: - configurator + - monitoring environment: MONGO_HOST: "mongo.sprinthub.ru" MONGO_PASSWORD: $MONGO_PASSWORD_PROD @@ -20,3 +21,5 @@ services: networks: configurator: external: true + monitoring: + external: true diff --git a/app/middlewares/__init__.py b/app/middlewares/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/app/middlewares/metrics.py b/app/middlewares/metrics.py new file mode 100644 index 0000000..b1b1b5d --- /dev/null +++ b/app/middlewares/metrics.py @@ -0,0 +1,14 @@ +import datetime +import zoneinfo +from fastapi import Request, Response +from starlette.middleware.base import BaseHTTPMiddleware + +from app.utils.monitoring import monitoring + +class MetricsMiddleware(BaseHTTPMiddleware): + async def dispatch(self, request: Request, call_next): + start = datetime.datetime.now(zoneinfo.ZoneInfo("Europe/Moscow")) + response: Response = await call_next(request) + end = datetime.datetime.now(zoneinfo.ZoneInfo("Europe/Moscow")) + monitoring.send_metric(start, end, request.url.path, response.status_code, request.method) + return response \ No newline at end of file diff --git a/app/utils/monitoring.py b/app/utils/monitoring.py new file mode 100644 index 0000000..0eb52d5 --- /dev/null +++ b/app/utils/monitoring.py @@ -0,0 +1,24 @@ +from concurrent.futures import ThreadPoolExecutor +import datetime +import requests + + +class Monitroing: + def __init__(self): + self.executor = ThreadPoolExecutor(max_workers=1) + + def send_metric(self, start: datetime.datetime, end: datetime.datetime, endpoint: str, status_code: int, method: str): + def send(): + requests.post(f'http://monitoring:1237/api/v1/metrics/endpoint', json={ + 'timestamp': start.strftime("%Y-%m-%dT%H:%M:%S") + "Z", + 'service': 'configurator', + 'endpoint': endpoint, + 'status_code': status_code, + 'response_time': (end - start).microseconds // 1000, + 'method': method, + }) + + self.executor.submit(send) + + +monitoring = Monitroing()