Fixes to adjust

Author: cwasicki

src/frequenz/client/reporting/_types.py

@@ -92,8 +92,8 @@ def __iter__(self) -> Iterator[MetricSample]:
         for item in items:
             cid = getattr(item, self.id_attr)
             for sample in getattr(item, "metric_samples", []):
-                ts = sample.sampled_at.ToDatetime().replace(tzinfo=timezone.utc)
-                met = sample.metric.name
+                ts = sample.sample_time.ToDatetime().replace(tzinfo=timezone.utc)
+                met = Metric(sample.metric).name
 
                 # Handle simple_metric
                 if sample.value.HasField("simple_metric"):
@@ -127,7 +127,7 @@ def __iter__(self) -> Iterator[MetricSample]:
                             )
 
             for state in getattr(item, "states", []):
-                ts = state.sampled_at.ToDatetime().replace(tzinfo=timezone.utc)
+                ts = state.sample_time.ToDatetime().replace(tzinfo=timezone.utc)
                 for category, category_items in {
                     "state": getattr(state, "states", []),
                     "warning": getattr(state, "warnings", []),
@@ -150,7 +150,10 @@ def __init__(self, data_pb: PBReceiveMicrogridComponentsDataStreamResponse):
             data_pb: The underlying protobuf message.
         """
         super().__init__(
-            data_pb, id_attr="component_id", items_attr="components", has_bounds=True
+            data_pb,
+            id_attr="electrical_component_id",
+            items_attr="components",
+            has_bounds=True,
         )