mirror of
https://github.com/XRPLF/rippled.git
synced 2026-08-21 22:30:57 +00:00
fix(tests): follow ConsensusSpanNames.h to its libxrpl location
The phase-10 merge brought a relocation: ConsensusSpanNames.h moved from src/xrpld/consensus/ to include/xrpl/consensus/. Three of its four consumers were updated during conflict resolution, but this test still included the old path, which no longer exists. Also corrects the file header, which explained that the test is guarded on XRPL_ENABLE_TELEMETRY "because that is the configuration in which this test target has src/ on its include path". That reason no longer holds: the header is lib-side now, so a libxrpl test can include it directly without reaching into src/. The guard remains because it is what builds the telemetry test target. Verified statically: every in-tree xrpld/ and xrpl/ include across src/ and include/ now resolves to a file that exists (only the three generated protobuf headers are absent, as expected before a build). check_otel_naming.py exits 0 and its 134 unit tests pass; the one remaining reference to the old path is a synthetic fixture path inside those tests, built in a temp dir, so it is correct as written. Not verified: this was not compiled. The clangd diagnostics that surfaced the problem come from a compile database generated ~19 hours before the merge, so it still indexes the pre-relocation layout and reports errors for headers that are present; those specific errors are an artifact, but a real build is still the only proof the merge compiles. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
This commit is contained in:
@@ -22,16 +22,16 @@
|
||||
* is asserted directly -- no Application, no validations container, and no
|
||||
* test-only hook added to production code to reach it.
|
||||
*
|
||||
* Compiled only when XRPL_ENABLE_TELEMETRY is defined, because that is the
|
||||
* configuration in which this test target has `src/` on its include path and can
|
||||
* therefore reach <xrpld/consensus/...>. The header itself is not
|
||||
* telemetry-conditional (constants and one constexpr function, no OTel types);
|
||||
* only this file's ability to include it is.
|
||||
* Compiled only when XRPL_ENABLE_TELEMETRY is defined, which is the configuration
|
||||
* that builds the telemetry test target. The header itself is not
|
||||
* telemetry-conditional (constants and one constexpr function, no OTel types),
|
||||
* and since it now lives at <xrpl/consensus/...> a libxrpl test can include it
|
||||
* directly without reaching into `src/`.
|
||||
*/
|
||||
|
||||
#ifdef XRPL_ENABLE_TELEMETRY
|
||||
|
||||
#include <xrpld/consensus/ConsensusSpanNames.h>
|
||||
#include <xrpl/consensus/ConsensusSpanNames.h>
|
||||
|
||||
#include <xrpl/telemetry/SpanNames.h>
|
||||
|
||||
|
||||
Reference in New Issue
Block a user