mirror of
https://github.com/XRPLF/rippled.git
synced 2026-08-19 21:30:56 +00:00
d1d766a8d1
Conflict resolutions: - docker/telemetry/xrpld-telemetry.cfg: relocation conflict. phase-9 had already moved [insight] to the end of the file with server=otel, so the incoming block was dropped rather than inserted. Keeping both would have produced two [insight] sections, which merge last-wins into a single effective section, silently reviving the bug this branch just fixed. phase-9's per-branch service_instance_id=xrpld-devnet is preserved. - OpenTelemetryPlan/06-implementation-phases.md: kept both corrections. phase-9's "Tempo" is right (no Jaeger anywhere in the stack) and phase-8's "active, sampled span" is right: Log.cpp:328 injects only when spanCtx.IsValid() && spanCtx.IsSampled(). - OpenTelemetryPlan/09-data-collection-reference.md and docs/telemetry-runbook.md: kept phase-9's structured-metadata LogQL. The collector's filelog regex_parser already extracts partition, severity, trace_id and span_id, so phase-8's inline regexp forms are redundant, and a line filter matches the literal text in a message body.