refactor(sut): Dumblog, refactor Metrics to own module

platonic-io · Feb 4, 2022 · 9395acf · 9395acf
1 parent 5c1aa35
commit 9395acf
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 17 deletions.
diff --git a/src/sut/dumblog/app/Main.hs b/src/sut/dumblog/app/Main.hs
@@ -23,22 +23,7 @@ import Journal.Internal.Metrics (MetricsSchema, Metrics) -- should maybe be move
 import qualified Journal.Internal.Metrics as Metrics
 
 import Blocker
-
-data DumblogCounters
-  = CurrentNumberTransactions
-  | NumberOfWrites
-  | NumberOfReads
-  | ErrorsEncountered
-  deriving (Eq, Show, Enum, Bounded)
-
-data DumblogHistograms
-  = ResponseTime
-  deriving (Eq, Show, Enum, Bounded)
-
-type DumblogMetrics = Metrics DumblogCounters DumblogHistograms
-
-dumblogSchema :: MetricsSchema DumblogCounters DumblogHistograms
-dumblogSchema = Metrics.MetricsSchema 1
+import Metrics
 
 data FrontEndInfo = FrontEndInfo
   { sequenceNumber :: AtomicCounter

diff --git a/src/sut/dumblog/dumblog.cabal b/src/sut/dumblog/dumblog.cabal
@@ -52,7 +52,9 @@ library
   build-depends:
       , base ^>=4.14.1.0
       , containers
+      , journal
   exposed-modules:
-    Blocker
+      Blocker
+    , Metrics
   hs-source-dirs: src
   default-language: Haskell2010
diff --git a/src/sut/dumblog/src/Metrics.hs b/src/sut/dumblog/src/Metrics.hs
@@ -0,0 +1,20 @@
+module Metrics where
+
+import Journal.Internal.Metrics (MetricsSchema, Metrics) -- should maybe be moved to separate package
+import qualified Journal.Internal.Metrics as Metrics
+
+data DumblogCounters
+  = CurrentNumberTransactions
+  | NumberOfWrites
+  | NumberOfReads
+  | ErrorsEncountered
+  deriving (Eq, Show, Enum, Bounded)
+
+data DumblogHistograms
+  = ResponseTime
+  deriving (Eq, Show, Enum, Bounded)
+
+type DumblogMetrics = Metrics DumblogCounters DumblogHistograms
+
+dumblogSchema :: MetricsSchema DumblogCounters DumblogHistograms
+dumblogSchema = Metrics.MetricsSchema 1