tremors 0.3.5__tar.gz → 0.4.0__tar.gz

{tremors-0.3.5/src/tremors.egg-info → tremors-0.4.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tremors
-Version: 0.3.5
+Version: 0.4.0
 Summary: Tremors is a library for logging while collecting metrics.
 Author-email: Narvin Singh <Narvin.A.Singh@gmail.com>
 License: Tremors is a library for logging with metrics.

{tremors-0.3.5 → tremors-0.4.0}/src/tremors/__init__.py

@@ -5,6 +5,6 @@ from tremors.logger import EXTRA_KEY, Collector, Logger
 
 __authors__ = ["Narvin Singh"]
 __project__ = "Tremors"
-__version__ = "0.3.5"
+__version__ = "0.4.0"
 
 __all__ = ["EXTRA_KEY", "Collector", "Logger", "__version__", "from_logged", "logged"]

{tremors-0.3.5 → tremors-0.4.0}/src/tremors/collector.py

@@ -93,10 +93,11 @@ class IndentifierState(NamedTuple):
 
 
 def _identifier_collect(
-    state: IndentifierState | None, logger: tremors.logger.Logger
+    state: IndentifierState | None, log_item: tremors.logger.LogItem
 ) -> IndentifierState | None:
     if state:
         return state
+    logger = log_item.logger
     if not logger.group_id or not logger.path:
         return None
     return IndentifierState(group_id=logger.group_id, parent=logger.parent, path=logger.path)
@@ -284,7 +285,7 @@ class CounterState:
     step: int
 
 
-def _counter_collect(state: CounterState, _: tremors.logger.Logger) -> CounterState:
+def _counter_collect(state: CounterState, _: tremors.logger.LogItem) -> CounterState:
     state.count += state.step
     return state
 
@@ -430,7 +431,7 @@ class ElapsedState:
     t: int | None
 
 
-def _collect_elapsed(state: ElapsedState, _: tremors.logger.Logger) -> ElapsedState:
+def _collect_elapsed(state: ElapsedState, _: tremors.logger.LogItem) -> ElapsedState:
     t = time.perf_counter_ns()
     if state.t0 is None:
         state.t0 = t

{tremors-0.3.5 → tremors-0.4.0}/src/tremors/logger.py

@@ -61,6 +61,29 @@ _current_logger: contextvars.ContextVar[Logger | None] = contextvars.ContextVar(
 )
 
 
+class LogItem(NamedTuple):
+    """The properties of a logged message.
+
+    This is essentially the arguments passed to :meth:`Logger.log`.
+    """
+
+    logger: Logger
+    level: int
+    msg: object
+    args: tuple[object, ...]
+    exc_info: (
+        bool
+        | tuple[type[BaseException], BaseException, TracebackType | None]
+        | tuple[None, None, None]
+        | BaseException
+        | None
+    )
+    stack_info: bool
+    stacklevel: int
+    extra: Mapping[str, object] | None
+    kwargs: dict[str, object]
+
+
 class Collector[TState](NamedTuple):
     """The collector specification.
 
@@ -73,26 +96,26 @@ class Collector[TState](NamedTuple):
         state: The initial state of the collector. Each time the collector
             runs, it may update this state.
         collect: When the collector runs, this function is called with the
-            current state, and the logger. It returns the new state.
+            current state, and the LogItem. It returns the new state.
     """
 
     name: str
     level: int
     state: TState
-    collect: Callable[[TState, Logger], TState]
+    collect: Callable[[TState, LogItem], TState]
 
 
 def _collectors_reducer[T](
     acc: tuple[MutableMapping[str, Collector[T]], MutableMapping[str, T]],
-    curr: tuple[tuple[Logger, int], tuple[str, Collector[T]]],
+    curr: tuple[LogItem, tuple[str, Collector[T]]],
 ) -> tuple[MutableMapping[str, Collector[T]], MutableMapping[str, T]]:
     acc_collectors, acc_extra = acc
-    (logger, level), (name, curr_c) = curr
-    if curr_c.level != logging.NOTSET and level < curr_c.level:
+    log_item, (name, curr_c) = curr
+    if curr_c.level != logging.NOTSET and log_item.level < curr_c.level:
         acc_collectors[name] = curr_c
         acc_extra[name] = curr_c.state
         return acc_collectors, acc_extra
-    state = curr_c.collect(curr_c.state, logger)
+    state = curr_c.collect(curr_c.state, log_item)
     acc_collectors[name] = Collector(curr_c.name, curr_c.level, state, curr_c.collect)
     acc_extra[name] = state
     return acc_collectors, acc_extra
@@ -276,9 +299,20 @@ class Logger(logging.LoggerAdapter[logging.Logger]):
         """
         initial_collectors: MutableMapping[str, Collector[Any]] = {}
         initial_extra: MutableMapping[str, Any] = {}
+        log_item = LogItem(
+            logger=self,
+            level=level,
+            msg=msg,
+            args=args,
+            exc_info=exc_info,
+            stack_info=stack_info,
+            stacklevel=stacklevel,
+            extra=extra,
+            kwargs=kwargs,
+        )
         self._collectors, own_extra = functools.reduce(
             _collectors_reducer,
-            zip(itertools.repeat((self, level)), self._collectors.items(), strict=False),
+            zip(itertools.repeat(log_item), self._collectors.items(), strict=False),
             (initial_collectors, initial_extra),
         )
         return self.logger.log(

{tremors-0.3.5 → tremors-0.4.0/src/tremors.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tremors
-Version: 0.3.5
+Version: 0.4.0
 Summary: Tremors is a library for logging while collecting metrics.
 Author-email: Narvin Singh <Narvin.A.Singh@gmail.com>
 License: Tremors is a library for logging with metrics.