From e2a7802945810665322c42f88bb18fd101b73cc8 Mon Sep 17 00:00:00 2001
From: Pratik Mankawde <3397372+pratikmankawde@users.noreply.github.com>
Date: Fri, 24 Apr 2026 20:49:14 +0100
Subject: [PATCH] refactor(telemetry): colocate SpanNames headers with their
 classes

Move TxSpanNames.h and TxQSpanNames.h from src/xrpld/telemetry/ to sit
next to the classes they instrument, matching the PathFindSpanNames.h
convention.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
---
 src/xrpld/app/misc/NetworkOPs.cpp                       | 2 +-
 src/xrpld/{telemetry => app/misc}/TxSpanNames.h         | 0
 src/xrpld/app/misc/detail/TxQ.cpp                       | 2 +-
 src/xrpld/{telemetry => app/misc/detail}/TxQSpanNames.h | 0
 src/xrpld/overlay/detail/PeerImp.cpp                    | 2 +-
 src/xrpld/telemetry/TxTracing.h                         | 2 +-
 6 files changed, 4 insertions(+), 4 deletions(-)
 rename src/xrpld/{telemetry => app/misc}/TxSpanNames.h (100%)
 rename src/xrpld/{telemetry => app/misc/detail}/TxQSpanNames.h (100%)

diff --git a/src/xrpld/app/misc/NetworkOPs.cpp b/src/xrpld/app/misc/NetworkOPs.cpp
index a7eb131514..d75de3344e 100644
--- a/src/xrpld/app/misc/NetworkOPs.cpp
+++ b/src/xrpld/app/misc/NetworkOPs.cpp
@@ -17,6 +17,7 @@
 #include <xrpld/app/misc/FeeVote.h>
 #include <xrpld/app/misc/Transaction.h>
 #include <xrpld/app/misc/TxQ.h>
+#include <xrpld/app/misc/TxSpanNames.h>
 #include <xrpld/app/misc/ValidatorKeys.h>
 #include <xrpld/app/misc/ValidatorList.h>
 #include <xrpld/app/misc/make_NetworkOPs.h>
@@ -34,7 +35,6 @@
 #include <xrpld/rpc/DeliveredAmount.h>
 #include <xrpld/rpc/MPTokenIssuanceID.h>
 #include <xrpld/rpc/ServerHandler.h>
-#include <xrpld/telemetry/TxSpanNames.h>
 #include <xrpld/telemetry/TxTracing.h>
 
 #include <xrpl/basics/Log.h>
diff --git a/src/xrpld/telemetry/TxSpanNames.h b/src/xrpld/app/misc/TxSpanNames.h
similarity index 100%
rename from src/xrpld/telemetry/TxSpanNames.h
rename to src/xrpld/app/misc/TxSpanNames.h
diff --git a/src/xrpld/app/misc/detail/TxQ.cpp b/src/xrpld/app/misc/detail/TxQ.cpp
index 4dd298aa58..51a5e1e386 100644
--- a/src/xrpld/app/misc/detail/TxQ.cpp
+++ b/src/xrpld/app/misc/detail/TxQ.cpp
@@ -1,5 +1,5 @@
 #include <xrpld/app/misc/TxQ.h>
-#include <xrpld/telemetry/TxQSpanNames.h>
+#include <xrpld/app/misc/detail/TxQSpanNames.h>
 
 #include <xrpld/app/ledger/OpenLedger.h>
 #include <xrpld/app/main/Application.h>
diff --git a/src/xrpld/telemetry/TxQSpanNames.h b/src/xrpld/app/misc/detail/TxQSpanNames.h
similarity index 100%
rename from src/xrpld/telemetry/TxQSpanNames.h
rename to src/xrpld/app/misc/detail/TxQSpanNames.h
diff --git a/src/xrpld/overlay/detail/PeerImp.cpp b/src/xrpld/overlay/detail/PeerImp.cpp
index 442f9fe194..16f8484243 100644
--- a/src/xrpld/overlay/detail/PeerImp.cpp
+++ b/src/xrpld/overlay/detail/PeerImp.cpp
@@ -7,6 +7,7 @@
 #include <xrpld/app/ledger/LedgerMaster.h>
 #include <xrpld/app/ledger/TransactionMaster.h>
 #include <xrpld/app/misc/Transaction.h>
+#include <xrpld/app/misc/TxSpanNames.h>
 #include <xrpld/app/misc/ValidatorList.h>
 #include <xrpld/consensus/Validations.h>
 #include <xrpld/overlay/Cluster.h>
@@ -21,7 +22,6 @@
 #include <xrpld/overlay/detail/Tuning.h>
 #include <xrpld/peerfinder/PeerfinderManager.h>
 #include <xrpld/peerfinder/Slot.h>
-#include <xrpld/telemetry/TxSpanNames.h>
 #include <xrpld/telemetry/TxTracing.h>
 
 #include <xrpl/basics/Log.h>
diff --git a/src/xrpld/telemetry/TxTracing.h b/src/xrpld/telemetry/TxTracing.h
index e8f4d9f281..d99163ee53 100644
--- a/src/xrpld/telemetry/TxTracing.h
+++ b/src/xrpld/telemetry/TxTracing.h
@@ -10,7 +10,7 @@
  *  no-op SpanGuard instances (zero overhead, zero dependencies).
  */
 
-#include <xrpld/telemetry/TxSpanNames.h>
+#include <xrpld/app/misc/TxSpanNames.h>
 
 #include <xrpl/basics/base_uint.h>
 #include <xrpl/telemetry/SpanGuard.h>