write AvailableMetrics in protobuf

sozu-proxy · Apr 5, 2023 · dbd1fad · dbd1fad
1 parent 4472332
commit dbd1fad
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 18 deletions.
diff --git a/bin/src/command/requests.rs b/bin/src/command/requests.rs
@@ -18,11 +18,11 @@ use sozu_command_lib::{
     logging,
     parser::parse_several_commands,
     proto::command::{
-        AggregatedMetrics, FrontendFilters, ListenersList, MetricsConfiguration, RunState,
-        WorkerInfo,
+        AggregatedMetrics, AvailableMetrics, FrontendFilters, ListenersList, MetricsConfiguration,
+        RunState, WorkerInfo,
     },
     request::{Request, WorkerRequest},
-    response::{AvailableMetrics, ListedFrontends, Response, ResponseContent, ResponseStatus},
+    response::{ListedFrontends, Response, ResponseContent, ResponseStatus},
     scm_socket::Listeners,
     state::get_cluster_ids_by_domain,
 };

diff --git a/bin/src/ctl/display.rs b/bin/src/ctl/display.rs
@@ -5,10 +5,10 @@ use prettytable::{Row, Table};
 
 use sozu_command_lib::{
     proto::command::{
-        filtered_metrics, AggregatedMetrics, ClusterMetrics, FilteredMetrics, ListenersList,
-        WorkerInfo, WorkerMetrics,
+        filtered_metrics, AggregatedMetrics, AvailableMetrics, ClusterMetrics, FilteredMetrics,
+        ListenersList, WorkerInfo, WorkerMetrics,
     },
-    response::{AvailableMetrics, ListedFrontends, ResponseContent},
+    response::{ListedFrontends, ResponseContent},
 };
 
 pub fn print_listeners(listeners_list: ListenersList) {

diff --git a/command/src/command.proto b/command/src/command.proto
@@ -295,6 +295,12 @@ enum RunState {
     NOT_ANSWERING = 3;
 }
 
+// lists of available metrics in a worker, or in the main process (in which case there are no cluster metrics)
+message AvailableMetrics {
+    repeated string proxy_metrics = 1;
+    repeated string cluster_metrics = 2;
+}
+
 // Aggregated metrics of main process & workers
 message AggregatedMetrics {
     map<string, FilteredMetrics> main = 1;

diff --git a/command/src/response.rs b/command/src/response.rs
@@ -8,9 +8,9 @@ use std::{
 
 use crate::{
     proto::command::{
-        AddBackend, AggregatedMetrics, CertificateSummary, Cluster, FilteredTimeSerie,
-        ListenersList, LoadBalancingParams, PathRule, PathRuleKind, RequestHttpFrontend,
-        RequestTcpFrontend, RulePosition, RunState, WorkerInfo, WorkerMetrics,
+        AddBackend, AggregatedMetrics, AvailableMetrics, CertificateSummary, Cluster,
+        FilteredTimeSerie, ListenersList, LoadBalancingParams, PathRule, PathRuleKind,
+        RequestHttpFrontend, RequestTcpFrontend, RulePosition, RunState, WorkerInfo, WorkerMetrics,
     },
     request::PROTOCOL_VERSION,
     state::{ClusterId, ConfigState},
@@ -101,13 +101,6 @@ pub struct ClusterInformation {
     pub backends: Vec<Backend>,
 }
 
-/// lists of available metrics in a worker, or in the main process (in which case there are no cluster metrics)
-#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
-pub struct AvailableMetrics {
-    pub proxy_metrics: Vec<String>,
-    pub cluster_metrics: Vec<String>,
-}
-
 #[derive(Debug, Clone, PartialOrd, Ord, PartialEq, Eq, Hash, Serialize, Deserialize)]
 pub struct HttpFrontend {
     /// Send a 401, DENY, if cluster_id is None

diff --git a/lib/src/metrics/local_drain.rs b/lib/src/metrics/local_drain.rs
@@ -4,8 +4,8 @@ use std::{collections::BTreeMap, str, time::Instant};
 use anyhow::Context;
 use hdrhistogram::Histogram;
 use sozu_command::{
-    proto::command::{filtered_metrics, BackendMetrics},
-    response::{AvailableMetrics, ResponseContent},
+    proto::command::{filtered_metrics, AvailableMetrics, BackendMetrics},
+    response::ResponseContent,
 };
 
 use crate::sozu_command::proto::command::{