workbench: default to RTView off; -rtview profiles

zeme-wana · Apr 26, 2023 · efcd6a6 · efcd6a6
1 parent 875e8f8
commit efcd6a6
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 9 deletions.
diff --git a/Makefile b/Makefile
@@ -75,9 +75,9 @@ ps:                                              ## Plain-text list of profiles
 ##
 PROFILES_BASE         := default plutus plutus-secp-ecdsa plutus-secp-schnorr oldtracing idle tracer-only
 PROFILES_STARTSTOP    := startstop startstop-p2p startstop-plutus startstop-notracer startstop-oldtracing
-PROFILES_CI_TEST      := ci-test ci-test-p2p ci-test-plutus ci-test-notracer ci-test-dense10 aws-test
-PROFILES_CI_BENCH     := ci-bench ci-bench-p2p ci-bench-plutus ci-bench-plutus-secp-ecdsa ci-bench-plutus-secp-schnorr ci-bench-notracer
-PROFILES_TRACE_BENCH  := trace-bench trace-bench-notracer trace-bench-oldtracing
+PROFILES_CI_TEST      := ci-test ci-test-p2p ci-test-plutus ci-test-notracer ci-test-rtview ci-test-dense10 aws-test
+PROFILES_CI_BENCH     := ci-bench ci-bench-p2p ci-bench-plutus ci-bench-plutus-secp-ecdsa ci-bench-plutus-secp-schnorr ci-bench-notracer ci-bench-rtview
+PROFILES_TRACE_BENCH  := trace-bench trace-bench-notracer trace-bench-oldtracing trace-bench-rtview
 PROFILES_EPOCHTRANS   := epoch-transition
 PROFILES_PLUTUSCALL   := plutuscall-loop-plain plutuscall-secp-ecdsa-plain plutuscall-secp-schnorr-plain
 PROFILES_PLUTUSCALL   += plutuscall-loop-half plutuscall-secp-ecdsa-half plutuscall-secp-schnorr-half

diff --git a/nix/nixos/cardano-tracer-service.nix b/nix/nixos/cardano-tracer-service.nix
@@ -28,10 +28,6 @@ let serviceConfigToJSON =
           rpMaxAgeHours   = 24;
         } // (cfg.rotation or {});
 
-        hasRTView = {
-          epHost    = "127.0.0.1";
-          epPort    = 3300;
-        } // (cfg.RTView or {});
         hasEKG = [
           { epHost  = "127.0.0.1"; epPort  = cfg.ekgPortBase;     }
           { epHost  = "127.0.0.1"; epPort  = cfg.ekgPortBase + 1; }
@@ -49,6 +45,9 @@ let serviceConfigToJSON =
         #     "Mempool.TxsInMempool" = "Mempool.TxsInMempool.Mapped";
         #     "ChainDB.SlotNum" = "ChainDB.SlotNum.Mapped";
         # };
+      } // pkgs.lib.optionalAttrs ((cfg.RTView or {}) != {})
+      {
+        hasRTView = cfg.RTView;
       };
 in pkgs.commonLib.defServiceModule
   (lib: with lib;

diff --git a/nix/workbench/profile/prof0-defaults.jq b/nix/workbench/profile/prof0-defaults.jq
@@ -66,6 +66,7 @@ def era_defaults($era):
     , tracing_backend:                "trace-dispatcher"  ## or "iohk-monitoring"
     , ekg:                            false
     , tracer:                         true
+    , rtview:                         false
     , verbatim:
       {
       }

diff --git a/nix/workbench/profile/prof1-variants.jq b/nix/workbench/profile/prof1-variants.jq
@@ -363,13 +363,19 @@ def all_profile_variants:
   ##
   |
     ({ extra_desc:                     "without cardano-tracer"
-     , suffix:                         "notracer"
+     , suffix:                         "notrc"
      }|
      .node.tracer                     = false
     ) as $without_tracer
+  |
+    ({ extra_desc:                     "with RTView"
+     , suffix:                         "rtvw"
+     }|
+     .node.rtview                     = true
+    ) as $with_rtview
   |
     ({ extra_desc:                     "with legacy iohk-monitoring"
-     , suffix:                         "oldtracing"
+     , suffix:                         "iomf"
      }|
      .node.tracing_backend           = "iohk-monitoring"
     ) as $old_tracing
@@ -584,6 +590,9 @@ def all_profile_variants:
   , $citest_base * $without_tracer *
     { name: "ci-test-notracer"
     }
+  , $citest_base * $with_rtview *
+    { name: "ci-test-rtview"
+    }
   , $citest_base * $aws_eu_only *
     { name: "aws-test"
     }
@@ -607,6 +616,9 @@ def all_profile_variants:
   , $cibench_base * $without_tracer *
     { name: "ci-bench-notracer"
     }
+  , $cibench_base * $with_rtview *
+    { name: "ci-bench-rtview"
+    }
 
   ## CI variants: test duration, 3 blocks, dense10
   , $citest_base * $solo_dense10 *
@@ -623,6 +635,9 @@ def all_profile_variants:
   , $tracebench_base * $without_tracer *
     { name: "trace-bench-notracer"
     }
+  , $tracebench_base * $with_rtview *
+    { name: "trace-bench-rtview"
+    }
 
   ## Epoch transition test: 1.5 epochs, 15mins runtime
   , $ep_trans_base *

diff --git a/nix/workbench/service/tracer.nix b/nix/workbench/service/tracer.nix
@@ -16,6 +16,11 @@ let
         logRoot        = ".";
       } // optionalAttrs backend.useCabalRun {
         executable     = "cardano-tracer";
+      } // optionalAttrs profile.node.rtview {
+        RTView         = {
+          epHost = "127.0.0.1";
+          epPort = 3300;
+        };
       });
 
   ##