Companion PR for removing Prometheus metrics prefix (#3623)

* Companion PR for removing Prometheus metrics prefix

* Was missing some metrics

* Fix missing renames

* Fix test

* Fixes

* Update test

* Update Substrate

* Second time

* remove prefix from intergration test for zombienet

* update zombienet image

* Update Substrate

Co-authored-by: Bastian Köcher <info@kchr.de>
Co-authored-by: Javier Viola <pepoviola@gmail.com>

polkadot/node/network/approval-distribution/src/lib.rs

@@ -1303,42 +1303,42 @@ impl metrics::Metrics for Metrics {
 		let metrics = MetricsInner {
 			assignments_imported_total: prometheus::register(
 				prometheus::Counter::new(
-					"parachain_assignments_imported_total",
+					"polkadot_parachain_assignments_imported_total",
 					"Number of valid assignments imported locally or from other peers.",
 				)?,
 				registry,
 			)?,
 			approvals_imported_total: prometheus::register(
 				prometheus::Counter::new(
-					"parachain_approvals_imported_total",
+					"polkadot_parachain_approvals_imported_total",
 					"Number of valid approvals imported locally or from other peers.",
 				)?,
 				registry,
 			)?,
 			unified_with_peer_total: prometheus::register(
 				prometheus::Counter::new(
-					"parachain_unified_with_peer_total",
+					"polkadot_parachain_unified_with_peer_total",
 					"Number of times `unify_with_peer` is called.",
 				)?,
 				registry,
 			)?,
 			time_unify_with_peer: prometheus::register(
 				prometheus::Histogram::with_opts(prometheus::HistogramOpts::new(
-					"parachain_time_unify_with_peer",
+					"polkadot_parachain_time_unify_with_peer",
 					"Time spent within fn `unify_with_peer`.",
 				))?,
 				registry,
 			)?,
 			time_import_pending_now_known: prometheus::register(
 				prometheus::Histogram::with_opts(prometheus::HistogramOpts::new(
-					"parachain_time_import_pending_now_known",
+					"polkadot_parachain_time_import_pending_now_known",
 					"Time spent on importing pending assignments and approvals.",
 				))?,
 				registry,
 			)?,
 			time_awaiting_approval_voting: prometheus::register(
 				prometheus::Histogram::with_opts(prometheus::HistogramOpts::new(
-					"parachain_time_awaiting_approval_voting",
+					"polkadot_parachain_time_awaiting_approval_voting",
 					"Time spent awaiting a reply from the Approval Voting Subsystem.",
 				))?,
 				registry,

polkadot/node/network/availability-distribution/src/metrics.rs

@@ -102,7 +102,7 @@ impl metrics::Metrics for Metrics {
 			fetched_chunks: prometheus::register(
 				CounterVec::new(
 					Opts::new(
-						"parachain_fetched_chunks_total",
+						"polkadot_parachain_fetched_chunks_total",
 						"Total number of fetched chunks.",
 					),
 					&["success"]
@@ -112,7 +112,7 @@ impl metrics::Metrics for Metrics {
 			served_chunks: prometheus::register(
 				CounterVec::new(
 					Opts::new(
-						"parachain_served_chunks_total",
+						"polkadot_parachain_served_chunks_total",
 						"Total number of chunks served by this backer.",
 					),
 					&["success"]
@@ -122,7 +122,7 @@ impl metrics::Metrics for Metrics {
 			served_povs: prometheus::register(
 				CounterVec::new(
 					Opts::new(
-						"parachain_served_povs_total",
+						"polkadot_parachain_served_povs_total",
 						"Total number of povs served by this backer.",
 					),
 					&["success"]
@@ -131,7 +131,7 @@ impl metrics::Metrics for Metrics {
 			)?,
 			retries: prometheus::register(
 				Counter::new(
-					"parachain_fetch_retries_total",
+					"polkadot_parachain_fetch_retries_total",
 					"Number of times we did not succeed in fetching a chunk and needed to try more backers.",
 				)?,
 				registry,

polkadot/node/network/availability-recovery/src/metrics.rs

@@ -104,7 +104,7 @@ impl metrics::Metrics for Metrics {
 		let metrics = MetricsInner {
 			chunk_requests_issued: prometheus::register(
 				Counter::new(
-					"parachain_availability_recovery_chunk_requests_issued",
+					"polkadot_parachain_availability_recovery_chunk_requests_issued",
 					"Total number of issued chunk requests.",
 				)?,
 				registry,
@@ -112,7 +112,7 @@ impl metrics::Metrics for Metrics {
 			chunk_requests_finished: prometheus::register(
 				CounterVec::new(
 					Opts::new(
-						"parachain_availability_recovery_chunk_requests_finished",
+						"polkadot_parachain_availability_recovery_chunk_requests_finished",
 						"Total number of chunk requests finished.",
 					),
 					&["result"],
@@ -121,7 +121,7 @@ impl metrics::Metrics for Metrics {
 			)?,
 			time_chunk_request: prometheus::register(
 				prometheus::Histogram::with_opts(prometheus::HistogramOpts::new(
-					"parachain_availability_recovery_time_chunk_request",
+					"polkadot_parachain_availability_recovery_time_chunk_request",
 					"Time spent waiting for a response to a chunk request",
 				))?,
 				registry,

polkadot/node/network/bitfield-distribution/src/lib.rs

@@ -756,35 +756,35 @@ impl metrics::Metrics for Metrics {
 		let metrics = MetricsInner {
 			gossipped_own_availability_bitfields: prometheus::register(
 				prometheus::Counter::new(
-					"parachain_gossipped_own_availabilty_bitfields_total",
+					"polkadot_parachain_gossipped_own_availabilty_bitfields_total",
 					"Number of own availability bitfields sent to other peers.",
 				)?,
 				registry,
 			)?,
 			received_availability_bitfields: prometheus::register(
 				prometheus::Counter::new(
-					"parachain_received_availabilty_bitfields_total",
+					"polkadot_parachain_received_availabilty_bitfields_total",
 					"Number of valid availability bitfields received from other peers.",
 				)?,
 				registry,
 			)?,
 			active_leaves_update: prometheus::register(
 				prometheus::Histogram::with_opts(prometheus::HistogramOpts::new(
-					"parachain_bitfield_distribution_active_leaves_update",
+					"polkadot_parachain_bitfield_distribution_active_leaves_update",
 					"Time spent within `bitfield_distribution::active_leaves_update`",
 				))?,
 				registry,
 			)?,
 			handle_bitfield_distribution: prometheus::register(
 				prometheus::Histogram::with_opts(prometheus::HistogramOpts::new(
-					"parachain_bitfield_distribution_handle_bitfield_distribution",
+					"polkadot_parachain_bitfield_distribution_handle_bitfield_distribution",
 					"Time spent within `bitfield_distribution::handle_bitfield_distribution`",
 				))?,
 				registry,
 			)?,
 			handle_network_msg: prometheus::register(
 				prometheus::Histogram::with_opts(prometheus::HistogramOpts::new(
-					"parachain_bitfield_distribution_handle_network_msg",
+					"polkadot_parachain_bitfield_distribution_handle_network_msg",
 					"Time spent within `bitfield_distribution::handle_network_msg`",
 				))?,
 				registry,

polkadot/node/network/bridge/src/lib.rs

@@ -167,7 +167,7 @@ impl metrics::Metrics for Metrics {
 			peer_count: prometheus::register(
 				prometheus::GaugeVec::new(
 					prometheus::Opts::new(
-						"parachain_peer_count",
+						"polkadot_parachain_peer_count",
 						"The number of peers on a parachain-related peer-set",
 					),
 					&["protocol"]
@@ -177,7 +177,7 @@ impl metrics::Metrics for Metrics {
 			connected_events: prometheus::register(
 				prometheus::CounterVec::new(
 					prometheus::Opts::new(
-						"parachain_peer_connect_events_total",
+						"polkadot_parachain_peer_connect_events_total",
 						"The number of peer connect events on a parachain notifications protocol",
 					),
 					&["protocol"]
@@ -187,7 +187,7 @@ impl metrics::Metrics for Metrics {
 			disconnected_events: prometheus::register(
 				prometheus::CounterVec::new(
 					prometheus::Opts::new(
-						"parachain_peer_disconnect_events_total",
+						"polkadot_parachain_peer_disconnect_events_total",
 						"The number of peer disconnect events on a parachain notifications protocol",
 					),
 					&["protocol"]
@@ -197,7 +197,7 @@ impl metrics::Metrics for Metrics {
 			desired_peer_count: prometheus::register(
 				prometheus::GaugeVec::new(
 					prometheus::Opts::new(
-						"parachain_desired_peer_count",
+						"polkadot_parachain_desired_peer_count",
 						"The number of peers that the local node is expected to connect to on a parachain-related peer-set (either including or not including unresolvable authorities, depending on whether `ConnectToValidators` or `ConnectToValidatorsResolved` was used.)",
 					),
 					&["protocol"]
@@ -207,7 +207,7 @@ impl metrics::Metrics for Metrics {
 			notifications_received: prometheus::register(
 				prometheus::CounterVec::new(
 					prometheus::Opts::new(
-						"parachain_notifications_received_total",
+						"polkadot_parachain_notifications_received_total",
 						"The number of notifications received on a parachain protocol",
 					),
 					&["protocol"]
@@ -217,7 +217,7 @@ impl metrics::Metrics for Metrics {
 			notifications_sent: prometheus::register(
 				prometheus::CounterVec::new(
 					prometheus::Opts::new(
-						"parachain_notifications_sent_total",
+						"polkadot_parachain_notifications_sent_total",
 						"The number of notifications sent on a parachain protocol",
 					),
 					&["protocol"]
@@ -227,7 +227,7 @@ impl metrics::Metrics for Metrics {
 			bytes_received: prometheus::register(
 				prometheus::CounterVec::new(
 					prometheus::Opts::new(
-						"parachain_notification_bytes_received_total",
+						"polkadot_parachain_notification_bytes_received_total",
 						"The number of bytes received on a parachain notification protocol",
 					),
 					&["protocol"]
@@ -237,7 +237,7 @@ impl metrics::Metrics for Metrics {
 			bytes_sent: prometheus::register(
 				prometheus::CounterVec::new(
 					prometheus::Opts::new(
-						"parachain_notification_bytes_sent_total",
+						"polkadot_parachain_notification_bytes_sent_total",
 						"The number of bytes sent on a parachain notification protocol",
 					),
 					&["protocol"]

polkadot/node/network/collator-protocol/src/collator_side/mod.rs

@@ -116,28 +116,28 @@ impl metrics::Metrics for Metrics {
 		let metrics = MetricsInner {
 			advertisements_made: prometheus::register(
 				prometheus::Counter::new(
-					"parachain_collation_advertisements_made_total",
+					"polkadot_parachain_collation_advertisements_made_total",
 					"A number of collation advertisements sent to validators.",
 				)?,
 				registry,
 			)?,
 			collations_send_requested: prometheus::register(
 				prometheus::Counter::new(
-					"parachain_collations_sent_requested_total",
+					"polkadot_parachain_collations_sent_requested_total",
 					"A number of collations requested to be sent to validators.",
 				)?,
 				registry,
 			)?,
 			collations_sent: prometheus::register(
 				prometheus::Counter::new(
-					"parachain_collations_sent_total",
+					"polkadot_parachain_collations_sent_total",
 					"A number of collations sent to validators.",
 				)?,
 				registry,
 			)?,
 			process_msg: prometheus::register(
 				prometheus::Histogram::with_opts(prometheus::HistogramOpts::new(
-					"parachain_collator_protocol_collator_process_msg",
+					"polkadot_parachain_collator_protocol_collator_process_msg",
 					"Time spent within `collator_protocol_collator::process_msg`",
 				))?,
 				registry,

polkadot/node/network/collator-protocol/src/validator_side/mod.rs

@@ -150,7 +150,7 @@ impl metrics::Metrics for Metrics {
 			collation_requests: prometheus::register(
 				prometheus::CounterVec::new(
 					prometheus::Opts::new(
-						"parachain_collation_requests_total",
+						"polkadot_parachain_collation_requests_total",
 						"Number of collations requested from Collators.",
 					),
 					&["success"],
@@ -160,7 +160,7 @@ impl metrics::Metrics for Metrics {
 			process_msg: prometheus::register(
 				prometheus::Histogram::with_opts(
 					prometheus::HistogramOpts::new(
-						"parachain_collator_protocol_validator_process_msg",
+						"polkadot_parachain_collator_protocol_validator_process_msg",
 						"Time spent within `collator_protocol_validator::process_msg`",
 					)
 				)?,
@@ -169,7 +169,7 @@ impl metrics::Metrics for Metrics {
 			handle_collation_request_result: prometheus::register(
 				prometheus::Histogram::with_opts(
 					prometheus::HistogramOpts::new(
-						"parachain_collator_protocol_validator_handle_collation_request_result",
+						"polkadot_parachain_collator_protocol_validator_handle_collation_request_result",
 						"Time spent within `collator_protocol_validator::handle_collation_request_result`",
 					)
 				)?,
@@ -177,7 +177,7 @@ impl metrics::Metrics for Metrics {
 			)?,
 			collator_peer_count: prometheus::register(
 				prometheus::Gauge::new(
-					"parachain_collator_peer_count",
+					"polkadot_parachain_collator_peer_count",
 					"Amount of collator peers connected",
 				)?,
 				registry,

polkadot/node/network/dispute-distribution/src/metrics.rs

@@ -90,7 +90,7 @@ impl metrics::Metrics for Metrics {
 			sent_requests: prometheus::register(
 				CounterVec::new(
 					Opts::new(
-						"parachain_dispute_distribution_sent_requests",
+						"polkadot_parachain_dispute_distribution_sent_requests",
 						"Total number of sent requests.",
 					),
 					&["success"],
@@ -99,7 +99,7 @@ impl metrics::Metrics for Metrics {
 			)?,
 			received_requests: prometheus::register(
 				Counter::new(
-					"parachain_dispute_distribution_received_requests",
+					"polkadot_parachain_dispute_distribution_received_requests",
 					"Total number of received dispute requests.",
 				)?,
 				registry,
@@ -107,7 +107,7 @@ impl metrics::Metrics for Metrics {
 			imported_requests: prometheus::register(
 				CounterVec::new(
 					Opts::new(
-						"parachain_dispute_distribution_imported_requests",
+						"polkadot_parachain_dispute_distribution_imported_requests",
 						"Total number of imported requests.",
 					),
 					&["success"],
@@ -116,7 +116,7 @@ impl metrics::Metrics for Metrics {
 			)?,
 			time_dispute_request: prometheus::register(
 				prometheus::Histogram::with_opts(prometheus::HistogramOpts::new(
-					"parachain_dispute_distribution_time_dispute_request",
+					"polkadot_parachain_dispute_distribution_time_dispute_request",
 					"Time needed for dispute votes to get confirmed/fail getting transmitted.",
 				))?,
 				registry,

polkadot/node/network/statement-distribution/src/lib.rs

@@ -1970,14 +1970,14 @@ impl metrics::Metrics for Metrics {
 		let metrics = MetricsInner {
 			statements_distributed: prometheus::register(
 				prometheus::Counter::new(
-					"parachain_statements_distributed_total",
+					"polkadot_parachain_statements_distributed_total",
 					"Number of candidate validity statements distributed to other peers.",
 				)?,
 				registry,
 			)?,
 			sent_requests: prometheus::register(
 				prometheus::Counter::new(
-					"parachain_statement_distribution_sent_requests_total",
+					"polkadot_parachain_statement_distribution_sent_requests_total",
 					"Number of large statement fetching requests sent.",
 				)?,
 				registry,
@@ -1985,7 +1985,7 @@ impl metrics::Metrics for Metrics {
 			received_responses: prometheus::register(
 				prometheus::CounterVec::new(
 					prometheus::Opts::new(
-						"parachain_statement_distribution_received_responses_total",
+						"polkadot_parachain_statement_distribution_received_responses_total",
 						"Number of received responses for large statement data.",
 					),
 					&["success"],
@@ -1994,21 +1994,21 @@ impl metrics::Metrics for Metrics {
 			)?,
 			active_leaves_update: prometheus::register(
 				prometheus::Histogram::with_opts(prometheus::HistogramOpts::new(
-					"parachain_statement_distribution_active_leaves_update",
+					"polkadot_parachain_statement_distribution_active_leaves_update",
 					"Time spent within `statement_distribution::active_leaves_update`",
 				))?,
 				registry,
 			)?,
 			share: prometheus::register(
 				prometheus::Histogram::with_opts(prometheus::HistogramOpts::new(
-					"parachain_statement_distribution_share",
+					"polkadot_parachain_statement_distribution_share",
 					"Time spent within `statement_distribution::share`",
 				))?,
 				registry,
 			)?,
 			network_bridge_update_v1: prometheus::register(
 				prometheus::Histogram::with_opts(prometheus::HistogramOpts::new(
-					"parachain_statement_distribution_network_bridge_update_v1",
+					"polkadot_parachain_statement_distribution_network_bridge_update_v1",
 					"Time spent within `statement_distribution::network_bridge_update_v1`",
 				))?,
 				registry,