Merge pull request #5091 from input-output-hk/bench-master

workbench: updates

Author: mgmeier

Diff for: bench/locli/src/Cardano/Command.hs

@@ -381,16 +381,19 @@ sAnchor State{sTags=[]} = error "sAnchor with no run or multi-summary."
 sAnchor s@State{sTags}
   = stateAnchor sTags s
 
+quote :: T.Text -> T.Text
+quote = (<> "\"") . ("\"" <>)
+
 runChainCommand :: State -> ChainCommand -> ExceptT CommandError IO State
 
 runChainCommand s
   c@(ListLogobjectKeys f) = do
-  dumpText "logobject-keys" (toText <$> logObjectStreamInterpreterKeys) f
+  dumpText "logobject-keys" (quote . toText <$> logObjectStreamInterpreterKeys) f
     & firstExceptT (CommandError c)
   pure s
 runChainCommand s
   c@(ListLogobjectKeysLegacy f) = do
-  dumpText "logobject-keys-legacy" (toText <$> logObjectStreamInterpreterKeysLegacy) f
+  dumpText "logobject-keys-legacy" (quote . toText <$> logObjectStreamInterpreterKeysLegacy) f
     & firstExceptT (CommandError c)
   pure s
 

Diff for: bench/locli/src/Cardano/Unlog/LogObject.hs

@@ -264,7 +264,7 @@ interpreters = map3ple Map.fromList . unzip3 . fmap ent $
             <*> pure 1
 
   -- Ledger snapshots:
-  , (,,,) "TraceSnapshotEvent.TookSnapshot" "LedgerEvent.TookSnapshot" "ChainDB.LedgerEvent.TookSnapshot" $
+  , (,,,) "TraceSnapshotEvent.TookSnapshot" "TraceLedgerEvent.TookSnapshot" "ChainDB.LedgerEvent.TookSnapshot" $
     \_ -> pure LOLedgerTookSnapshot
 
   -- Tx receive path & mempool:

Diff for: cardano-node/src/Cardano/Node/Tracing/Tracers/Consensus.hs

@@ -971,48 +971,48 @@ instance MetaTrace  (ForgeTracerType blk) where
   namespaceFor (Left ev) =
     nsCast (namespaceFor ev)
   namespaceFor (Right _ev) =
-    Namespace [] ["StartLeadershipCheckPlus"]
+    Namespace [] ["StartLeadershipCheck"]
 
-  severityFor (Namespace _ ["StartLeadershipCheckPlus"]) _ = Just
+  severityFor (Namespace _ ["StartLeadershipCheck"]) _ = Just
     Info
   severityFor ns (Just (Left ev')) =
     severityFor (nsCast ns) (Just ev')
   severityFor ns Nothing =
     severityFor (nsCast ns :: Namespace (TraceForgeEvent blk)) Nothing
   severityFor _ _ = Nothing
 
-  detailsFor (Namespace _ ["StartLeadershipCheckPlus"]) _ = Just
+  detailsFor (Namespace _ ["StartLeadershipCheck"]) _ = Just
     DNormal
   detailsFor ns (Just (Left ev')) =
     detailsFor (nsCast ns) (Just ev')
   detailsFor ns Nothing =
     detailsFor (nsCast ns :: Namespace (TraceForgeEvent blk)) Nothing
   detailsFor _ _ = Nothing
 
-  privacyFor (Namespace _ ["StartLeadershipCheckPlus"]) _ = Just
+  privacyFor (Namespace _ ["StartLeadershipCheck"]) _ = Just
     Public
   privacyFor ns (Just (Left ev')) =
     privacyFor (nsCast ns) (Just ev')
   privacyFor ns Nothing =
     privacyFor (nsCast ns :: Namespace (TraceForgeEvent blk)) Nothing
   privacyFor _ _ = Nothing
 
-  metricsDocFor (Namespace _ ["StartLeadershipCheckPlus"]) =
+  metricsDocFor (Namespace _ ["StartLeadershipCheck"]) =
       [ ("Forge.UtxoSize", "")
       , ("Forge.DelegMapSize", "")
       ]
   metricsDocFor ns =
     metricsDocFor (nsCast ns :: Namespace (TraceForgeEvent blk))
 
-  documentFor (Namespace _ ["StartLeadershipCheckPlus"]) = Just $ mconcat
+  documentFor (Namespace _ ["StartLeadershipCheck"]) = Just $ mconcat
     [ "We adopted the block we produced, we also trace the transactions"
     , "  that were adopted."
     ]
   documentFor ns =
     documentFor (nsCast ns :: Namespace (TraceForgeEvent blk))
 
   allNamespaces =
-    Namespace [] ["StartLeadershipCheckPlus"]
+    Namespace [] ["StartLeadershipCheck"]
     : map nsCast (allNamespaces :: [Namespace (TraceForgeEvent blk)])
 
 --------------------------------------------------------------------------------

Diff for: nix/workbench/analyse/analyse.sh

@@ -101,7 +101,7 @@ do case "$1" in
        --filter-slot-expr | -fsex )  sargs+=($1 "$2"); filter_exprs+=('{ "tag":"CSlot" , "contents": '"$2"'}'); shift;;
        --no-filters | --unfiltered | -u )
                                    sargs+=($1);    arg_filters=(); unfiltered='true';;
-       --loany-ok )                sargs+=($1);    locli_args+=(--loany-ok);;
+       --ok-loany )                sargs+=($1);    locli_args+=(--ok-loany);;
        --lodecodeerror-ok )        sargs+=($1);    locli_args+=(--lodecodeerror-ok);;
        --dump-logobjects | -lo )   sargs+=($1);    dump_logobjects='true';;
        --dump-machviews  | -mw )   sargs+=($1);    dump_machviews='true';;

Diff for: nix/workbench/service/tracing.nix

@@ -22,15 +22,15 @@
 
     ## These are benchmarking-specific config deviations from the default.
     ##
-    "BlockFetch".severity = "Info";
+    "BlockFetch".severity = "Debug";
     "BlockFetch.Client.CompletedBlockFetch".maxFrequency = 0;
-    "ChainSync".severity = "Info";
+    "ChainSync".severity = "Debug";
     "ChainSync.Client.DownloadedHeader".maxFrequency = 0;
-    "Forge.Loop.BlockContext".severity = "Info";
-    "Forge.Loop.LedgerState".severity = "Info";
-    "Forge.Loop.LedgerView".severity = "Info";
-    "Forge.Loop.MempoolSnapshot".severity = "Info";
-    "Forge.Loop.TickedLedgerState".severity = "Info";
-    "Startup".severity = "Info";
+    "Forge.Loop.BlockContext".severity = "Debug";
+    "Forge.Loop.LedgerState".severity = "Debug";
+    "Forge.Loop.LedgerView".severity = "Debug";
+    "Forge.Loop.MempoolSnapshot".severity = "Debug";
+    "Forge.Loop.TickedLedgerState".severity = "Debug";
+    "Startup".severity = "Debug";
   };
 }