mirror of
https://github.com/XRPLF/rippled.git
synced 2026-08-21 22:30:57 +00:00
b77f516f95
Conflict resolution kept this branch's evolution and re-applied phase-6's fixes on top of it, rather than taking either side wholesale: - consensus-health.json: kept the native `span_calls_total` metric name and the `interval: 15s` and point styling from this branch; added phase-6's `close_time_correct` PromQL filter and the NetClock axis labels. The TraceQL boolean-regex filter stays removed and the `byRegexp` overrides carry over. Panel count unchanged at 27. - 09-data-collection-reference.md: kept this branch's headings, its more detailed consensus attribute table (which already types `consensus_round_id` as int64) and its section numbering, including the deliberate removal of the SpanNames inventory. Carried over only the correction that the state-accounting duration gauges are cumulative microseconds, not seconds. - telemetry-runbook.md: kept this branch's native metric names (`span_calls_total`, `span_duration_milliseconds_bucket`); carried the `rpc.request` -> `rpc.http_request` span-name fix and the `jobq_` segment on the job-queue depth metric. - integration-test.sh: kept this branch's `check_otel_metric` form and carried the `jobq_job_count` correction.