bench: Trace message fixes

and forwarding config adoption

Author: jutaro

bench/locli/src/Cardano/Unlog/LogObject.hs

@@ -358,11 +358,11 @@ interpreters = map3ple Map.fromList . unzip3 . fmap ent $
   , (,,,) "TraceBenchTxSubServAck" "TraceBenchTxSubServAck" "TraceBenchTxSubServAck" $
     \v -> LOTxsAcked <$> v .: "txIds"
 
-  , (,,,) "TraceTxSubmissionCollected" "TraceTxSubmissionCollected" "TraceTxSubmissionCollected" $
+  , (,,,) "TraceTxSubmissionCollected" "TraceTxSubmissionCollected" "TxSubmission.TxInbound.Collected" $
     \v -> LOTxsCollected
             <$> v .: "count"
 
-  , (,,,) "TraceTxSubmissionProcessed" "TraceTxSubmissionProcessed" "TraceTxSubmissionProcessed" $
+  , (,,,) "TraceTxSubmissionProcessed" "TraceTxSubmissionProcessed" "TxSubmission.TxInbound.Processed" $
     \v -> LOTxsProcessed
             <$> v .: "accepted"
             <*> v .: "rejected"
@@ -381,7 +381,7 @@ interpreters = map3ple Map.fromList . unzip3 . fmap ent $
     \_ -> pure LOMempoolRejectedTx
 
   -- Generator:
-  , (,,,) "TraceBenchTxSubSummary" "TraceBenchTxSubSummary" "TraceBenchTxSubSummary" $
+  , (,,,) "TraceBenchTxSubSummary" "TraceBenchTxSubSummary" "Benchmark.BenchTxSubSummary" $
     \v -> do
        x :: Object <- v .: "summary"
        LOGeneratorSummary

bench/tx-generator/src/Cardano/Benchmarking/Tracer.hs

@@ -95,10 +95,10 @@ initTxGenTracers mbForwarding = do
         configureTracers confState initialTraceConfig [tracer]
         pure $ Tracer (traceWith tracer)
 
-  benchTracer@(Tracer traceBench) <- mkTracer "benchmark"
-  n2nSubmitTracer <- mkTracer "submitN2N"
-  connectTracer <- mkTracer "connect"
-  submitTracer <- mkTracer "submit"
+  benchTracer@(Tracer traceBench) <- mkTracer "Benchmark"
+  n2nSubmitTracer <- mkTracer "SubmitN2N"
+  connectTracer <- mkTracer "Connect"
+  submitTracer <- mkTracer "Submit"
 
   traceBench $ TraceTxGeneratorVersion Version.txGeneratorVersion
 
@@ -112,8 +112,9 @@ initTxGenTracers mbForwarding = do
   prepareForwardingTracer :: IO (Maybe (Trace IO FormattedMessage))
   prepareForwardingTracer = forM mbForwarding $
     \(iomgr, networkId, tracerSocket) -> do
+        let forwardingConf = fromMaybe defaultForwarder (tcForwarder initialTraceConfig)
         (forwardSink :: ForwardSink TraceObject, dpStore) <-
-          initForwarding iomgr (tcForwarder initialTraceConfig) (toNetworkMagic networkId) Nothing $ Just (tracerSocket, Initiator)
+          initForwarding iomgr forwardingConf (toNetworkMagic networkId) Nothing $ Just (tracerSocket, Initiator)
 
         -- we need to provide NodeInfo DataPoint, to forward generator's name
         -- to the acceptor application (for example, 'cardano-tracer').
@@ -161,7 +162,7 @@ initialTraceConfig = TraceConfig {
           , setMaxDetail "connect"
           , setMaxDetail "submit"
           ]
-    , tcForwarder = defaultForwarder
+    , tcForwarder = Just defaultForwarder
     , tcNodeName = Nothing
     , tcPeerFrequency = Just 2000 -- Every 2 seconds
     , tcResourceFrequency = Just 1000 -- Every second
@@ -278,7 +279,7 @@ instance MetaTrace (TraceBenchTxSubmit TxId) where
     namespaceFor TraceBenchTxSubServCons {} = Namespace [] ["BenchTxSubServCons"]
     namespaceFor TraceBenchTxSubIdle {} = Namespace [] ["BenchTxSubIdle"]
     namespaceFor TraceBenchTxSubRateLimit {} = Namespace [] ["BenchTxSubRateLimit"]
-    namespaceFor TraceBenchTxSubSummary {} = Namespace [] ["eBenchTxSubSummary"]
+    namespaceFor TraceBenchTxSubSummary {} = Namespace [] ["BenchTxSubSummary"]
     namespaceFor TraceBenchTxSubDebug {} = Namespace [] ["BenchTxSubDebug"]
     namespaceFor TraceBenchTxSubError {} = Namespace [] ["BenchTxSubError"]
     namespaceFor TraceBenchPlutusBudgetSummary {} = Namespace [] ["BenchPlutusBudgetSummary"]
@@ -301,7 +302,7 @@ instance MetaTrace (TraceBenchTxSubmit TxId) where
         , Namespace [] ["BenchTxSubServCons"]
         , Namespace [] ["BenchTxSubIdle"]
         , Namespace [] ["BenchTxSubRateLimit"]
-        , Namespace [] ["eBenchTxSubSummary"]
+        , Namespace [] ["BenchTxSubSummary"]
         , Namespace [] ["BenchTxSubDebug"]
         , Namespace [] ["BenchTxSubError"]
         , Namespace [] ["BenchPlutusBudgetSummary"]

nix/workbench/service/tracing.nix

@@ -85,11 +85,6 @@ let
       "TxSubmission.Remote".severity = "Notice";
       "TxSubmission.TxInbound".severity = "Debug";
       "TxSubmission.TxOutbound".severity = "Notice";
-
-      "TraceBenchTxSubServAck".severity = "Debug";
-      "TraceBenchTxSubSummary".severity = "Debug";
-      "TraceTxSubmissionCollected".severity = "Debug";
-      "TraceTxSubmissionProcessed".severity = "Debug";
       };
   };