chore(metrics): Upgrade to prometheus-client v0.19.0 (#3207)

misc/metrics/src/kad.rs

@@ -18,7 +18,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-use prometheus_client::encoding::text::Encode;
+use prometheus_client::encoding::{EncodeLabelSet, EncodeLabelValue};
 use prometheus_client::metrics::counter::Counter;
 use prometheus_client::metrics::family::Family;
 use prometheus_client::metrics::histogram::{exponential_buckets, Histogram};
@@ -52,42 +52,42 @@ impl Metrics {
         sub_registry.register(
             "query_result_get_record_ok",
             "Number of records returned by a successful Kademlia get record query.",
-            Box::new(query_result_get_record_ok.clone()),
+            query_result_get_record_ok.clone(),
         );
 
         let query_result_get_record_error = Family::default();
         sub_registry.register(
             "query_result_get_record_error",
             "Number of failed Kademlia get record queries.",
-            Box::new(query_result_get_record_error.clone()),
+            query_result_get_record_error.clone(),
         );
 
         let query_result_get_closest_peers_ok = Histogram::new(exponential_buckets(1.0, 2.0, 10));
         sub_registry.register(
             "query_result_get_closest_peers_ok",
             "Number of closest peers returned by a successful Kademlia get closest peers query.",
-            Box::new(query_result_get_closest_peers_ok.clone()),
+            query_result_get_closest_peers_ok.clone(),
         );
 
         let query_result_get_closest_peers_error = Family::default();
         sub_registry.register(
             "query_result_get_closest_peers_error",
             "Number of failed Kademlia get closest peers queries.",
-            Box::new(query_result_get_closest_peers_error.clone()),
+            query_result_get_closest_peers_error.clone(),
         );
 
         let query_result_get_providers_ok = Histogram::new(exponential_buckets(1.0, 2.0, 10));
         sub_registry.register(
             "query_result_get_providers_ok",
             "Number of providers returned by a successful Kademlia get providers query.",
-            Box::new(query_result_get_providers_ok.clone()),
+            query_result_get_providers_ok.clone(),
         );
 
         let query_result_get_providers_error = Family::default();
         sub_registry.register(
             "query_result_get_providers_error",
             "Number of failed Kademlia get providers queries.",
-            Box::new(query_result_get_providers_error.clone()),
+            query_result_get_providers_error.clone(),
         );
 
         let query_result_num_requests: Family<_, _> =
@@ -95,7 +95,7 @@ impl Metrics {
         sub_registry.register(
             "query_result_num_requests",
             "Number of requests started for a Kademlia query.",
-            Box::new(query_result_num_requests.clone()),
+            query_result_num_requests.clone(),
         );
 
         let query_result_num_success: Family<_, _> =
@@ -103,7 +103,7 @@ impl Metrics {
         sub_registry.register(
             "query_result_num_success",
             "Number of successful requests of a Kademlia query.",
-            Box::new(query_result_num_success.clone()),
+            query_result_num_success.clone(),
         );
 
         let query_result_num_failure: Family<_, _> =
@@ -111,7 +111,7 @@ impl Metrics {
         sub_registry.register(
             "query_result_num_failure",
             "Number of failed requests of a Kademlia query.",
-            Box::new(query_result_num_failure.clone()),
+            query_result_num_failure.clone(),
         );
 
         let query_result_duration: Family<_, _> =
@@ -120,21 +120,21 @@ impl Metrics {
             "query_result_duration",
             "Duration of a Kademlia query.",
             Unit::Seconds,
-            Box::new(query_result_duration.clone()),
+            query_result_duration.clone(),
         );
 
         let routing_updated = Family::default();
         sub_registry.register(
             "routing_updated",
             "Number of peers added, updated or evicted to, in or from a specific kbucket in the routing table",
-            Box::new(routing_updated.clone()),
+            routing_updated.clone(),
         );
 
         let inbound_requests = Family::default();
         sub_registry.register(
             "inbound_requests",
             "Number of inbound requests",
-            Box::new(inbound_requests.clone()),
+            inbound_requests.clone(),
         );
 
         Self {
@@ -258,12 +258,12 @@ impl super::Recorder<libp2p_kad::KademliaEvent> for Metrics {
     }
 }
 
-#[derive(Encode, Hash, Clone, Eq, PartialEq)]
+#[derive(EncodeLabelSet, Hash, Clone, Eq, PartialEq, Debug)]
 struct QueryResult {
     r#type: QueryType,
 }
 
-#[derive(Encode, Hash, Clone, Eq, PartialEq)]
+#[derive(EncodeLabelValue, Hash, Clone, Eq, PartialEq, Debug)]
 enum QueryType {
     Bootstrap,
     GetClosestPeers,
@@ -306,12 +306,12 @@ impl From<&libp2p_kad::QueryResult> for QueryResult {
     }
 }
 
-#[derive(Encode, Hash, Clone, Eq, PartialEq)]
+#[derive(EncodeLabelSet, Hash, Clone, Eq, PartialEq, Debug)]
 struct GetRecordResult {
     error: GetRecordError,
 }
 
-#[derive(Encode, Hash, Clone, Eq, PartialEq)]
+#[derive(EncodeLabelValue, Hash, Clone, Eq, PartialEq, Debug)]
 enum GetRecordError {
     NotFound,
     QuorumFailed,
@@ -334,12 +334,12 @@ impl From<&libp2p_kad::GetRecordError> for GetRecordResult {
     }
 }
 
-#[derive(Encode, Hash, Clone, Eq, PartialEq)]
+#[derive(EncodeLabelSet, Hash, Clone, Eq, PartialEq, Debug)]
 struct GetClosestPeersResult {
     error: GetClosestPeersError,
 }
 
-#[derive(Encode, Hash, Clone, Eq, PartialEq)]
+#[derive(EncodeLabelValue, Hash, Clone, Eq, PartialEq, Debug)]
 enum GetClosestPeersError {
     Timeout,
 }
@@ -354,12 +354,12 @@ impl From<&libp2p_kad::GetClosestPeersError> for GetClosestPeersResult {
     }
 }
 
-#[derive(Encode, Hash, Clone, Eq, PartialEq)]
+#[derive(EncodeLabelSet, Hash, Clone, Eq, PartialEq, Debug)]
 struct GetProvidersResult {
     error: GetProvidersError,
 }
 
-#[derive(Encode, Hash, Clone, Eq, PartialEq)]
+#[derive(EncodeLabelValue, Hash, Clone, Eq, PartialEq, Debug)]
 enum GetProvidersError {
     Timeout,
 }
@@ -374,20 +374,20 @@ impl From<&libp2p_kad::GetProvidersError> for GetProvidersResult {
     }
 }
 
-#[derive(Encode, Hash, Clone, Eq, PartialEq)]
+#[derive(EncodeLabelSet, Hash, Clone, Eq, PartialEq, Debug)]
 struct RoutingUpdated {
     action: RoutingAction,
     bucket: u32,
 }
 
-#[derive(Encode, Hash, Clone, Eq, PartialEq)]
+#[derive(EncodeLabelValue, Hash, Clone, Eq, PartialEq, Debug)]
 enum RoutingAction {
     Added,
     Updated,
     Evicted,
 }
 
-#[derive(Encode, Hash, Clone, Eq, PartialEq)]
+#[derive(EncodeLabelSet, Hash, Clone, Eq, PartialEq, Debug)]
 struct InboundRequest {
     request: Request,
 }
@@ -406,7 +406,7 @@ impl From<&libp2p_kad::InboundRequest> for InboundRequest {
     }
 }
 
-#[derive(Encode, Hash, Clone, Eq, PartialEq)]
+#[derive(EncodeLabelValue, Hash, Clone, Eq, PartialEq, Debug)]
 enum Request {
     FindNode,
     GetProvider,