Light server to statistics control

2024-03-19 10:22:20 +01:00
parent 5753c30973
commit 72cffc71cc
3 changed files with 186 additions and 40 deletions
@@ -557,9 +557,9 @@ dependencies = [
 "bitflags 1.3.2",
 "bytes",
 "futures-util",
- "http",
- "http-body",
- "hyper",
+ "http 0.2.9",
+ "http-body 0.4.5",
+ "hyper 0.14.27",
 "itoa",
 "matchit",
 "memchr",
@@ -587,8 +587,8 @@ dependencies = [
 "async-trait",
 "bytes",
 "futures-util",
- "http",
- "http-body",
+ "http 0.2.9",
+ "http-body 0.4.5",
 "mime",
 "rustversion",
 "tower-layer",
@@ -3011,7 +3011,7 @@ dependencies = [
 "futures-core",
 "futures-sink",
 "gloo-utils",
- "http",
+ "http 0.2.9",
 "js-sys",
 "pin-project",
 "serde",
@@ -3080,7 +3080,7 @@ dependencies = [
 "futures-core",
 "futures-sink",
 "futures-util",
- "http",
+ "http 0.2.9",
 "indexmap 1.9.3",
 "slab",
 "tokio",
@@ -3088,6 +3088,25 @@ dependencies = [
 "tracing",
 ]

+[[package]]
+name = "h2"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "51ee2dd2e4f378392eeff5d51618cd9a63166a2513846bbc55f21cfacd9199d4"
+dependencies = [
+ "bytes",
+ "fnv",
+ "futures-core",
+ "futures-sink",
+ "futures-util",
+ "http 1.1.0",
+ "indexmap 2.0.2",
+ "slab",
+ "tokio",
+ "tokio-util",
+ "tracing",
+]
+
 [[package]]
 name = "half"
 version = "1.8.2"
@@ -3290,6 +3309,17 @@ dependencies = [
 "itoa",
 ]

+[[package]]
+name = "http"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258"
+dependencies = [
+ "bytes",
+ "fnv",
+ "itoa",
+]
+
 [[package]]
 name = "http-api-client"
 version = "0.1.0"
@@ -3311,7 +3341,30 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1"
 dependencies = [
 "bytes",
- "http",
+ "http 0.2.9",
+ "pin-project-lite 0.2.13",
+]
+
+[[package]]
+name = "http-body"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1cac85db508abc24a2e48553ba12a996e87244a0395ce011e62b37158745d643"
+dependencies = [
+ "bytes",
+ "http 1.1.0",
+]
+
+[[package]]
+name = "http-body-util"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0475f8b2ac86659c21b64320d5d653f9efe42acd2a4e560073ec61a155a34f1d"
+dependencies = [
+ "bytes",
+ "futures-core",
+ "http 1.1.0",
+ "http-body 1.0.0",
 "pin-project-lite 0.2.13",
 ]

@@ -3378,9 +3431,9 @@ dependencies = [
 "futures-channel",
 "futures-core",
 "futures-util",
- "h2",
- "http",
- "http-body",
+ "h2 0.3.21",
+ "http 0.2.9",
+ "http-body 0.4.5",
 "httparse",
 "httpdate",
 "itoa",
@@ -3392,6 +3445,27 @@ dependencies = [
 "want",
 ]

+[[package]]
+name = "hyper"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "186548d73ac615b32a73aafe38fb4f56c0d340e110e5a200bcadbaf2e199263a"
+dependencies = [
+ "bytes",
+ "futures-channel",
+ "futures-util",
+ "h2 0.4.3",
+ "http 1.1.0",
+ "http-body 1.0.0",
+ "httparse",
+ "httpdate",
+ "itoa",
+ "pin-project-lite 0.2.13",
+ "smallvec",
+ "tokio",
+ "want",
+]
+
 [[package]]
 name = "hyper-rustls"
 version = "0.24.1"
@@ -3399,8 +3473,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8d78e1e73ec14cf7375674f74d7dde185c8206fd9dea6fb6295e8a98098aaa97"
 dependencies = [
 "futures-util",
- "http",
- "hyper",
+ "http 0.2.9",
+ "hyper 0.14.27",
 "rustls 0.21.10",
 "tokio",
 "tokio-rustls 0.24.1",
@@ -3412,12 +3486,32 @@ version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bbb958482e8c7be4bc3cf272a766a2b0bf1a6755e7a6ae777f017a31d11b13b1"
 dependencies = [
- "hyper",
+ "hyper 0.14.27",
 "pin-project-lite 0.2.13",
 "tokio",
 "tokio-io-timeout",
 ]

+[[package]]
+name = "hyper-util"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ca38ef113da30126bbff9cd1705f9273e15d45498615d138b0c20279ac7a76aa"
+dependencies = [
+ "bytes",
+ "futures-channel",
+ "futures-util",
+ "http 1.1.0",
+ "http-body 1.0.0",
+ "hyper 1.2.0",
+ "pin-project-lite 0.2.13",
+ "socket2 0.5.4",
+ "tokio",
+ "tower",
+ "tower-service",
+ "tracing",
+]
+
 [[package]]
 name = "iana-time-zone"
 version = "0.1.58"
@@ -3742,7 +3836,7 @@ dependencies = [
 "curl-sys",
 "event-listener",
 "futures-lite",
- "http",
+ "http 0.2.9",
 "log",
 "once_cell",
 "polling",
@@ -4555,7 +4649,7 @@ dependencies = [
 "bytes",
 "encoding_rs",
 "futures-util",
- "http",
+ "http 0.2.9",
 "httparse",
 "log",
 "memchr",
@@ -5192,7 +5286,10 @@ dependencies = [
 "dirs 4.0.0",
 "futures",
 "gloo-timers",
+ "http-body-util",
 "humantime-serde",
+ "hyper 1.2.0",
+ "hyper-util",
 "log",
 "nym-bandwidth-controller",
 "nym-config",
@@ -5515,7 +5612,7 @@ dependencies = [
 "dotenvy",
 "futures",
 "humantime-serde",
- "hyper",
+ "hyper 0.14.27",
 "ipnetwork 0.16.0",
 "log",
 "nym-api-requests",
@@ -5951,7 +6048,7 @@ dependencies = [
 "dashmap",
 "fastrand 2.0.1",
 "hmac 0.12.1",
- "hyper",
+ "hyper 0.14.27",
 "ipnetwork 0.16.0",
 "mime",
 "nym-config",
@@ -6104,7 +6201,7 @@ dependencies = [
 "dotenvy",
 "futures",
 "hex",
- "http",
+ "http 0.2.9",
 "httpcodec",
 "libp2p",
 "log",
@@ -6844,7 +6941,7 @@ checksum = "a819b71d6530c4297b49b3cae2939ab3a8cc1b9f382826a1bc29dd0ca3864906"
 dependencies = [
 "async-trait",
 "bytes",
- "http",
+ "http 0.2.9",
 "isahc",
 "opentelemetry_api",
 ]
@@ -6858,7 +6955,7 @@ dependencies = [
 "async-trait",
 "futures",
 "futures-executor",
- "http",
+ "http 0.2.9",
 "isahc",
 "once_cell",
 "opentelemetry",
@@ -8038,10 +8135,10 @@ dependencies = [
 "encoding_rs",
 "futures-core",
 "futures-util",
- "h2",
- "http",
- "http-body",
- "hyper",
+ "h2 0.3.21",
+ "http 0.2.9",
+ "http-body 0.4.5",
+ "hyper 0.14.27",
 "hyper-rustls",
 "ipnet",
 "js-sys",
@@ -8200,7 +8297,7 @@ version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cfac3a1df83f8d4fc96aa41dba3b86c786417b7fc0f52ec76295df2ba781aa69"
 dependencies = [
- "http",
+ "http 0.2.9",
 "log",
 "regex",
 "rocket",
@@ -8220,8 +8317,8 @@ dependencies = [
 "cookie",
 "either",
 "futures",
- "http",
- "hyper",
+ "http 0.2.9",
+ "hyper 0.14.27",
 "indexmap 2.0.2",
 "log",
 "memchr",
@@ -9025,9 +9122,9 @@ dependencies = [

 [[package]]
 name = "smallvec"
-version = "1.11.1"
+version = "1.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a"
+checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7"

 [[package]]
 name = "snafu"
@@ -9978,10 +10075,10 @@ dependencies = [
 "bytes",
 "futures-core",
 "futures-util",
- "h2",
- "http",
- "http-body",
- "hyper",
+ "h2 0.3.21",
+ "http 0.2.9",
+ "http-body 0.4.5",
+ "hyper 0.14.27",
 "hyper-timeout",
 "percent-encoding",
 "pin-project",
@@ -10024,8 +10121,8 @@ dependencies = [
 "bytes",
 "futures-core",
 "futures-util",
- "http",
- "http-body",
+ "http 0.2.9",
+ "http-body 0.4.5",
 "http-range-header",
 "httpdate",
 "mime",
@@ -10303,7 +10400,7 @@ dependencies = [
 "byteorder",
 "bytes",
 "data-encoding",
- "http",
+ "http 0.2.9",
 "httparse",
 "log",
 "rand 0.8.5",
@@ -27,10 +27,15 @@ tap = "1.0.1"
 thiserror = { workspace = true }
 url = { workspace = true, features = ["serde"] }
 tungstenite = { workspace = true, default-features = false }
-tokio = { workspace = true, features = ["macros"]}
+tokio = { workspace = true, features = ["macros"] }
 time = "0.3.17"
 zeroize = { workspace = true }

+# For serving metrics
+hyper = { version = "1", features = ["full"] }
+http-body-util = "0.1"
+hyper-util = { version = "0.1", features = ["full"] }
+
 # internal
 nym-bandwidth-controller = { path = "../bandwidth-controller" }
 nym-config = { path = "../config" }
@@ -92,11 +97,15 @@ tempfile = "3.1.0"

 [build-dependencies]
 tokio = { workspace = true, features = ["rt-multi-thread", "macros"] }
-sqlx = { workspace = true, features = ["runtime-tokio-rustls", "sqlite", "macros", "migrate"] }
+sqlx = { workspace = true, features = [
+    "runtime-tokio-rustls",
+    "sqlite",
+    "macros",
+    "migrate",
+] }

 [features]
 default = []
 cli = ["clap"]
 fs-surb-storage = ["sqlx"]
 wasm = ["nym-gateway-client/wasm"]
-
@@ -3,9 +3,21 @@ use std::{
    time::{Duration, Instant},
 };

+use log::warn;
 use nym_metrics::{inc, inc_by, metrics};
 use si_scale::helpers::bibytes2;

+// Metrics server
+use http_body_util::Full;
+use hyper::body::Bytes;
+use hyper::server::conn::http1;
+use hyper::service::service_fn;
+use hyper::{Request, Response};
+use hyper_util::rt::TokioIo;
+use std::convert::Infallible;
+use std::net::SocketAddr;
+use tokio::net::TcpListener;
+
 use crate::spawn_future;

 // Time interval between reporting packet statistics
@@ -484,6 +496,12 @@ impl PacketStatisticsControl {
        let snapshot_interval = Duration::from_millis(SNAPSHOT_INTERVAL_MS);
        let mut snapshot_interval = tokio::time::interval(snapshot_interval);

+        let metrics_port = 18000;
+        let addr = SocketAddr::from(([0, 0, 0, 0], metrics_port));
+        let listener = TcpListener::bind(addr)
+            .await
+            .expect(&format!("Cannot bind metrics server to {metrics_port}!"));
+
        loop {
            tokio::select! {
                stats_event = self.stats_rx.recv() => match stats_event {
@@ -496,6 +514,22 @@ impl PacketStatisticsControl {
                        break;
                    }
                },
+                result = listener.accept() => {
+                    if let Ok((stream, _)) = result {
+                        let io = TokioIo::new(stream);
+
+                        tokio::task::spawn(async move {
+                            if let Err(err) = http1::Builder::new()
+                                .serve_connection(io, service_fn(serve_metrics))
+                                .await
+                            {
+                                warn!("Error serving connection: {:?}", err);
+                            }
+                        });
+                    } else {
+                        warn!("Error accepting connection");
+                    }
+                }
                _ = snapshot_interval.tick() => {
                    self.update_history();
                    self.update_rates();
@@ -520,3 +554,9 @@ impl PacketStatisticsControl {
        })
    }
 }
+
+async fn serve_metrics(
+    _: Request<hyper::body::Incoming>,
+) -> Result<Response<Full<Bytes>>, Infallible> {
+    Ok(Response::new(Full::new(Bytes::from(metrics!()))))
+}