microbootstrap 1.2.2__tar.gz → 1.2.4__tar.gz

{microbootstrap-1.2.2 → microbootstrap-1.2.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: microbootstrap
-Version: 1.2.2
+Version: 1.2.4
 Summary: Package for bootstrapping new micro-services
 Keywords: python,microservice,bootstrap,opentelemetry,logging,error-tracing,litestar,fastapi
 Author: community-of-python
@@ -29,7 +29,7 @@ Requires-Dist: pydantic-settings>=2
 Requires-Dist: rich>=13
 Requires-Dist: sentry-sdk>=2.7
 Requires-Dist: structlog>=24
-Requires-Dist: pyroscope-io<=1.0.0 ; sys_platform != 'win32'
+Requires-Dist: pyroscope-io>=1.0.0 ; sys_platform != 'win32'
 Requires-Dist: opentelemetry-distro[otlp]>=0.54b1
 Requires-Dist: opentelemetry-instrumentation-aio-pika>=0.54b1
 Requires-Dist: opentelemetry-instrumentation-aiohttp-client>=0.54b1

{microbootstrap-1.2.2 → microbootstrap-1.2.4}/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.2 → microbootstrap-1.2.4}/microbootstrap/instruments/pyroscope_instrument.py

@@ -19,7 +19,6 @@ class PyroscopeConfig(BaseInstrumentConfig):
 
     pyroscope_endpoint: pydantic.HttpUrl | None = None
     pyroscope_sample_rate: int = 100
-    pyroscope_auth_token: str | None = None
     pyroscope_tags: dict[str, str] = pydantic.Field(default_factory=dict)
     pyroscope_additional_params: dict[str, typing.Any] = pydantic.Field(default_factory=dict)
 
@@ -38,7 +37,6 @@ class PyroscopeInstrument(Instrument[PyroscopeConfig]):
         pyroscope.configure(
             application_name=self.instrument_config.opentelemetry_service_name or self.instrument_config.service_name,
             server_address=str(self.instrument_config.pyroscope_endpoint),
-            auth_token=self.instrument_config.pyroscope_auth_token or "",
             sample_rate=self.instrument_config.pyroscope_sample_rate,
             tags=(
                 {"service_namespace": self.instrument_config.opentelemetry_namespace}

{microbootstrap-1.2.2 → microbootstrap-1.2.4}/pyproject.toml

@@ -41,7 +41,7 @@ dependencies = [
     "rich>=13",
     "sentry-sdk>=2.7",
     "structlog>=24",
-    "pyroscope-io<=1.0.0; platform_system != 'Windows'",
+    "pyroscope-io>=1.0.0; platform_system != 'Windows'",
     "opentelemetry-distro[otlp]>=0.54b1",
     "opentelemetry-instrumentation-aio-pika>=0.54b1",
     "opentelemetry-instrumentation-aiohttp-client>=0.54b1",
@@ -56,7 +56,7 @@ dependencies = [
     "opentelemetry-instrumentation-asgi>=0.46b0",
     "orjson>=3.10.18",
 ]
-version = "1.2.2"
+version = "1.2.4"
 authors = [{ name = "community-of-python" }]
 
 [project.optional-dependencies]