Refactor task logger setup and TaskLogHandler

- Moved task logger setup from frinx_conductor_wrapper to task_logging.
- Refactored the method to set task-specific information for threads.

Author: MartinFoka

frinx/client/v2/frinx_conductor_wrapper.py

@@ -24,18 +24,13 @@
 
 from frinx.client.v2.conductor import WFClientMgr
 from frinx.common.frinx_rest import CONDUCTOR_URL_BASE
-from frinx.common.logging.task_logging import TaskLogHandler
+from frinx.common.logging.task_logging import task_log_handler
 from frinx.common.worker.worker import WorkerImpl
 
 logger = logging.getLogger(__name__)
 hostname = socket.gethostname()
 RawTaskIO: TypeAlias = dict[str, Any]
 
-task_logger = logging.getLogger('task_logger')
-task_logger.propagate = False
-task_log_handler = TaskLogHandler(max_capacity=100, max_message_length=15000)
-task_logger.addHandler(task_log_handler)
-
 
 @dataclass
 class RegisteredWorkerTask:
@@ -244,7 +239,7 @@ def register(self, task_blueprint: WorkerImpl) -> None:
 
     def execute(self, task: RawTaskIO, task_blueprint: WorkerImpl) -> None:
         try:
-            task_log_handler.set_taskname_for_thread(task['taskType'])
+            task_log_handler.set_task_info_for_thread(str(task['taskType']), str(task['workflowInstanceId']))
             logger.info('Executing a task %s', task['taskId'])
             resp = task_blueprint.execute_wrapper(task)
 

frinx/common/logging/task_logging.py

@@ -23,10 +23,10 @@ def __init__(self, max_capacity: int = 100, max_message_length: int = 15000, lev
         self.max_message_length: int = max_message_length
         self.thread_data = threading.local()
         self.thread_data.log_queue = deque(maxlen=self.max_capacity)
-        self.thread_data.task_name = 'Unknown'
         self.formatter = logging.Formatter('%(levelname)s: %(message)s')
         self.console_formatter = logging.Formatter(
-            '%(asctime)s | %(threadName)s | %(levelname)s | task: %(taskname)s | %(message)s', datefmt='%F %T')
+            '%(asctime)s | %(threadName)s | %(levelname)s | %(task_info)s | %(message)s',
+            datefmt='%F %T')
         self.console_handler = logging.StreamHandler()
         self.console_handler.setFormatter(self.console_formatter)
 
@@ -38,10 +38,7 @@ def emit(self, record: logging.LogRecord) -> None:
         if not hasattr(self.thread_data, 'log_queue'):
             self._setup_thread_logging()
 
-        if not hasattr(self.thread_data, 'task_name'):
-            self.thread_data.task_name = 'Unknown'
-
-        record.taskname = self.thread_data.task_name
+        record.task_info = getattr(self.thread_data, 'task_info', 'Unknown')
 
         formatted_record: str = self.format(record)
         truncated_record: str = self._truncate_message(formatted_record)
@@ -63,11 +60,12 @@ def _setup_thread_logging(self) -> None:
         """
         self.thread_data.log_queue = deque(maxlen=self.max_capacity)
 
-    def set_taskname_for_thread(self, task_name: str) -> None:
+    def set_task_info_for_thread(self, *args: str) -> None:
         """
-        Set the task name for the current thread.
+        Set task-specific information for the current thread.
         """
-        self.thread_data.task_name = task_name
+        delimiter: str = ' '
+        self.thread_data.task_info = delimiter.join(str(arg) for arg in args)
 
     def get_logs(self, clear: bool = True) -> list[str]:
         """
@@ -89,4 +87,11 @@ def _clear_taskname_for_thread(self) -> None:
         Clear the task name for the current thread.
         """
         if hasattr(self.thread_data, 'task_name'):
-            del self.thread_data.task_name
+            del self.thread_data.task_name
+
+
+# Task logger setup
+task_log_handler = TaskLogHandler(max_capacity=100, max_message_length=15000)
+task_logger = logging.getLogger('task_logger')
+task_logger.addHandler(task_log_handler)
+task_logger.propagate = False