fix merge conflicts

libp2p · Nov 24, 2021 · 18888d9 · 18888d9
2 parents 83b1743 + 4d68832
commit 18888d9
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/misc/metrics/Cargo.toml b/misc/metrics/Cargo.toml
@@ -22,7 +22,7 @@ libp2p-identify = { version = "0.33.0", path = "../../protocols/identify", optio
 libp2p-kad = { version = "0.34.0", path = "../../protocols/kad", optional = true }
 libp2p-ping = { version = "0.33.0", path = "../../protocols/ping", optional = true }
 libp2p-swarm = { version = "0.33.0", path = "../../swarm" }
-open-metrics-client = "0.12.0"
+open-metrics-client = "0.13.0"
 
 [dev-dependencies]
 env_logger = "0.8.1"

diff --git a/misc/metrics/src/kad.rs b/misc/metrics/src/kad.rs
@@ -90,31 +90,31 @@ impl Metrics {
             Box::new(query_result_get_providers_error.clone()),
         );
 
-        let query_result_num_requests =
+        let query_result_num_requests: Family<_, _> =
             Family::new_with_constructor(|| Histogram::new(exponential_buckets(1.0, 2.0, 10)));
         sub_registry.register(
             "query_result_num_requests",
             "Number of requests started for a Kademlia query.",
             Box::new(query_result_num_requests.clone()),
         );
 
-        let query_result_num_success =
+        let query_result_num_success: Family<_, _> =
             Family::new_with_constructor(|| Histogram::new(exponential_buckets(1.0, 2.0, 10)));
         sub_registry.register(
             "query_result_num_success",
             "Number of successful requests of a Kademlia query.",
             Box::new(query_result_num_success.clone()),
         );
 
-        let query_result_num_failure =
+        let query_result_num_failure: Family<_, _> =
             Family::new_with_constructor(|| Histogram::new(exponential_buckets(1.0, 2.0, 10)));
         sub_registry.register(
             "query_result_num_failure",
             "Number of failed requests of a Kademlia query.",
             Box::new(query_result_num_failure.clone()),
         );
 
-        let query_result_duration =
+        let query_result_duration: Family<_, _> =
             Family::new_with_constructor(|| Histogram::new(exponential_buckets(0.1, 2.0, 10)));
         sub_registry.register_with_unit(
             "query_result_duration",

diff --git a/protocols/gossipsub/Cargo.toml b/protocols/gossipsub/Cargo.toml
@@ -30,7 +30,7 @@ futures-timer = "3.0.2"
 pin-project = "1.0.8"
 instant = "0.1.11"
 # Metrics dependencies
-open-metrics-client = "0.12"
+open-metrics-client = "0.13"
 
 [dev-dependencies]
 async-std = "1.6.3"