microbootstrap 1.2.4__tar.gz → 1.3.0__tar.gz

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

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

{microbootstrap-1.2.4 → microbootstrap-1.3.0}/microbootstrap/instruments/logging_instrument.py

@@ -78,7 +78,6 @@ STRUCTLOG_PRE_CHAIN_PROCESSORS: typing.Final[list[typing.Any]] = [
     structlog.stdlib.add_logger_name,
     tracer_injection,
     structlog.stdlib.PositionalArgumentsFormatter(),
-    structlog.processors.TimeStamper(fmt="%Y-%m-%d %H:%M:%S"),
     structlog.processors.StackInfoRenderer(),
     structlog.processors.format_exc_info,
     structlog.processors.UnicodeDecoder(),
@@ -149,6 +148,9 @@ class LoggingConfig(BaseInstrumentConfig):
     )
     logging_exclude_endpoints: list[str] = pydantic.Field(default_factory=lambda: ["/health/", "/metrics"])
     logging_turn_off_middleware: bool = False
+    logging_timestamper_extra_params: dict[str, typing.Any] = pydantic.Field(
+        default_factory=lambda: {"fmt": "%Y-%m-%d %H:%M:%S"}
+    )
 
     @pydantic.model_validator(mode="after")
     def remove_trailing_slashes_from_logging_exclude_endpoints(self) -> typing_extensions.Self:
@@ -172,6 +174,10 @@ class LoggingInstrument(Instrument[LoggingConfig]):
         for unset_handlers_logger in self.instrument_config.logging_unset_handlers:
             logging.getLogger(unset_handlers_logger).handlers = []
 
+    @property
+    def _timestamper_processor(self) -> structlog.processors.TimeStamper:
+        return structlog.processors.TimeStamper(**self.instrument_config.logging_timestamper_extra_params)
+
     def _configure_structlog_loggers(self) -> None:
         if self.instrument_config.service_debug:
             structlog.configure(
@@ -186,6 +192,7 @@ class LoggingInstrument(Instrument[LoggingConfig]):
             processors=[
                 structlog.stdlib.filter_by_level,
                 *STRUCTLOG_PRE_CHAIN_PROCESSORS,
+                self._timestamper_processor,
                 *self.instrument_config.logging_extra_processors,
                 STRUCTLOG_FORMATTER_PROCESSOR,
             ],
@@ -213,7 +220,7 @@ class LoggingInstrument(Instrument[LoggingConfig]):
             )
             if self.instrument_config.service_debug
             else structlog.stdlib.ProcessorFormatter(
-                foreign_pre_chain=STRUCTLOG_PRE_CHAIN_PROCESSORS,
+                foreign_pre_chain=[*STRUCTLOG_PRE_CHAIN_PROCESSORS, self._timestamper_processor],
                 processors=[
                     structlog.stdlib.ProcessorFormatter.remove_processors_meta,
                     STRUCTLOG_FORMATTER_PROCESSOR,

{microbootstrap-1.2.4 → microbootstrap-1.3.0}/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.4 → microbootstrap-1.3.0}/pyproject.toml

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