mirror of
https://github.com/XRPLF/rippled.git
synced 2026-08-03 04:01:01 +00:00
87078dca6e
Conflict in OpenTelemetryPlan/03-implementation-strategy.md §3.9: both branches independently fixed the same defect (stale hand-maintained line counts) in different ways. - 1b (0ff947454c) stripped the Lines Added / Lines Changed columns but kept the §3.9.1 and §3.9.2 tables. - 1a (3ad525a48a) removed both sections outright. Resolved in favour of 1a's deletion. The tables were pre-implementation estimates with no source of truth, so trimming the columns only defers the next drift; the file/component lists duplicated §3.1's directory tree, which 1b already keeps current (DiscardFlag.h, FilteringSpanProcessor). Keeping the upstream resolution also stops the same conflict recurring on 1c..10. 1b-specific content verified intact after the merge: §3.1 retains the DiscardFlag.h entry, the FilteringSpanProcessor and discard() annotations, and the TracingInstrumentation removal. No references to the deleted sections remain in any plan doc.