From cb9c427a4c7b153f5e74dd9f5dadd16e828bc8fa Mon Sep 17 00:00:00 2001
From: Andrea Cerone <andrea.cerone@trili.tech>
Date: Mon, 30 Jan 2023 12:03:53 +0100
Subject: [PATCH] Dac/Node: display more informative logs when resolving plugin

---
 src/bin_dac_node/dac_manager.ml | 16 ++++++++++------
 src/bin_dac_node/event.ml       | 15 +++++++++++----
 2 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/src/bin_dac_node/dac_manager.ml b/src/bin_dac_node/dac_manager.ml
index fbd26f1083ff..1952417ed563 100644
--- a/src/bin_dac_node/dac_manager.ml
+++ b/src/bin_dac_node/dac_manager.ml
@@ -113,16 +113,20 @@ end
 let resolve_plugin
     (protocols : Tezos_shell_services.Chain_services.Blocks.protocols) =
   let open Lwt_syntax in
+  let current_protocol = protocols.current_protocol in
+  let next_protocol = protocols.next_protocol in
   let plugin_opt =
     Option.either
-      (Dac_plugin.get protocols.current_protocol)
-      (Dac_plugin.get protocols.next_protocol)
+      (Dac_plugin.get current_protocol)
+      (Dac_plugin.get next_protocol)
   in
   match plugin_opt with
   | None ->
-      let* () = Event.emit_protocol_plugin_not_resolved () in
-      return None
+      let+ () =
+        Event.emit_protocol_plugin_not_resolved current_protocol next_protocol
+      in
+      None
   | Some dac_plugin ->
       let (module Dac_plugin : Dac_plugin.T) = dac_plugin in
-      let* () = Event.emit_protocol_plugin_resolved Dac_plugin.Proto.hash in
-      return @@ Some dac_plugin
+      let+ () = Event.emit_protocol_plugin_resolved Dac_plugin.Proto.hash in
+      Some dac_plugin
diff --git a/src/bin_dac_node/event.ml b/src/bin_dac_node/event.ml
index d99f8733826e..b70f250a097b 100644
--- a/src/bin_dac_node/event.ml
+++ b/src/bin_dac_node/event.ml
@@ -112,12 +112,15 @@ let protocol_plugin_resolved =
     ("proto_hash", Data_encoding.string)
 
 let protocol_plugin_not_resolved =
-  declare_0
+  declare_2
     ~section
     ~name:"dac_node_plugin_not_resolved"
-    ~msg:"Could not resolve plugin"
+    ~msg:
+      "Could not resolve plugin for protocols {current_protocol} or \
+       {next_protocol}"
     ~level:Notice
-    ()
+    ("current_protocol", Data_encoding.string)
+    ("next_protocol", Data_encoding.string)
 
 let daemon_error =
   declare_1
@@ -166,4 +169,8 @@ let proto_short_hash_string hash =
 let emit_protocol_plugin_resolved hash =
   emit protocol_plugin_resolved @@ proto_short_hash_string hash
 
-let emit_protocol_plugin_not_resolved = emit protocol_plugin_not_resolved
+let emit_protocol_plugin_not_resolved current_protocol next_protocol =
+  emit
+    protocol_plugin_not_resolved
+    ( proto_short_hash_string current_protocol,
+      proto_short_hash_string next_protocol )
-- 
GitLab