Fix metrics

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

@@ -69,14 +69,14 @@ impl metrics::Metrics for Metrics {
 		let metrics = MetricsInner {
 			advertisments_made: prometheus::register(
 				prometheus::Counter::new(
-					"advertisments_made_total",
+					"parachain_advertisments_made_total",
 					"A number of advertisments sent to validators.",
 				)?,
 				registry,
 			)?,
 			collations_sent: prometheus::register(
 				prometheus::Counter::new(
-					"collations_sent_total",
+					"parachain_collations_sent_total",
 					"A number of collations sent to validators.",
 				)?,
 				registry,

node/network/collator-protocol/src/lib.rs

@@ -64,19 +64,6 @@ enum ProtocolSide {
 	Collator(CollatorId, collator_side::Metrics),
 }
 
-/// Metrics.
-#[derive(Clone, Default)]
-pub struct Metrics;
-
-// TODO: So how do we tie this to metrics in modules?.
-impl metrics::Metrics for Metrics {
-	fn try_register(_registry: &prometheus::Registry)
-		-> std::result::Result<Self, prometheus::PrometheusError>
-	{
-		Ok(Self)
-	}
-}
-
 /// The collator protocol subsystem.
 pub struct CollatorProtocolSubsystem {
 	protocol_side: ProtocolSide, 
@@ -87,17 +74,16 @@ impl CollatorProtocolSubsystem {
 	/// If `id` is `Some` this is a collator side of the protocol.
 	/// If `id` is `None` this is a validator side of the protocol. 
 	/// Caller must provide a registry for prometheus metrics.
-	pub fn new(id: Option<CollatorId>, registry: &prometheus::Registry)
-		-> std::result::Result<Self, prometheus::PrometheusError> {
+	pub fn new(id: Option<CollatorId>, registry: Option<&prometheus::Registry>) -> Self {
 		use metrics::Metrics;
 		let protocol_side = match id {
-			Some(id) => ProtocolSide::Collator(id, collator_side::Metrics::try_register(registry)?),
-			None => ProtocolSide::Validator(validator_side::Metrics::try_register(registry)?),
+			Some(id) => ProtocolSide::Collator(id, collator_side::Metrics::register(registry)),
+			None => ProtocolSide::Validator(validator_side::Metrics::register(registry)),
 		};
 
-		Ok(Self {
+		Self {
 			protocol_side,
-		})
+		}
 	}
 
 	async fn run<Context>(self, ctx: Context) -> Result<()>
@@ -123,7 +109,7 @@ impl<Context> Subsystem<Context> for CollatorProtocolSubsystem
 where
 	Context: SubsystemContext<Message = CollatorProtocolMessage> + Sync + Send,
 {
-	type Metrics = Metrics;
+	type Metrics = ();
 
 	fn start(self, ctx: Context) -> SpawnedSubsystem {
 		SpawnedSubsystem {

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

@@ -77,7 +77,7 @@ impl metrics::Metrics for Metrics {
 			collation_requests: prometheus::register(
 				prometheus::CounterVec::new(
 					prometheus::Opts::new(
-						"collation_requests_total",
+						"parachain_collation_requests_total",
 						"Number of collations requested from Collators.",
 					),
 					&["succeeded", "failed"],