wb | tracing: correct describe-run; explicit NodeName in config

IntersectMBO · Nov 19, 2024 · 6c9bfc7 · 6c9bfc7
1 parent 347255c
commit 6c9bfc7
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 14 deletions.
diff --git a/nix/workbench/backend/supervisor.sh b/nix/workbench/backend/supervisor.sh
@@ -97,16 +97,23 @@ case "$op" in
         local usage="USAGE: wb backend $op RUN-DIR"
         local dir=${1:?$usage}
 
-        local basePort=$(                   envjq 'basePort')
-        local port_ekg=$((       basePort+$(envjq 'port_shift_ekg')))
-        local port_prometheus=$((basePort+$(envjq 'port_shift_prometheus')))
-        local port_rtview=$((    basePort+$(envjq 'port_shift_rtview')))
-
-        cat <<EOF
-  - RTView URL:              http://localhost:$port_rtview
-  - EKG URL (node-0):        http://localhost:$port_ekg/
-  - Prometheus URL (node-0): http://localhost:$port_prometheus/metrics
+        if jqtest '.node.tracing_backend == "trace-dispatcher"' "$dir"/profile.json
+        then
+            local basePort=$(                   envjq 'basePortTracer')
+            local port_ekg=$((       basePort+$(envjq 'port_shift_ekg')))
+            local port_prometheus=$((basePort+$(envjq 'port_shift_prometheus')))
+            local port_rtview=$((    basePort+$(envjq 'port_shift_rtview')))
+            cat <<EOF
+  - EKG URL (node-0):                                  http://localhost:$port_ekg/node-0
+  - Prometheus URL (node-0):                           http://localhost:$port_prometheus/node-0
+  - RTView URL (depending on cardano-tracer build):    http://localhost:$port_rtview
+EOF
+
+        else cat <<EOF
+  - EKG URL (node-0):                                  http://localhost:12788
+  - Prometheus URL (node-0):                           http://localhost:12798/metrics
 EOF
+        fi
         ;;
 
     start-node )
@@ -196,7 +203,7 @@ EOF
         local usage="USAGE: wb backend $op RUN-DIR"
         local dir=${1:?$usage}; shift
 
-        if jqtest ".node.tracer" "$dir"/profile.json
+        if jqtest '.node.tracing_backend == "trace-dispatcher"' "$dir"/profile.json
         then if ! supervisorctl start tracer
              then progress "supervisor" "$(red fatal: failed to start) $(white cardano-tracer)"
                   echo "$(red config.json) -------------------------------------" >&2

diff --git a/nix/workbench/env.sh b/nix/workbench/env.sh
@@ -1,8 +1,9 @@
 WB_ENV_DEFAULT='
-{ "type":         "supervisor"
-, "cacheDir":     "'${XDG_CACHE_HOME:-$HOME/.cache}'/cardano-workbench"
-, "basePort":     30000
-, "staggerPorts": true
+{ "type":           "supervisor"
+, "cacheDir":       "'${XDG_CACHE_HOME:-$HOME/.cache}'/cardano-workbench"
+, "basePort":       30000
+, "basePortTracer": 3000
+, "staggerPorts":   true
 }'
 
 export WB_ENV=$WB_ENV_DEFAULT

diff --git a/nix/workbench/service/tracing.nix b/nix/workbench/service/tracing.nix
@@ -13,6 +13,7 @@ let
   {
     UseTraceDispatcher   = true;
     TraceOptionResourceFrequency = 1000;
+    TraceOptionNodeName = nodeSpec.name;
 
   ## Please see the generated tracing configuration reference at:
   ##
@@ -129,6 +130,10 @@ let
     TraceBlockFetchServer       = true;
     TraceChainSyncHeaderServer  = true;
     TraceChainSyncClient        = true;
+
+    ## needs to be explicit when new tracing is the node's default
+    UseTraceDispatcher          = false;
+
     options = {
       mapBackends = {
         "cardano.node.resources" = [ "KatipBK" ];