Fix error count calculation for Rnfe errors

    Added comments for more clarity.

Author: pandpara

codeguru_profiler_agent/agent_metadata/agent_debug_info.py

@@ -1,17 +1,19 @@
-from codeguru_profiler_agent.utils.synchronization import synchronized
+import logging
+import os
+
+logger = logging.getLogger(__name__)
 
 
 class ErrorsMetadata:
     def __init__(self):
-        self.errors_count = 0
-        self.sdk_client_errors = 0
-        self.configure_agent_errors = 0
-        self.configure_agent_rnfe_auto_create_enabled_errors = 0
-        self.create_profiling_group_errors = 0
-        self.post_agent_profile_errors = 0
-        self.post_agent_profile_rnfe_auto_create_enabled_errors = 0
+        self.reset()
 
     def reset(self):
+        """
+        We want to differentiate API call errors more granularly. We want to gather ResourceNotFoundException errors
+        because we are going to get this exception with auto-create  feature and want to monitor how many times
+        the agent is not able to create the PG and resulting in subsequent ResourceNotFoundException.
+        """
         self.errors_count = 0
         self.sdk_client_errors = 0
         self.configure_agent_errors = 0
@@ -20,12 +22,10 @@ def reset(self):
         self.post_agent_profile_errors = 0
         self.post_agent_profile_rnfe_auto_create_enabled_errors = 0
 
-    """
-    This needs to be compliant with errors count schema.
-    https://code.amazon.com/packages/SkySailProfileIonSchema/blobs/811cc0e7e406e37a5b878acf31468be3dcd2963d/--/src/main/resources/schema/DebugInfo.isl#L21
-    """
-
     def serialize_to_json(self):
+        """
+        This needs to be compliant with errors count schema.
+        """
         return {
             "errorsCount": self.errors_count,
             "sdkClientErrors": self.sdk_client_errors,
@@ -36,35 +36,86 @@ def serialize_to_json(self):
             "postAgentProfileRnfeAutoCreateEnabledErrors": self.post_agent_profile_rnfe_auto_create_enabled_errors
         }
 
-    @synchronized
     def increment_sdk_error(self, error_type):
+        """
+        ErrorsCount is the umbrella of all the kinds of error we want to capture. Currently we have only SdkClientErrors
+        in it. SdkClientErrors is comprised of different API level errors like ConfigureAgentErrors,
+        PostAgentProfileErrors, CreateProfilingGroupErrors.
+        :param error_type: The type of API level error that we want to capture.
+        """
         self.errors_count += 1
         self.sdk_client_errors += 1
 
+        """
+        Special handling for ResourceNotFoundException errors.
+        For example configureAgentRnfeAutoCreateEnabledErrors is also a configureAgentErrors.
+        """
         if error_type == "configureAgentErrors":
             self.configure_agent_errors += 1
         elif error_type == "configureAgentRnfeAutoCreateEnabledErrors":
+            self.configure_agent_errors += 1
             self.configure_agent_rnfe_auto_create_enabled_errors += 1
         elif error_type == "createProfilingGroupErrors":
             self.create_profiling_group_errors += 1
         elif error_type == "postAgentProfileErrors":
             self.post_agent_profile_errors += 1
         elif error_type == "postAgentProfileRnfeAutoCreateEnabledErrors":
+            self.post_agent_profile_errors += 1
             self.post_agent_profile_rnfe_auto_create_enabled_errors += 1
 
     def record_sdk_error(self, error_type):
         self.increment_sdk_error(error_type)
 
 
 class AgentDebugInfo:
-    def __init__(self, errors_metadata):
+    def __init__(self, errors_metadata=None, agent_start_time=None, timer=None):
+        self.process_id = get_process_id()
         self.errors_metadata = errors_metadata
+        self.agent_start_time = agent_start_time
+        self.timer = timer
 
     def serialize_to_json(self):
         """
         This needs to be compliant with agent debug info schema.
-        https://code.amazon.com/packages/SkySailProfileIonSchema/blobs/811cc0e7e406e37a5b878acf31468be3dcd2963d/--/src/main/resources/schema/DebugInfo.isl#L21
         """
-        return {
-            "errorsCount": self.errors_metadata.serialize_to_json()
-        }
+        json = {}
+
+        self.add_agent_start_time(json)
+        self.add_process_id(json)
+        self.add_errors_metadata(json)
+        self.add_generic_metrics(json)
+
+        return json
+
+    def add_agent_start_time(self, json):
+        if self.agent_start_time is not None:
+            json["agentStartTime"] = int(self.agent_start_time)
+
+    def add_errors_metadata(self, json):
+        if self.errors_metadata is not None:
+            json["errorsCount"] = self.errors_metadata.serialize_to_json()
+
+    def add_process_id(self, json):
+        if self.process_id is not None:
+            json["processId"] = self.process_id
+
+    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()
+
+            if generic_metrics:
+                json["genericMetrics"] = generic_metrics
+
+
+def get_process_id():
+    try:
+        return os.getpid()
+    except Exception as e:
+        logger.info("Failed to get the process id, " + repr(e))
+        return None
+

codeguru_profiler_agent/local_aggregator.py

@@ -47,6 +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.reset()
 
@@ -75,15 +76,15 @@ def _check_memory_limit(self):
 
     def reset(self):
         self.errors_metadata.reset()
+        self.timer.reset()
         self.profile = self.profile_factory(
             profiling_group_name=self.profiling_group_name,
             sampling_interval_seconds=AgentConfiguration.get().sampling_interval.total_seconds(),
             host_weight=self.host_weight,
             start=current_milli_time(clock=self.clock),
-            agent_debug_info=AgentDebugInfo(self.errors_metadata),
+            agent_debug_info=AgentDebugInfo(self.errors_metadata, self.agent_start_time, self.timer),
             clock=self.clock
         )
-        self.timer.reset()
 
     @with_timer("flush")
     def flush(self, force=False, reset=True):