UPDATE: Use modern way of importing protos

This will make it very easy to update versions.

Author: nhatcher-frequenz

Cargo.toml

@@ -14,10 +14,10 @@ frequenz-microgrid-component-graph = { git = "https://github.com/frequenz-floss/
 frequenz-microgrid-formula-engine = { git = "https://github.com/frequenz-floss/frequenz-microgrid-formula-engine-rs.git", rev = "463414a" }
 frequenz-resampling = { git = "https://github.com/frequenz-floss/frequenz-resampling-rs.git", rev = "ce84d66" }
 futures = "0.3.31"
-prost = "0.13"
-prost-types = "0.13"
+prost = "0.14"
 tokio = { version = "1.48", features = ["rt", "rt-multi-thread"] }
-tonic = "0.13"
+tonic = "0.14"
+tonic-prost = "0.14"
 tracing = { version = "0.1" }
 tracing-subscriber = { version = "0.3" }
 
@@ -28,5 +28,4 @@ tokio-stream = { version = "0.1.17", features = ["sync"] }
 
 
 [build-dependencies]
-prost-build = { version = "0.13", features = ["cleanup-markdown"] }
-tonic-build = "0.13"
+tonic-prost-build = { version = "0.14", features = ["cleanup-markdown"] }

build.rs

@@ -2,11 +2,11 @@
 // Copyright © 2025 Frequenz Energy-as-a-Service GmbH
 
 fn main() -> Result<(), std::io::Error> {
-    let config = tonic_build::Config::new();
-
-    tonic_build::configure()
-        .compile_protos_with_config(
-            config,
+    tonic_prost_build::configure()
+        .disable_comments(["."])
+        .include_file("proto_v1_alpha18.rs")
+        .compile_well_known_types(true)
+        .compile_protos(
             &["submodules/frequenz-api-microgrid/proto/frequenz/api/microgrid/v1alpha18/microgrid.proto"],
             &[
                 "submodules/frequenz-api-microgrid/proto",

src/client/instruction.rs

@@ -7,7 +7,7 @@ use tokio::sync::{broadcast, oneshot};
 
 use crate::{
     Error,
-    proto::common::v1alpha8::microgrid::electrical_components::{
+    proto::common::microgrid::electrical_components::{
         ElectricalComponent, ElectricalComponentConnection, ElectricalComponentTelemetry,
     },
 };

src/client/microgrid_api_client.rs

@@ -6,7 +6,7 @@
 
 use tonic::transport::Channel;
 
-use crate::proto::microgrid::v1alpha18::{
+use crate::proto::microgrid::{
     ListElectricalComponentConnectionsRequest, ListElectricalComponentConnectionsResponse,
     ListElectricalComponentsRequest, ListElectricalComponentsResponse,
     ReceiveElectricalComponentTelemetryStreamRequest,
@@ -50,9 +50,7 @@ pub trait MicrogridApiClient: Send + Sync + 'static {
 ///
 /// Forwards calls to the underlying gRPC client methods, without any additional logic.
 #[async_trait::async_trait]
-impl MicrogridApiClient
-    for crate::proto::microgrid::v1alpha18::microgrid_client::MicrogridClient<Channel>
-{
+impl MicrogridApiClient for crate::proto::microgrid::microgrid_client::MicrogridClient<Channel> {
     async fn list_electrical_components(
         &mut self,
         request: impl tonic::IntoRequest<ListElectricalComponentsRequest> + Send,

src/client/microgrid_client_actor.rs

@@ -5,7 +5,7 @@
 
 use crate::{
     client::{MicrogridApiClient, instruction::Instruction, retry_tracker::RetryTracker},
-    proto::microgrid::v1alpha18::{
+    proto::microgrid::{
         ListElectricalComponentConnectionsRequest, ListElectricalComponentsRequest,
         ReceiveElectricalComponentTelemetryStreamRequest,
         ReceiveElectricalComponentTelemetryStreamResponse,
@@ -20,9 +20,7 @@ use tokio::{
 };
 use tracing::Instrument as _;
 
-use crate::{
-    Error, proto::common::v1alpha8::microgrid::electrical_components::ElectricalComponentTelemetry,
-};
+use crate::{Error, proto::common::microgrid::electrical_components::ElectricalComponentTelemetry};
 
 enum StreamStatus {
     Failed(u64),

src/client/microgrid_client_handle.rs

@@ -13,10 +13,10 @@ use crate::{
     Error,
     client::MicrogridApiClient,
     proto::{
-        common::v1alpha8::microgrid::electrical_components::{
+        common::microgrid::electrical_components::{
             ElectricalComponent, ElectricalComponentConnection, ElectricalComponentTelemetry,
         },
-        microgrid::v1alpha18::microgrid_client::MicrogridClient,
+        microgrid::microgrid_client::MicrogridClient,
     },
 };
 
@@ -164,7 +164,7 @@ mod tests {
     use crate::{
         MicrogridClientHandle,
         client::test_utils::{MockComponent, MockMicrogridApiClient},
-        proto::common::v1alpha8::metrics::{SimpleMetricValue, metric_value_variant},
+        proto::common::metrics::{SimpleMetricValue, metric_value_variant},
     };
 
     fn new_client_handle() -> MicrogridClientHandle {

src/client/test_utils.rs

@@ -10,7 +10,7 @@ use tonic::Response;
 
 use crate::{
     proto::{
-        common::v1alpha8::{
+        common::{
             metrics::{
                 Metric, MetricSample, MetricValueVariant, SimpleMetricValue, metric_value_variant,
             },
@@ -22,7 +22,8 @@ use crate::{
                 electrical_component_category_specific_info::Kind,
             },
         },
-        microgrid::v1alpha18::{
+        google::protobuf,
+        microgrid::{
             ListElectricalComponentConnectionsRequest, ListElectricalComponentConnectionsResponse,
             ListElectricalComponentsRequest, ListElectricalComponentsResponse,
             ReceiveElectricalComponentTelemetryStreamRequest,
@@ -330,7 +331,12 @@ impl MicrogridApiClient for MockMicrogridApiClient {
                     for metrics in metrics.iter() {
                         interval.tick().await;
                         next_ts += dur;
-                        let ts = Some(prost_types::Timestamp::from(next_ts));
+                        let duration_since_epoch =
+                            next_ts.duration_since(SystemTime::UNIX_EPOCH).unwrap();
+                        let ts = Some(protobuf::Timestamp {
+                            seconds: duration_since_epoch.as_secs() as i64,
+                            nanos: duration_since_epoch.subsec_nanos() as i32,
+                        });
                         let mut metric_samples = vec![];
                         if let Some(power) = metrics.0 {
                             metric_samples.push(MetricSample {

src/logical_meter/formula/graph_formula_provider.rs

@@ -9,7 +9,7 @@ use crate::logical_meter::formula::aggregation_formula::AggregationFormula;
 use crate::logical_meter::formula::coalesce_formula::CoalesceFormula;
 use crate::logical_meter::logical_meter_actor;
 use crate::metric::Metric;
-use crate::proto::common::v1alpha8::microgrid::electrical_components::{
+use crate::proto::common::microgrid::electrical_components::{
     ElectricalComponent, ElectricalComponentConnection,
 };
 

src/logical_meter/logical_meter_actor.rs

@@ -13,11 +13,11 @@ use tokio::sync::{broadcast, mpsc, oneshot};
 use tokio::time::{MissedTickBehavior, interval};
 
 use crate::ErrorKind;
-use crate::proto::common::v1alpha8::metrics::{Metric, metric_value_variant::MetricValueVariant};
+use crate::proto::common::metrics::{Metric, metric_value_variant::MetricValueVariant};
 use crate::quantity::{Current, Power, Quantity, ReactivePower, Voltage};
 use crate::{
     Error, MicrogridClientHandle, Sample,
-    proto::common::v1alpha8::microgrid::electrical_components::ElectricalComponentTelemetry,
+    proto::common::microgrid::electrical_components::ElectricalComponentTelemetry,
 };
 
 use super::config::LogicalMeterConfig;

src/logical_meter/logical_meter_handle.rs

@@ -6,7 +6,7 @@ use crate::logical_meter::formula::graph_formula_provider::GraphFormulaProvider;
 use crate::{
     client::MicrogridClientHandle,
     error::Error,
-    proto::common::v1alpha8::microgrid::electrical_components::{
+    proto::common::microgrid::electrical_components::{
         ElectricalComponent, ElectricalComponentConnection,
     },
 };