SIENTIAPDE-1174

Update requirements and refactor manager classes to remove pod_id

- Updated the sientia-dataops-library dependency version to 1.3.8 in requirements.txt.
- Refactored IngestorManager, OpcManager, and ResourceManager classes to remove pod_id from their initialization and internal handling, enhancing code clarity and consistency.
- Adjusted unit tests to reflect the removal of pod_id, ensuring they remain functional and accurate.

ingestor/managers/ingestor_manager.py

@@ -14,7 +14,7 @@ import ingestor.metrics as metrics
 class IngestorManager(BaseActivity):
     def __init__(self,
                  kafka_servers: str, redis_data: dict,
-                 lease_ttl: int, heartbeat_ttl: int,  pod_id: str,
+                 lease_ttl: int, heartbeat_ttl: int,
                  poll_interval: int, mongo_connection_string: str, mongo_database: str,
                  metadata: dict,
                  logger: Logger, notification_handler: NotificationHandler,
@@ -40,7 +40,6 @@ class IngestorManager(BaseActivity):
             port=redis_port,
             lease_ttl=lease_ttl,
             heartbeat_ttl=heartbeat_ttl,
-            pod_id=pod_id,
             metadata=metadata,
             logger=logger,
             notification_handler=notification_handler,
@@ -52,7 +51,6 @@ class IngestorManager(BaseActivity):
         self.managed_tags = {}
         self.opc_servers = {}
 
-        self.pod_id = pod_id
         self.metadata = metadata
 
         BaseActivity.__init__(self, logger=logger,
@@ -88,7 +86,6 @@ class IngestorManager(BaseActivity):
                 logger=self.logger,
                 server_uri=server_config['server_uri'],
                 notification_handler=self.notification_handler,
-                pod_id=self.pod_id,
                 metadata=self.metadata,
                 cert_path=server_config.get('cert_path'),
                 private_key_path=server_config.get('private_key_path'),

ingestor/managers/opc_manager.py

@@ -11,8 +11,8 @@ import ingestor.metrics as metrics
 
 
 class OpcManager(BaseActivity):
-    def __init__(self, name: str, url: str, data_manager: DataManager,
-                 logger: Logger, server_uri: str, notification_handler: NotificationHandler, pod_id: str, metadata: dict,
+    def __init__(self, name: str, url: str, data_manager: DataManager, logger: Logger,
+                 server_uri: str, notification_handler: NotificationHandler, metadata: dict,
                  cert_path: str = None, private_key_path: str = None, server_cert_path: str = None):
         self.url = url
         self.name = name
@@ -26,18 +26,17 @@ class OpcManager(BaseActivity):
         self.nodes = {}
         self.subscriptions = {}
         self.data_manager = data_manager
-        self.pod_id = pod_id
         self.metadata = metadata
 
+        BaseActivity.__init__(self, logger=logger,
+                              notification_handler=notification_handler,
+                              set_error_counter=True)
+
         metrics.OPC_CONNECTION_STATUS.labels(
             pod_id=self.pod_id, server_name=self.name, server_url=self.url).set(0)
         metrics.OPC_TAGS_SUBSCRIBED.labels(
             pod_id=self.pod_id, server_name=self.name).set(0)
 
-        BaseActivity.__init__(self, logger=logger,
-                              notification_handler=notification_handler,
-                              set_error_counter=True)
-
     def __str__(self):
         return f"OpcManager(name={self.name}, url={self.url}, server_uri={self.server_uri})\n" \
             f"nodes={self.nodes}, subscriptions={self.subscriptions}"

ingestor/managers/resource_manager.py

@@ -16,14 +16,15 @@ class ResourceManager(BaseActivity):
         port: int,
         lease_ttl: int,
         heartbeat_ttl: int,
-        pod_id: str,
         metadata: dict,
         logger: Logger,
         notification_handler: NotificationHandler,
         username: str | None = None,
         password: str | None = None,
     ) -> None:
-        self.pod_id = pod_id
+        BaseActivity.__init__(self, logger=logger,
+                              notification_handler=notification_handler,
+                              set_error_counter=True)
         try:
             self.redis = Redis(
                 host=host,
@@ -35,7 +36,7 @@ class ResourceManager(BaseActivity):
             self.redis.ping()
             metrics.REDIS_CONNECTION_STATUS.labels(pod_id=self.pod_id).set(1)
         except Exception as e:
-            logger.error(f"Failed to connect to Redis: {e}")
+            self.logger.error(f"Failed to connect to Redis: {e}")
             metrics.REDIS_CONNECTION_STATUS.labels(pod_id=self.pod_id).set(0)
             raise
 
@@ -43,10 +44,6 @@ class ResourceManager(BaseActivity):
         self.heartbeat_ttl = heartbeat_ttl
         self.metadata = metadata
 
-        BaseActivity.__init__(self, logger=logger,
-                              notification_handler=notification_handler,
-                              set_error_counter=True)
-
     def _execute_redis_op(self, operation_name: str, func, *args, **kwargs):
         """Wrapper to execute Redis operations and record metrics."""
         start_time = time()