Adapt to new file locations.

Author: twittner

Cargo.lock

@@ -4,3 +4,10 @@ description = "Metrics API types"
 version.workspace = true
 edition.workspace = true
 rust-version.workspace = true
+
+[features]
+prometheus = ["dep:parking_lot", "dep:prometheus"]
+
+[dependencies]
+parking_lot = { workspace = true, optional = true }
+prometheus = { workspace = true, optional = true }

metrics/Cargo.toml

@@ -14,6 +14,9 @@
 //! - [`Histogram`]: stores multiple float values based for a graph (example usage: CPU %)
 //! - text: stores a constant string in the collected metrics
 
+#[cfg(feature = "prometheus")]
+pub mod prometheus;
+
 use std::fmt::Debug;
 
 /// The metrics type.

metrics/src/lib.rs

@@ -1,6 +1,6 @@
 use std::{collections::HashMap, sync::Arc};
 
-use metrics::{
+use crate::{
     Counter, CounterFamily, Gauge, GaugeFamily, Histogram, HistogramFamily, Metrics, TextFamily,
 };
 use parking_lot::RwLock;
@@ -64,7 +64,7 @@ impl TimeboostGauge {
 }
 
 #[derive(Debug)]
-pub struct PrometheusError(anyhow::Error);
+pub struct PrometheusError(Box<dyn std::error::Error + Send + Sync>);
 
 impl std::fmt::Display for PrometheusError {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
@@ -80,7 +80,7 @@ impl std::error::Error for PrometheusError {
 
 impl From<prometheus::Error> for PrometheusError {
     fn from(source: prometheus::Error) -> Self {
-        Self(anyhow::anyhow!(source))
+        Self(Box::new(source))
     }
 }
 

metrics/src/prometheus.rs

@@ -18,6 +18,7 @@ bincode = { workspace = true }
 blake3 = { workspace = true }
 bs58 = { workspace = true }
 bytes = { workspace = true }
+clap = { workspace = true }
 cliquenet = { path = "../cliquenet" }
 committable = { workspace = true, optional = true }
 crossbeam-queue = { workspace = true, optional = true }
@@ -31,6 +32,7 @@ prometheus = { workspace = true }
 rand = { workspace = true }
 reqwest = { workspace = true }
 sailfish-types = { path = "../sailfish-types", optional = true }
+secp256k1 = { workspace = true }
 serde = { workspace = true }
 serde_json = { workspace = true }
 thiserror = { workspace = true }
@@ -40,3 +42,8 @@ tokio = { workspace = true }
 toml = { workspace = true }
 tracing = { workspace = true }
 tracing-subscriber = { workspace = true }
+url = { workspace = true }
+
+[[bin]]
+name = "mkconfig"
+path = "src/binaries/mkconfig.rs"

timeboost-utils/Cargo.toml

@@ -1,2 +1 @@
 pub mod logging;
-pub mod prometheus;

timeboost-utils/src/types/mod.rs

@@ -13,10 +13,6 @@ path = "src/binaries/timeboost.rs"
 name = "sailfish"
 path = "src/binaries/sailfish.rs"
 
-[[bin]]
-name = "mkconfig"
-path = "src/binaries/mkconfig.rs"
-
 [features]
 until = []
 
@@ -31,13 +27,11 @@ clap = { workspace = true }
 cliquenet = { path = "../cliquenet" }
 committable = { workspace = true }
 http = { workspace = true }
-jiff = { workspace = true }
-metrics = { path = "../metrics" }
+metrics = { path = "../metrics", features = ["prometheus"]}
 multisig = { path = "../multisig" }
 prost = { workspace = true }
 rand = { workspace = true }
 sailfish = { path = "../sailfish" }
-secp256k1 = { workspace = true }
 serde = { workspace = true }
 serde_bytes = { workspace = true }
 serde_json = { workspace = true }

timeboost/Cargo.toml

@@ -1,5 +1,6 @@
 use std::{io, sync::Arc, time::Duration};
 
+use ::metrics::prometheus::PrometheusMetrics;
 use axum::{
     Json, Router,
     body::Body,
@@ -11,7 +12,6 @@ use bon::Builder;
 use http::{Request, Response, StatusCode};
 use timeboost_crypto::prelude::ThresholdEncKey;
 use timeboost_types::{Bundle, BundleVariant, DecryptionKeyCell, SignedPriorityBundle};
-use timeboost_utils::types::prometheus::PrometheusMetrics;
 use tokio::{
     net::{TcpListener, ToSocketAddrs},
     sync::mpsc::Sender,

timeboost/src/api.rs

@@ -1,5 +1,6 @@
 use std::{iter::repeat_with, path::PathBuf, sync::Arc, time::Duration};
 
+use ::metrics::prometheus::PrometheusMetrics;
 use alloy::providers::Provider;
 use anyhow::{Context, Result};
 use cliquenet::{Network, NetworkMetrics, Overlay};
@@ -14,7 +15,7 @@ use sailfish::{
 use serde::{Deserialize, Serialize};
 use timeboost_contract::{CommitteeMemberSol, KeyManager};
 use timeboost_utils::keyset::NodeConfig;
-use timeboost_utils::types::{logging, prometheus::PrometheusMetrics};
+use timeboost_utils::types::logging;
 use tokio::{select, signal, time::sleep};
 use tracing::{error, info};
 

timeboost/src/binaries/sailfish.rs

@@ -3,13 +3,13 @@ mod config;
 use std::iter::once;
 use std::sync::Arc;
 
+use ::metrics::prometheus::PrometheusMetrics;
 use anyhow::Result;
 use metrics::TimeboostMetrics;
 use multisig::PublicKey;
 use timeboost_builder::{Certifier, CertifierDown, Submitter};
 use timeboost_sequencer::{Output, Sequencer};
 use timeboost_types::BundleVariant;
-use timeboost_utils::types::prometheus::PrometheusMetrics;
 use tokio::select;
 use tokio::sync::mpsc::{self, Receiver, Sender};
 use tracing::{info, warn};