From 6f9ea76af916fd593edc91d2e197eec20782a57a Mon Sep 17 00:00:00 2001
From: Michael Karg <michael.karg@iohk.io>
Date: Mon, 21 Oct 2024 16:31:25 +0200
Subject: [PATCH] switch to ekg-wai backend from ekg

---
 cardano-node/cardano-node.cabal                        | 6 +++---
 cardano-node/src/Cardano/Node/Configuration/Logging.hs | 2 +-
 cardano-node/src/Cardano/Tracing/Tracers.hs            | 2 +-
 trace-dispatcher/bench/trace-dispatcher-bench.hs       | 2 +-
 trace-dispatcher/src/Cardano/Logging/Tracer/EKG.hs     | 2 +-
 trace-dispatcher/trace-dispatcher.cabal                | 5 ++---
 6 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/cardano-node/cardano-node.cabal b/cardano-node/cardano-node.cabal
index c2f8e5c5873..f243c161329 100644
--- a/cardano-node/cardano-node.cabal
+++ b/cardano-node/cardano-node.cabal
@@ -169,17 +169,17 @@ library
                       , deepseq
                       , directory
                       , dns
-                      , ekg
+                      , ekg-wai
                       , ekg-core
                       , filepath
                       , formatting
                       , generic-data
                       , hostname
                       , io-classes >= 1.4
-                      , iohk-monitoring < 0.2
+                      , iohk-monitoring ^>= 0.2
                       , iproute
                       , lobemo-backend-aggregation
-                      , lobemo-backend-ekg < 0.2
+                      , lobemo-backend-ekg ^>= 0.2
                       , lobemo-backend-monitoring
                       , lobemo-backend-trace-forwarder
                       , mtl
diff --git a/cardano-node/src/Cardano/Node/Configuration/Logging.hs b/cardano-node/src/Cardano/Node/Configuration/Logging.hs
index cad45ea0495..caf41dbb8db 100644
--- a/cardano-node/src/Cardano/Node/Configuration/Logging.hs
+++ b/cardano-node/src/Cardano/Node/Configuration/Logging.hs
@@ -48,7 +48,7 @@ import           Data.Version (showVersion)
 import           System.Metrics.Counter (Counter)
 import           System.Metrics.Gauge (Gauge)
 import           System.Metrics.Label (Label)
-import qualified System.Remote.Monitoring as EKG
+import qualified System.Remote.Monitoring.Wai as EKG
 
 import           Cardano.BM.Backend.Aggregation (plugin)
 import           Cardano.BM.Backend.EKGView (plugin)
diff --git a/cardano-node/src/Cardano/Tracing/Tracers.hs b/cardano-node/src/Cardano/Tracing/Tracers.hs
index 78ea014e3e5..8f4636ac6e1 100644
--- a/cardano-node/src/Cardano/Tracing/Tracers.hs
+++ b/cardano-node/src/Cardano/Tracing/Tracers.hs
@@ -135,7 +135,7 @@ import           GHC.TypeLits (KnownNat, Nat, natVal)
 import qualified System.Metrics.Counter as Counter
 import qualified System.Metrics.Gauge as Gauge
 import qualified System.Metrics.Label as Label
-import qualified System.Remote.Monitoring as EKG
+import qualified System.Remote.Monitoring.Wai as EKG
 
 
 {-# OPTIONS_GHC -Wno-redundant-constraints #-}
diff --git a/trace-dispatcher/bench/trace-dispatcher-bench.hs b/trace-dispatcher/bench/trace-dispatcher-bench.hs
index b8425e2af4c..89d25a53304 100644
--- a/trace-dispatcher/bench/trace-dispatcher-bench.hs
+++ b/trace-dispatcher/bench/trace-dispatcher-bench.hs
@@ -6,7 +6,7 @@ import           Cardano.Logging.Test.Tracer
 import           Cardano.Logging.Test.Types
 
 import           Data.IORef
-import           System.Remote.Monitoring (forkServer)
+import           System.Remote.Monitoring.Wai (forkServer)
 
 import           Criterion.Main
 
diff --git a/trace-dispatcher/src/Cardano/Logging/Tracer/EKG.hs b/trace-dispatcher/src/Cardano/Logging/Tracer/EKG.hs
index ba2060e34bf..c5f64226502 100644
--- a/trace-dispatcher/src/Cardano/Logging/Tracer/EKG.hs
+++ b/trace-dispatcher/src/Cardano/Logging/Tracer/EKG.hs
@@ -19,7 +19,7 @@ import qualified System.Metrics as Metrics
 import qualified System.Metrics.Counter as Counter
 import qualified System.Metrics.Gauge as Gauge
 import qualified System.Metrics.Label as Label
-import           System.Remote.Monitoring (Server, getCounter, getGauge, getLabel)
+import           System.Remote.Monitoring.Wai (Server, getCounter, getGauge, getLabel)
 
 
 -- | It is mandatory to construct only one standard tracer in any application!
diff --git a/trace-dispatcher/trace-dispatcher.cabal b/trace-dispatcher/trace-dispatcher.cabal
index 09f155b25c6..ffa0faad9b2 100644
--- a/trace-dispatcher/trace-dispatcher.cabal
+++ b/trace-dispatcher/trace-dispatcher.cabal
@@ -54,7 +54,7 @@ library
                       , containers
                       , contra-tracer
                       , deepseq
-                      , ekg
+                      , ekg-wai
                       , ekg-core
                       , ekg-forward >= 0.5
                       , hostname
@@ -116,7 +116,6 @@ test-suite trace-dispatcher-test
                       , cardano-prelude
                       , containers
                       , deepseq
-                      , ekg
                       , ekg-core
                       , generic-data
                       , hostname
@@ -164,7 +163,7 @@ benchmark trace-dispatcher-bench
                       , aeson
                       , containers
                       , criterion
-                      , ekg
+                      , ekg-wai
                       , text
                       , time
                       , trace-dispatcher