From 6afd2e35bc76436d7f721686919130d0ae211820 Mon Sep 17 00:00:00 2001
From: Pratik Mankawde <3397372+pratikmankawde@users.noreply.github.com>
Date: Tue, 10 Mar 2026 19:01:34 +0000
Subject: [PATCH] Fix CI: cspell EOJSON delimiter and telemetry workflow conan
 setup

- Rename EOJSON heredoc delimiter to EOF_JSON to avoid cspell unknown word
- Add conan installation step (pip3 install conan) to telemetry-validation workflow
- Use shared setup-conan action for proper Conan profile/remote configuration
- Align build commands with reusable-build-test-config.yml conventions

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
---
 .github/workflows/telemetry-validation.yml    | 20 ++++++++++++-------
 .../workload/collect_system_metrics.sh        |  4 ++--
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/telemetry-validation.yml b/.github/workflows/telemetry-validation.yml
index 471352e834..228dbff42e 100644
--- a/.github/workflows/telemetry-validation.yml
+++ b/.github/workflows/telemetry-validation.yml
@@ -77,11 +77,17 @@ jobs:
       - name: Install Python dependencies
         run: pip3 install -r docker/telemetry/workload/requirements.txt
 
-      - name: Set up Conan and build cache
+      - name: Install Conan
+        run: pip3 install conan
+
+      - name: Set up Conan
+        uses: ./.github/actions/setup-conan
+
+      - name: Cache Conan packages and build directory
         uses: actions/cache@v4
         with:
           path: |
-            ~/.conan2
+            ~/.conan2/p
             .build
           key: telemetry-build-${{ runner.os }}-${{ hashFiles('conanfile.py', 'CMakeLists.txt') }}
           restore-keys: |
@@ -89,9 +95,9 @@ jobs:
 
       - name: Build rippled with telemetry
         run: |
-          conan install . --build=missing -o telemetry=True
-          cmake --preset default -Dtelemetry=ON
-          cmake --build --preset default --parallel $(nproc)
+          conan install . --build=missing --profile ci --output-folder=build
+          cmake -B build -DCMAKE_TOOLCHAIN_FILE:FILEPATH=build/generators/conan_toolchain.cmake -DCMAKE_BUILD_TYPE=Release -Dtelemetry=ON
+          cmake --build build --parallel $(nproc)
 
       - name: Make scripts executable
         run: |
@@ -100,9 +106,9 @@ jobs:
       - name: Run full telemetry validation
         id: validation
         env:
-          XRPLD: .build/xrpld
+          XRPLD: build/xrpld
         run: |
-          ARGS="--xrpld .build/xrpld --skip-loki"
+          ARGS="--xrpld build/xrpld --skip-loki"
           ARGS="$ARGS --rpc-rate ${{ github.event.inputs.rpc_rate || '50' }}"
           ARGS="$ARGS --rpc-duration ${{ github.event.inputs.rpc_duration || '120' }}"
           ARGS="$ARGS --tx-tps ${{ github.event.inputs.tx_tps || '5' }}"
diff --git a/docker/telemetry/workload/collect_system_metrics.sh b/docker/telemetry/workload/collect_system_metrics.sh
index 42569b3d47..d0d116d0da 100755
--- a/docker/telemetry/workload/collect_system_metrics.sh
+++ b/docker/telemetry/workload/collect_system_metrics.sh
@@ -214,7 +214,7 @@ fi
 # ---------------------------------------------------------------------------
 # Write output JSON
 # ---------------------------------------------------------------------------
-cat > "$OUTPUT_FILE" <<EOJSON
+cat > "$OUTPUT_FILE" <<EOF_JSON
 {
   "cpu_pct_avg": $CPU_AVG,
   "memory_rss_mb_peak": $MEM_PEAK,
@@ -227,7 +227,7 @@ cat > "$OUTPUT_FILE" <<EOJSON
   "initial_ledger_seq": $INITIAL_SEQ,
   "final_ledger_seq": $FINAL_SEQ
 }
-EOJSON
+EOF_JSON
 
 ok "Metrics written to $OUTPUT_FILE"
 cat "$OUTPUT_FILE"