chore: Unify autometrics versions

get10101 · Jun 7, 2023 · ce8fd73 · ce8fd73
1 parent bea50ec
commit ce8fd73
Show file tree

Hide file tree

Showing 7 changed files with 61 additions and 73 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/coordinator/Cargo.toml b/coordinator/Cargo.toml
@@ -6,7 +6,7 @@ edition = "2021"
 [dependencies]
 anyhow = { version = "1", features = ["backtrace"] }
 atty = "0.2.14"
-autometrics = { version = "0.4.1", features = ["prometheus-exporter"] }
+autometrics = { version = "0.5", features = ["prometheus-exporter"] }
 axum = { version = "0.6.7", features = ["ws", "query"] }
 bdk = { version = "0.27.0", default-features = false, features = ["key-value-db", "use-esplora-blocking"] }
 bitcoin = "0.29"

diff --git a/coordinator/src/bin/coordinator.rs b/coordinator/src/bin/coordinator.rs
@@ -226,7 +226,7 @@ async fn main() -> Result<()> {
     let app = router(node, pool, settings);
 
     // Start the metrics exporter
-    let _exporter = autometrics::global_metrics_exporter();
+    autometrics::prometheus_exporter::init();
 
     tracing::debug!("listening on http://{}", http_address);
     axum::Server::bind(&http_address)

diff --git a/coordinator/src/node/connection.rs b/coordinator/src/node/connection.rs
@@ -1,3 +1,4 @@
+use autometrics::autometrics;
 use lightning::ln::msgs::NetAddress;
 use ln_dlc_node::node::Node;
 use ln_dlc_node::node::NodeInfo;
@@ -10,6 +11,7 @@ use std::sync::Arc;
 use std::time::Duration;
 use tokio::task::spawn_blocking;
 
+#[autometrics]
 pub async fn keep_public_channel_peers_connected(
     node: Arc<Node<PaymentMap>>,
     check_interval: Duration,

diff --git a/coordinator/src/routes.rs b/coordinator/src/routes.rs
@@ -365,7 +365,7 @@ async fn update_settings(
 }
 
 pub async fn get_metrics() -> impl IntoResponse {
-    match autometrics::encode_global_metrics() {
+    match autometrics::prometheus_exporter::encode_to_string() {
         Ok(metrics) => (StatusCode::OK, metrics),
         Err(err) => (StatusCode::INTERNAL_SERVER_ERROR, format!("{:?}", err)),
     }

diff --git a/crates/ln-dlc-node/Cargo.toml b/crates/ln-dlc-node/Cargo.toml
@@ -8,7 +8,7 @@ description = "A common interface for using Lightning and DLC channels side-by-s
 
 [dependencies]
 anyhow = { version = "1", features = ["backtrace"] }
-autometrics = "0.4.1"
+autometrics = "0.5"
 bdk = { version = "0.27.0", default-features = false, features = ["key-value-db", "use-esplora-blocking"] }
 bip39 = { version = "2", features = ["rand_core"] }
 bitcoin = "0.29"

diff --git a/crates/ln-dlc-node/src/node/connection.rs b/crates/ln-dlc-node/src/node/connection.rs
@@ -3,14 +3,12 @@ use crate::node::NodeInfo;
 use anyhow::bail;
 use anyhow::Context;
 use anyhow::Result;
-use autometrics::autometrics;
 use bitcoin::secp256k1::PublicKey;
 use futures::Future;
 use std::pin::Pin;
 use std::time::Duration;
 
 impl<P> Node<P> {
-    #[autometrics]
     pub async fn connect(&self, peer: NodeInfo) -> Result<Pin<Box<impl Future<Output = ()>>>> {
         #[allow(clippy::async_yields_async)] // We want to poll this future in a loop elsewhere
         let connection_closed_future = tokio::time::timeout(Duration::from_secs(15), async {