From f750106526137e1487d71957bfbf6bd79e91e361 Mon Sep 17 00:00:00 2001 From: "iguerNL@Functori" Date: Tue, 18 Mar 2025 13:48:09 +0100 Subject: [PATCH 1/2] DAL/Node: show the network name when emitting node_is_ready event --- src/bin_dal_node/daemon.ml | 2 +- src/bin_dal_node/event.ml | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/bin_dal_node/daemon.ml b/src/bin_dal_node/daemon.ml index eedd1fcedb2c..028731415e08 100644 --- a/src/bin_dal_node/daemon.ml +++ b/src/bin_dal_node/daemon.ml @@ -1766,6 +1766,6 @@ let run ~data_dir ~configuration_override = (* Register topics with gossipsub worker. *) let* () = update_and_register_profiles ctxt in (* Start never-ending monitoring daemons *) - let*! () = Event.emit_node_is_ready () in + let*! () = Event.emit_node_is_ready ~network_name in let* () = daemonize [Handler.new_finalized_head ctxt cctxt crawler] in return_unit diff --git a/src/bin_dal_node/event.ml b/src/bin_dal_node/event.ml index 5067a2b3570f..4c3d33ec45ab 100644 --- a/src/bin_dal_node/event.ml +++ b/src/bin_dal_node/event.ml @@ -101,13 +101,13 @@ open struct () let node_is_ready = - declare_0 + declare_1 ~section ~prefix_name_with_section:true ~name:"is_ready" - ~msg:"the DAL node is ready" + ~msg:"the DAL node is ready (network {network})" ~level:Notice - () + ("network", Distributed_db_version.Name.encoding) let data_dir_not_found = declare_1 @@ -1044,7 +1044,7 @@ let emit_dal_node_sqlite3_store_init () = emit dal_node_sqlite3_store_init () let emit_store_is_ready () = emit store_is_ready () -let emit_node_is_ready () = emit node_is_ready () +let emit_node_is_ready ~network_name = emit node_is_ready network_name let emit_data_dir_not_found ~path = emit data_dir_not_found path -- GitLab From dd590f5e98d8612c8264f78685ed801a73b69af8 Mon Sep 17 00:00:00 2001 From: "iguerNL@Functori" Date: Thu, 20 Mar 2025 10:09:03 +0100 Subject: [PATCH 2/2] DAL/Node: show the node version at startup --- src/bin_dal_node/daemon.ml | 3 ++- src/bin_dal_node/event.ml | 9 ++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/bin_dal_node/daemon.ml b/src/bin_dal_node/daemon.ml index 028731415e08..2c3fae22b5f2 100644 --- a/src/bin_dal_node/daemon.ml +++ b/src/bin_dal_node/daemon.ml @@ -1766,6 +1766,7 @@ let run ~data_dir ~configuration_override = (* Register topics with gossipsub worker. *) let* () = update_and_register_profiles ctxt in (* Start never-ending monitoring daemons *) - let*! () = Event.emit_node_is_ready ~network_name in + let version = Tezos_version_value.Bin_version.octez_version_string in + let*! () = Event.emit_node_is_ready ~network_name ~version in let* () = daemonize [Handler.new_finalized_head ctxt cctxt crawler] in return_unit diff --git a/src/bin_dal_node/event.ml b/src/bin_dal_node/event.ml index 4c3d33ec45ab..0e3030c0e1b6 100644 --- a/src/bin_dal_node/event.ml +++ b/src/bin_dal_node/event.ml @@ -101,13 +101,15 @@ open struct () let node_is_ready = - declare_1 + declare_2 ~section ~prefix_name_with_section:true ~name:"is_ready" - ~msg:"the DAL node is ready (network {network})" + ~msg: + "the DAL node is ready (network: {network}, octez version: {version})" ~level:Notice ("network", Distributed_db_version.Name.encoding) + ("version", Data_encoding.string) let data_dir_not_found = declare_1 @@ -1044,7 +1046,8 @@ let emit_dal_node_sqlite3_store_init () = emit dal_node_sqlite3_store_init () let emit_store_is_ready () = emit store_is_ready () -let emit_node_is_ready ~network_name = emit node_is_ready network_name +let emit_node_is_ready ~network_name ~version = + emit node_is_ready (network_name, version) let emit_data_dir_not_found ~path = emit data_dir_not_found path -- GitLab