Upgrade to contra-tracer 0.2.1

cabal.project

@@ -15,10 +15,10 @@ repository cardano-haskell-packages
 -- repeat the index-state for hackage to work around haskell.nix parsing limitation
 index-state:
   -- Bump this if you need newer packages from Hackage
-  , hackage.haskell.org 2026-03-04T10:56:45Z
+  , hackage.haskell.org 2026-05-13T07:31:22Z
 
   -- Bump this if you need newer packages from CHaP
-  , cardano-haskell-packages 2026-03-30T15:30:34Z
+  , cardano-haskell-packages 2026-05-11T20:15:43Z
 
 active-repositories:
   , :rest
@@ -32,6 +32,14 @@ packages: ./cardano-ping
           ./ntp-client
           ./acts-generic
 
+-- TODO: contra-tracer 0.2.1.0 is on Hackage but shadowed by CHaP's 0.1.x under
+-- active-repositories: cardano-haskell-packages:override.
+source-repository-package
+  type: git
+  location: https://github.com/avieth/contra-tracer
+  tag: bf4a562a3b1315946aca7f6b4935e94ca1a23aa9
+  --sha256: 1d3zlyi8hlmwhfa2dw3icprr6rgx1xnfds5vk1rmchpjcvmz6bkb
+
 tests: True
 benchmarks: True
 

cardano-diffusion/cardano-diffusion.cabal

@@ -96,7 +96,7 @@ library api-tests-lib
     Cardano.Network.NodeToNode.Version.TestUtils
 
   build-depends:
-    QuickCheck,
+    QuickCheck < 2.18,
     base >=4.14 && <4.23,
     cardano-diffusion:api,
     ouroboros-network:api,
@@ -112,7 +112,7 @@ test-suite api-tests
     Test.Cardano.Network.Version
 
   build-depends:
-    QuickCheck,
+    QuickCheck < 2.18,
     base >=4.14 && <4.23,
     cardano-diffusion:{api, api-tests-lib},
     ouroboros-network:api,
@@ -371,7 +371,7 @@ library protocols-tests-lib
     Ouroboros.Network.Protocol.TxSubmission2.Test as Cardano.Network.Protocol.TxSubmission2.Test,
 
   build-depends:
-    QuickCheck,
+    QuickCheck < 2.18,
     base >=4.14 && <4.23,
     bytestring,
     cardano-diffusion:{api, api-tests-lib, protocols},
@@ -416,7 +416,7 @@ test-suite protocols-cddl
     buildable: False
 
   build-depends:
-    QuickCheck,
+    QuickCheck < 2.18,
     base >=4.14 && <4.23,
     bytestring,
     cardano-diffusion:{api, api-tests-lib, protocols, protocols-tests-lib},
@@ -479,7 +479,7 @@ library cardano-diffusion-tests-lib
   visibility: public
   hs-source-dirs: tests/lib
   build-depends:
-    QuickCheck,
+    QuickCheck < 2.18,
     aeson,
     base >=4.14 && <4.23,
     bytestring,
@@ -559,7 +559,7 @@ library subscription
     cardano-diffusion ^>=1.0.0.0,
     cborg >=0.2.8 && <0.3,
     containers >=0.5 && <0.9,
-    contra-tracer >=0.1 && <0.3,
+    contra-tracer ^>=0.2.1,
     deepseq,
     io-classes:si-timers ^>=1.8.0.1,
     network-mux ^>=0.10.1.0,

cardano-diffusion/changelog.d/20260513_170556_fabrizio.ferrai_contra_tracer_0_2_1.md

@@ -0,0 +1,5 @@
+### Breaking
+
+- Upgraded to `contra-tracer ^>=0.2.1`. The `Tracer` data constructor is no
+  longer exported; use `mkTracer` instead.
+- Capped `QuickCheck < 2.18`.

cardano-diffusion/tests/lib/Test/Cardano/Network/Diffusion/Testnet/Simulation.hs

@@ -52,7 +52,7 @@ import Control.Monad.Class.MonadTime.SI
 import Control.Monad.Class.MonadTimer.SI
 import Control.Monad.Fix
 import Control.Monad.IOSim (IOSim)
-import Control.Tracer (Tracer (..), contramap, nullTracer, traceWith)
+import Control.Tracer (Tracer, contramap, mkTracer, nullTracer, traceWith)
 
 import Data.Bifunctor (first)
 import Data.Bool (bool)
@@ -1330,7 +1330,7 @@ diffusionSimulationM
               , Node.aTimeWaitTimeout      = 30
               , Node.aDNSTimeoutScript     = dnsTimeout
               , Node.aDNSLookupDelayScript = dnsLookupDelay
-              , Node.aDebugTracer          = Tracer (\s -> do
+              , Node.aDebugTracer          = mkTracer (\s -> do
                                               t <- getMonotonicTime
                                               traceWith nodeTracer $ WithTime t (WithName addr (DiffusionDebugTrace s)))
               , Node.aExtraChurnArgs       = cardanoChurnArgs
@@ -1480,7 +1480,7 @@ diffusionSimulationM
                            m
     mkTracers ntnAddr nodeId =
       let sayTracer' :: Show event => Tracer m event
-          sayTracer' = Tracer $ \event ->
+          sayTracer' = mkTracer $ \event ->
                        -- time of events is added in `testWithIOSim` and
                        -- `testWithIOSimPOR`
                        say $ show nodeId ++ " @ " ++ show event

cardano-diffusion/tests/lib/Test/Cardano/Network/PeerSelection.hs

@@ -32,7 +32,7 @@ import Control.Exception (AssertionFailed (..), catch, evaluate)
 import Control.Monad (when)
 import Control.Monad.Class.MonadTime.SI
 import Control.Monad.Class.MonadTimer.SI
-import Control.Tracer (Tracer (..))
+import Control.Tracer (Tracer, mkTracer)
 
 import Data.Bifoldable (bitraverse_)
 import Data.ByteString.Char8 qualified as BS
@@ -4289,7 +4289,7 @@ _governorFindingPublicRoots targetNumberOfRootPeers readDomains readUseBootstrap
     tracer' = tracer
 
     tracer :: Show a => Tracer IO a
-    tracer  = Tracer (BS.putStrLn . BS.pack . show)
+    tracer  = mkTracer (BS.putStrLn . BS.pack . show)
 
     actions
       :: PeerSelectionActions

cardano-diffusion/tests/lib/Test/Cardano/Network/PeerSelection/MockEnvironment.hs

@@ -60,7 +60,7 @@ import Control.Monad.Class.MonadTime.SI
 import Control.Monad.Class.MonadTimer.SI hiding (timeout)
 import Control.Monad.Fail qualified as Fail
 import Control.Monad.IOSim
-import Control.Tracer (Tracer (..), contramap, traceWith)
+import Control.Tracer (Tracer, contramap, mkTracer, traceWith)
 
 import Ouroboros.Network.BlockFetch (FetchMode (..), PraosFetchMode (..))
 import Ouroboros.Network.ConnectionManager.Types (Provenance)
@@ -838,7 +838,7 @@ traceAssociationMode
 
   -> Tracer (IOSim s)
            (DebugPeerSelection Cardano.ExtraState extraFlags extraPeers PeerAddr)
-traceAssociationMode interfaces actions = Tracer $ \(TraceGovernorState _ _ st) -> do
+traceAssociationMode interfaces actions = mkTracer $ \(TraceGovernorState _ _ st) -> do
     associationMode <- atomically $ readAssociationMode
                                            (readUseLedgerPeers interfaces)
                                            (Governor.peerSharing actions)

cardano-ping/cardano-ping.cabal

@@ -30,7 +30,7 @@ library
     base >=4.14 && <4.23,
     bytestring >=0.10 && <0.13,
     cborg >=0.2.8 && <0.3,
-    contra-tracer >=0.1 && <0.3,
+    contra-tracer ^>=0.2.1,
     io-classes:{si-timers, strict-stm} ^>=1.8,
     iproute ^>=1.7.15,
     network ^>=3.2.7,

cardano-ping/changelog.d/20260513_170556_fabrizio.ferrai_contra_tracer_0_2_1.md

@@ -0,0 +1,4 @@
+### Breaking
+
+- Upgraded to `contra-tracer ^>=0.2.1`. The `Tracer` data constructor is no
+  longer exported; use `mkTracer` instead.

network-mux/changelog.d/20260513_170556_fabrizio.ferrai_contra_tracer_0_2_1.md

@@ -0,0 +1,7 @@
+### Breaking
+
+- Upgraded to `contra-tracer ^>=0.2.1`. The `Tracer` data constructor is no
+  longer exported; use `mkTracer` instead. `nullTracers`, the `TracersI`
+  pattern synonym, `contramapTracers'`, `tracersWithBearer` and
+  `traceBearerState` now require `Monad m` rather than `Applicative m`.
+- Capped `QuickCheck < 2.18`.

network-mux/demo/mux-demo.hs

@@ -19,7 +19,7 @@ import Control.Concurrent (forkIO)
 import Control.Concurrent.STM (atomically)
 import Control.Exception (finally)
 import Control.Monad
-import Control.Tracer (Tracer (..))
+import Control.Tracer (Tracer, mkTracer)
 
 import System.Environment qualified as SysEnv
 import System.Exit
@@ -72,7 +72,7 @@ putStrLn_ :: String -> IO ()
 putStrLn_ = BSC.putStrLn . BSC.pack
 
 debugTracer :: Show a => Tracer IO a
-debugTracer = show >$< Tracer putStrLn_
+debugTracer = show >$< mkTracer putStrLn_
 
 --
 -- Protocols

network-mux/demo/mux-leios-demo.hs

@@ -98,7 +98,7 @@ reqrespTracer
   :: String
   -- ^ tag
   -> Tracer IO (TraceSendRecv (MsgReqResp ByteString ByteString))
-reqrespTracer tag = Tracer $ \case
+reqrespTracer tag = mkTracer $ \case
   TraceSend (MsgReq a)  -> putStrLn_ $ tag ++ " Send MsgReq " ++ show (BSC.length a)
   TraceSend (MsgResp a) -> putStrLn_ $ tag ++ " Send MsgResp " ++ show (BSC.length a)
   TraceSend MsgDone     -> putStrLn_ $ tag ++ " Send MsgDone"

network-mux/network-mux.cabal

@@ -58,7 +58,7 @@ library
     binary >=0.8 && <0.11,
     bytestring >=0.10 && <0.13,
     containers >=0.5 && <0.9,
-    contra-tracer >=0.1 && <0.2,
+    contra-tracer ^>=0.2.1,
     io-classes:{io-classes, si-timers, strict-stm} ^>=1.8,
     monoidal-synchronisation >=0.1 && <0.2,
     network ^>=3.2.7,
@@ -135,7 +135,7 @@ test-suite test
   default-language: Haskell2010
   default-extensions: ImportQualifiedPost
   build-depends:
-    QuickCheck,
+    QuickCheck < 2.18,
     Win32-network,
     base >=4.14 && <4.23,
     binary,

network-mux/src/Network/Mux.hs

@@ -723,7 +723,7 @@ muxChannel tracer egressQueue want@(Wanton w) mc md q =
         traceWith tracer $ TraceChannelRecvEnd mc (fromIntegral $ BL.length blob)
         return $ Just blob
 
-traceBearerState :: Tracer m Trace -> State -> m ()
+traceBearerState :: Monad m => Tracer m Trace -> State -> m ()
 traceBearerState tracer state =
     traceWith tracer (TraceState state)
 

network-mux/src/Network/Mux/DeltaQ/TraceTransformer.hs

@@ -9,7 +9,6 @@ module Network.Mux.DeltaQ.TraceTransformer
 
 import Control.Concurrent.Class.MonadSTM.Strict
 import Control.Tracer
-import Data.Functor.Contravariant ((>$<))
 import Data.Functor.Identity
 
 import Network.Mux.DeltaQ.TraceStats
@@ -35,7 +34,7 @@ dqTracer :: MonadSTM m
          => StrictTVar m StatsA
          -> Tracer m BearerTrace
          -> Tracer m BearerTrace
-dqTracer sTvar tr = Tracer go
+dqTracer sTvar tr = mkTracer go
   where
     go (TraceRecvDeltaQObservation SDUHeader { mhTimestamp, mhLength } t)
       = update mhTimestamp t (fromIntegral mhLength)

network-mux/src/Network/Mux/Trace.hs

@@ -209,14 +209,15 @@ tracersWith tr = Tracers {
   }
 
 
-nullTracers :: Applicative m => Tracers' m f
+nullTracers :: Monad m => Tracers' m f
 nullTracers = tracersWith nullTracer
 
 
 -- | A convenient bidirectional pattern synonym which (un)wraps the `Identity`
 -- functor in the `Tracer` type.
 --
 pattern TracersI :: forall m.
+                    Monad m =>
                     Tracer m Trace
                  -> Tracer m ChannelTrace
                  -> Tracer m BearerTrace
@@ -238,7 +239,8 @@ pattern TracersI { tracer_, channelTracer_, bearerTracer_ } <-
 
 -- | Contravariant natural transformation of `Tracers' m`.
 --
-contramapTracers' :: (forall x. f' x -> f x)
+contramapTracers' :: Monad m
+                  => (forall x. f' x -> f x)
                   -> Tracers' m f -> Tracers' m f'
 contramapTracers'
   f
@@ -255,5 +257,5 @@ contramapTracers'
 
 type TracersWithBearer connId m = Tracers' m (WithBearer connId)
 
-tracersWithBearer :: peerId -> TracersWithBearer peerId m -> Tracers m
+tracersWithBearer :: Monad m => peerId -> TracersWithBearer peerId m -> Tracers m
 tracersWithBearer peerId = contramapTracers' (WithBearer peerId . runIdentity)

network-mux/test/Test/Mux.hs

@@ -28,7 +28,6 @@ import Data.Binary.Put qualified as Bin
 import Data.Bits
 import Data.ByteString.Lazy qualified as BL
 import Data.ByteString.Lazy.Char8 qualified as BL8 (pack)
-import Data.Functor.Contravariant ((>$<))
 import Data.List (dropWhileEnd, nub)
 import Data.List qualified as List
 import Data.Map qualified as M
@@ -1009,7 +1008,7 @@ prop_mux_starvation (Uneven response0 response1) =
     activeMpsVar <- newTVarIO 0
     traceHeaderVar <- newTVarIO []
     let headerTracer =
-          Tracer $ \e -> case e of
+          mkTracer $ \e -> case e of
             Mx.TraceRecvHeaderEnd header
               -> atomically (modifyTVar traceHeaderVar (header:))
             _ -> return ()
@@ -1914,7 +1913,7 @@ verboseTracer :: forall a m.
                        , Show a
                        )
                => Tracer m a
-verboseTracer = threadAndTimeTracer $ show >$< Tracer say
+verboseTracer = threadAndTimeTracer $ show >$< mkTracer say
 
 muxVerboseTracer :: forall m.
                        ( MonadAsync m
@@ -1929,7 +1928,7 @@ threadAndTimeTracer :: forall a m.
                        , MonadMonotonicTime m
                        )
                     => Tracer m (WithThreadAndTime a) -> Tracer m a
-threadAndTimeTracer tr = Tracer $ \s -> do
+threadAndTimeTracer tr = mkTracer $ \s -> do
     !now <- getMonotonicTime
     !tid <- myThreadId
     traceWith tr $ WithThreadAndTime now (show tid) s

nix/ouroboros-network.nix

@@ -110,9 +110,6 @@ let
         packages.ouroboros-network.components.tests.framework-sim-tests.doCheck = onLinux;
         packages.ouroboros-network.components.tests.ouroboros-network-sim-tests.doCheck = onLinux;
       })
-      ({ pkgs, ... }: lib.mkIf pkgs.stdenv.hostPlatform.isWindows {
-        packages.basement.configureFlags = [ "--hsc2hs-options=--cflag=-Wno-int-conversion" ];
-      })
     ];
   });
 in

ntp-client/changelog.d/20260513_170556_fabrizio.ferrai_contra_tracer_0_2_1.md

@@ -0,0 +1,4 @@
+### Breaking
+
+- Upgraded to `contra-tracer ^>=0.2.1`. The `Tracer` data constructor is no
+  longer exported; use `mkTracer` instead.

ntp-client/demo/Main.hs

@@ -5,7 +5,6 @@ import Control.Concurrent (threadDelay)
 import Control.Concurrent.Async
 import Control.Monad (forever)
 import Control.Tracer
-import Data.Functor.Contravariant ((>$<))
 
 import Network.NTP.Client (NtpClient (..), NtpSettings (..), withNtpClient)
 

ntp-client/ntp-client.cabal

@@ -33,7 +33,7 @@ library
     base >=4.14 && <4.23,
     binary >=0.8 && <0.11,
     bytestring >=0.10 && <0.13,
-    contra-tracer >=0.1 && <0.2,
+    contra-tracer ^>=0.2.1,
     network ^>=3.2.7,
     stm >=2.4 && <2.6,
     time >=1.9.1 && <1.16,
@@ -62,7 +62,7 @@ test-suite test
   other-modules: Network.NTP.Client.Packet
   type: exitcode-stdio-1.0
   build-depends:
-    QuickCheck,
+    QuickCheck < 2.18,
     base >=4.14 && <4.23,
     binary >=0.8 && <0.11,
     tasty,
@@ -90,7 +90,7 @@ executable demo-ntp-client
     Win32-network >=0.1 && <0.3,
     async >=2.2 && <2.3,
     base >=4.14 && <4.23,
-    contra-tracer >=0.1 && <0.2,
+    contra-tracer ^>=0.2.1,
     ntp-client,
 
   default-language: Haskell2010