wb | locli: provide correct log object count for truncated logs

Author: mgmeier

bench/locli/src/Cardano/Analysis/Summary.hs

@@ -172,16 +172,20 @@ computeSummary sumAnalysisTime
  where
    cdfLogLineRate       = cdf stdCentiles lineRates
 
+   hostLogs =
+    rlHostLogs
+    & Map.elems
+
    (,) logObjectsEmitted textLinesEmitted =
-     rlHostLogs
-     & Map.toList
-     & fmap ((hlRawLogObjects &&& hlRawLines) . snd)
+     hostLogs
+     & fmap (hlRawLogObjects &&& hlRawLines)
      & unzip
+
    objLists = rlLogs rl <&> snd
 
    losFirsts, losLasts :: [UTCTime]
-   losFirsts  = objLists <&> loAt . Prelude.head
-   losLasts   = objLists <&> loAt . Prelude.last
+   losFirsts  = hostLogs <&> (\HostLogs{hlLogs, hlRawFirstAt} -> fromMaybe (loAt $ Prelude.head $ snd hlLogs) hlRawFirstAt)
+   losLasts   = hostLogs <&> (\HostLogs{hlLogs, hlRawLastAt}  -> fromMaybe (loAt $ Prelude.last $ snd hlLogs) hlRawLastAt)
    runtimes :: [NominalDiffTime]
    runtimes   = zipWith diffUTCTime losLasts losFirsts
    lineRates  = zipWith (/) (textLinesEmitted <&> fromIntegral)

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

@@ -114,6 +114,8 @@ data HostLogs a
     , hlLogs           :: (JsonLogfile, a)
     , hlFilteredSha256 :: Hash
     , hlProfile        :: [ProfileEntry I]
+    , hlRawFirstAt     :: Maybe UTCTime
+    , hlRawLastAt      :: Maybe UTCTime
     }
   deriving (Generic)
 

nix/workbench/analyse/analyse.sh

@@ -572,8 +572,6 @@ EOF
         then remanifest_reasons+=("$(red logs modified after manifest)")
         fi
 
-        echo $(ls 2>/dev/null --sort=time $dir/node-*/*.json $dir/node-*/stdout $run_logs)
-
         if test ${#remanifest_reasons[*]} = 0
         then progress "analyse" "log manifest exists and is up to date"
         else progress "analyse" "assembling log manifest:  ${remanifest_reasons[*]}"
@@ -623,6 +621,13 @@ EOF
 
                  done
                  wait
+
+                 for mach in $(jq_tolist '.rlHostLogs | keys' $run_logs)
+                 do jq_fmutate "$run_logs" '
+                      .rlHostLogs["'"$mach"'"].hlRawFirstAt = '"$(cat $adir/logs-$mach.flt.json | head -n1 | jq .at)"'
+                    | .rlHostLogs["'"$mach"'"].hlRawLastAt  = '"$(cat $adir/logs-$mach.flt.json | tail -n1 | jq .at)"'
+                    '
+                 done
              }
         fi