Improved wrapped logging #187

src/cpl-dependency/cpl/dependency/service_collection.py

@@ -1,9 +1,6 @@
 from typing import Union, Type, Callable, Self
 
-from cpl.core.log.logger import Logger
 from cpl.core.log.logger_abc import LoggerABC
-from cpl.core.log.structured_logger import StructuredLogger
-from cpl.core.log.wrapped_logger import WrappedLogger
 from cpl.core.typing import T, Service
 from cpl.dependency.service_descriptor import ServiceDescriptor
 from cpl.dependency.service_lifetime_enum import ServiceLifetimeEnum
@@ -82,14 +79,20 @@ class ServiceCollection:
         return self
 
     def add_logging(self) -> Self:
+        from cpl.core.log.logger import Logger
+        from cpl.core.log.wrapped_logger import WrappedLogger
+
         self.add_transient(LoggerABC, Logger)
-        return self
-
-    def add_structured_logging(self) -> Self:
-        self.add_transient(LoggerABC, StructuredLogger)
-        return self
-
-    def add_wrapped_logging(self) -> Self:
+        for wrapper in WrappedLogger.__subclasses__():
+            self.add_transient(wrapper)
+        return self
+
+    def add_structured_logging(self) -> Self:
+        from cpl.core.log.structured_logger import StructuredLogger
+        from cpl.core.log.wrapped_logger import WrappedLogger
+
+        self.add_transient(LoggerABC, StructuredLogger)
+
         for wrapper in WrappedLogger.__subclasses__():
             self.add_transient(wrapper)
         return self