Review fixes

Author: jutaro

bench/tx-generator/src/Cardano/Benchmarking/Tracer.hs

@@ -34,7 +34,7 @@ import           Cardano.Benchmarking.Version as Version
 import           Cardano.Logging
 import qualified Cardano.Logging.Types as Net
 import           Cardano.Node.Startup
-import           Cardano.Node.Tracing.NodeInfo () -- MetaTrace NodeInfo
+import           Cardano.Node.Tracing.NodeInfo ()
 import           Ouroboros.Network.IOManager (IOManager)
 
 import           Control.Monad (forM, guard)
@@ -49,8 +49,8 @@ import qualified Data.Text as Text
 import           Data.Time.Clock
 import           GHC.Generics
 
+import           Trace.Forward.Forwarding (initForwardingDelayed)
 import           Trace.Forward.Utils.TraceObject
-import Trace.Forward.Forwarding (initForwardingDelayed)
 
 pattern TracerNameBench     :: Text
 pattern TracerNameBench     = "Benchmark"

cardano-node/src/Cardano/Node/Tracing/API.hs

@@ -9,8 +9,8 @@ module Cardano.Node.Tracing.API
   ) where
 
 import           Cardano.Logging hiding (traceWith)
-import qualified Cardano.Logging.Types as Net
 import           Cardano.Logging.Prometheus.TCPServer (runPrometheusSimple)
+import qualified Cardano.Logging.Types as Net
 import           Cardano.Network.PeerSelection.PeerTrustable (PeerTrustable)
 import           Cardano.Node.Configuration.NodeAddress (PortNumber)
 import           Cardano.Node.Configuration.POM (NodeConfiguration (..))
@@ -51,8 +51,9 @@ import           Data.Time.Clock (getCurrentTime)
 import           Network.Mux.Trace (TraceLabelPeer (..))
 import           Network.Socket (HostName)
 import           System.Metrics as EKG
-import Trace.Forward.Forwarding (initForwardingDelayed)
-import Trace.Forward.Utils.TraceObject (writeToSink)
+
+import           Trace.Forward.Forwarding (initForwardingDelayed)
+import           Trace.Forward.Utils.TraceObject (writeToSink)
 
 
 initTraceDispatcher ::

cardano-tracer/CHANGELOG.md

@@ -1,5 +1,8 @@
 # ChangeLog
 
+## 0.3.5
+* trace-forward now depends on trace-dispatcher, and not the other way around
+
 ## 0.3.4 (July, 2025)
 * Forwarding protocol supports connections over TCP socket, in addition to Unix domain sockets.
 

cardano-tracer/cardano-tracer.cabal

@@ -1,7 +1,7 @@
 cabal-version: 3.0
 
 name:                   cardano-tracer
-version:                0.3.3
+version:                0.3.5
 synopsis:               A service for logging and monitoring over Cardano nodes
 description:            A service for logging and monitoring over Cardano nodes.
 category:               Cardano,

cardano-tracer/src/Cardano/Tracer/Handlers/ReForwarder.hs

@@ -15,7 +15,6 @@ module Cardano.Tracer.Handlers.ReForwarder
   ( initReForwarder
   ) where
 
-import           Trace.Forward.Forwarding
 import           Cardano.Logging.Trace
 import           Cardano.Logging.Tracer.DataPoint
 import qualified Cardano.Logging.Types as Log
@@ -29,8 +28,9 @@ import           Control.Monad (when)
 import           Data.List (isPrefixOf)
 import qualified Data.Text as Text
 
+import           Trace.Forward.Forwarding
+import           Trace.Forward.Utils.ForwardSink (ForwardSink)
 import           Trace.Forward.Utils.TraceObject (writeToSink)
-import Trace.Forward.Utils.ForwardSink (ForwardSink)
 
 -- | Initialize the reforwarding service if configured to be active.
 --   Returns

cardano-tracer/test/cardano-tracer-test-ext.hs

@@ -29,8 +29,9 @@ import qualified System.Process as Sys
 
 import           Test.Tasty
 import           Test.Tasty.QuickCheck
-import Trace.Forward.Forwarding (initForwarding)
-import Trace.Forward.Utils.TraceObject (writeToSink)
+
+import           Trace.Forward.Forwarding (initForwarding)
+import           Trace.Forward.Utils.TraceObject (writeToSink)
 
 main :: IO ()
 main = do

kernel-resource-summary.json

@@ -1,5 +1,9 @@
 # Revision history for trace-dispatcher
 
+## 2.11.0 -- July, 2025
+* trace-forward now depends on trace-dispatcher, and not the other
+* improves the structure and metadata of the generated tracer documentation
+
 ## 2.10.0 -- July, 2025
 * Forwarding protocol supports connections over TCP socket, in addition to Unix domain sockets.
 * Failure to initialise the `PrometheusSimple` backend is now lenient - i.e., won't result in an exception being propagated.

trace-dispatcher/CHANGELOG.md

@@ -1,7 +1,7 @@
 cabal-version: 3.0
 
 name:                   trace-dispatcher
-version:                2.10.0
+version:                2.11.0
 synopsis:               Tracers for Cardano
 description:            Package for development of simple and efficient tracers
                         based on the arrow based contra-tracer package
@@ -82,7 +82,6 @@ library
                       , http-date
                       , io-classes
                       , network
-                      , optparse-applicative
                       , serialise
                       , stm
                       , text
@@ -130,18 +129,13 @@ test-suite trace-dispatcher-test
                       , ekg-core
                       , generic-data
                       , hostname
-                      , optparse-applicative
-                      , ouroboros-network
                       , text
                       , stm
                       , tasty
                       , tasty-hunit
                       , tasty-quickcheck
                       , time
                       , trace-dispatcher
-                      , unagi-chan
-                      , unliftio
-                      , unliftio-core
                       , unordered-containers
                       , utf8-string
                       , yaml

trace-dispatcher/trace-dispatcher.cabal

@@ -14,13 +14,14 @@ module Trace.Forward.Utils.DataPoint
   , askForDataPoints
   ) where
 
+import           Cardano.Logging.Tracer.DataPoint
+
 import           Control.Concurrent.STM (atomically, check, orElse)
 import           Control.Concurrent.STM.TMVar
 import           Control.Concurrent.STM.TVar
 import           Data.Aeson
 import qualified Data.Map.Strict as M
 
-import Cardano.Logging.Tracer.DataPoint
 import           Trace.Forward.Protocol.DataPoint.Forwarder
 import           Trace.Forward.Protocol.DataPoint.Type