Pratik Mankawde ff1a905ede merge: bring the CI fixes forward from phase6-statsd ...

Three conflicts, all resolved by keeping this branch's rewrite and
re-applying the incoming change onto it:

- 09-data-collection-reference.md: phase-7 rewrote both attribute tables,
  so the incoming table would have reverted them. Kept phase-7's and
  re-applied the two "XRPL epoch" spellings.
- integration-test.sh: phase-7 moved these checks from StatsD to OTel and
  no longer defines check_statsd_metric, so only this side compiles.
- TelemetryConfig.cpp: the incoming side carried networkTypeFromId(), which
  this branch already has. Kept one definition and took the incoming
  doc wording, which the auto-merged body below it already matches.

2026-09-08 17:17:50 +01:00

..

basics

refactor: Use std::format instead of boost::format where it fits (#7996)

2026-08-14 13:49:08 +00:00

beast

fix(telemetry): correct drain, init and naming defects; add export cadence keys

2026-09-03 20:20:13 +01:00

conditions

refactor: Remove operator!= overloads that C++20 synthesizes (#7994)

2026-08-10 17:23:02 +00:00

config

perf: Pause online delete if there any gaps in recent ledger history (#5531)

2026-08-24 14:16:03 +00:00

consensus

fix(telemetry): make the consensus trace strategy an enum

2026-09-08 14:39:05 +01:00

core

Merge branch 'pratik/otel-phase1a-plan-docs' into pratik/otel-phase1b-telemetry-infra

2026-09-08 16:02:36 +01:00

crypto

style: Unify style for all Doxygen comments (#7776)

2026-07-13 10:40:40 +00:00

git

…

json

refactor: Convert boost::beast::string_view to std::string_view (#6306)

2026-08-17 23:19:56 +00:00

ledger

fix: Reinforce the priority of AMMClawback in case of insufficient reserves (#7796)

2026-09-02 20:48:53 +00:00

net

refactor: Use std::format instead of boost::format where it fits (#7996)

2026-08-14 13:49:08 +00:00

nodestore

chore: Trivial gtest migrations (#7865)

2026-07-27 16:34:53 +00:00

peerfinder

chore: Rename CamelCase namespaces to snake_case (#7933)

2026-08-04 13:46:55 +00:00

proto

Merge branch 'pratik/otel-phase5-docs-deployment' into pratik/otel-phase6-statsd

2026-08-20 12:10:49 +01:00

protocol

feat: Add fixCleanup3_5_0 amendment placeholder (#8174)

2026-09-05 00:06:14 +00:00

protocol_autogen

feat: Support key rotation in MPTokenIssuanceSet (#7915)

2026-09-03 21:13:06 +00:00

rdb

refactor: Use std::format instead of boost::format where it fits (#7996)

2026-08-14 13:49:08 +00:00

resource

Merge remote-tracking branch 'upstream/release/3.3.x' into mathbunnyru/merge-3.3.0-to-develop

2026-08-07 16:00:25 +01:00

server

fix(telemetry): order the metrics pipeline by instrument kind

2026-08-20 16:36:41 +01:00

shamap

refactor: Add SHAMapNodeID::isPrefixOf (#7939)

2026-08-18 12:35:32 +00:00

telemetry

merge: bring the review fixes forward from otel-phase6-statsd

2026-09-08 15:45:22 +01:00

tx

merge: bring develop forward from phase2-rpc-tracing

2026-09-03 17:33:20 +01:00