Merge pull request #18 from CleverCloud/bump-to-sozu-1.1

convert histogram metrics
CleverCloud · Jul 18, 2024 · b9dc09d · b9dc09d
2 parents fc90d9c + e405175
commit b9dc09d
Show file tree

Hide file tree

Showing 6 changed files with 145 additions and 301 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -23,8 +23,8 @@ serde = { version = "^1.0.195", features = ["derive"] }
 serde_json = "^1.0.111"
 sentry = { version = "^0.34.0", default-features = false, features = ["backtrace", "contexts", "panic", "reqwest", "rustls"] }
 sentry-tracing = "^0.34.0"
-sozu-client = "^0.4.0"
-sozu-command-lib = "^1.0.0"
+sozu-client = "^0.4.1"
+sozu-command-lib = "^1.0.3"
 thiserror = "^1.0.56"
 tokio = { version = "^1.35.1", features = ["macros", "rt", "signal"] }
 tracing = "^0.1.40"

diff --git a/example.config.toml b/example.config.toml
@@ -1,9 +1,6 @@
 # Socket address on which to listen
 listening-address = "0.0.0.0:3000"
 
-# aggregate backend metrics by cluster id
-aggregate-backend-metrics = true
-
 [sozu]
 # Path to Sōzu's configuration file
 configuration = "path/to/sozu/config.toml"

diff --git a/src/svc/config.rs b/src/svc/config.rs
@@ -42,8 +42,6 @@ pub struct Sozu {
 pub struct ConnectorConfiguration {
     #[serde(rename = "listening-address")]
     pub listening_address: SocketAddr,
-    #[serde(rename = "aggregate-backend-metrics")]
-    pub aggregate_backend_metrics: bool,
     #[serde(rename = "sozu")]
     pub sozu: Sozu,
     #[serde(rename = "sentry")]

diff --git a/src/svc/http/server/handler.rs b/src/svc/http/server/handler.rs
@@ -97,10 +97,7 @@ pub async fn telemetry(State(state): State<server::State>, _req: Request<Body>)
                     content_type: Some(ContentType::Metrics(aggregated_metrics)),
                 }),
             ..
-        }) => convert_metrics_to_prometheus(
-            aggregated_metrics,
-            state.config.aggregate_backend_metrics,
-        ),
+        }) => convert_metrics_to_prometheus(aggregated_metrics),
         Ok(response) => {
             let headers = res.headers_mut();
             let message = serde_json::json!({