Merge pull request #48 from IntersectMBO/coot/prometheus-namespace

Prometheus counters prefix

Author: coot

README.md

@@ -149,6 +149,14 @@ The `Prometheus` requires a different port number than `cardano-node`'s
 }
 ```
 
+By default all counters are prefixed with `dmq-node_`, this can be changed with
+`TraceOptionMetricsPrefix` option in the configuration file, e.g.
+```json
+{
+  "TraceOptionMetricsPrefix": "dmq-aggregator"
+}
+```
+
 ## Developing with Nix
 
 To enter a development shell with all dependencies available, use:

cabal.project

@@ -18,7 +18,7 @@ index-state:
   , hackage.haskell.org 2026-02-17T10:15:41Z
 
   -- Bump this if you need newer packages from CHaP
-  , cardano-haskell-packages 2026-03-28T08:55:07Z
+  , cardano-haskell-packages 2026-04-07T08:02:00Z
 
 active-repositories:
   , :rest

dmq-node/CHANGELOG.md

@@ -2,6 +2,15 @@
 
 <!-- scriv-insert-here -->
 
+<a id='changelog-0.4.2.0'></a>
+## 0.4.2.0 -- 2026-04-07
+
+### Non-Breaking
+
+- Changed default prefix for prometheus counters to `dmq-node_` (previously no
+  prefix was added).  The prefix can be changed using
+  `TraceOptionMetricsPrefix` option in a configuration file.
+
 <a id='changelog-0.4.1.0'></a>
 ## 0.4.1.0 -- 2026-04-01
 

dmq-node/dmq-node.cabal

@@ -1,6 +1,6 @@
 cabal-version: 3.4
 name: dmq-node
-version: 0.4.1.0
+version: 0.4.2.0
 synopsis: Decentralised Message Queue Node
 description:
   Decentralised Message Queue Node based on Cardano Diffusion
@@ -136,7 +136,7 @@ library
     singletons,
     text >=1.2.4 && <2.2,
     time >=1.12 && <1.15,
-    trace-dispatcher ^>=2.12.0,
+    trace-dispatcher ^>=2.12.1,
     transformers,
     typed-protocols:{typed-protocols, cborg} ^>=1.2,
 

dmq-node/src/DMQ/Tracer.hs

@@ -199,28 +199,6 @@ type DMQDiffusionTracers m =
 
 type PrometheusConfig = Maybe (Bool, Maybe HostName, PortNumber)
 
--- | Make a default configuration option for a top level namespace.
---
--- * severity `Info`
--- * backend `Stdout MachineFormat`
---
--- NOTE: no prometheus, since we'd need to pick a port number for it.
---
-mkDefaultConfig :: [Logging.ConfigOption] -> [Logging.ConfigOption]
-mkDefaultConfig cfg =
-  cfg
-  ++
-  case filter (\opt -> case opt of
-                  Logging.ConfSeverity{} -> True
-                  _                      -> False ) cfg of
-    [] -> [Logging.ConfSeverity (Logging.SeverityF (Just Logging.Info))]
-    _  -> []
-  ++
-  case filter (\opt -> case opt of
-                  Logging.ConfBackend{} -> True
-                  _                     -> False) cfg of
-   [] -> [Logging.ConfBackend [Logging.Stdout Logging.MachineFormat]]
-   _  -> []
 
 -- | Create and configure `DMQTracers` and `DMQDiffusionTracers`.
 --
@@ -242,19 +220,24 @@ mkDMQTracers
         )
 mkDMQTracers ekgStore dmqConfigFilePath = do
   exist <- doesFileExist dmqConfigFilePath
-  traceConfig' <-
+
+  traceConfig <-
     if exist
-      then Logging.readConfiguration dmqConfigFilePath
-      else return Logging.emptyTraceConfig
-  let traceConfig = traceConfig'
-        { Logging.tcOptions =
-          Map.alter
-            (\case
-               Just a  -> Just (mkDefaultConfig a)
-               Nothing -> Just (mkDefaultConfig []))
-            mempty
-            (Logging.tcOptions traceConfig')
-        }
+    then
+      Logging.readConfigurationWithFallbackAndDefault
+        Logging.Info
+        Logging.DNormal
+        (Logging.Stdout Logging.MachineFormat)
+        dmqConfigFilePath
+        Logging.emptyTraceConfig { Logging.tcMetricsPrefix = Just "dmq-node_" }
+    else
+      return
+        (Logging.mkConfigurationWithFallback
+          Logging.Info
+          Logging.DNormal
+          (Logging.Stdout Logging.MachineFormat)
+        ) { Logging.tcMetricsPrefix = Just "dmq-node_" }
+
   ekgTrace <- Logging.ekgTracer traceConfig ekgStore
 
   configReflection <- Logging.emptyConfigReflection