diff --git a/Cargo.toml b/Cargo.toml index 74bedf2cd..0c1632e39 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -32,6 +32,8 @@ ethers = {version = "2.0.4", features = ["legacy", "abigen-online"]} # Log, Tracing & telemetry opentelemetry = { version = "0.19", features = ["rt-tokio", "metrics"] } opentelemetry-otlp = { version = "0.12", features = ["grpc-tonic", "metrics", "tls-roots"] } +prometheus = "0.13.3" +prometheus-client = "0.21" tracing = { version = "0.1", default-features = false } tracing-attributes = "0.1" tracing-opentelemetry = "0.19" diff --git a/crates/topos-metrics/Cargo.toml b/crates/topos-metrics/Cargo.toml index 68a2d365d..6e31070da 100644 --- a/crates/topos-metrics/Cargo.toml +++ b/crates/topos-metrics/Cargo.toml @@ -4,5 +4,5 @@ version = "0.1.0" edition = "2021" [dependencies] -prometheus = "0.13.3" lazy_static.workspace = true +prometheus.workspace = true diff --git a/crates/topos-p2p/Cargo.toml b/crates/topos-p2p/Cargo.toml index 59ce80a92..d22062218 100644 --- a/crates/topos-p2p/Cargo.toml +++ b/crates/topos-p2p/Cargo.toml @@ -8,6 +8,7 @@ async-trait.workspace = true bincode.workspace = true futures.workspace = true lazy_static.workspace = true +prometheus-client.workspace = true serde = { workspace = true, features = ["derive"] } thiserror.workspace = true tokio = { workspace = true, features = ["full"] } @@ -19,8 +20,6 @@ void = "1" topos-metrics = { path = "../topos-metrics/" } -prometheus-client = "0.21.1" - [dev-dependencies] test-log.workspace = true env_logger.workspace = true diff --git a/crates/topos-p2p/src/behaviour/gossip.rs b/crates/topos-p2p/src/behaviour/gossip.rs index 68bfb106c..c5f4fd256 100644 --- a/crates/topos-p2p/src/behaviour/gossip.rs +++ b/crates/topos-p2p/src/behaviour/gossip.rs @@ -8,7 +8,6 @@ use std::{ use libp2p::{ gossipsub::{self, IdentTopic, Message, MessageAuthenticity, MessageId, Topic}, identity::Keypair, - multihash::IdentityHasher, swarm::{NetworkBehaviour, THandlerInEvent, ToSwarm}, }; use serde::{Deserialize, Serialize}; @@ -190,6 +189,12 @@ impl NetworkBehaviour for Behaviour { let event = match self.gossipsub.poll(cx, params) { Poll::Pending => return Poll::Pending, Poll::Ready(ToSwarm::GenerateEvent(event)) => event, + Poll::Ready(ToSwarm::ListenOn { opts }) => { + return Poll::Ready(ToSwarm::ListenOn { opts }) + } + Poll::Ready(ToSwarm::RemoveListener { id }) => { + return Poll::Ready(ToSwarm::RemoveListener { id }) + } Poll::Ready(ToSwarm::Dial { opts }) => return Poll::Ready(ToSwarm::Dial { opts }), Poll::Ready(ToSwarm::NotifyHandler { peer_id, diff --git a/crates/topos-tce-api/Cargo.toml b/crates/topos-tce-api/Cargo.toml index fb0c855cf..8fa2c74b1 100644 --- a/crates/topos-tce-api/Cargo.toml +++ b/crates/topos-tce-api/Cargo.toml @@ -11,33 +11,33 @@ topos-metrics = { path = "../topos-metrics" } topos-tce-storage = { path = "../topos-tce-storage" } topos-telemetry = { path = "../topos-telemetry" } -async-trait.workspace = true +async-graphql-axum.workspace = true +async-graphql.workspace = true async-stream.workspace = true +async-trait.workspace = true +axum.workspace = true +base64.workspace = true futures.workspace = true hex.workspace = true +http.workspace = true +hyper.workspace = true +opentelemetry.workspace = true +prometheus-client.workspace = true serde.workspace = true thiserror.workspace = true tokio-stream.workspace = true tokio.workspace = true tonic.workspace = true +tower-http.workspace = true tower.workspace = true +tracing-opentelemetry.workspace = true tracing.workspace = true uuid.workspace = true -base64.workspace = true -opentelemetry.workspace = true -tracing-opentelemetry.workspace = true -axum.workspace = true -async-graphql.workspace = true -async-graphql-axum.workspace = true -hyper.workspace = true -http.workspace = true -tower-http.workspace = true tonic-health = "0.9.0" tonic-reflection = "0.9.0" pin-project = "1.0.12" async-recursion = "1.0" -prometheus-client = "0.21.1" [dev-dependencies] bytes.workspace = true diff --git a/crates/topos-tce/Cargo.toml b/crates/topos-tce/Cargo.toml index 367b0f206..5dfc40472 100644 --- a/crates/topos-tce/Cargo.toml +++ b/crates/topos-tce/Cargo.toml @@ -10,15 +10,17 @@ async-trait.workspace = true bincode.workspace = true clap.workspace = true futures.workspace = true +opentelemetry.workspace = true +prometheus-client.workspace = true +prometheus.workspace = true serde.workspace = true thiserror.workspace = true tokio.workspace = true topos-core.workspace = true -tracing-subscriber = { workspace = true, default-features = false, features = ["std", "env-filter", "fmt", "ansi"] } -tracing.workspace = true -opentelemetry.workspace = true tracing-attributes.workspace = true tracing-opentelemetry.workspace = true +tracing-subscriber = { workspace = true, default-features = false, features = ["std", "env-filter", "fmt", "ansi"] } +tracing.workspace = true tce_transport = { package = "topos-tce-transport", path = "../topos-tce-transport" } topos-p2p = { path = "../topos-p2p" } @@ -31,8 +33,6 @@ topos-tce-synchronizer = { path = "../topos-tce-synchronizer" } topos-telemetry = { path = "../topos-telemetry" } axum = "0.6.18" axum-prometheus = "0.3.3" -prometheus = "0.13.3" -prometheus-client = "0.21.1" [dev-dependencies] async-stream.workspace = true