jararaca 0.3.22__py3-none-any.whl → 0.3.24__py3-none-any.whl

jararaca/observability/decorators.py

@@ -9,6 +9,7 @@ from typing import (
     Callable,
     ContextManager,
     Generator,
+    Literal,
     Mapping,
     Protocol,
     Sequence,
@@ -36,10 +37,25 @@ AttributeMap = Mapping[str, AttributeValue]
 
 class TracingContextProvider(Protocol):
 
-    def __call__(
+    def start_trace_context(
         self, trace_name: str, context_attributes: AttributeMap | None
     ) -> ContextManager[Any]: ...
 
+    def add_event(
+        self,
+        event_name: str,
+        event_attributes: AttributeMap | None = None,
+    ) -> None: ...
+
+    def set_span_status(self, status_code: Literal["OK", "ERROR", "UNSET"]) -> None: ...
+
+    def record_exception(
+        self,
+        exception: Exception,
+        attributes: AttributeMap | None = None,
+        escaped: bool = False,
+    ) -> None: ...
+
 
 class TracingContextProviderFactory(Protocol):
 
@@ -101,7 +117,7 @@ class TracedFunc:
         ) -> Any:
 
             if ctx_provider := get_tracing_ctx_provider():
-                with ctx_provider(
+                with ctx_provider.start_trace_context(
                     self.trace_name,
                     self.trace_mapper(*args, **kwargs),
                 ):

jararaca/observability/hooks.py

@@ -1,7 +1,11 @@
 from contextlib import contextmanager
-from typing import Any, Generator
+from typing import Any, Generator, Literal
 
-from jararaca.observability.decorators import AttributeMap, get_tracing_ctx_provider
+from jararaca.observability.decorators import (
+    AttributeMap,
+    TracingContextProvider,
+    get_tracing_ctx_provider,
+)
 
 
 @contextmanager
@@ -11,10 +15,45 @@ def spawn_trace(
 ) -> Generator[None, Any, None]:
 
     if trace_context_provider := get_tracing_ctx_provider():
-        with trace_context_provider(trace_name=name, context_attributes=attributes):
+        with trace_context_provider.start_trace_context(
+            trace_name=name, context_attributes=attributes
+        ):
             yield
     else:
         yield
 
 
-spawn_trace
+def add_event(
+    name: str,
+    attributes: AttributeMap | None = None,
+) -> None:
+
+    if trace_context_provider := get_tracing_ctx_provider():
+        trace_context_provider.add_event(
+            event_name=name,
+            event_attributes=attributes,
+        )
+
+
+def set_span_status(status_code: Literal["OK", "ERROR", "UNSET"]) -> None:
+
+    if trace_context_provider := get_tracing_ctx_provider():
+        trace_context_provider.set_span_status(status_code=status_code)
+
+
+def record_exception(
+    exception: Exception,
+    attributes: AttributeMap | None = None,
+    escaped: bool = False,
+) -> None:
+
+    if trace_context_provider := get_tracing_ctx_provider():
+        trace_context_provider.record_exception(
+            exception=exception,
+            attributes=attributes,
+            escaped=escaped,
+        )
+
+
+def get_tracing_provider() -> TracingContextProvider | None:
+    return get_tracing_ctx_provider()

jararaca/observability/providers/otel.py

@@ -1,6 +1,6 @@
 import logging
 from contextlib import asynccontextmanager, contextmanager
-from typing import Any, AsyncGenerator, Generator, Protocol
+from typing import Any, AsyncGenerator, Generator, Literal, Protocol
 
 from opentelemetry import metrics, trace
 from opentelemetry._logs import set_logger_provider
@@ -50,7 +50,7 @@ class OtelTracingContextProvider(TracingContextProvider):
         self.app_context = app_context
 
     @contextmanager
-    def __call__(
+    def start_trace_context(
         self,
         trace_name: str,
         context_attributes: AttributeMap | None,
@@ -59,6 +59,29 @@ class OtelTracingContextProvider(TracingContextProvider):
         with tracer.start_as_current_span(trace_name, attributes=context_attributes):
             yield
 
+    def add_event(
+        self, event_name: str, event_attributes: AttributeMap | None = None
+    ) -> None:
+        trace.get_current_span().add_event(name=event_name, attributes=event_attributes)
+
+    def set_span_status(self, status_code: Literal["OK", "ERROR", "UNSET"]) -> None:
+        span = trace.get_current_span()
+        if status_code == "OK":
+            span.set_status(trace.Status(trace.StatusCode.OK))
+        elif status_code == "ERROR":
+            span.set_status(trace.Status(trace.StatusCode.ERROR))
+        else:
+            span.set_status(trace.Status(trace.StatusCode.UNSET))
+
+    def record_exception(
+        self,
+        exception: Exception,
+        attributes: AttributeMap | None = None,
+        escaped: bool = False,
+    ) -> None:
+        span = trace.get_current_span()
+        span.record_exception(exception, attributes=attributes, escaped=escaped)
+
 
 class OtelTracingContextProviderFactory(TracingContextProviderFactory):
 
@@ -101,6 +124,12 @@ class OtelTracingContextProviderFactory(TracingContextProviderFactory):
                     f"http.request.header.{k}": v
                     for k, v in tx_data.request.headers.items()
                 },
+                "http.request.body": (await tx_data.request.body())[:5000].decode(
+                    errors="ignore"
+                ),
+                "http.request.client.host": (
+                    tx_data.request.client.host if tx_data.request.client else ""
+                ),
             }
 
         elif tx_data.context_type == "message_bus":

{jararaca-0.3.22.dist-info → jararaca-0.3.24.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: jararaca
-Version: 0.3.22
+Version: 0.3.24
 Summary: A simple and fast API framework for Python
 Home-page: https://github.com/LuscasLeo/jararaca
 Author: Lucas S

{jararaca-0.3.22.dist-info → jararaca-0.3.24.dist-info}/RECORD

@@ -1,6 +1,6 @@
 LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
 README.md,sha256=YmCngjU8llW0l7L3tuXkkfr8qH7V9aBMgfp2jEzeiKg,3517
-pyproject.toml,sha256=cIaZ30kR0_7WQwX6DOqoxWOKZrZ71y8bIh81lS5SYyg,2739
+pyproject.toml,sha256=6sYLrOMmNeyU9uwMy6ye483fbPxeNvmrL39AVtHUMcI,2739
 jararaca/__init__.py,sha256=niZQiN-Whyw2ExcwQbB8uBDPy90pK36pPwa7dYkecuU,22822
 jararaca/__main__.py,sha256=-O3vsB5lHdqNFjUtoELDF81IYFtR-DSiiFMzRaiSsv4,67
 jararaca/broker_backend/__init__.py,sha256=GzEIuHR1xzgCJD4FE3harNjoaYzxHMHoEL0_clUaC-k,3528
@@ -26,11 +26,11 @@ jararaca/messagebus/message.py,sha256=U6cyd2XknX8mtm0333slz5fanky2PFLWCmokAO56vv
 jararaca/messagebus/publisher.py,sha256=JTkxdKbvxvDWT8nK8PVEyyX061vYYbKQMxRHXrZtcEY,2173
 jararaca/messagebus/worker.py,sha256=DiKDUhcU4rEjjA_3KqCmnN3X5yyokZq_-SbLryjS_PM,69237
 jararaca/microservice.py,sha256=DW4RVeqgrx4J-dAg17sbzTn_sLXuvV1UOQFde2fpqds,11471
-jararaca/observability/decorators.py,sha256=vKAPGLyKz092rd1K4k3xtI2FrRafN69EEuRZKEhaLSk,5627
-jararaca/observability/hooks.py,sha256=VRYg-vlNlFxu9FqOgxyS9VIY6zDcCcgOuZ0RhTUtjwY,488
+jararaca/observability/decorators.py,sha256=xTt4HEmpm_m1OUS29kaoZLMCT2YYToJUzQziepl8qfQ,6062
+jararaca/observability/hooks.py,sha256=vQCxb5m4uFse0lJIAuzSd84acu7iGDNgf4kpaWYkju8,1499
 jararaca/observability/interceptor.py,sha256=U4ZLM0f8j6Q7gMUKKnA85bnvD-Qa0ii79Qa_X8KsXAQ,1498
 jararaca/observability/providers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-jararaca/observability/providers/otel.py,sha256=LgkDRLRFA689ypfVjR67EU-eFHYBZRU01npDs-K8HMQ,9613
+jararaca/observability/providers/otel.py,sha256=DCNjGhcpF-XdlGTiYoQg9F_1ftcggTItDfJ_PjlZm0s,10808
 jararaca/persistence/base.py,sha256=xnGUbsLNz3gO-9iJt-Sn5NY13Yc9-misP8wLwQuGGoM,1024
 jararaca/persistence/exports.py,sha256=Ghx4yoFaB4QVTb9WxrFYgmcSATXMNvrOvT8ybPNKXCA,62
 jararaca/persistence/interceptors/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -76,8 +76,8 @@ jararaca/tools/typescript/interface_parser.py,sha256=yOSuOXKOeG0soGFo0fKiZIabu4Y
 jararaca/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 jararaca/utils/rabbitmq_utils.py,sha256=ytdAFUyv-OBkaVnxezuJaJoLrmN7giZgtKeet_IsMBs,10918
 jararaca/utils/retry.py,sha256=DzPX_fXUvTqej6BQ8Mt2dvLo9nNlTBm7Kx2pFZ26P2Q,4668
-jararaca-0.3.22.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-jararaca-0.3.22.dist-info/METADATA,sha256=--9VrDmq9co0M_0CDIcr_GjlbwhmHKypO4dh5F4sZYQ,5149
-jararaca-0.3.22.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-jararaca-0.3.22.dist-info/entry_points.txt,sha256=WIh3aIvz8LwUJZIDfs4EeH3VoFyCGEk7cWJurW38q0I,45
-jararaca-0.3.22.dist-info/RECORD,,
+jararaca-0.3.24.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+jararaca-0.3.24.dist-info/METADATA,sha256=uNJ8D0EW1oyL0t2bIodsYE3nVXnr8R6oJGTUc_uXOVw,5149
+jararaca-0.3.24.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+jararaca-0.3.24.dist-info/entry_points.txt,sha256=WIh3aIvz8LwUJZIDfs4EeH3VoFyCGEk7cWJurW38q0I,45
+jararaca-0.3.24.dist-info/RECORD,,

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "jararaca"
-version = "0.3.22"
+version = "0.3.24"
 description = "A simple and fast API framework for Python"
 authors = ["Lucas S <me@luscasleo.dev>"]
 readme = "README.md"