From f4186165e4be6d77bfdf0bb98b892044fcafa275 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 f3a7a6574f..ac2037f88d 100644
--- a/src/xrpld/app/misc/NetworkOPs.cpp
+++ b/src/xrpld/app/misc/NetworkOPs.cpp
@@ -13,6 +13,7 @@
 #include <xrpld/app/misc/DeliverMax.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/detail/AccountTxPaging.h>
@@ -29,7 +30,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/UptimeClock.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 292187eae0..12b0a866c7 100644
--- a/src/xrpld/app/misc/detail/TxQ.cpp
+++ b/src/xrpld/app/misc/detail/TxQ.cpp
@@ -1,7 +1,7 @@
 #include <xrpld/app/ledger/OpenLedger.h>
 #include <xrpld/app/main/Application.h>
 #include <xrpld/app/misc/TxQ.h>
-#include <xrpld/telemetry/TxQSpanNames.h>
+#include <xrpld/app/misc/detail/TxQSpanNames.h>
 
 #include <xrpl/basics/mulDiv.h>
 #include <xrpl/protocol/Feature.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 4090e4bde0..b5c039e66b 100644
--- a/src/xrpld/overlay/detail/PeerImp.cpp
+++ b/src/xrpld/overlay/detail/PeerImp.cpp
@@ -4,11 +4,11 @@
 #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/overlay/Cluster.h>
 #include <xrpld/overlay/detail/PeerImp.h>
 #include <xrpld/overlay/detail/Tuning.h>
-#include <xrpld/telemetry/TxSpanNames.h>
 #include <xrpld/telemetry/TxTracing.h>
 
 #include <xrpl/basics/UptimeClock.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>