dmq: added handshake tracers

Author: coot

decentralized-message-queue/app/Main.hs

@@ -3,12 +3,12 @@
 module Main where
 
 import Control.Monad (void)
-import Control.Tracer (Tracer (..), traceWith)
+import Control.Tracer (Tracer (..), nullTracer, traceWith)
 
 import Data.Aeson (ToJSON)
 import Data.Act
+import Data.Functor.Contravariant ((>$<))
 import Data.Void (Void)
-import Debug.Trace (traceShowM)
 import Options.Applicative
 import System.Random (newStdGen, split)
 
@@ -47,8 +47,10 @@ runDMQ commandLineConfig = do
     -- combine default configuration, configuration file and command line
     -- options
     let dmqConfig@Configuration {
-          dmqcPrettyLog    = I prettyLog,
-          dmqcTopologyFile = I topologyFile
+          dmqcPrettyLog            = I prettyLog,
+          dmqcTopologyFile         = I topologyFile,
+          dmqcHandshakeTracer      = I handshakeTracer,
+          dmqcLocalHandshakeTracer = I localHandshakeTracer
         } = config' <> commandLineConfig
             `act`
             defaultConfiguration
@@ -78,8 +80,12 @@ runDMQ commandLineConfig = do
                     dmqLimitsAndTimeouts
                     defaultSigDecisionPolicy
           dmqDiffusionArguments =
-            diffusionArguments debugTracer
-                               debugTracer
+            diffusionArguments (if handshakeTracer
+                                  then WithEventType "Handshake" >$< tracer
+                                  else nullTracer)
+                               (if localHandshakeTracer
+                                  then WithEventType "Handshake" >$< tracer
+                                  else nullTracer)
           dmqDiffusionApplications =
             diffusionApplications nodeKernel
                                   dmqConfig
@@ -92,6 +98,3 @@ runDMQ commandLineConfig = do
                     (dmqDiffusionTracers dmqConfig tracer)
                     dmqDiffusionConfiguration
                     dmqDiffusionApplications
-
-debugTracer :: (Show a, Applicative m) => Tracer m a
-debugTracer = Tracer traceShowM

decentralized-message-queue/src/DMQ/Configuration.hs

@@ -210,11 +210,11 @@ defaultConfiguration = Configuration {
       dmqcMuxTracer                                  = I False,
       dmqcChannelTracer                              = I False,
       dmqcBearerTracer                               = I False,
-      dmqcHandshakeTracer                            = I False,
+      dmqcHandshakeTracer                            = I True,
       dmqcLocalMuxTracer                             = I True,
       dmqcLocalChannelTracer                         = I False,
       dmqcLocalBearerTracer                          = I False,
-      dmqcLocalHandshakeTracer                       = I False,
+      dmqcLocalHandshakeTracer                       = I True,
       dmqcDiffusionTracer                            = I True,
       dmqcTraceLocalRootPeersTracer                  = I False,
       dmqcTracePublicRootPeersTracer                 = I False,
@@ -223,7 +223,7 @@ defaultConfiguration = Configuration {
       dmqcTraceChurnCounters                         = I False,
       dmqcDebugPeerSelectionInitiatorTracer          = I False,
       dmqcDebugPeerSelectionInitiatorResponderTracer = I False,
-      dmqcTracePeerSelectionCounters                 = I False,
+      dmqcTracePeerSelectionCounters                 = I True,
       dmqcPeerSelectionActionsTracer                 = I False,
       dmqcConnectionManagerTracer                    = I True,
       dmqcConnectionManagerTransitionTracer          = I False,