write MetricsConfiguration in protobuf

sozu-proxy · Apr 5, 2023 · ba6928c · ba6928c
1 parent a87214f
commit ba6928c
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 20 deletions.
diff --git a/bin/src/command/mod.rs b/bin/src/command/mod.rs
@@ -25,7 +25,8 @@ use serde::{Deserialize, Serialize};
 
 use sozu_command_lib::{
     config::Config,
-    request::{MetricsConfiguration, Request, WorkerRequest},
+    proto::command::MetricsConfiguration,
+    request::{Request, WorkerRequest},
     response::{Response, ResponseContent, ResponseStatus, RunState, WorkerResponse},
     scm_socket::{Listeners, ScmSocket},
     state::ConfigState,

diff --git a/bin/src/command/requests.rs b/bin/src/command/requests.rs
@@ -17,8 +17,8 @@ use sozu_command_lib::{
     config::Config,
     logging,
     parser::parse_several_commands,
-    proto::command::FrontendFilters,
-    request::{MetricsConfiguration, Request, WorkerRequest},
+    proto::command::{FrontendFilters, MetricsConfiguration},
+    request::{Request, WorkerRequest},
     response::{
         AggregatedMetrics, AvailableMetrics, ListedFrontends, ListenersList, Response,
         ResponseContent, ResponseStatus, RunState, WorkerInfo,

diff --git a/bin/src/ctl/request_builder.rs b/bin/src/ctl/request_builder.rs
@@ -7,13 +7,11 @@ use sozu_command_lib::{
     config::{Config, ListenerBuilder},
     proto::command::{
         AddBackend, AddCertificate, CertificateAndKey, Cluster, FrontendFilters,
-        LoadBalancingParams, PathRule, ProxyProtocolConfig, RemoveBackend, RemoveCertificate,
-        ReplaceCertificate, RequestHttpFrontend, RequestTcpFrontend, RulePosition, TlsVersion,
-    },
-    request::{
-        ActivateListener, DeactivateListener, ListenerType, MetricsConfiguration, RemoveListener,
-        Request,
+        LoadBalancingParams, MetricsConfiguration, PathRule, ProxyProtocolConfig, RemoveBackend,
+        RemoveCertificate, ReplaceCertificate, RequestHttpFrontend, RequestTcpFrontend,
+        RulePosition, TlsVersion,
     },
+    request::{ActivateListener, DeactivateListener, ListenerType, RemoveListener, Request},
 };
 
 use crate::{

diff --git a/command/src/command.proto b/command/src/command.proto
@@ -172,4 +172,14 @@ message QueryMetricsOptions {
     repeated string backend_ids = 3;
     // query only these metrics
     repeated string metric_names = 4;
+}
+
+// options to configure metrics collection
+enum MetricsConfiguration {
+    // enable metrics collection
+    ENABLED = 0;
+    // disable metrics collection
+    DISABLED = 1;
+    // wipe the metrics memory
+    CLEAR = 2;
 }
diff --git a/command/src/request.rs b/command/src/request.rs
@@ -12,7 +12,7 @@ use crate::{
     proto::command::{
         AddBackend, AddCertificate, Cluster, FrontendFilters, LoadBalancingAlgorithms,
         PathRuleKind, QueryClusterByDomain, QueryMetricsOptions, RemoveBackend, RemoveCertificate,
-        ReplaceCertificate, RequestHttpFrontend, RequestTcpFrontend, RulePosition,
+        ReplaceCertificate, RequestHttpFrontend, RequestTcpFrontend, RulePosition,MetricsConfiguration
     },
     response::{
         HttpFrontend, HttpListenerConfig, HttpsListenerConfig, MessageId, TcpListenerConfig,
@@ -282,13 +282,6 @@ impl Display for RequestHttpFrontend {
     }
 }
 
-#[derive(Debug, Clone, PartialEq, Eq, Hash, Serialize, Deserialize)]
-pub enum MetricsConfiguration {
-    Enabled,
-    Disabled,
-    Clear,
-}
-
 #[derive(Debug)]
 pub struct ParseErrorLoadBalancing;
 

diff --git a/lib/src/metrics/local_drain.rs b/lib/src/metrics/local_drain.rs
@@ -6,8 +6,7 @@ use hdrhistogram::Histogram;
 use sozu_command::response::{AvailableMetrics, BackendMetrics, ResponseContent};
 
 use crate::sozu_command::{
-    proto::command::QueryMetricsOptions,
-    request::MetricsConfiguration,
+    proto::command::{MetricsConfiguration, QueryMetricsOptions},
     response::{ClusterMetrics, FilteredMetrics, Percentiles, WorkerMetrics},
 };
 

diff --git a/lib/src/metrics/mod.rs b/lib/src/metrics/mod.rs
@@ -16,7 +16,8 @@ use mio::net::UdpSocket;
 use sozu_command::response::ResponseContent;
 
 use crate::sozu_command::{
-    proto::command::QueryMetricsOptions, request::MetricsConfiguration, response::FilteredMetrics,
+    proto::command::{MetricsConfiguration, QueryMetricsOptions},
+    response::FilteredMetrics,
 };
 
 use self::{local_drain::LocalDrain, network_drain::NetworkDrain};