fixup! Upgraded to ouroboros-network-0.15.0.0

IntersectMBO · May 7, 2024 · fca9108 · fca9108
1 parent 087491b
commit fca9108
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 0 deletions.
diff --git a/cardano-node/src/Cardano/Node/Tracing/Tracers/P2P.hs b/cardano-node/src/Cardano/Node/Tracing/Tracers/P2P.hs
@@ -1629,6 +1629,15 @@ forMachineGov _dtal (InboundGovernor.TrInboundGovernorError err) =
   mconcat [ "kind" .= String "InboundGovernorError"
             , "remoteSt" .= String (pack . show $ err)
             ]
+forMachineGov _dtal (InboundGovernor.TrMaturedConnections matured fresh) =
+  mconcat [ "kind" .= String "MaturedConnections"
+          , "matured" .= toJSON matured
+          , "fresh" .= toJSON fresh
+          ]
+forMachineGov _dtal (InboundGovernor.TrInactive fresh) =
+  mconcat [ "kind" .= String "Inactive"
+          , "fresh" .= toJSON fresh
+          ]
 
 instance MetaTrace (InboundGovernorTrace addr) where
     namespaceFor TrNewConnection {}         = Namespace [] ["NewConnection"]
@@ -1650,6 +1659,10 @@ instance MetaTrace (InboundGovernorTrace addr) where
                                 Namespace [] ["UnexpectedlyFalseAssertion"]
     namespaceFor InboundGovernor.TrInboundGovernorError {} =
                                 Namespace [] ["InboundGovernorError"]
+    namespaceFor InboundGovernor.TrMaturedConnections {} =
+                                Namespace [] ["MaturedConnections"]
+    namespaceFor InboundGovernor.TrInactive {} =
+                                Namespace [] ["Inactive"]
 
     severityFor (Namespace _ ["NewConnection"]) _ = Just Debug
     severityFor (Namespace _ ["ResponderRestarted"]) _ = Just Debug
@@ -1668,6 +1681,8 @@ instance MetaTrace (InboundGovernorTrace addr) where
     severityFor (Namespace _ ["RemoteState"]) _ = Just Debug
     severityFor (Namespace _ ["UnexpectedlyFalseAssertion"]) _ = Just Error
     severityFor (Namespace _ ["InboundGovernorError"]) _ = Just Error
+    severityFor (Namespace _ ["MaturedConnections"]) _ = Just Info
+    severityFor (Namespace _ ["Inactive"]) _ = Just Debug
     severityFor _ _ = Nothing
 
     documentFor (Namespace _ ["NewConnection"]) = Just ""
@@ -1693,6 +1708,8 @@ instance MetaTrace (InboundGovernorTrace addr) where
     documentFor (Namespace _ ["RemoteState"]) = Just ""
     documentFor (Namespace _ ["UnexpectedlyFalseAssertion"]) = Just ""
     documentFor (Namespace _ ["InboundGovernorError"]) = Just ""
+    documentFor (Namespace _ ["MaturedConnections"]) = Just ""
+    documentFor (Namespace _ ["Inactive"]) = Just ""
     documentFor _ = Nothing
 
     metricsDocFor (Namespace [] ["InboundGovernorCounters"]) =
@@ -1735,6 +1752,8 @@ instance MetaTrace (InboundGovernorTrace addr) where
       , Namespace [] ["RemoteState"]
       , Namespace [] ["UnexpectedlyFalseAssertion"]
       , Namespace [] ["InboundGovernorError"]
+      , Namespace [] ["MaturedConnections"]
+      , Namespace [] ["Inactive"]
       ]
 
 --------------------------------------------------------------------------------

diff --git a/cardano-node/src/Cardano/Tracing/OrphanInstances/Network.hs b/cardano-node/src/Cardano/Tracing/OrphanInstances/Network.hs
@@ -566,6 +566,8 @@ instance HasSeverityAnnotation (InboundGovernorTrace addr) where
       InboundGovernor.TrUnexpectedlyFalseAssertion {}
                                                    -> Error
       InboundGovernor.TrInboundGovernorError {}    -> Error
+      InboundGovernor.TrMaturedConnections {}      -> Info
+      InboundGovernor.TrInactive {}                -> Debug
 
 instance HasPrivacyAnnotation (Server.RemoteTransitionTrace addr)
 instance HasSeverityAnnotation (Server.RemoteTransitionTrace addr) where
@@ -2556,6 +2558,15 @@ instance (ToJSON addr, Show addr)
     mconcat [ "kind" .= String "InboundGovernorError"
              , "remoteSt" .= String (pack . show $ err)
              ]
+  toObject _verb (InboundGovernor.TrMaturedConnections matured fresh) =
+    mconcat [ "kind" .= String "MaturedConnections"
+            , "matured" .= toJSON matured
+            , "fresh" .= toJSON fresh
+            ]
+  toObject _verb (InboundGovernor.TrInactive fresh) =
+    mconcat [ "kind" .= String "Inactive"
+            , "fresh" .= toJSON fresh
+            ]
 
 instance ToJSON addr
       => ToObject (Server.RemoteTransitionTrace addr) where