Incorporating review comments of revision 2

Author: pandpara

codeguru_profiler_agent/agent_metadata/agent_debug_info.py

@@ -2,6 +2,7 @@
 import os
 
 from codeguru_profiler_agent.utils.synchronization import synchronized
+from codeguru_profiler_agent.utils.time import to_iso
 
 logger = logging.getLogger(__name__)
 
@@ -92,7 +93,7 @@ def serialize_to_json(self):
 
     def add_agent_start_time(self, json):
         if self.agent_start_time is not None:
-            json["agentStartTime"] = int(self.agent_start_time)
+            json["agentStartTime"] = to_iso(self.agent_start_time)
 
     def add_errors_metadata(self, json):
         if self.errors_metadata is not None:
@@ -106,10 +107,9 @@ def add_generic_metrics(self, json):
         if self.timer is not None and self.timer.metrics:
             generic_metrics = {}
 
-            for metric in self.timer.metrics:
-                metric_value = self.timer.metrics[metric]
-                generic_metrics[metric + "_max"] = metric_value.max
-                generic_metrics[metric + "_average"] = metric_value.average()
+            for metric, metric_value in self.timer.metrics.items():
+                generic_metrics[metric + "_timings_max"] = metric_value.max
+                generic_metrics[metric + "_timings_average"] = metric_value.average()
 
             if generic_metrics:
                 json["genericMetrics"] = generic_metrics
@@ -119,6 +119,6 @@ def get_process_id():
     try:
         return os.getpid()
     except Exception as e:
-        logger.info("Failed to get the process id, " + repr(e))
+        logger.info("Failed to get the process id", exc_info=True)
         return None
 

codeguru_profiler_agent/local_aggregator.py

@@ -47,7 +47,7 @@ def __init__(self, reporter, environment=dict()):
         self.profile = None
         self.memory_limit_bytes = environment["memory_limit_bytes"]
         self.last_report_attempted = current_milli_time(clock=self.clock)
-        self.agent_start_time = int(current_milli_time(clock=self.clock))
+        self.agent_start_time = current_milli_time(clock=self.clock)
 
         self.reset()
 

codeguru_profiler_agent/utils/time.py

@@ -5,7 +5,7 @@
 
 def to_iso(epoch_milli):
     try:
-        return datetime.fromtimestamp(epoch_milli / 1000).isoformat()
+        return datetime.fromtimestamp(epoch_milli / 1000).isoformat() + "Z"  # ISO 8601 date-time format
     except ValueError:
         return str(epoch_milli)
 

test/unit/agent_metadata/test_agent_debug_info.py

@@ -20,10 +20,10 @@ def test_it_returns_json_with_error_counts(self):
         }
 
     def test_it_returns_json_with_agent_start_time(self):
-        subject = AgentDebugInfo(agent_start_time=12345)
+        subject = AgentDebugInfo(agent_start_time=1577869200000)  # 2020-01-01T01:00:00Z
 
         serialized_json = subject.serialize_to_json()
-        assert serialized_json["agentStartTime"] == 12345
+        assert serialized_json["agentStartTime"] == "2020-01-01T01:00:00Z"
 
     def test_it_returns_json_with_generic_metrics(self):
         timer = Timer()
@@ -33,8 +33,8 @@ def test_it_returns_json_with_generic_metrics(self):
 
         serialized_json = subject.serialize_to_json()
         assert serialized_json["genericMetrics"] == {
-            "metric1_max": 12350000,
-            "metric1_average": 12347500.0
+            "metric1_timings_max": 12350000,
+            "metric1_timings_average": 12347500.0
         }