wip

Author: 0x416e746f6e

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "rproxy"
-version = "0.0.8"
+version = "0.0.9"
 edition = "2024"
 default-run = "rproxy"
 

crates/rproxy/Cargo.toml

@@ -34,6 +34,9 @@ pub(crate) struct Metrics {
     pub(crate) client_connections_closed_count: Family<LabelsProxy, Counter>,
     pub(crate) client_info: Family<LabelsProxyClientInfo, Counter>,
 
+    pub(crate) http_in_flight_requests_backend: Family<LabelsProxy, Gauge>,
+    pub(crate) http_in_flight_requests_client: Family<LabelsProxy, Gauge>,
+
     pub(crate) http_latency_backend: Family<LabelsProxyHttpJrpc, Candlestick>,
     pub(crate) http_latency_delta: Family<LabelsProxyHttpJrpc, Candlestick>,
     pub(crate) http_latency_total: Family<LabelsProxyHttpJrpc, Candlestick>,
@@ -75,6 +78,9 @@ impl Metrics {
 
             client_info: Family::default(),
 
+            http_in_flight_requests_backend: Family::default(),
+            http_in_flight_requests_client: Family::default(),
+
             http_latency_backend: Family::default(),
             http_latency_delta: Family::default(),
             http_latency_total: Family::default(),
@@ -128,6 +134,18 @@ impl Metrics {
             this.client_connections_closed_count.clone(),
         );
 
+        this.registry.register(
+            "http_in_flight_requests_backend",
+            "count of in-flight backend requests",
+            this.http_in_flight_requests_backend.clone(),
+        );
+
+        this.registry.register(
+            "http_in_flight_requests_client",
+            "count of in-flight client requests",
+            this.http_in_flight_requests_client.clone(),
+        );
+
         this.registry.register_with_unit(
             "http_latency_backend",
             "latency of backend http responses (interval b/w end of client's request and begin of backend's response)",

crates/rproxy/src/server/metrics.rs

@@ -76,7 +76,7 @@ impl ConfigTls {
                             });
                         } else {
                             if let Ok(decoded) =
-                                base64::engine::general_purpose::STANDARD.decode(&raw)
+                                base64::engine::general_purpose::STANDARD.decode(raw.trim_ascii())
                             {
                                 raw = decoded;
                             }
@@ -133,7 +133,7 @@ impl ConfigTls {
                             });
                         } else {
                             if let Ok(decoded) =
-                                base64::engine::general_purpose::STANDARD.decode(&raw)
+                                base64::engine::general_purpose::STANDARD.decode(raw.trim_ascii())
                             {
                                 raw = decoded;
                             }
@@ -194,7 +194,8 @@ impl ConfigTls {
             let mut raw = Vec::new();
             file.read_to_end(&mut raw).expect(ALREADY_VALIDATED);
 
-            if let Ok(decoded) = base64::engine::general_purpose::STANDARD.decode(&raw) {
+            if let Ok(decoded) = base64::engine::general_purpose::STANDARD.decode(raw.trim_ascii())
+            {
                 raw = decoded;
             }
 
@@ -213,7 +214,8 @@ impl ConfigTls {
             let mut raw = Vec::new();
             file.read_to_end(&mut raw).expect(ALREADY_VALIDATED);
 
-            if let Ok(decoded) = base64::engine::general_purpose::STANDARD.decode(&raw) {
+            if let Ok(decoded) = base64::engine::general_purpose::STANDARD.decode(raw.trim_ascii())
+            {
                 raw = decoded;
             }