fdc-shared-kernel 0.0.65__tar.gz → 0.0.67__tar.gz

{fdc_shared_kernel-0.0.65 → fdc_shared_kernel-0.0.67}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fdc_shared_kernel
-Version: 0.0.65
+Version: 0.0.67
 Summary: Shared library for microservice
 Author-email: Shikhil S <shikhil.s@dbizsolution.com>, Ahammed Akdham N <ahammedakdham.n@dbizsolution.com>
 Classifier: Programming Language :: Python :: 3

{fdc_shared_kernel-0.0.65 → fdc_shared_kernel-0.0.67}/fdc_shared_kernel.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fdc_shared_kernel
-Version: 0.0.65
+Version: 0.0.67
 Summary: Shared library for microservice
 Author-email: Shikhil S <shikhil.s@dbizsolution.com>, Ahammed Akdham N <ahammedakdham.n@dbizsolution.com>
 Classifier: Programming Language :: Python :: 3

{fdc_shared_kernel-0.0.65 → fdc_shared_kernel-0.0.67}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "fdc_shared_kernel"
-version = "0.0.65"
+version = "0.0.67"
 requires-python = ">=3.7"
 readme = "README_pypi.md"
 description = "Shared library for microservice"

{fdc_shared_kernel-0.0.65 → fdc_shared_kernel-0.0.67}/shared_kernel/event_executor/event_executor.py

@@ -106,6 +106,28 @@ class EventExecutor:
 
                 callback(event_msg.raw_message, None)
 
+            elif task["status"] == TaskStatus.QUEUED.value:
+                logger.info(
+                    f"Task {event_msg.event_name} is already processing. trace-id: {event_msg.event_meta.trace_id}. span-id: {event_msg.event_meta.trace_id}."
+                )
+
+                self.status_tracker.set_tracking_payload(
+                    span_id=event_msg.event_meta.span_id,
+                    trace_id=event_msg.event_meta.trace_id,
+                    task=event_msg.event_name,
+                    tracking_payload=event_msg.to_json(),
+                    task_id=event_msg.event_meta.job_id,
+                )
+                
+                self.status_tracker.update_task(
+                    span_id=event_msg.event_meta.span_id,
+                    trace_id=event_msg.event_meta.trace_id,
+                    task=event_msg.event_name,
+                    status=TaskStatus.PROCESSING.value,
+                    task_id=event_msg.event_meta.job_id,
+                )
+                callback(event_msg.raw_message, task.get("tracking_payload"))
+
             elif task["status"] == TaskStatus.PROCESSING.value:
                 logger.info(
                     f"Task {event_msg.event_name} is already processing. trace-id: {event_msg.event_meta.trace_id}. span-id: {event_msg.event_meta.trace_id}."
@@ -188,7 +210,7 @@ class EventExecutor:
 
             if success:
                 logger.info(
-                    f"Event {event_msg.event_name} completed successfully. trace-id: {event_msg.event_meta.trace_id}. span-id: {event_msg.event_meta.trace_id}."
+                    f"Event {event_msg.event_name} completed successfully. trace-id: {event_msg.event_meta.trace_id}. span-id: {event_msg.event_meta.span_id}."
                 )
                 self.status_tracker.update_task(
                     span_id=event_msg.event_meta.span_id,
@@ -199,7 +221,7 @@ class EventExecutor:
                 )
             else:
                 logger.warning(
-                    f"Event {event_msg.event_name} failed during processing. trace-id: {event_msg.event_meta.trace_id}. span-id: {event_msg.event_meta.trace_id}."
+                    f"Event {event_msg.event_name} failed during processing. trace-id: {event_msg.event_meta.trace_id}. span-id: {event_msg.event_meta.span_id}."
                 )
             self.databus.delete_message(event_msg)
 

{fdc_shared_kernel-0.0.65 → fdc_shared_kernel-0.0.67}/shared_kernel/messaging/aws_databus.py

@@ -6,7 +6,6 @@ from shared_kernel.interfaces.databus import DataBus
 from shared_kernel.logger import Logger
 from shared_kernel.messaging.utils.aws_utility import AWSMessagingUtility, AWSQueue
 from shared_kernel.messaging.utils.event_messages import AWSEventMessage
-from shared_kernel.status_tracker.status_tracker import StatusTracker
 from shared_kernel.enums import TaskStatus
 
 app_config = Config()
@@ -32,6 +31,8 @@ class AWSDataBus(DataBus):
         Args:
             config (Dict): A dictionary containing the EventBridge and SQS configuration.
         """
+        ## Importing here to avoid circular import error since status_tracker depends on DataBusFactory
+        from shared_kernel.status_tracker.status_tracker import StatusTracker
         if not hasattr(self, "initialized"):  # Prevent reinitialization
             super().__init__()
             self.aws_utility = AWSMessagingUtility()
@@ -68,6 +69,13 @@ class AWSDataBus(DataBus):
                 status=TaskStatus.QUEUED.value,
                 task_id=validated_event_dict["event_meta"]["job_id"],
             )
+            self.status_tracker.set_tracking_payload(
+                span_id=validated_event_dict["event_meta"]["span_id"],
+                trace_id=validated_event_dict["event_meta"]["trace_id"],
+                task=validated_event_dict["event_name"],
+                tracking_payload=validated_event_dict,
+                task_id=validated_event_dict["event_meta"]["job_id"],
+            )
 
     def subscribe_sync_event(self, event_name: str, callback: Callable[[Any], None]):
         """