diff --git a/src/main_rtr.rs b/src/main_rtr.rs index 3467dcc..4da7593 100644 --- a/src/main_rtr.rs +++ b/src/main_rtr.rs @@ -563,15 +563,13 @@ fn log_cache_memory_stats(phase: &str, shared_cache: &SharedRtrCache, notifier: let rss_mib = current_rss_mib(); info!( - "RTR memory observe: phase={}, listener_count={}, serials={:?}, snapshot_payload_counts={:?}, delta_lengths={:?}, delta_payload_counts={:?}, snapshot_arc_strong_counts={:?}, rtr_payloads_arc_strong_counts={:?}, rss_mib={:?}", + "RTR memory observe: phase={}, listener_count={}, serials={:?}, snapshot_payload_counts={:?}, delta_lengths={:?}, delta_payload_counts={:?}, rss_mib={:?}", phase, notifier.listener_count(), stats.serials, stats.snapshot_payload_counts, stats.delta_lengths, stats.delta_payload_counts, - stats.snapshot_arc_strong_counts, - stats.rtr_payloads_arc_strong_counts, rss_mib ); } diff --git a/src/rtr/cache/core.rs b/src/rtr/cache/core.rs index 7933c03..677b7c3 100644 --- a/src/rtr/cache/core.rs +++ b/src/rtr/cache/core.rs @@ -741,8 +741,6 @@ pub struct CacheMemoryStats { pub snapshot_payload_counts: [usize; VERSION_COUNT], pub delta_lengths: [usize; VERSION_COUNT], pub delta_payload_counts: [usize; VERSION_COUNT], - pub snapshot_arc_strong_counts: [usize; VERSION_COUNT], - pub rtr_payloads_arc_strong_counts: [usize; VERSION_COUNT], } #[derive(Debug, Clone, Copy, Default, Serialize)] @@ -817,18 +815,11 @@ impl RtrCache { .map(|delta| delta.announced().len() + delta.withdrawn().len()) .sum() }); - let snapshot_arc_strong_counts = - std::array::from_fn(|idx| Arc::strong_count(&self.versions[idx].snapshot)); - let rtr_payloads_arc_strong_counts = - std::array::from_fn(|idx| Arc::strong_count(&self.versions[idx].rtr_payloads)); - CacheMemoryStats { serials: self.serials(), snapshot_payload_counts, delta_lengths, delta_payload_counts, - snapshot_arc_strong_counts, - rtr_payloads_arc_strong_counts, } } diff --git a/src/rtr/report.rs b/src/rtr/report.rs index 0fe198f..7c1e930 100644 --- a/src/rtr/report.rs +++ b/src/rtr/report.rs @@ -406,7 +406,7 @@ impl ReportContext { let max_connections = service_stats.max_connections(); let generated_at = self.report_now(timezone); let metadata = ReportMetadata { - schema_version: 2, + schema_version: 1, generated_at, phase: phase.to_string(), }; diff --git a/tests/test_rtr_report.rs b/tests/test_rtr_report.rs index 7ef284a..591c92d 100644 --- a/tests/test_rtr_report.rs +++ b/tests/test_rtr_report.rs @@ -44,7 +44,7 @@ fn write_report_creates_parseable_json() { ); let source_report = read_single_report(&report_dir, "rtr-source"); - assert_eq!(source_report["schema_version"], 2); + assert_eq!(source_report["schema_version"], 1); assert_eq!(source_report["phase"], "test"); assert_report_time_offset(&source_report["generated_at"]); assert_report_time_offset(&source_report["cache"]["created_at"]);