microbootstrap 1.2.3__tar.gz → 1.2.5__tar.gz

{microbootstrap-1.2.3 → microbootstrap-1.2.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: microbootstrap
-Version: 1.2.3
+Version: 1.2.5
 Summary: Package for bootstrapping new micro-services
 Keywords: python,microservice,bootstrap,opentelemetry,logging,error-tracing,litestar,fastapi
 Author: community-of-python

{microbootstrap-1.2.3 → microbootstrap-1.2.5}/microbootstrap/instruments/logging_instrument.py

@@ -93,6 +93,19 @@ STRUCTLOG_FORMATTER_PROCESSOR: typing.Final = structlog.processors.JSONRenderer(
     serializer=_serialize_log_with_orjson_to_string
 )
 
+_FAKER_STDLIB_LOGGER = logging.getLogger("microbootstrap.structlog")
+_FAKER_STDLIB_LOGGER.propagate = False
+_FAKER_STDLIB_LOGGER.addHandler(logging.NullHandler())
+
+
+def redirect_json_log_to_stdlib(_: WrappedLogger, __: str, event_dict: EventDict) -> EventDict:
+    __tracebackhide__ = True
+    getattr(_FAKER_STDLIB_LOGGER, event_dict["level"])(
+        STRUCTLOG_FORMATTER_PROCESSOR(_, __, event_dict),
+        exc_info=event_dict.get("exc_info", bool(event_dict.get("exception", False))),
+    )
+    return event_dict
+
 
 class MemoryLoggerFactory(structlog.stdlib.LoggerFactory):
     def __init__(
@@ -161,6 +174,13 @@ class LoggingInstrument(Instrument[LoggingConfig]):
 
     def _configure_structlog_loggers(self) -> None:
         if self.instrument_config.service_debug:
+            structlog.configure(
+                processors=[
+                    *structlog.get_config()["processors"][:-1],
+                    redirect_json_log_to_stdlib,  # ensure log is sent to Sentry
+                    structlog.get_config()["processors"][-1],
+                ]
+            )
             return
         structlog.configure(
             processors=[

{microbootstrap-1.2.3 → microbootstrap-1.2.5}/microbootstrap/instruments/opentelemetry_instrument.py

@@ -2,7 +2,6 @@ from __future__ import annotations
 import dataclasses
 import logging
 import os
-import threading
 import typing
 
 import pydantic
@@ -200,17 +199,14 @@ class PyroscopeSpanProcessor(SpanProcessor):
     def on_start(self, span: Span, parent_context: Context | None = None) -> None:  # noqa: ARG002
         if _is_root_span(span):
             formatted_span_id: typing.Final = format_span_id(span.context.span_id)
-            thread_id: typing.Final = threading.get_ident()
-
             span.set_attribute(OTEL_PROFILE_ID_KEY, formatted_span_id)
-            pyroscope.add_thread_tag(thread_id, PYROSCOPE_SPAN_ID_KEY, formatted_span_id)
-            pyroscope.add_thread_tag(thread_id, PYROSCOPE_SPAN_NAME_KEY, span.name)
+            pyroscope.add_thread_tag(PYROSCOPE_SPAN_ID_KEY, formatted_span_id)
+            pyroscope.add_thread_tag(PYROSCOPE_SPAN_NAME_KEY, span.name)
 
     def on_end(self, span: ReadableSpan) -> None:
         if _is_root_span(span):
-            thread_id: typing.Final = threading.get_ident()
-            pyroscope.remove_thread_tag(thread_id, PYROSCOPE_SPAN_ID_KEY, format_span_id(span.context.span_id))
-            pyroscope.remove_thread_tag(thread_id, PYROSCOPE_SPAN_NAME_KEY, span.name)
+            pyroscope.remove_thread_tag(PYROSCOPE_SPAN_ID_KEY, format_span_id(span.context.span_id))
+            pyroscope.remove_thread_tag(PYROSCOPE_SPAN_NAME_KEY, span.name)
 
     def force_flush(self, timeout_millis: int = 30000) -> bool:  # noqa: ARG002  # pragma: no cover
         return True

{microbootstrap-1.2.3 → microbootstrap-1.2.5}/pyproject.toml

@@ -56,7 +56,7 @@ dependencies = [
     "opentelemetry-instrumentation-asgi>=0.46b0",
     "orjson>=3.10.18",
 ]
-version = "1.2.3"
+version = "1.2.5"
 authors = [{ name = "community-of-python" }]
 
 [project.optional-dependencies]