feat(metrics): added metrics and peer_id endpoints

fluencelabs · Jul 11, 2023 · 66539c5 · 66539c5
1 parent 08ac0be
commit 66539c5
Show file tree

Hide file tree

Showing 11 changed files with 151 additions and 101 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/created-swarm/src/swarm.rs b/crates/created-swarm/src/swarm.rs
@@ -183,7 +183,7 @@ where
             let aquamarine_api = node.aquamarine_api.clone();
             async move {
                 let outlet = node
-                    .start(Some(peer_id.to_string()))
+                    .start(peer_id)
                     .await
                     .expect("node start");
 
@@ -312,6 +312,7 @@ pub fn create_swarm_with_runtime<RT: AquaRuntime>(
         "builtins_base_dir": config.builtins_dir,
         "external_multiaddresses": [config.listen_on],
         "spell_base_dir": Some(config.spell_base_dir.clone().unwrap_or(to_abs_path(PathBuf::from("spell")))),
+        "http_port": null
     });
 
     let node_config: UnresolvedConfig =

diff --git a/crates/server-config/src/defaults.rs b/crates/server-config/src/defaults.rs
@@ -63,7 +63,7 @@ pub fn default_websocket_port() -> u16 {
     9999
 }
 
-pub fn default_metrics_port() -> u16 {
+pub fn default_http_port() -> u16 {
     18080
 }
 

diff --git a/crates/server-config/src/node_config.rs b/crates/server-config/src/node_config.rs
@@ -71,6 +71,9 @@ pub struct UnresolvedNodeConfig {
     #[serde(flatten)]
     pub metrics_config: MetricsConfig,
 
+    #[serde(flatten)]
+    pub http_config: Option<HttpConfig>,
+
     #[serde(default)]
     pub bootstrap_config: BootstrapConfig,
 
@@ -199,6 +202,7 @@ impl UnresolvedNodeConfig {
             listen_config: self.listen_config,
             allowed_binaries: self.allowed_binaries,
             system_services: self.system_services,
+            http_config: self.http_config
         };
 
         Ok(result)
@@ -342,6 +346,8 @@ pub struct NodeConfig {
     pub allowed_binaries: Vec<String>,
 
     pub system_services: SystemServicesConfig,
+
+    pub http_config: Option<HttpConfig>
 }
 
 #[derive(Clone, Deserialize, Serialize, Derivative, Copy)]
@@ -369,16 +375,19 @@ pub struct TransportConfig {
     pub max_established: Option<u32>,
 }
 
+#[derive(Clone, Deserialize, Serialize, Derivative, Copy)]
+#[derivative(Debug)]
+pub struct HttpConfig {
+    #[serde(default = "default_http_port")]
+    pub http_port: u16,
+}
+
 #[derive(Clone, Deserialize, Serialize, Derivative)]
 #[derivative(Debug)]
 pub struct MetricsConfig {
     #[serde(default = "default_metrics_enabled")]
     pub metrics_enabled: bool,
 
-    /// Metrics port
-    #[serde(default = "default_metrics_port")]
-    pub metrics_port: u16,
-
     #[serde(default = "default_services_metrics_timer_resolution")]
     #[serde(with = "humantime_serde")]
     pub metrics_timer_resolution: Duration,

diff --git a/crates/server-config/src/resolved_config.rs b/crates/server-config/src/resolved_config.rs
@@ -144,11 +144,9 @@ impl ResolvedConfig {
         addrs
     }
 
-    pub fn metrics_listen_addr(&self) -> SocketAddr {
-        SocketAddr::new(
-            self.listen_config.listen_ip,
-            self.metrics_config.metrics_port,
-        )
+    pub fn http_listen_addr(&self) -> Option<SocketAddr> {
+        self.http_config
+            .map(|config| SocketAddr::new(self.listen_config.listen_ip, config.http_port))
     }
 
     pub fn listen_multiaddrs(&self) -> Vec<Multiaddr> {

diff --git a/nox/Cargo.toml b/nox/Cargo.toml
@@ -52,7 +52,7 @@ humantime-serde = { workspace = true }
 log = { workspace = true }
 tracing-log = { version = "0.1.3" }
 console-subscriber = { version = "0.1.10", features = ["parking_lot"] }
-hyper = "0.14.27"
+axum = { version = "0.6.18", features = ["macros"] }
 itertools = { workspace = true }
 eyre = { workspace = true }
 base64 = { workspace = true }

diff --git a/nox/src/http.rs b/nox/src/http.rs
@@ -0,0 +1,73 @@
+use axum::body::Body;
+use axum::http::header::CONTENT_TYPE;
+use axum::{
+    extract::State,
+    http::StatusCode,
+    response::{IntoResponse, Response},
+    routing::get,
+    Json, Router,
+};
+use libp2p::PeerId;
+use prometheus_client::encoding::text::encode;
+use prometheus_client::registry::Registry;
+use serde_json::json;
+use std::net::SocketAddr;
+use std::sync::Arc;
+
+async fn handler_404() -> impl IntoResponse {
+    (StatusCode::NOT_FOUND, "nothing to see here")
+}
+
+async fn handle_metrics(State(state): State<RouteState>) -> Response<Body> {
+    let mut buf = String::new();
+    let registry = state
+        .0
+        .registry
+        .as_ref()
+        .expect("Registry is not initialized");
+    encode(&mut buf, registry).unwrap(); //TODO: fix unwrap
+
+    let body = Body::from(buf);
+    Response::builder()
+        .header(
+            CONTENT_TYPE,
+            "application/openmetrics-text; version=1.0.0; charset=utf-8",
+        )
+        .body(body)
+        .unwrap() //TODO: fix unwrap
+}
+
+async fn handle_peer_id(State(state): State<RouteState>) -> Response {
+    let peer_id = state.0.peer_id;
+    Json(json!({
+        "peer_id": peer_id.to_string(),
+    }))
+    .into_response()
+}
+
+#[derive(Debug, Clone)]
+struct RouteState(Arc<Inner>);
+
+#[derive(Debug)]
+struct Inner {
+    registry: Option<Registry>,
+    peer_id: PeerId,
+}
+
+pub async fn start_http_endpoint(
+    listen_addr: SocketAddr,
+    registry: Option<Registry>,
+    peer_id: PeerId,
+) {
+    let state = RouteState(Arc::new(Inner { registry, peer_id }));
+    let app: Router = Router::new()
+        .route("/metrics", get(handle_metrics))
+        .route("/peer_id", get(handle_peer_id))
+        .fallback(handler_404)
+        .with_state(state);
+
+    axum::Server::bind(&listen_addr)
+        .serve(app.into_make_service())
+        .await
+        .expect("Could not make http endpoint")
+}
diff --git a/nox/src/lib.rs b/nox/src/lib.rs
@@ -33,8 +33,8 @@ mod builtins;
 mod connectivity;
 mod dispatcher;
 mod effectors;
+mod http;
 mod layers;
-mod metrics;
 mod node;
 mod tasks;
 

diff --git a/nox/src/main.rs b/nox/src/main.rs
@@ -139,10 +139,7 @@ async fn start_fluence(config: ResolvedConfig) -> eyre::Result<impl Stoppable> {
         Node::new(config, vm_config, VERSION).wrap_err("error create node instance")?;
     node.listen(listen_addrs).wrap_err("error on listen")?;
 
-    let node_exit_outlet = node
-        .start(Some(peer_id.to_string()))
-        .await
-        .wrap_err("node failed to start")?;
+    let node_exit_outlet = node.start(peer_id).await.wrap_err("node failed to start")?;
 
     struct Fluence {
         node_exit_outlet: oneshot::Sender<()>,

diff --git a/nox/src/metrics.rs b/nox/src/metrics.rs
-Original file line number
+Diff line change
@@ Expand Up / @@ -63,7 +63,7 @@ pub fn default_websocket_port() -> u16 { @@
     }
-    pub fn default_metrics_port() -> u16 {
+    pub fn default_http_port() -> u16 {
     }
@@ Expand Down @@