Correct the metrics for topic subscriptions

beacon_node/lighthouse_network/src/gossipsub/behaviour.rs

@@ -826,6 +826,13 @@ where
         }
     }
 
+    /// Register topics to ensure metrics are recorded correctly for these topics.
+    pub fn register_topics_for_metrics(&mut self, topics: Vec<TopicHash>) {
+        if let Some(metrics) = &mut self.metrics {
+            metrics.register_allowed_topics(topics);
+        }
+    }
+
     /// Adds a new peer to the list of explicitly connected peers.
     pub fn add_explicit_peer(&mut self, peer_id: &PeerId) {
         tracing::debug!(peer=%peer_id, "Adding explicit peer");

beacon_node/lighthouse_network/src/gossipsub/metrics.rs

@@ -38,7 +38,7 @@ const DEFAULT_MAX_TOPICS: usize = 300;
 
 // Default value that limits how many topics for which there has never been a subscription do we
 // store metrics.
-const DEFAULT_MAX_NEVER_SUBSCRIBED_TOPICS: usize = 50;
+const DEFAULT_MAX_NEVER_SUBSCRIBED_TOPICS: usize = 100;
 
 #[derive(Debug, Clone)]
 pub struct Config {
@@ -392,13 +392,21 @@ impl Metrics {
         }
     }
 
-    /// Increase the number of peers do we known are subscribed to this topic.
+    /// Registers a set of topics that we want to store calculate metrics for.
+    pub(crate) fn register_allowed_topics(&mut self, topics: Vec<TopicHash>) {
+        for topic_hash in topics {
+            self.topic_info.insert(topic_hash, true);
+        }
+    }
+
+    /// Increase the number of peers that are subscribed to this topic.
     pub(crate) fn inc_topic_peers(&mut self, topic: &TopicHash) {
         if self.register_topic(topic).is_ok() {
             self.topic_peers_count.get_or_create(topic).inc();
         }
     }
 
+    /// Decrease the number of peers that are subscribed to this topic.
     pub(crate) fn dec_topic_peers(&mut self, topic: &TopicHash) {
         if self.register_topic(topic).is_ok() {
             self.topic_peers_count.get_or_create(topic).dec();

beacon_node/lighthouse_network/src/service/mod.rs

@@ -41,6 +41,7 @@ use std::{
 use types::ForkName;
 use types::{
     consts::altair::SYNC_COMMITTEE_SUBNET_COUNT, EnrForkId, EthSpec, ForkContext, Slot, SubnetId,
+    SyncSubnetId, Unsigned,
 };
 use utils::{build_transport, strip_peer_id, Context as ServiceContext, MAX_CONNECTIONS_PER_PEER};
 
@@ -275,6 +276,30 @@ impl<AppReqId: ReqId, TSpec: EthSpec> Network<AppReqId, TSpec> {
                 .with_peer_score(params, thresholds)
                 .expect("Valid score params and thresholds");
 
+            // If we are using metrics, then register which topics we want to make sure to keep
+            // track of
+            if ctx.libp2p_registry.is_some() {
+                let topics_to_keep_metrics_for = (0..TSpec::SubnetBitfieldLength::to_usize())
+                    .map(|subnet_id| GossipKind::Attestation(SubnetId::new(subnet_id as u64)))
+                    .chain((0..TSpec::SyncCommitteeSubnetCount::to_usize()).map(
+                        |sync_committee_id| {
+                            GossipKind::SyncCommitteeMessage(SyncSubnetId::new(
+                                sync_committee_id as u64,
+                            ))
+                        },
+                    ))
+                    .map(|gossip_kind| {
+                        Topic::from(GossipTopic::new(
+                            gossip_kind,
+                            GossipEncoding::default(),
+                            enr_fork_id.fork_digest,
+                        ))
+                        .into()
+                    })
+                    .collect::<Vec<TopicHash>>();
+                gossipsub.register_topics_for_metrics(topics_to_keep_metrics_for);
+            }
+
             (gossipsub, update_gossipsub_scores)
         };