Merge pull request #776 from openmina/fix/node-id-logging

Remove node_id logging from non-test runs

Author: adonagy

core/src/log.rs

@@ -78,12 +78,20 @@ pub const ACTION_TRACE_TARGET: &str = "openmina_core::log::action";
 #[macro_export]
 macro_rules! action_event {
     ($level:expr, $context:expr, $($tts:tt)*) => {
-        $crate::log::inner::event!(target: { $crate::log::ACTION_TRACE_TARGET }, $level, time = $context.time(), node_id = $context.node_id(), $($tts)*)
+        if $context.log_node_id() {
+            $crate::log::inner::event!(target: { $crate::log::ACTION_TRACE_TARGET }, $level, time = $context.time(), node_id = $context.node_id(), $($tts)*)
+        } else {
+            $crate::log::inner::event!(target: { $crate::log::ACTION_TRACE_TARGET }, $level, time = $context.time(), $($tts)*)
+        }
     };
     ($level:expr, $context:expr) => {
-        $crate::log::inner::event!(target: { $crate::log::ACTION_TRACE_TARGET }, $level, time = $context.time(), node_id = $context.node_id())
+        if $context.log_node_id() {
+            $crate::log::inner::event!(target: { $crate::log::ACTION_TRACE_TARGET }, $level, time = $context.time(), node_id = $context.node_id())
+        } else {
+            $crate::log::inner::event!(target: { $crate::log::ACTION_TRACE_TARGET }, $level, time = $context.time())
+        }
     };
- }
+}
 
 #[macro_export]
 macro_rules! action_error {
@@ -139,6 +147,7 @@ pub trait EventContext {
     fn timestamp(&self) -> redux::Timestamp;
     fn time(&self) -> &'_ dyn Value;
     fn node_id(&self) -> &'_ dyn Value;
+    fn log_node_id(&self) -> bool;
 }
 
 pub trait ActionEvent {

node/native/src/node/builder.rs

@@ -293,6 +293,7 @@ impl NodeBuilder {
                 build: node::BuildEnv::get().into(),
                 snarker: self.snarker,
                 consensus_constants: consensus_consts.clone(),
+                testing_run: false,
             },
             p2p: P2pConfig {
                 libp2p_port: self.p2p_libp2p_port,

node/src/config.rs

@@ -33,6 +33,7 @@ pub struct GlobalConfig {
     pub build: Box<BuildEnv>,
     pub snarker: Option<SnarkerConfig>,
     pub consensus_constants: ConsensusConstants,
+    pub testing_run: bool,
 }
 
 #[derive(Serialize, Deserialize, Debug, Clone)]

node/src/logger/logger_effects.rs

@@ -18,14 +18,16 @@ struct ActionLoggerContext {
     time: redux::Timestamp,
     time_str: String,
     node_id: DisplayValue<PeerId>,
+    log_node_id: bool,
 }
 
 impl ActionLoggerContext {
-    fn new(time: redux::Timestamp, node_id: PeerId) -> Self {
+    fn new(time: redux::Timestamp, node_id: PeerId, log_node_id: bool) -> Self {
         ActionLoggerContext {
             time,
             time_str: time_to_str(time),
             node_id: display(node_id),
+            log_node_id,
         }
     }
 }
@@ -39,14 +41,22 @@ impl EventContext for ActionLoggerContext {
         &self.time_str
     }
 
+    fn log_node_id(&self) -> bool {
+        self.log_node_id
+    }
+
     fn node_id(&self) -> &'_ dyn Value {
         &self.node_id
     }
 }
 
 pub fn logger_effects<S: Service>(store: &Store<S>, action: ActionWithMetaRef<'_>) {
     let (action, meta) = action.split();
-    let context = ActionLoggerContext::new(meta.time(), store.state().p2p.my_id());
+    let context = ActionLoggerContext::new(
+        meta.time(),
+        store.state().p2p.my_id(),
+        store.state().should_log_node_id(),
+    );
 
     match action {
         Action::P2p(action) => match action {

node/src/state.rs

@@ -273,6 +273,10 @@ impl State {
                 self.current_epoch() <= Some(epoch)
             })
     }
+
+    pub fn should_log_node_id(&self) -> bool {
+        self.config.testing_run
+    }
 }
 
 #[serde_with::serde_as]

node/testing/src/cluster/mod.rs

@@ -274,6 +274,7 @@ impl Cluster {
                 build: BuildEnv::get().into(),
                 snarker: testing_config.snark_worker,
                 consensus_constants: consensus_consts.clone(),
+                testing_run: true,
             },
             p2p: P2pConfig {
                 libp2p_port: Some(libp2p_port),

node/web/src/node/builder.rs

@@ -223,6 +223,7 @@ impl NodeBuilder {
                 build: node::BuildEnv::get().into(),
                 snarker: self.snarker,
                 consensus_constants: consensus_consts.clone(),
+                testing_run: false,
             },
             p2p: P2pConfig {
                 libp2p_port: None,

p2p/testing/src/redux.rs

@@ -172,6 +172,10 @@ impl EventContext for ActionLoggerContext {
     fn node_id(&self) -> &'_ dyn Value {
         &self.node_id
     }
+
+    fn log_node_id(&self) -> bool {
+        true
+    }
 }
 
 pub(super) fn log_action(action: &Action, meta: &ActionMeta, node_id: PeerId) {