Move start_time to store in SimulationData and add sim_name to Framework trace name

Author: rosswhitfield

ipsframework/configurationManager.py

@@ -9,6 +9,7 @@
 import uuid
 import logging
 import socket
+import time
 from multiprocessing import Queue, Process, set_start_method
 from .configobj import ConfigObj
 from . import ipsLogging
@@ -40,7 +41,8 @@ class SimulationData:
         entry in the configurationManager class
         """
 
-        def __init__(self, sim_name):
+        def __init__(self, sim_name, start_time=time.time()):
+            self.start_time = start_time
             self.sim_name = sim_name
             self.portal_sim_name = None
             self.sim_root = None
@@ -281,7 +283,7 @@ def initialize(self, data_mgr, resource_mgr, task_mgr):
             sim_name_list.append(sim_name)
             sim_root_list.append(sim_root)
             log_file_list.append(log_file)
-            new_sim = self.SimulationData(sim_name)
+            new_sim = self.SimulationData(sim_name, self.fwk.start_time)
             conf['__PORTAL_SIM_NAME'] = sim_name
             new_sim.sim_conf = conf
             new_sim.config_file = conf_file
@@ -301,7 +303,7 @@ def initialize(self, data_mgr, resource_mgr, task_mgr):
             if not self.fwk_sim_name:
                 fwk_sim_conf = conf.dict()
                 fwk_sim_conf['SIM_NAME'] = '_'.join([conf['SIM_NAME'], 'FWK'])
-                fwk_sim = self.SimulationData(fwk_sim_conf['SIM_NAME'])
+                fwk_sim = self.SimulationData(fwk_sim_conf['SIM_NAME'], self.fwk.start_time)
                 fwk_sim.sim_conf = fwk_sim_conf
                 fwk_sim.sim_root = new_sim.sim_root
                 fwk_sim.log_file = self.fwk.log_file  # sys.stdout
@@ -502,7 +504,6 @@ def _create_component(self, comp_conf, sim_data):
 
         # SIMYAN: removed else conditional, copying files in runspaceInit
         # component now
-
         svc_response_q = Queue(0)
         invocation_q = Queue(0)
         component_id = ComponentID(class_name, sim_name)
@@ -512,7 +513,7 @@ def _create_component(self, comp_conf, sim_data):
         services_proxy = ServicesProxy(self.fwk, fwk_inq, svc_response_q,
                                        sim_data.sim_conf, log_pipe_name)
         new_component = component_class(services_proxy, comp_conf)
-        new_component.__initialize__(component_id, invocation_q, self.fwk.start_time)
+        new_component.__initialize__(component_id, invocation_q, sim_data.start_time)
         services_proxy.__initialize__(new_component)
         self.comp_registry.addEntry(component_id, svc_response_q,
                                     invocation_q, new_component,
@@ -643,7 +644,7 @@ def create_simulation(self, sim_name, config_file, override, sub_workflow=False)
         self.sim_name_list.append(sim_name)
         self.sim_root_list.append(sim_root)
         self.log_file_list.append(log_file)
-        new_sim = self.SimulationData(sim_name)
+        new_sim = self.SimulationData(sim_name, start_time=self.fwk.start_time if sub_workflow else time.time())
         new_sim.sim_conf = conf
         new_sim.config_file = config_file
         new_sim.sim_root = sim_root

ipsframework/ips.py

@@ -603,7 +603,7 @@ def _send_monitor_event(self, sim_name='', eventType='', comment='', ok=True, ta
         portal_data['eventtype'] = eventType
         portal_data['ok'] = ok
         portal_data['comment'] = comment
-        portal_data['walltime'] = '%.2f' % (event_time - self.start_time)
+        portal_data['walltime'] = '%.2f' % (event_time - self.config_manager.sim_map[sim_name].start_time)
         portal_data['time'] = getTimeString(time.localtime(event_time))
 
         topic_name = '_IPS_MONITOR'
@@ -647,7 +647,7 @@ def _send_monitor_event(self, sim_name='', eventType='', comment='', ok=True, ta
                 portal_data['sim_runid'] = get_config(sim_name, 'RUN_ID')
             except KeyError:
                 pass
-            portal_data['startat'] = getTimeString(time.localtime(self.start_time))
+            portal_data['startat'] = getTimeString(time.localtime(self.config_manager.sim_map[sim_name].start_time))
             portal_data['ips_version'] = get_versions()['version']
 
             try:
@@ -659,12 +659,12 @@ def _send_monitor_event(self, sim_name='', eventType='', comment='', ok=True, ta
             portal_data['state'] = 'Completed'
             portal_data['stopat'] = getTimeString(time.localtime(event_time))
             # Zipkin json format
-            portal_data['trace'] = {"timestamp": int(self.start_time*1e6),
-                                    "duration": int((event_time - self.start_time)*1e6),
+            portal_data['trace'] = {"timestamp": int(self.config_manager.sim_map[sim_name].start_time*1e6),
+                                    "duration": int((event_time - self.config_manager.sim_map[sim_name].start_time)*1e6),
                                     "localEndpoint": {
-                                        "serviceName": str(self.component_id)
+                                        "serviceName": f'{sim_name}@{self.component_id}'
                                     },
-                                    "id": hashlib.md5(str(self.component_id).encode()).hexdigest()[:16],
+                                    "id": hashlib.md5(f'{sim_name}@{self.component_id}'.encode()).hexdigest()[:16],
                                     'tags': {'total_cores': str(self.resource_manager.total_cores)}}
         elif eventType == "IPS_CALL_END":
             trace = {}  # Zipkin json format
@@ -675,7 +675,7 @@ def _send_monitor_event(self, sim_name='', eventType='', comment='', ok=True, ta
                 trace['localEndpoint'] = {"serviceName": target}
                 trace['name'] = operation
                 trace['id'] = hashlib.md5(f"{target}:{operation}".encode()).hexdigest()[:16]
-                trace["parentId"] = hashlib.md5(str(self.component_id).encode()).hexdigest()[:16]
+                trace["parentId"] = hashlib.md5(f'{sim_name}@{self.component_id}'.encode()).hexdigest()[:16]
 
             if trace:
                 portal_data['trace'] = trace