Update process server proto (#417)

ava-labs · Dec 7, 2023 · 9c2d9a7 · 9c2d9a7
1 parent d7b157c
commit 9c2d9a7
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 173 deletions.
diff --git a/grpc-testtool/Cargo.toml b/grpc-testtool/Cargo.toml
@@ -21,7 +21,6 @@ prost = "0.12.0"
 thiserror = "1.0.47"
 tokio = { version = "1.32.0", features = ["sync", "rt-multi-thread"] }
 tonic = { version = "0.10.0", features = ["tls"] }
-prost-types = "0.12.0"
 clap = { version = "4.4.11", features = ["derive"] }
 tempdir = "0.3.7"
 log = "0.4.20"

diff --git a/grpc-testtool/build.rs b/grpc-testtool/build.rs
@@ -4,12 +4,7 @@
 fn main() -> Result<(), Box<dyn std::error::Error>> {
     tonic_build::compile_protos("proto/sync/sync.proto")?;
     tonic_build::compile_protos("proto/rpcdb/rpcdb.proto")?;
-    tonic_build::compile_protos("proto/io/prometheus/client/metrics.proto")?;
-
-    tonic_build::configure().compile(
-        &["proto/process-server/process-server.proto"], // protos
-        &["proto"],                                     // includes
-    )?;
+    tonic_build::compile_protos("proto/process-server/process-server.proto")?;
 
     Ok(())
 }
diff --git a/grpc-testtool/proto/io/prometheus/client/metrics.proto b/grpc-testtool/proto/io/prometheus/client/metrics.proto
diff --git a/grpc-testtool/proto/process-server/process-server.proto b/grpc-testtool/proto/process-server/process-server.proto
@@ -3,7 +3,6 @@ syntax = "proto3";
 package process;
 
 import "google/protobuf/empty.proto";
-import "io/prometheus/client/metrics.proto";
 
 option go_package = "github.com/ava-labs/merkledb-tester/proto/pb/process";
 
@@ -12,5 +11,5 @@ service ProcessServerService {
 }
 
 message MetricsResponse {
-  repeated io.prometheus.client.MetricFamily metric_families = 1;
+  string metrics = 1;
 }
diff --git a/grpc-testtool/src/lib.rs b/grpc-testtool/src/lib.rs
@@ -1,16 +1,6 @@
 // Copyright (C) 2023, Ava Labs, Inc. All rights reserved.
 // See the file LICENSE.md for licensing terms.
 
-pub mod io {
-    pub mod prometheus {
-        pub mod client {
-            #![allow(clippy::unwrap_used)]
-            #![allow(clippy::missing_const_for_fn)]
-            tonic::include_proto!("io.prometheus.client");
-        }
-    }
-}
-
 pub mod sync {
     #![allow(clippy::unwrap_used)]
     #![allow(clippy::missing_const_for_fn)]