mirror of
https://github.com/XRPLF/rippled.git
synced 2026-07-24 15:40:26 +00:00
Merge branch 'pratik/otel-phase3-tx-tracing' into pratik/otel-phase4-consensus-tracing
Carries the tx activation-site dedup (activateIfLive) forward. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
This commit is contained in:
@@ -1624,8 +1624,7 @@ NetworkOPsImp::apply(std::unique_lock<std::mutex>& batchLock)
|
||||
// Non-owning: the span is still owned/ended by e.span. Scoped to
|
||||
// one loop iteration, so each tx's span is ambient only for its
|
||||
// own processing. No yield in this loop.
|
||||
auto txActivation =
|
||||
(e.span && *e.span) ? e.span->activate() : telemetry::ScopedActivation{};
|
||||
auto txActivation = telemetry::activateIfLive(e.span);
|
||||
|
||||
if (e.span && *e.span)
|
||||
{
|
||||
|
||||
@@ -1436,7 +1436,7 @@ PeerImp::handleTransaction(
|
||||
// Activate the tx.receive span so checkTransaction's log
|
||||
// lines carry its trace_id. Non-owning; sp still owns/ends
|
||||
// the span. This job body runs to completion on one worker.
|
||||
auto activation = (sp && *sp) ? sp->activate() : telemetry::ScopedActivation{};
|
||||
auto activation = telemetry::activateIfLive(sp);
|
||||
if (auto peer = weak.lock())
|
||||
peer->checkTransaction(flags, checkSignature, stx, batch);
|
||||
});
|
||||
|
||||
Reference in New Issue
Block a user