Merge #4908

4908: Added features to tracing r=jutaro a=jutaro * Generated docu shows tracers, tracers with metrics, silent tracers according to current configuration * Trace message shows tracers with metrics and silent tracers Co-authored-by: Yupanqui <jnf@arcor.de>
IntersectMBO · Feb 27, 2023 · 1b3828b · 1b3828b
2 parents ec57638 + d8a4f04
commit 1b3828b
Show file tree

Hide file tree

Showing 24 changed files with 608 additions and 453 deletions.
diff --git a/bench/tx-generator/src/Cardano/Benchmarking/Tracer.hs b/bench/tx-generator/src/Cardano/Benchmarking/Tracer.hs
@@ -82,14 +82,15 @@ initDefaultTracers :: IO BenchTracers
 initDefaultTracers = do
   mbStdoutTracer <- fmap Just standardTracer
   let mbForwardingTracer = Nothing
+  confState       <- emptyConfigReflection
   benchTracer <-  generatorTracer "benchmark" mbStdoutTracer mbForwardingTracer
-  configureTracers initialTraceConfig [benchTracer]
+  configureTracers confState initialTraceConfig [benchTracer]
   n2nSubmitTracer <- generatorTracer "submitN2N" mbStdoutTracer mbForwardingTracer
-  configureTracers initialTraceConfig [n2nSubmitTracer]
+  configureTracers confState initialTraceConfig [n2nSubmitTracer]
   connectTracer <- generatorTracer "connect" mbStdoutTracer mbForwardingTracer
-  configureTracers initialTraceConfig [connectTracer]
+  configureTracers confState initialTraceConfig [connectTracer]
   submitTracer <- generatorTracer "submit" mbStdoutTracer mbForwardingTracer
-  configureTracers initialTraceConfig [submitTracer]
+  configureTracers confState initialTraceConfig [submitTracer]
 
   return $ BenchTracers
     { btTxSubmit_    = Tracer (traceWith benchTracer)
@@ -111,14 +112,15 @@ initTracers iomgr networkId tracerSocket = do
           pure (forwardTracer forwardSink, dataPointTracer dpStore)
   mbStdoutTracer <- fmap Just standardTracer
   let mbForwardingTracer = Just forwardingTracer
+  confState       <- emptyConfigReflection
   benchTracer <-  generatorTracer "benchmark" mbStdoutTracer mbForwardingTracer
-  configureTracers initialTraceConfig [benchTracer]
+  configureTracers confState initialTraceConfig [benchTracer]
   n2nSubmitTracer <- generatorTracer "submitN2N" mbStdoutTracer mbForwardingTracer
-  configureTracers initialTraceConfig [n2nSubmitTracer]
+  configureTracers confState initialTraceConfig [n2nSubmitTracer]
   connectTracer <- generatorTracer "connect" mbStdoutTracer mbForwardingTracer
-  configureTracers initialTraceConfig [connectTracer]
+  configureTracers confState initialTraceConfig [connectTracer]
   submitTracer <- generatorTracer "submit" mbStdoutTracer mbForwardingTracer
-  configureTracers initialTraceConfig [submitTracer]
+  configureTracers confState initialTraceConfig [submitTracer]
   -- Now we need to provide "Nodeinfo" DataPoint, to forward generator's name
   -- to the acceptor application (for example, 'cardano-tracer').
   nodeInfoTracer <- mkDataPointTracer dpTracer

diff --git a/cardano-node/src/Cardano/Node/Tracing/Documentation.hs b/cardano-node/src/Cardano/Node/Tracing/Documentation.hs