Update cardano-node

IntersectMBO · May 26, 2023 · f61f519 · f61f519
1 parent e515a22
commit f61f519
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 7 deletions.
diff --git a/cardano-node/src/Cardano/Node/Tracing/Tracers/P2P.hs b/cardano-node/src/Cardano/Node/Tracing/Tracers/P2P.hs
@@ -43,7 +43,6 @@ import           Ouroboros.Network.PeerSelection.Governor (DebugPeerSelection (.
                    TracePeerSelection (..))
 import qualified Ouroboros.Network.PeerSelection.KnownPeers as KnownPeers
 import           Ouroboros.Network.PeerSelection.PeerStateActions (PeerSelectionActionsTrace (..))
-import           Ouroboros.Network.PeerSelection.RelayAccessPoint (RelayAccessPoint)
 import           Ouroboros.Network.PeerSelection.RootPeersDNS (TraceLocalRootPeers (..),
                    TracePublicRootPeers (..))
 import           Ouroboros.Network.PeerSelection.Types ()
@@ -57,7 +56,7 @@ import           Ouroboros.Network.Snocket (LocalAddress (..))
 -- LocalRootPeers Tracer
 --------------------------------------------------------------------------------
 
-instance (ToJSONKey ntnAddr, ToJSONKey RelayAccessPoint, Show ntnAddr, Show exception) =>
+instance (ToJSONKey ntnAddr, ToJSON ntnAddr, Show ntnAddr, Show exception) =>
     LogFormatting (TraceLocalRootPeers ntnAddr exception) where
   forMachine _dtal (TraceLocalRootDomains groups) =
     mconcat [ "kind" .= String "LocalRootDomains"
@@ -87,11 +86,15 @@ instance (ToJSONKey ntnAddr, ToJSONKey RelayAccessPoint, Show ntnAddr, Show exce
              , "domainAddress" .= toJSON d
              , "reason" .= show exception
              ]
-  forMachine _dtal (TraceLocalRootReconfigured d exception) =
+  forMachine _dtal (TraceLocalRootReconfigured old new) =
     mconcat [ "kind" .= String "LocalRootReconfigured"
-             , "domainAddress" .= toJSON d
-             , "reason" .= show exception
+             , "old" .= toJSON old
+             , "new" .= toJSON new
              ]
+  forMachine _dtal (TraceLocalRootDNSMap domainMap) =
+    mconcat [ "kind" .= String "LocalRootDNSMap"
+            , "result" .= toJSON domainMap
+            ]
   forHuman = pack . show
 
 instance MetaTrace (TraceLocalRootPeers ntnAddr exception) where
@@ -102,6 +105,7 @@ instance MetaTrace (TraceLocalRootPeers ntnAddr exception) where
   namespaceFor TraceLocalRootFailure {} = Namespace [] ["LocalRootFailure"]
   namespaceFor TraceLocalRootError {} = Namespace [] ["LocalRootError"]
   namespaceFor TraceLocalRootReconfigured {} = Namespace [] ["LocalRootReconfigured"]
+  namespaceFor TraceLocalRootDNSMap {} = Namespace [] ["LocalRootDNSMap"]
 
   severityFor (Namespace [] ["LocalRootDomains"]) _ = Just Info
   severityFor (Namespace [] ["LocalRootWaiting"]) _ = Just Info

diff --git a/cardano-node/src/Cardano/Tracing/OrphanInstances/Network.hs b/cardano-node/src/Cardano/Tracing/OrphanInstances/Network.hs
@@ -1343,6 +1343,7 @@ instance ToObject peer => ToObject (WithMuxBearer peer MuxTrace) where
              , "event" .= show ev ]
 
 instance Aeson.ToJSONKey RelayAccessPoint where
+instance Aeson.ToJSONKey DomainAccessPoint where
 
 instance Show exception => ToObject (TraceLocalRootPeers RemoteAddress exception) where
   toObject _verb (TraceLocalRootDomains groups) =
@@ -1373,9 +1374,15 @@ instance Show exception => ToObject (TraceLocalRootPeers RemoteAddress exception
              , "domainAddress" .= toJSON d
              , "reason" .= show dexception
              ]
-  toObject _verb (TraceLocalRootReconfigured _ _) =
+  toObject _verb (TraceLocalRootReconfigured old new) =
     mconcat [ "kind" .= String "LocalRootReconfigured"
-             ]
+            , "old" .= toJSON old
+            , "new" .= toJSON new
+            ]
+  toObject _verb (TraceLocalRootDNSMap domainMap) =
+    mconcat [ "kind" .= String "LocalRootDNSMap"
+            , "result" .= toJSON domainMap
+            ]
 
 instance ToJSON IP where
   toJSON ip = String (pack . show $ ip)