trace-resources: remove local package, use hermod-trace-resources from hermod-tracing

.github/workflows/stylish-haskell.yml

@@ -38,7 +38,6 @@ jobs:
         cardano-tracer
         trace-dispatcher
         trace-forward
-        trace-resources
 
     steps:
     - name: Download stylish-haskell

bench/cardano-timeseries-io/app/Cardano/Timeseries/Common.hs

@@ -4,7 +4,7 @@
 
 module Cardano.Timeseries.Common(readStore, repl, printInterpResult, printExecutionResult) where
 
-import           Cardano.Logging.Resources (ResourceStats, Resources (..), readResourceStats)
+import           Hermod.Tracing.Resources (ResourceStats, Resources (..), readResourceStats)
 import           Cardano.Timeseries.API
 import           Cardano.Timeseries.Import.PlainCBOR
 

bench/cardano-timeseries-io/cardano-timeseries-io.cabal

@@ -144,7 +144,7 @@ executable cardano-timeseries-io
       , statistics
       , text
       , time
-      , trace-resources
+      , hermod-trace-resources
       , vector
 
 test-suite cardano-timeseries-test
@@ -184,6 +184,6 @@ benchmark cardano-timeseries-io-bench
       , statistics
       , text
       , time
-      , trace-resources
+      , hermod-trace-resources
       , vector
       , zlib

bench/locli/locli.cabal

@@ -136,7 +136,7 @@ library
                       , text
                       , text-short
                       , time
-                      , trace-resources
+                      , hermod-trace-resources
                       , transformers
                       , transformers-except
                       , unix
@@ -197,7 +197,7 @@ executable locli-quick
                       , text
                       , text-short
                       , time
-                      , trace-resources
+                      , hermod-trace-resources
                       , sqlite-easy >= 1.1.0.1
                       , unordered-containers
 

bench/locli/src/Cardano/Analysis/API/Metrics.hs

@@ -21,7 +21,7 @@ import Data.Time.Clock
 import Data.Map.Strict                  qualified as M
 
 -- Repo-local:
-import Cardano.Logging.Resources.Types
+import Hermod.Tracing.Resources.Types
 
 -- Package-local:
 import Data.CDF

bench/locli/src/Cardano/Analysis/API/Types.hs

@@ -15,7 +15,7 @@ import Options.Applicative      qualified as Opt
 import Data.CDF
 import Data.Profile
 
-import Cardano.Logging.Resources.Types
+import Hermod.Tracing.Resources.Types
 
 import Cardano.Unlog.LogObject
 import Cardano.Util

bench/locli/src/Cardano/Unlog/LogObject.hs

@@ -33,7 +33,7 @@ module Cardano.Unlog.LogObject
 where
 
 import           Cardano.Analysis.API.Ground
-import           Cardano.Logging.Resources.Types
+import           Hermod.Tracing.Resources.Types
 import           Cardano.Prelude hiding (Text, show, toText)
 import           Cardano.Util
 

bench/locli/src/Cardano/Unlog/LogObjectDB.hs

@@ -37,7 +37,7 @@ module Cardano.Unlog.LogObjectDB
        ) where
 
 import           Cardano.Analysis.API.Ground
-import           Cardano.Logging.Resources.Types (ResourceStats, Resources (..))
+import           Hermod.Tracing.Resources.Types (ResourceStats, Resources (..))
 import           Cardano.Unlog.LogObject
 import           Cardano.Util hiding (count)
 

bench/locli/src/Cardano/Unlog/Resources.hs

@@ -18,7 +18,7 @@ import Cardano.Prelude
 import Data.Accum
 import Data.CDF
 import Cardano.Util
-import Cardano.Logging.Resources.Types
+import Hermod.Tracing.Resources.Types
 
 deriving instance Foldable Resources
 deriving instance Traversable Resources

bench/trace-schemas/scripts/schema-gen/GhciSchemaGen.hs

@@ -55,8 +55,8 @@ rootDirs =
   , "../ouroboros-consensus/ouroboros-consensus-diffusion/src/ouroboros-consensus-diffusion"
   , "../ouroboros-consensus/ouroboros-consensus-cardano/src"
   , "../hermod-tracing/trace-dispatcher/src"
+  , "../hermod-tracing/hermod-trace-resources/src"
   , "trace-forward/src"
-  , "trace-resources/src"
   ]
 
 type ConstructorName = String

cabal.project

@@ -48,7 +48,6 @@ packages:
   bench/tx-generator
   bench/cardano-timeseries-io
   bench/trace-schemas/scripts/schema-gen
-  trace-resources
   trace-forward
 
 -- Needed when cross compiling
@@ -86,3 +85,10 @@ allow-newer:
 -- IMPORTANT
 -- Do NOT add more source-repository-package stanzas here unless they are strictly
 -- temporary! Please read the section in CONTRIBUTING about updating dependencies.
+
+-- hermod-trace-resources is pending publication to CHaP.
+-- Nix builds resolve it via the flake inputMap (see nix/haskell.nix + flake.nix).
+-- For local cabal builds, add the following to your cabal.project.local:
+--
+--   packages:
+--     ../hermod-tracing/hermod-trace-resources

cardano-node/cardano-node.cabal

@@ -183,7 +183,7 @@ library
                       , time
                       , trace-dispatcher ^>= 2.12.0
                       , trace-forward ^>= 2.4.0
-                      , trace-resources ^>= 0.2.4
+                      , hermod-trace-resources ^>= 0.2.4
                       , transformers
                       , transformers-except
                       , typed-protocols:{typed-protocols, stateful} >= 1.2

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

@@ -9,7 +9,7 @@ module Cardano.Node.Tracing
   , ConsensusStartupException (..)
   ) where
 
-import           Cardano.Logging.Resources
+import           Hermod.Tracing.Resources
 import qualified Cardano.Network.Diffusion as Cardano.Diffusion
 import           Cardano.Node.Handlers.Shutdown (ShutdownTrace)
 import           Cardano.Node.Startup (NodeInfo, NodeStartupInfo, StartupTrace (..))

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

@@ -14,8 +14,8 @@ module Cardano.Node.Tracing.Consistency
 
 
 import           Cardano.Logging
-import           Cardano.Logging.Resources
-import           Cardano.Logging.Resources.Types ()
+import           Hermod.Tracing.Resources
+import           Hermod.Tracing.Resources.Types ()
 import           Cardano.Network.NodeToNode (RemoteAddress)
 import qualified Cardano.Network.NodeToNode as NtN
 import qualified Cardano.Network.PeerSelection.ExtraRootPeers as Cardano.PublicRootPeers

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

@@ -27,8 +27,8 @@ import           Cardano.Network.Tracing.PeerSelection ()
 import           Cardano.Network.Tracing.PeerSelectionCounters ()
 import           Cardano.Git.Rev (gitRev)
 import           Cardano.Logging as Logging
-import           Cardano.Logging.Resources
-import           Cardano.Logging.Resources.Types ()
+import           Hermod.Tracing.Resources
+import           Hermod.Tracing.Resources.Types ()
 import qualified Cardano.Network.PeerSelection.ExtraRootPeers as Cardano.PublicRootPeers
 import qualified Cardano.Network.PeerSelection.Governor.PeerSelectionState as Cardano
 import qualified Cardano.Network.PeerSelection.Governor.Types as Cardano

cardano-node/src/Cardano/Node/Tracing/Tracers/Resources.hs

@@ -4,7 +4,7 @@ module Cardano.Node.Tracing.Tracers.Resources
   ( startResourceTracer
   ) where
 
-import           Cardano.Logging.Resources
+import           Hermod.Tracing.Resources
 
 import           Control.Concurrent (threadDelay)
 import           Control.Concurrent.Async (async)

cardano-tracer/cardano-tracer.cabal

@@ -199,7 +199,7 @@ library
                       , time
                       , trace-dispatcher ^>= 2.12.0
                       , trace-forward ^>= 2.4.0
-                      , trace-resources ^>= 0.2.4
+                      , hermod-trace-resources ^>= 0.2.4
                       , vector
                       , wai ^>= 3.2
                       , warp ^>= 3.4

cardano-tracer/src/Cardano/Tracer/MetaTrace.hs

@@ -21,7 +21,7 @@ module Cardano.Tracer.MetaTrace
   ) where
 
 import           Cardano.Logging
-import           Cardano.Logging.Resources
+import           Hermod.Tracing.Resources
 import           Cardano.Timeseries.Component.Trace (TimeseriesTrace)
 import           Cardano.Tracer.Configuration
 import           Cardano.Tracer.Types (NodeId (..), NodeName)

cardano-tracer/src/Cardano/Tracer/Run.hs

@@ -11,7 +11,7 @@ module Cardano.Tracer.Run
   , runCardanoTracer
   ) where
 
-import           Cardano.Logging.Resources
+import           Hermod.Tracing.Resources
 import           Cardano.Tracer.Acceptors.Run
 import           Cardano.Tracer.CLI
 import           Cardano.Tracer.Configuration

flake.nix

@@ -39,6 +39,11 @@
       flake = false;
     };
 
+    hermod-tracing = {
+      url = "github:IntersectMBO/hermod-tracing/without_contra_included";
+      flake = false;
+    };
+
     haskellNix = {
       url = "github:input-output-hk/haskell.nix";
       inputs.nixpkgs.follows = "nixpkgs";
@@ -60,6 +65,7 @@
   outputs = {
     cardano-automation,
     CHaP,
+    hermod-tracing,
     haskellNix,
     incl,
     iohkNix,
@@ -503,7 +509,7 @@
         cardanoNodeProject =
           (import ./nix/haskell.nix {
             inherit (final) haskell-nix;
-            inherit CHaP incl windowsCompilerNixName;
+            inherit CHaP hermod-tracing incl windowsCompilerNixName;
             macOS-security = macOS-security (final.pkgs);
           })
           .appendModule [

nix/haskell.nix

@@ -4,6 +4,7 @@
 { haskell-nix
 , incl
 , CHaP
+, hermod-tracing
 , macOS-security
 , windowsCompilerNixName
 }:
@@ -31,6 +32,15 @@ let
           secure: True
         active-repositories: hackage.haskell.org, cardano-haskell-packages-local
         allow-newer: terminfo:base
+
+        -- hermod-trace-resources is pending publication to CHaP.
+        -- Resolved via the hermod-tracing flake input (see inputMap below).
+        -- Remove once the package is available in CHaP.
+        source-repository-package
+          type: git
+          location: https://github.com/IntersectMBO/hermod-tracing
+          tag: f94edf21d7df01f43e115e370f0a48fd00240003
+          subdir: hermod-trace-resources
       '' + lib.optionalString pkgs.stdenv.hostPlatform.isWindows ''
         -- When cross compiling we don't have a `ghc` package
         package plutus-tx-plugin
@@ -46,7 +56,8 @@ let
           flags: -systemd
       '';
       inputMap = {
-        "https://chap.intersectmbo.org/" = CHaP;
+        "https://chap.intersectmbo.org/"                 = CHaP;
+        "https://github.com/IntersectMBO/hermod-tracing" = hermod-tracing;
       };
       shell = {
         name = lib.mkDefault "cabal-dev-shell";
@@ -400,7 +411,7 @@ project.appendOverlays (with haskellLib.projectOverlays; [
             [ "cardano-node"
               "cardano-tracer"
               "trace-forward"
-              "trace-resources"
+              "hermod-trace-resources"
             ]
             (name: { configureFlags = [ "--ghc-option=-fprof-auto" ]; });
         }];