ARCHIVE/rippled
1
0
Fork 0
mirror of https://github.com/XRPLF/rippled.git synced 2026-07-30 18:40:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor(telemetry): use detachInPlace() helper at consensus span re-detach call sites

Browse Source 
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
This commit is contained in:
Pratik Mankawde
2026-07-20 21:47:23 +01:00
parent 95056a49da
commit 82f3c86a28
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/xrpld/app/consensus/RCLConsensus.cpp
View File

@@ -540,8 +540,8 @@ RCLConsensus::Adaptor::makeAcceptSpan(Result const& result)
// above, so it is not popped on the wrong thread. accept.apply parents
// via acceptSpanContext_ (captured above), so no ambient child is
// orphaned on either the sync (onForceAccept) or async (onAccept) path.
// Rebuild the shared_ptr from the detached rvalue (move-assign deleted).
span = std::make_shared<telemetry::SpanGuard>(std::move(*span).detached());
// detachInPlace rebuilds the shared_ptr (move-assign is deleted).
span = telemetry::detachInPlace(std::move(span));
}
return span;
}
@@ -1328,9 +1328,9 @@ RCLConsensus::Adaptor::startRoundTracing(RCLCxLedger const& prevLgr)
// roundSpanContext_ (captured above) is the durable handle that child
// spans on other threads link to. The guard itself is reset() on a
// different worker than it was emplaced on, so detach its Scope now --
// AFTER the context capture -- to avoid a wrong-thread Scope pop. Re-emplace
// the detached guard in place (SpanGuard move-assignment is deleted).
roundSpan_.emplace(std::move(*roundSpan_).detached());
// AFTER the context capture -- to avoid a wrong-thread Scope pop.
// detachInPlace re-emplaces it (move-assignment is deleted).
telemetry::detachInPlace(roundSpan_);
}
std::optional<telemetry::SpanGuard>

2
src/xrpld/consensus/Consensus.h
View File

@@ -2116,7 +2116,7 @@ Consensus<Adaptor>::startEstablishTracing()
if (*establishSpan_)
{
establishSpanContext_ = establishSpan_->captureContext();
establishSpan_.emplace(std::move(*establishSpan_).detached());
telemetry::detachInPlace(establishSpan_);
}
}