Merge branch 'main' into elmattic/chain-get-events

Author: elmattic

.github/RPC_PARITY_ISSUE_TEMPLATE.md

@@ -1,5 +1,5 @@
 ---
-title: "[automated] RPC parity test failure"
+title: "[automated] RPC parity test failure @ {{ date | date('D/M/YY:HH:mm') }}"
 labels: ["Bug"]
 ---
 

CHANGELOG.md

@@ -36,6 +36,8 @@
 ### Removed
 
 - [#5449](https://github.com/ChainSafe/forest/pull/5449) Remove unnecessary/duplicate metrics.
+- [#5457](https://github.com/ChainSafe/forest/pull/5457) Remove most prometheus
+  metrics starting with `libp2p_`.
 
 ### Fixed
 

docs/docs/users/reference/env_variables.md

@@ -31,6 +31,7 @@ process.
 | `FOREST_TEST_RNG_FIXED_SEED`                              | non-negative integer             | empty                                          | 0                                                             | Override RNG with a reproducible one seeded by the value. This should never be used out of test context for security. |
 | `RUST_LOG`                                                | string                           | empty                                          | `debug,forest_libp2p::service=info`                           | Allows for log level customization.                                                                                   |
 | `FOREST_IGNORE_DRAND`                                     | 1 or true                        | empty                                          | 1                                                             | Ignore Drand validation.                                                                                              |
+| `FOREST_LIBP2P_METRICS_ENABLED`                           | 1 or true                        | empty                                          | 1                                                             | Include `libp2p` metrics in Forest's Prometheus output.                                                               |
 | `FOREST_F3_SIDECAR_RPC_ENDPOINT`                          | string                           | 127.0.0.1:23456                                | `127.0.0.1:23456`                                             | An RPC endpoint of F3 sidecar.                                                                                        |
 | `FOREST_F3_SIDECAR_FFI_ENABLED`                           | 1 or true                        | hard-coded per chain                           | 1                                                             | Whether or not to start the F3 sidecar via FFI                                                                        |
 | `FOREST_F3_CONSENSUS_ENABLED`                             | 1 or true                        | hard-coded per chain                           | 1                                                             | Whether or not to apply the F3 consensus to the node                                                                  |

docs/docs/users/reference/metrics.md

@@ -2,3 +2,4 @@
 # They should be considered bugged, and not used until the root cause is resolved.
 # Disable until next Lotus release with go-f3 0.8.0
 !Filecoin.F3GetManifest
+!Filecoin.EthTraceFilter

scripts/tests/api_compare/filter-list

@@ -27,3 +27,4 @@
 !Filecoin.EthGetBlockByNumber
 !eth_getBlockByNumber
 !Filecoin.ChainSetHead
+!Filecoin.EthTraceFilter

scripts/tests/api_compare/filter-list-offline

@@ -76,6 +76,10 @@ pub(in crate::libp2p) mod metrics {
     }
 }
 
+fn libp2p_metrics_enabled() -> bool {
+    crate::utils::misc::env::is_env_truthy("FOREST_LIBP2P_METRICS_ENABLED")
+}
+
 /// `Gossipsub` Filecoin blocks topic identifier.
 pub const PUBSUB_BLOCK_STR: &str = "/fil/blocks";
 /// `Gossipsub` Filecoin messages topic identifier.
@@ -295,7 +299,11 @@ where
         let mut bitswap_outbound_request_stream =
             bitswap_request_manager.outbound_request_stream().fuse();
         let mut peer_ops_rx_stream = self.peer_manager.peer_ops_rx().stream().fuse();
-        let metrics = Metrics::new(&mut crate::metrics::default_registry());
+        let metrics = if libp2p_metrics_enabled() {
+            Some(Metrics::new(&mut crate::metrics::default_registry()))
+        } else {
+            None
+        };
 
         const BOOTSTRAP_PEER_DIALER_INTERVAL: tokio::time::Duration =
             tokio::time::Duration::from_secs(60);
@@ -310,7 +318,9 @@ where
                 swarm_event = swarm_stream.next() => match swarm_event {
                     // outbound events
                     Some(SwarmEvent::Behaviour(event)) => {
-                        metrics.record(&event);
+                        if let Some(m) = &metrics {
+                            m.record(&event);
+                        }
                         handle_forest_behaviour_event(
                             swarm_stream.get_mut(),
                             &bitswap_request_manager,