trace-dispatcher: Config without merging options

TraceOptionForwarder config adoption

Author: jutaro

trace-dispatcher/examples/Examples/Configuration.hs

@@ -48,7 +48,7 @@ config1 = TraceConfig {
           , (["tracer2","TestMessage"], [ConfSeverity (SeverityF (Just Critical))])
           , (["tracer3","TestMessage"], [ConfSeverity (SeverityF (Just Info))])
           ]
-    , tcForwarder = TraceOptionForwarder {
+    , tcForwarder = Just TraceOptionForwarder {
         tofConnQueueSize = 100
       , tofDisconnQueueSize = 1000
       , tofVerbosity = Minimum
@@ -65,7 +65,7 @@ config2 = TraceConfig {
         , (["tracer2","TestMessage"], [ConfSeverity (SeverityF (Just Warning))])
         , (["tracer3","TestMessage"], [ConfSeverity (SeverityF (Just Warning))])
         ]
-    , tcForwarder = TraceOptionForwarder {
+    , tcForwarder = Just TraceOptionForwarder {
         tofConnQueueSize = 100
       , tofDisconnQueueSize = 1000
       , tofVerbosity = Minimum

trace-dispatcher/examples/Examples/Documentation.hs

@@ -47,7 +47,7 @@ config1 = TraceConfig {
           [ ([], [ConfSeverity (SeverityF Nothing)])
           , (["node2"], [ConfSeverity (SeverityF (Just Info))])
           ]
-    , tcForwarder = TraceOptionForwarder {
+    , tcForwarder = Just TraceOptionForwarder {
         tofConnQueueSize = 100
       , tofDisconnQueueSize = 1000
       , tofVerbosity = Minimum

trace-dispatcher/src/Cardano/Logging/ConfigurationParser.hs

@@ -1,6 +1,5 @@
 {-# LANGUAGE DeriveGeneric #-}
 {-# LANGUAGE DerivingStrategies #-}
-{-# LANGUAGE LambdaCase #-}
 {-# LANGUAGE RecordWildCards #-}
 {-# LANGUAGE ScopedTypeVariables #-}
 
@@ -17,10 +16,9 @@ import           Control.Exception (throwIO)
 import qualified Data.Aeson as AE
 import           Data.ByteString (ByteString)
 import qualified Data.ByteString.Char8 as BS
-import           Data.Functor
 import           Data.List (foldl')
 import qualified Data.Map.Strict as Map
-import           Data.Maybe (fromMaybe, isJust)
+import           Data.Maybe (isJust)
 import           Data.Text (Text, split)
 import           Data.Yaml
 import           GHC.Generics
@@ -51,11 +49,12 @@ readConfigurationWithDefault fp defaultConf = do
     fileConf <- either throwIO pure . parseRepresentation =<< BS.readFile fp
     pure $ mergeWithDefault fileConf defaultConf
 
-
 mergeWithDefault ::  TraceConfig -> TraceConfig -> TraceConfig
 mergeWithDefault fileConf defaultConf =
   TraceConfig
-    (mergeOptionsWithDefault (tcOptions fileConf) (tcOptions defaultConf))
+    (if (not . Map.null) (tcOptions fileConf)
+      then tcOptions fileConf
+      else tcOptions defaultConf)
     (tcForwarder fileConf)
     (if isJust (tcNodeName fileConf)
         then tcNodeName fileConf
@@ -67,44 +66,6 @@ mergeWithDefault fileConf defaultConf =
         then tcResourceFrequency fileConf
         else tcResourceFrequency defaultConf)
 
-mergeOptionsWithDefault ::
-     Map.Map [Text] [ConfigOption]
-  -> Map.Map [Text] [ConfigOption]
-  -> Map.Map [Text] [ConfigOption]
-mergeOptionsWithDefault fileOpts defaultOpts =
-    foldr mergeOptsNs defaultOpts (Map.toList fileOpts)
-  where
-    mergeOptsNs :: ([Text],[ConfigOption]) -> Map.Map [Text] [ConfigOption] -> Map.Map [Text] [ConfigOption]
-    mergeOptsNs (ns,opts) into =
-      case Map.lookup ns into of
-        Nothing -> Map.insert ns opts into
-        Just currentOpts -> Map.insert ns (mergeOpts opts currentOpts) into
-
-    mergeOpts :: [ConfigOption] ->  [ConfigOption] -> [ConfigOption]
-    mergeOpts fromFile fromDefault = foldr mergeOpt fromDefault fromFile
-
-    mergeOpt :: ConfigOption -> [ConfigOption] ->  [ConfigOption]
-    mergeOpt (ConfSeverity severityF) configList =
-      ConfSeverity severityF : filter (\case
-                                            ConfSeverity _ -> False
-                                            _ -> True) configList
-    mergeOpt (ConfDetail detailLevel) configList =
-      ConfDetail detailLevel : filter (\case
-                                            ConfDetail _ -> False
-                                            _ -> True) configList
-    mergeOpt (ConfBackend backendConfig) configList =
-      ConfBackend backendConfig : filter (\case
-                                            ConfBackend _ -> False
-                                            _ -> True) configList
-    mergeOpt (ConfLimiter maxFrequency) configList =
-      if maxFrequency /= 0.0
-        then ConfLimiter maxFrequency : filter (\case
-                                            ConfLimiter _ -> False
-                                            _ -> True) configList
-        else filter (\case
-                      ConfLimiter _ -> False
-                      _ -> True) configList
-
 parseRepresentation :: ByteString -> Either ParseException TraceConfig
 parseRepresentation bs = transform (decodeEither' bs)
   where
@@ -136,7 +97,7 @@ parseRepresentation bs = transform (decodeEither' bs)
 
 data ConfigRepresentation = ConfigRepresentation {
     traceOptions                :: OptionsRepresentation
-  , traceOptionForwarder        :: TraceOptionForwarder
+  , traceOptionForwarder        :: Maybe TraceOptionForwarder
   , traceOptionNodeName         :: Maybe Text
   , traceOptionPeerFrequency     :: Maybe Int
   , traceOptionResourceFrequency :: Maybe Int
@@ -148,7 +109,7 @@ type OptionsRepresentation = Map.Map Text ConfigOptionRep
 instance AE.FromJSON ConfigRepresentation where
     parseJSON (Object obj) = ConfigRepresentation
                            <$> obj .: "TraceOptions"
-                           <*> (obj .:? "TraceOptionForwarder" <&> fromMaybe defaultForwarder)
+                           <*> obj .:? "TraceOptionForwarder"
                            <*> obj .:? "TraceOptionNodeName"
                            <*> obj .:? "TraceOptionPeerFrequency"
                            <*> obj .:? "TraceOptionResourceFrequency"

trace-dispatcher/src/Cardano/Logging/Types.hs

@@ -442,7 +442,7 @@ data TraceConfig = TraceConfig {
      -- | Options specific to a certain namespace
     tcOptions   :: Map.Map [Text] [ConfigOption]
      -- | Options for the forwarder
-  , tcForwarder :: TraceOptionForwarder
+  , tcForwarder :: Maybe TraceOptionForwarder
     -- | Optional human-readable name of the node.
   , tcNodeName  :: Maybe Text
     -- | Optional peer trace frequency in milliseconds.
@@ -455,7 +455,7 @@ data TraceConfig = TraceConfig {
 emptyTraceConfig :: TraceConfig
 emptyTraceConfig = TraceConfig {
     tcOptions = Map.empty
-  , tcForwarder = defaultForwarder
+  , tcForwarder = Nothing
   , tcNodeName = Nothing
   , tcPeerFrequency = Just 2000 -- Every 2 seconds
   , tcResourceFrequency = Just 5000 -- Every five seconds