fast-telemetry 0.0.2__py3-none-any.whl → 0.2.0__py3-none-any.whl

fast_telemetry/_version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '0.0.2'
-__version_tuple__ = version_tuple = (0, 0, 2)
+__version__ = version = '0.2.0'
+__version_tuple__ = version_tuple = (0, 2, 0)
 
 __commit_id__ = commit_id = None

fast_telemetry/core.py

@@ -2,6 +2,7 @@ import os
 import functools
 import inspect
 from abc import abstractmethod, ABC
+from types import TracebackType
 from typing import (
     Callable,
     Any,
@@ -98,13 +99,82 @@ class MetricsCollector(ABC):
 
             return sync_wrapper
 
+    @overload
+    def track_exception(self, func: Callable[P, R]) -> Callable[P, R]:
+        pass
+
+    @overload
+    def track_exception(self, *, exclude: list[Type[BaseException]] | None = None) -> "_ExceptionTracker":
+        pass
+
     @abstractmethod
     def track_exception(
-        self, *, exclude: list[Type[BaseException]] | None = None
-    ) -> Callable[[Callable[P, R]], Callable[P, R]]:
+        self, arg: Callable[P, R] | None = None, *, exclude: list[Type[BaseException]] | None = None
+    ) -> Any:
         pass
 
 
+class _ExceptionTracker:
+    """
+    Гибридный класс: Context Manager + Decorator.
+    Используется внутри track_exception.
+    """
+
+    def __init__(
+        self,
+        metrics: MetricsCollector,
+        exclude: list[Type[BaseException]] | None = None,
+    ):
+        self.metrics = metrics
+        self.exclude = tuple(exclude) if exclude else ()
+
+    def _handle_exception(self, exc_val: BaseException) -> None:
+        if not isinstance(exc_val, self.exclude):
+            self.metrics.inc_error(exc_val)
+
+    def __enter__(self) -> "_ExceptionTracker":
+        return self
+
+    def __exit__(
+        self,
+        exc_type: Type[BaseException] | None,
+        exc_val: BaseException | None,
+        exc_tb: TracebackType | None,
+    ) -> None:
+        if exc_val:
+            self._handle_exception(exc_val)
+
+    async def __aenter__(self) -> "_ExceptionTracker":
+        return self
+
+    async def __aexit__(
+        self,
+        exc_type: Type[BaseException] | None,
+        exc_val: BaseException | None,
+        exc_tb: TracebackType | None,
+    ) -> None:
+        if exc_val:
+            self._handle_exception(exc_val)
+
+    def __call__(self, func: Callable[P, R]) -> Callable[P, R]:
+        if inspect.iscoroutinefunction(func):
+
+            @functools.wraps(func)
+            async def async_wrapper(*args: P.args, **kwargs: P.kwargs) -> R:
+                async with self:
+                    return await func(*args, **kwargs)
+
+            return async_wrapper  # type: ignore
+        else:
+
+            @functools.wraps(func)
+            def sync_wrapper(*args: P.args, **kwargs: P.kwargs) -> R:
+                with self:
+                    return func(*args, **kwargs)
+
+            return sync_wrapper
+
+
 class PrometheusMetrics(MetricsCollector, MetricsExporter):
     """
     Реализация метрик на базе prometheus-client.
@@ -186,39 +256,14 @@ class PrometheusMetrics(MetricsCollector, MetricsExporter):
         self, arg: Callable[P, R] | None = None, *, exclude: list[Type[BaseException]] | None = None
     ) -> Any:
         """
-        Декоратор для подсчета исключений.
-        Использует имя класса исключения как метку error_type.
+        Декоратор и контекстный менеджер для подсчета исключений.
         """
-
-        def decorator(func: Callable[P, R]) -> Callable[P, R]:
-            if inspect.iscoroutinefunction(func):
-
-                @functools.wraps(func)
-                async def async_wrapper(*args: P.args, **kwargs: P.kwargs) -> R:
-                    try:
-                        return await func(*args, **kwargs)  # type: ignore
-                    except Exception as e:
-                        if not exclude or not isinstance(e, tuple(exclude)):
-                            self.inc_error(e)
-                        raise
-
-                return async_wrapper  # type: ignore
-            else:
-
-                @functools.wraps(func)
-                def sync_wrapper(*args: P.args, **kwargs: P.kwargs) -> R:
-                    try:
-                        return func(*args, **kwargs)
-                    except Exception as e:
-                        if not exclude or not isinstance(e, tuple(exclude)):
-                            self.inc_error(e)
-                        raise
-
-                return sync_wrapper
+        tracker = _ExceptionTracker(self, exclude=exclude)
 
         if callable(arg):
-            return decorator(arg)
-        return decorator
+            return tracker(arg)
+
+        return tracker
 
     def timer(self, task_type: str, long_task: bool = False) -> ContextManager[Any]:
         if long_task:

fast_telemetry/integrations/fastapi.py

@@ -4,12 +4,9 @@ from fastapi import FastAPI
 from prometheus_fastapi_instrumentator import Instrumentator
 
 from .. import MetricsExporter
-from ..core import PrometheusMetrics
 
 
-def setup_fastapi_metrics(
-    app: FastAPI, metrics: MetricsExporter, excluded_routes: Iterable[str] | None = None
-) -> None:
+def setup_fastapi_metrics(app: FastAPI, metrics: MetricsExporter, excluded_routes: Iterable[str] | None = None) -> None:
     """
     Настраивает автоматический мониторинг HTTP запросов
     и добавляет эндпоинт /metrics.

{fast_telemetry-0.0.2.dist-info → fast_telemetry-0.2.0.dist-info}/METADATA

@@ -1,13 +1,13 @@
 Metadata-Version: 2.4
 Name: fast-telemetry
-Version: 0.0.2
+Version: 0.2.0
 Summary: Internal standardized metrics library
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown
-Requires-Dist: prometheus-client~=0.21.0
+Requires-Dist: prometheus-client<1.0.0,>=0.21.0
 Provides-Extra: web
-Requires-Dist: fastapi~=0.115.0; extra == "web"
-Requires-Dist: prometheus-fastapi-instrumentator~=7.1.0; extra == "web"
+Requires-Dist: fastapi<1.0.0,>=0.115.0; extra == "web"
+Requires-Dist: prometheus-fastapi-instrumentator<8.0.0,>=7.1.0; extra == "web"
 Provides-Extra: stream
 Requires-Dist: faststream~=0.6.0; extra == "stream"
 

fast_telemetry-0.2.0.dist-info/RECORD

@@ -0,0 +1,12 @@
+__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+fast_telemetry/__init__.py,sha256=maomIZLdB92E2j9kW1caPUa-_B799ZTGEi24NY-ERZI,191
+fast_telemetry/_version.py,sha256=Dg8AmJomLVpjKL6prJylOONZAPRtB86LOce7dorQS_A,704
+fast_telemetry/core.py,sha256=je27wPE2rvpNGjW76Z562PL-tHG2_KEuMm3N1lLceMQ,9424
+fast_telemetry/integrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+fast_telemetry/integrations/fastapi.py,sha256=PtnPUJeW4QTwo89jEfBLGDvzlLB6c3V-qtBU3ynoEts,1039
+fast_telemetry/integrations/faststream.py,sha256=1ncNXCHk9nv1SyV_fKqwo2LpOh8rV1n8wxpLBtb7KGY,3389
+fast_telemetry/integrations/worker.py,sha256=BQCLdjxTB3PluD7Bxv-rPzOjWTkBde6ssg4KOxQENeQ,4713
+fast_telemetry-0.2.0.dist-info/METADATA,sha256=1MhNHhHJ0mzR61vEmRnBujO6c_ibf3mbj2kOEWJR-Kw,8896
+fast_telemetry-0.2.0.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+fast_telemetry-0.2.0.dist-info/top_level.txt,sha256=OvY6pUtFsIZyuDZiiIF6RFF-mfjMuvXDpUbz4XXXop0,24
+fast_telemetry-0.2.0.dist-info/RECORD,,

fast_telemetry-0.0.2.dist-info/RECORD

@@ -1,12 +0,0 @@
-__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-fast_telemetry/__init__.py,sha256=maomIZLdB92E2j9kW1caPUa-_B799ZTGEi24NY-ERZI,191
-fast_telemetry/_version.py,sha256=huLsL1iGeXWQKZ8bjwDdIWC7JOkj3wnzBh-HFMZl1PY,704
-fast_telemetry/core.py,sha256=T39rEQuM2W95S9_9ww05a6RSIRFgvo7XFagqKBXGqCk,8431
-fast_telemetry/integrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-fast_telemetry/integrations/fastapi.py,sha256=l2MQaKz8lAdwOBQPFbvzsHlS7I7SYuaHNelCLKu83I0,1082
-fast_telemetry/integrations/faststream.py,sha256=1ncNXCHk9nv1SyV_fKqwo2LpOh8rV1n8wxpLBtb7KGY,3389
-fast_telemetry/integrations/worker.py,sha256=BQCLdjxTB3PluD7Bxv-rPzOjWTkBde6ssg4KOxQENeQ,4713
-fast_telemetry-0.0.2.dist-info/METADATA,sha256=IM_4_-Rlv53La2l4vw15zBWSvmw4N4kFMKdQS6A8zEs,8875
-fast_telemetry-0.0.2.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
-fast_telemetry-0.0.2.dist-info/top_level.txt,sha256=OvY6pUtFsIZyuDZiiIF6RFF-mfjMuvXDpUbz4XXXop0,24
-fast_telemetry-0.0.2.dist-info/RECORD,,