{misc,protocols/gossipsub}: Move to prometheus-client (#2442)

`open-metrics-client` has been accepted as the official Prometheus Rust client and thus renamed to `prometheus-client`. See https://groups.google.com/g/prometheus-developers/c/E67ByGmVQKM
libp2p · Feb 3, 2022 · 3f4dbb1 · 3f4dbb1
1 parent fbdd208
commit 3f4dbb1
Show file tree

Hide file tree

Showing 18 changed files with 62 additions and 44 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -42,6 +42,12 @@
 
 # `libp2p` facade crate
 
+## Version 0.43.0 [unreleased]
+
+- Update individual crates.
+  - `libp2p-gossipsub`
+  - `libp2p-metrics`
+
 ## Version 0.42.1 [2022-02-02]
 
 - Update individual crates.

diff --git a/Cargo.toml b/Cargo.toml
@@ -3,7 +3,7 @@ name = "libp2p"
 edition = "2021"
 rust-version = "1.56.1"
 description = "Peer-to-peer networking library"
-version = "0.42.1"
+version = "0.43.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 license = "MIT"
 repository = "https://github.com/libp2p/rust-libp2p"
@@ -79,10 +79,10 @@ lazy_static = "1.2"
 libp2p-autonat = { version = "0.1.0", path = "protocols/autonat", optional = true }
 libp2p-core = { version = "0.31.0", path = "core",  default-features = false }
 libp2p-floodsub = { version = "0.33.0", path = "protocols/floodsub", optional = true }
-libp2p-gossipsub = { version = "0.35.0", path = "./protocols/gossipsub", optional = true }
+libp2p-gossipsub = { version = "0.36.0", path = "./protocols/gossipsub", optional = true }
 libp2p-identify = { version = "0.33.0", path = "protocols/identify", optional = true }
 libp2p-kad = { version = "0.34.0", path = "protocols/kad", optional = true }
-libp2p-metrics = { version = "0.3.0", path = "misc/metrics", optional = true }
+libp2p-metrics = { version = "0.4.0", path = "misc/metrics", optional = true }
 libp2p-mplex = { version = "0.31.0", path = "muxers/mplex", optional = true }
 libp2p-noise = { version = "0.34.0", path = "transports/noise", optional = true }
 libp2p-ping = { version = "0.33.0", path = "protocols/ping", optional = true }

diff --git a/misc/metrics/CHANGELOG.md b/misc/metrics/CHANGELOG.md
@@ -1,3 +1,9 @@
+# 0.4.0 [unreleased]
+
+- Move from `open-metrics-client` to `prometheus-client` (see [PR 2442]).
+
+[PR 2442]: https://github.com/libp2p/rust-libp2p/pull/2442
+
 # 0.3.0 [2022-01-27]
 
 - Update dependencies.

diff --git a/misc/metrics/Cargo.toml b/misc/metrics/Cargo.toml
@@ -3,7 +3,7 @@ name = "libp2p-metrics"
 edition = "2021"
 rust-version = "1.56.1"
 description = "Metrics for libp2p"
-version = "0.3.0"
+version = "0.4.0"
 authors = ["Max Inden <mail@max-inden.de>"]
 license = "MIT"
 repository = "https://github.com/libp2p/rust-libp2p"
@@ -19,13 +19,13 @@ relay = ["libp2p-relay"]
 
 [dependencies]
 libp2p-core = { version = "0.31.0", path = "../../core", default-features = false }
-libp2p-gossipsub =  { version = "0.35.0", path = "../../protocols/gossipsub", optional = true }
+libp2p-gossipsub =  { version = "0.36.0", path = "../../protocols/gossipsub", optional = true }
 libp2p-identify = { version = "0.33.0", path = "../../protocols/identify", optional = true }
 libp2p-kad = { version = "0.34.0", path = "../../protocols/kad", optional = true }
 libp2p-ping = { version = "0.33.0", path = "../../protocols/ping", optional = true }
 libp2p-relay =  { version = "0.6.0", path = "../../protocols/relay", optional = true }
 libp2p-swarm = { version = "0.33.0", path = "../../swarm" }
-open-metrics-client = "0.14.0"
+prometheus-client = "0.15.0"
 
 [dev-dependencies]
 env_logger = "0.8.1"

diff --git a/misc/metrics/examples/metrics.rs b/misc/metrics/examples/metrics.rs
@@ -55,8 +55,8 @@ use libp2p::metrics::{Metrics, Recorder};
 use libp2p::ping::{Ping, PingConfig};
 use libp2p::swarm::SwarmEvent;
 use libp2p::{identity, PeerId, Swarm};
-use open_metrics_client::encoding::text::encode;
-use open_metrics_client::registry::Registry;
+use prometheus_client::encoding::text::encode;
+use prometheus_client::registry::Registry;
 use std::error::Error;
 use std::sync::{Arc, Mutex};
 use std::thread;

diff --git a/misc/metrics/src/gossipsub.rs b/misc/metrics/src/gossipsub.rs
@@ -18,8 +18,8 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-use open_metrics_client::metrics::counter::Counter;
-use open_metrics_client::registry::Registry;
+use prometheus_client::metrics::counter::Counter;
+use prometheus_client::registry::Registry;
 
 pub struct Metrics {
     messages: Counter,

diff --git a/misc/metrics/src/identify.rs b/misc/metrics/src/identify.rs
@@ -18,9 +18,9 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-use open_metrics_client::metrics::counter::Counter;
-use open_metrics_client::metrics::histogram::{exponential_buckets, Histogram};
-use open_metrics_client::registry::Registry;
+use prometheus_client::metrics::counter::Counter;
+use prometheus_client::metrics::histogram::{exponential_buckets, Histogram};
+use prometheus_client::registry::Registry;
 use std::iter;
 
 pub struct Metrics {

diff --git a/misc/metrics/src/kad.rs b/misc/metrics/src/kad.rs
@@ -18,11 +18,11 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-use open_metrics_client::encoding::text::Encode;
-use open_metrics_client::metrics::counter::Counter;
-use open_metrics_client::metrics::family::Family;
-use open_metrics_client::metrics::histogram::{exponential_buckets, Histogram};
-use open_metrics_client::registry::{Registry, Unit};
+use prometheus_client::encoding::text::Encode;
+use prometheus_client::metrics::counter::Counter;
+use prometheus_client::metrics::family::Family;
+use prometheus_client::metrics::histogram::{exponential_buckets, Histogram};
+use prometheus_client::registry::{Registry, Unit};
 
 pub struct Metrics {
     query_result_get_record_ok: Histogram,

diff --git a/misc/metrics/src/lib.rs b/misc/metrics/src/lib.rs
@@ -37,7 +37,7 @@ mod ping;
 mod relay;
 mod swarm;
 
-use open_metrics_client::registry::Registry;
+use prometheus_client::registry::Registry;
 
 /// Set of Swarm and protocol metrics derived from emitted events.
 pub struct Metrics {
@@ -58,7 +58,7 @@ impl Metrics {
     /// Create a new set of Swarm and protocol [`Metrics`].
     ///
     /// ```
-    /// use open_metrics_client::registry::Registry;
+    /// use prometheus_client::registry::Registry;
     /// use libp2p_metrics::Metrics;
     /// let mut registry = Registry::default();
     /// let metrics = Metrics::new(&mut registry);

diff --git a/misc/metrics/src/ping.rs b/misc/metrics/src/ping.rs
@@ -18,11 +18,11 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-use open_metrics_client::encoding::text::Encode;
-use open_metrics_client::metrics::counter::Counter;
-use open_metrics_client::metrics::family::Family;
-use open_metrics_client::metrics::histogram::{exponential_buckets, Histogram};
-use open_metrics_client::registry::{Registry, Unit};
+use prometheus_client::encoding::text::Encode;
+use prometheus_client::metrics::counter::Counter;
+use prometheus_client::metrics::family::Family;
+use prometheus_client::metrics::histogram::{exponential_buckets, Histogram};
+use prometheus_client::registry::{Registry, Unit};
 
 #[derive(Clone, Hash, PartialEq, Eq, Encode)]
 struct FailureLabels {

diff --git a/misc/metrics/src/relay.rs b/misc/metrics/src/relay.rs
@@ -18,10 +18,10 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-use open_metrics_client::encoding::text::Encode;
-use open_metrics_client::metrics::counter::Counter;
-use open_metrics_client::metrics::family::Family;
-use open_metrics_client::registry::Registry;
+use prometheus_client::encoding::text::Encode;
+use prometheus_client::metrics::counter::Counter;
+use prometheus_client::metrics::family::Family;
+use prometheus_client::registry::Registry;
 
 pub struct Metrics {
     events: Family<EventLabels, Counter>,

diff --git a/misc/metrics/src/swarm.rs b/misc/metrics/src/swarm.rs
@@ -18,10 +18,10 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-use open_metrics_client::encoding::text::Encode;
-use open_metrics_client::metrics::counter::Counter;
-use open_metrics_client::metrics::family::Family;
-use open_metrics_client::registry::Registry;
+use prometheus_client::encoding::text::Encode;
+use prometheus_client::metrics::counter::Counter;
+use prometheus_client::metrics::family::Family;
+use prometheus_client::registry::Registry;
 
 pub struct Metrics {
     connections_incoming: Counter,

diff --git a/protocols/gossipsub/CHANGELOG.md b/protocols/gossipsub/CHANGELOG.md
@@ -1,3 +1,9 @@
+# 0.36.0 [unreleased]
+
+- Move from `open-metrics-client` to `prometheus-client` (see [PR 2442]).
+
+[PR 2442]: https://github.com/libp2p/rust-libp2p/pull/2442
+
 # 0.35.0 [2022-01-27]
 
 - Update dependencies.

diff --git a/protocols/gossipsub/Cargo.toml b/protocols/gossipsub/Cargo.toml
@@ -3,7 +3,7 @@ name = "libp2p-gossipsub"
 edition = "2021"
 rust-version = "1.56.1"
 description = "Gossipsub protocol for libp2p"
-version = "0.35.0"
+version = "0.36.0"
 authors = ["Age Manning <Age@AgeManning.com>"]
 license = "MIT"
 repository = "https://github.com/libp2p/rust-libp2p"
@@ -32,7 +32,7 @@ pin-project = "1.0.8"
 instant = "0.1.11"
 serde = { version = "1", optional = true, features = ["derive"] }
 # Metrics dependencies
-open-metrics-client = "0.14.0"
+prometheus-client = "0.15.0"
 
 [dev-dependencies]
 async-std = "1.6.3"

diff --git a/protocols/gossipsub/src/behaviour.rs b/protocols/gossipsub/src/behaviour.rs
@@ -32,7 +32,7 @@ use std::{
 
 use futures::StreamExt;
 use log::{debug, error, trace, warn};
-use open_metrics_client::registry::Registry;
+use prometheus_client::registry::Registry;
 use prost::Message;
 use rand::{seq::SliceRandom, thread_rng};
 

diff --git a/protocols/gossipsub/src/metrics.rs b/protocols/gossipsub/src/metrics.rs
@@ -23,12 +23,12 @@
 
 use std::collections::HashMap;
 
-use open_metrics_client::encoding::text::Encode;
-use open_metrics_client::metrics::counter::Counter;
-use open_metrics_client::metrics::family::{Family, MetricConstructor};
-use open_metrics_client::metrics::gauge::Gauge;
-use open_metrics_client::metrics::histogram::{linear_buckets, Histogram};
-use open_metrics_client::registry::Registry;
+use prometheus_client::encoding::text::Encode;
+use prometheus_client::metrics::counter::Counter;
+use prometheus_client::metrics::family::{Family, MetricConstructor};
+use prometheus_client::metrics::gauge::Gauge;
+use prometheus_client::metrics::histogram::{linear_buckets, Histogram};
+use prometheus_client::registry::Registry;
 
 use crate::topic::TopicHash;
 use crate::types::{MessageAcceptance, PeerKind};

diff --git a/protocols/gossipsub/src/topic.rs b/protocols/gossipsub/src/topic.rs
@@ -20,7 +20,7 @@
 
 use crate::rpc_proto;
 use base64::encode;
-use open_metrics_client::encoding::text::Encode;
+use prometheus_client::encoding::text::Encode;
 use prost::Message;
 use sha2::{Digest, Sha256};
 use std::fmt;

diff --git a/protocols/gossipsub/src/types.rs b/protocols/gossipsub/src/types.rs
@@ -22,7 +22,7 @@
 use crate::rpc_proto;
 use crate::TopicHash;
 use libp2p_core::{connection::ConnectionId, PeerId};
-use open_metrics_client::encoding::text::Encode;
+use prometheus_client::encoding::text::Encode;
 use prost::Message;
 use std::fmt;
 use std::fmt::Debug;