refactor: Simplify metric collect logic

Author: seedspirit

src/ai/backend/agent/stats.py

@@ -51,7 +51,6 @@
     FlattenedDeviceMetric,
     FlattenedKernelMetric,
     FlattenedProcessMetric,
-    MetricValueFieldPair,
 )
 from .utils import remove_exponent
 
@@ -728,7 +727,6 @@ async def collect_container_stat(
         )
         results = await asyncio.gather(*_tasks, return_exceptions=True)
         updated_kernel_ids: set[KernelId] = set()
-        raw_kernel_value_pairs: dict[tuple[KernelId, MetricKey], list[MetricValueFieldPair]] = {}
         self._stage_observer.observe_stage(
             stage="before_observe",
             upper_layer="collect_container_stat",
@@ -768,10 +766,6 @@ async def collect_container_stat(
                         )
                     else:
                         self.kernel_metrics[kernel_id][metric_key].update(measure)
-                    value_pairs = [(CURRENT_METRIC_KEY, str(measure.value))]
-                    if measure.capacity is not None:
-                        value_pairs.append((CAPACITY_METRIC_KEY, str(measure.capacity)))
-                    raw_kernel_value_pairs[(kernel_id, metric_key)] = value_pairs
 
         prometheus_kernel_updates: list[FlattenedKernelMetric] = []
         kernel_serialized_updates: list[tuple[KernelId, bytes]] = []
@@ -789,12 +783,12 @@ async def collect_container_stat(
                     )
                     continue
                 serializable_metrics[key] = metric_value
-                if (raw_value_pairs := raw_kernel_value_pairs.get((kernel_id, key))) is None:
-                    continue
                 value_pairs = [
-                    *raw_value_pairs,
+                    (CURRENT_METRIC_KEY, metric_value["current"]),
                     (PCT_METRIC_KEY, metric_value["pct"]),
                 ]
+                if (capacity := metric_value.get("capacity")) is not None:
+                    value_pairs.append((CAPACITY_METRIC_KEY, capacity))
                 if (max_value := metric_value.get("stats.max")) is not None:
                     value_pairs.append((MAX_METRIC_KEY, max_value))
                 if (avg_value := metric_value.get("stats.avg")) is not None: