Adding the get_limits call within the collect_all_tracked call

azurelinuxagent/common/cgroups.py

@@ -186,6 +186,8 @@ class CGroupsTelemetry(object):
 
     tracked_names = set()
 
+    _osutil = get_osutil()
+
     @staticmethod
     def metrics_hierarchies():
         return CGroupsTelemetry._hierarchies
@@ -267,6 +269,24 @@ def stop_tracking(name):
         if CGroupsTelemetry.is_tracked(name):
             del (CGroupsTelemetry._tracked[name])
 
+    @staticmethod
+    def get_cpu_limits(name):
+        # default values
+        cpu_limit = DEFAULT_CPU_LIMIT_AGENT if AGENT_NAME.lower() in name.lower() else DEFAULT_CPU_LIMIT_EXT
+
+        return cpu_limit
+
+    @staticmethod
+    def get_memory_limits(name):
+        # default values
+        mem_limit = max(DEFAULT_MEM_LIMIT_MIN_MB, round(_osutil.get_total_mem() * DEFAULT_MEM_LIMIT_PCT / 100, 0))
+
+        # agent values
+        if AGENT_NAME.lower() in name.lower():
+            mem_limit = min(DEFAULT_MEM_LIMIT_MAX_MB, mem_limit)
+
+        return mem_limit
+
     @staticmethod
     def collect_all_tracked():
         """
@@ -284,7 +304,9 @@ def collect_all_tracked():
         for cgroup_name, collector in CGroupsTelemetry._tracked.copy().items():
             cgroup_name = cgroup_name if cgroup_name else WRAPPER_CGROUP_NAME
             results[cgroup_name] = collector.collect()
-            limits[cgroup_name] = collector.cgroup.threshold
+            limits[cgroup_name] = {"cpu": CGroupsTelemetry.get_cpu_limits(cgroup_name),
+                                   "memory": CGroupsTelemetry.get_memory_limits(cgroup_name)}
+
         return results, limits
 
     @staticmethod
@@ -538,9 +560,6 @@ def set_limits(self):
                 message=msg,
                 log_event=False)
 
-        # Returning the limits -
-        self.threshold = {"cpu": cpu_limit, "memory": mem_limit}
-
     @staticmethod
     def _apply_wrapper_limits(path, hierarchy):
         """