Refactor LogProxy again, add late filter predicate

Author: geo2a

booster/tools/booster/Server.hs

@@ -73,7 +73,6 @@ import Kore.Log.BoosterAdaptor (
     ExeName (..),
     KoreLogType (..),
     LogAction (LogAction),
-    LogProxyActionData (..),
     TimestampsSwitch (TimestampsDisable),
     defaultKoreLogOptions,
     koreSomeEntryLogAction,
@@ -160,12 +159,14 @@ main = do
                         koreSomeEntryLogAction
                             (renderStandardPretty (ExeName "") (TimeSpec 0 0) TimestampsDisable)
                             (not . logAsJson)
+                            (const True)
                             (LogAction $ \txt -> liftIO $ monadLogger defaultLoc "kore" logLevel $ toLogStr txt)
 
                     koreJsonLogAction =
                         koreSomeEntryLogAction
                             (renderJson (ExeName "") (TimeSpec 0 0) TimestampsDisable)
                             logAsJson
+                            (const True)
                             ( LogAction $ \txt ->
                                 let bytes = Text.encodeUtf8 $ prefix txt <> "\n"
                                  in liftIO $ do
@@ -184,12 +185,7 @@ main = do
                             , Log.timestampsSwitch = TimestampsDisable
                             , Log.debugSolverOptions =
                                 Log.DebugSolverOptions . fmap (<> ".kore") $ smtOptions >>= (.transcript)
-                            , Log.logType =
-                                LogProxy $
-                                    Log.LogProxyActionData
-                                        { messageFilter = const True
-                                        , logActions = koreLogActions
-                                        }
+                            , Log.logType = LogProxy (mconcat koreLogActions)
                             , Log.logFormat = Log.Standard
                             }
                     srvSettings = serverSettings port "*"

dev-tools/kore-rpc-dev/Server.hs

@@ -65,7 +65,6 @@ import Kore.Log.BoosterAdaptor (
     ExeName (..),
     KoreLogType (..),
     LogAction (LogAction),
-    LogProxyActionData (..),
     TimestampsSwitch (TimestampsDisable),
     defaultKoreLogOptions,
     koreSomeEntryLogAction,
@@ -183,12 +182,14 @@ main = do
                         koreSomeEntryLogAction
                             (renderStandardPretty (ExeName "") (TimeSpec 0 0) TimestampsDisable)
                             (not . logAsJson)
+                            (const True)
                             (LogAction $ \txt -> liftIO $ monadLogger defaultLoc "kore" logLevel $ toLogStr txt)
 
                     koreJsonLogAction =
                         koreSomeEntryLogAction
                             (renderJson (ExeName "") (TimeSpec 0 0) TimestampsDisable)
                             logAsJson
+                            (const True)
                             ( LogAction $ \txt ->
                                 let bytes = Text.encodeUtf8 $ prefix txt <> "\n"
                                  in liftIO $ do
@@ -206,12 +207,7 @@ main = do
                         , Log.timestampsSwitch = TimestampsDisable
                         , Log.debugSolverOptions =
                             Log.DebugSolverOptions . fmap (<> ".kore") $ smtOptions >>= (.transcript)
-                        , Log.logType =
-                            LogProxy $
-                                Log.LogProxyActionData
-                                    { messageFilter = const True
-                                    , logActions = koreLogActions
-                                    }
+                        , Log.logType = LogProxy (mconcat koreLogActions)
                         , Log.logFormat = Log.Standard
                         }
                 srvSettings = serverSettings port "*"

kore/src/Kore/Log/BoosterAdaptor.hs

@@ -28,6 +28,7 @@ import Data.Functor.Contravariant (
 import Data.Text (
     Text,
  )
+import Data.Text qualified as Text
 import Data.Text.Lazy qualified as LazyText
 import Kore.JsonRpc.Types.Log (LogOrigin (KoreRpc))
 import Kore.Log (WithTimestamp (..), swappableLogger, withTimestamp)
@@ -65,20 +66,25 @@ withMainLogger koreLogOptions = runContT $ do
         . Log.koreLogTransformer koreLogOptions
         . Log.koreLogFilters koreLogOptions
         $ case logType koreLogOptions of
-            LogProxy LogProxyActionData{logActions} -> mconcat logActions
+            LogProxy logAction -> logAction
             ltype -> error ("Unexpected log type " <> show ltype)
 
 koreSomeEntryLogAction ::
     MonadIO m =>
+    -- | how to render a timestamped 'SomeEntry' into Text
     (WithTimestamp -> Text) ->
+    -- | filter log entries, applies BEFORE rendering to text
     (SomeEntry -> Bool) ->
+    -- | filter log entries, applies AFTER rendering to text
+    (Text -> Bool) ->
     LogAction m Text ->
     LogAction m SomeEntry
-koreSomeEntryLogAction renderer selector textLogAction =
+koreSomeEntryLogAction renderer earlyFilter lateFilter textLogAction =
     textLogAction
+        & Colog.cfilter lateFilter
         & contramap renderer
         & Colog.cmapM withTimestamp
-        & Colog.cfilter selector
+        & Colog.cfilter earlyFilter
 
 renderJson :: ExeName -> TimeSpec -> TimestampsSwitch -> WithTimestamp -> Text
 renderJson _exeName _startTime _timestampSwitch (WithTimestamp (SomeEntry _context actualEntry) _entryTime) =

kore/src/Kore/Log/KoreLogOptions.hs

@@ -7,7 +7,6 @@ License     : BSD-3-Clause
 module Kore.Log.KoreLogOptions (
     KoreLogOptions (..),
     KoreLogType (..),
-    LogProxyActionData (..),
     KoreLogFormat (..),
     EntryTypes,
     ExeName (..),
@@ -166,16 +165,8 @@ data KoreLogType
       LogStdErr
     | -- | Log to specified file when '--log <filename>' is passed.
       LogFileText FilePath
-    | -- | Log actions forwarded from proxy servers (e.g. kore-rpc-booster, kore-rpc-dev)
-      LogProxy LogProxyActionData
-
--- | Log actions forwarded from 'booster/Server.hs'
-data LogProxyActionData = LogProxyActionData
-    { messageFilter :: (Text -> Bool)
-    -- ^ which messages to log
-    , logActions :: (forall m. MonadIO m => [LogAction m SomeEntry])
-    -- ^ actual log actions
-    }
+    | -- | Log action forwarded from proxy servers (e.g. kore-rpc-booster, kore-rpc-dev)
+      LogProxy (forall m. MonadIO m => LogAction m SomeEntry)
 
 instance Eq KoreLogType where
     LogStdErr == LogStdErr = True