fast-telemetry 0.0.1__tar.gz → 0.1.0__tar.gz

{fast_telemetry-0.0.1/src/fast_telemetry.egg-info → fast_telemetry-0.1.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fast-telemetry
-Version: 0.0.1
+Version: 0.1.0
 Summary: Internal standardized metrics library
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown

{fast_telemetry-0.0.1 → fast_telemetry-0.1.0}/src/fast_telemetry/_version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '0.0.1'
-__version_tuple__ = version_tuple = (0, 0, 1)
+__version__ = version = '0.1.0'
+__version_tuple__ = version_tuple = (0, 1, 0)
 
-__commit_id__ = commit_id = 'ge8b1cc512'
+__commit_id__ = commit_id = 'g8f02c6373'

{fast_telemetry-0.0.1 → fast_telemetry-0.1.0}/src/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-0.0.1 → fast_telemetry-0.1.0}/src/fast_telemetry/integrations/fastapi.py

@@ -2,12 +2,11 @@ from typing import Iterable
 
 from fastapi import FastAPI
 from prometheus_fastapi_instrumentator import Instrumentator
-from ..core import PrometheusMetrics
 
+from .. import MetricsExporter
 
-def setup_fastapi_metrics(
-    app: FastAPI, metrics: PrometheusMetrics, 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.1 → fast_telemetry-0.1.0}/src/fast_telemetry/integrations/faststream.py

@@ -5,11 +5,11 @@ from faststream.asgi import AsgiFastStream
 from faststream.prometheus import PrometheusMiddleware
 from prometheus_client import make_asgi_app
 
-from ..core import PrometheusMetrics
+from ..core import MetricsExporter
 
 
 class MiddlewareFactory(Protocol):
-    def __call__(self, metrics: PrometheusMetrics) -> PrometheusMiddleware: ...
+    def __call__(self, metrics: MetricsExporter) -> PrometheusMiddleware: ...
 
 
 _BROKER_MIDDLEWARE_MAP: dict[Type[BrokerUsecase], MiddlewareFactory] = {}
@@ -20,8 +20,8 @@ try:
     from faststream.rabbit.prometheus import RabbitPrometheusMiddleware
 
     class CustomRabbitMiddleware(RabbitPrometheusMiddleware):
-        def __init__(self, metrics: PrometheusMetrics):
-            super().__init__(registry=metrics.get_registry(), custom_labels={"service": metrics.service_name})
+        def __init__(self, metrics: MetricsExporter):
+            super().__init__(registry=metrics.get_registry())
 
     _BROKER_MIDDLEWARE_MAP[RabbitBroker] = CustomRabbitMiddleware
 except ImportError:
@@ -33,8 +33,8 @@ try:
     from faststream.kafka.prometheus import KafkaPrometheusMiddleware
 
     class CustomKafkaMiddleware(KafkaPrometheusMiddleware):
-        def __init__(self, metrics: PrometheusMetrics):
-            super().__init__(registry=metrics.get_registry(), custom_labels={"service": metrics.service_name})
+        def __init__(self, metrics: MetricsExporter):
+            super().__init__(registry=metrics.get_registry())
 
     _BROKER_MIDDLEWARE_MAP[KafkaBroker] = CustomKafkaMiddleware
 except ImportError:
@@ -46,8 +46,8 @@ try:
     from faststream.redis.prometheus import RedisPrometheusMiddleware
 
     class CustomRedisMiddleware(RedisPrometheusMiddleware):
-        def __init__(self, metrics: PrometheusMetrics):
-            super().__init__(registry=metrics.get_registry(), custom_labels={"service": metrics.service_name})
+        def __init__(self, metrics: MetricsExporter):
+            super().__init__(registry=metrics.get_registry())
 
     _BROKER_MIDDLEWARE_MAP[RedisBroker] = CustomRedisMiddleware
 except ImportError:
@@ -58,8 +58,8 @@ try:
     from faststream.confluent.prometheus import KafkaPrometheusMiddleware as ConfluentPrometheusMiddleware
 
     class CustomConfluentPrometheusMiddleware(ConfluentPrometheusMiddleware):
-        def __init__(self, metrics: PrometheusMetrics):
-            super().__init__(registry=metrics.get_registry(), custom_labels={"service": metrics.service_name})
+        def __init__(self, metrics: MetricsExporter):
+            super().__init__(registry=metrics.get_registry())
 
     _BROKER_MIDDLEWARE_MAP[ConfluentBroker] = CustomConfluentPrometheusMiddleware
 except ImportError:
@@ -71,8 +71,8 @@ try:
     from faststream.nats.prometheus import NatsPrometheusMiddleware
 
     class CustomNatsPrometheusMiddleware(NatsPrometheusMiddleware):
-        def __init__(self, metrics: PrometheusMetrics):
-            super().__init__(registry=metrics.get_registry(), custom_labels={"service": metrics.service_name})
+        def __init__(self, metrics: MetricsExporter):
+            super().__init__(registry=metrics.get_registry())
 
     _BROKER_MIDDLEWARE_MAP[NatsBroker] = CustomNatsPrometheusMiddleware
 
@@ -80,7 +80,7 @@ except ImportError:
     pass
 
 
-def setup_faststream_metrics(app: AsgiFastStream, metrics: PrometheusMetrics) -> None:
+def setup_faststream_metrics(app: AsgiFastStream, metrics: MetricsExporter) -> None:
     broker = app.broker
     broker_type = type(broker)
 

{fast_telemetry-0.0.1 → fast_telemetry-0.1.0/src/fast_telemetry.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fast-telemetry
-Version: 0.0.1
+Version: 0.1.0
 Summary: Internal standardized metrics library
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown