From b59b3c1bb48ae51f63d0dd2f96acfeeffc6ea0e3 Mon Sep 17 00:00:00 2001 From: Pratik Mankawde <3397372+pratikmankawde@users.noreply.github.com> Date: Fri, 3 Jul 2026 21:18:22 +0100 Subject: [PATCH] fix(telemetry): correct service.name to xrpld and restore rename README The integration-test.sh trace queries used resource.service.name="rippled", but the OTel resource attribute is "xrpld" (TelemetryConfig.cpp, MetricsRegistry.cpp), so every span check and the service-registration check returned no results. Also restore .github/scripts/rename/README.md, which an overzealous find-and-replace had corrupted into circular no-ops (e.g. rename "xrpld" to "xrpld"). The file documents the rename process and must retain the source names (rippled/ripple); restored to match develop. Co-Authored-By: Claude Opus 4.8 --- .github/scripts/rename/README.md | 12 ++++++------ docker/telemetry/integration-test.sh | 8 ++++---- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/scripts/rename/README.md b/.github/scripts/rename/README.md index 123881094e..ab685bb0c3 100644 --- a/.github/scripts/rename/README.md +++ b/.github/scripts/rename/README.md @@ -1,11 +1,11 @@ ## Renaming ripple(d) to xrpl(d) In the initial phases of development of the XRPL, the open source codebase was -called "xrpld" and it remains with that name even today. Today, over 1000 +called "rippled" and it remains with that name even today. Today, over 1000 nodes run the application, and code contributions have been submitted by developers located around the world. The XRPL community is larger than ever. In light of the decentralized and diversified nature of XRPL, we will rename any -references to `ripple` and `xrpld` to `xrpl` and `xrpld`, when appropriate. +references to `ripple` and `rippled` to `xrpl` and `xrpld`, when appropriate. See [here](https://xls.xrpl.org/xls/XLS-0095-rename-rippled-to-xrpld.html) for more information. @@ -22,17 +22,17 @@ run from the repository root. 2. `.github/scripts/rename/copyright.sh`: This script will remove superfluous copyright notices. 3. `.github/scripts/rename/cmake.sh`: This script will rename all CMake files - from `RippleXXX.cmake` or `XrpldXXX.cmake` to `XrplXXX.cmake`, and any - references to `ripple` and `xrpld` (with or without capital letters) to + from `RippleXXX.cmake` or `RippledXXX.cmake` to `XrplXXX.cmake`, and any + references to `ripple` and `rippled` (with or without capital letters) to `xrpl` and `xrpld`, respectively. The name of the binary will remain as-is, and will only be renamed to `xrpld` by a later script. 4. `.github/scripts/rename/binary.sh`: This script will rename the binary from - `xrpld` to `xrpld`, and reverses the symlink so that `xrpld` points to + `rippled` to `xrpld`, and reverses the symlink so that `rippled` points to the `xrpld` binary. 5. `.github/scripts/rename/namespace.sh`: This script will rename the C++ namespaces from `ripple` to `xrpl`. 6. `.github/scripts/rename/config.sh`: This script will rename the config from - `xrpld.cfg` to `xrpld.cfg`, and updating the code accordingly. The old + `rippled.cfg` to `xrpld.cfg`, and updating the code accordingly. The old filename will still be accepted. 7. `.github/scripts/rename/docs.sh`: This script will rename any lingering references of `ripple(d)` to `xrpl(d)` in code, comments, and documentation. diff --git a/docker/telemetry/integration-test.sh b/docker/telemetry/integration-test.sh index 7a36d43b4f..f8263df63a 100755 --- a/docker/telemetry/integration-test.sh +++ b/docker/telemetry/integration-test.sh @@ -63,7 +63,7 @@ check_span() { local op="$1" local count count=$(curl -sf "$TEMPO/api/search" \ - --data-urlencode "q={resource.service.name=\"rippled\" && name=\"$op\"}" \ + --data-urlencode "q={resource.service.name=\"xrpld\" && name=\"$op\"}" \ --data-urlencode "limit=5" | jq '.traces | length' 2>/dev/null || echo 0) if [ "$count" -gt 0 ]; then @@ -470,10 +470,10 @@ log "Verifying spans in Tempo..." # Check service registration services=$(curl -sf "$TEMPO/api/v2/search/tag/resource.service.name/values" | jq -r '.tagValues[].value' 2>/dev/null || echo "") -if echo "$services" | grep -q "rippled"; then - ok "Service 'rippled' registered in Tempo" +if echo "$services" | grep -q "xrpld"; then + ok "Service 'xrpld' registered in Tempo" else - fail "Service 'rippled' NOT found in Tempo (found: $services)" + fail "Service 'xrpld' NOT found in Tempo (found: $services)" fi log ""