v0.34.0_1

scripts/tests/cache_hot_034_static_test.py

@@ -12,17 +12,21 @@ assert 'headers: Arc<HeaderMap>' in entry
 assert 'Arc::clone(&entry.headers)' in hot
 assert 'drop(store);' in hot
 assert hot.index('drop(store);\n\n                let mut response') < hot.index('headers.as_ref().clone()')
-assert 'store.saved_body_hit(&ticket.scope, &ticket.domain, body_bytes)' in hot
+assert 'self.domain_stats.saved_body_hit(&ticket.scope, &ticket.domain, body_bytes)' in hot
 assert 'store.lru.remove(&old_sequence)' in hot and 'store.lru.insert(sequence, storage_key)' in hot
 assert '.sweep()' not in hot
 assert 'fn sweep(' not in entry
-assert 'fn saved_body_hit(' in entry
-assert 'domains: BTreeMap<String, BTreeMap<String, DomainCounters>>' in entry
+stats = read('src/cache/stats.rs')
+assert 'fn saved_body_hit(' in stats
+assert 'const DOMAIN_STATS_LIMIT: usize = 4096' in stats
+assert 'ArcSwap<PublishedDomains>' in stats
+assert 'fn record_reason(&self, reason:' in stats
+assert 'self.store.lock()' not in stats
 assert 'if self.ban_rule_count.load(Ordering::Acquire) == 0' in inv
 assert 'bans.iter().any(|rule| rule.matches_hot' in inv
 assert 'fn matching_hot_key(' in model and 'entry.vary.is_empty()' in model
-assert 'store.domain_count = 0' in dash
-assert 'c.reasons.get_mut(reason)' in dash
+assert 'self.domain_stats.clear()' in dash
+assert 'self.domain_stats.record(scope, domain, outcome, reason);' in dash
 assert 'include!("tests/hot_hit_034_tests.rs")' in read('src/cache/tests.rs')
 for path in (ROOT / 'src').rglob('*.rs'):
     if '/tests/' not in path.as_posix() and path.name != 'tests.rs':

scripts/tests/rps_hotpath_034_static_test.py

@@ -107,6 +107,19 @@ assert "if !headers.contains_key(http::header::COOKIE)" in source("src/proxy/hea
 assert "if !headers.contains_key(http::header::SET_COOKIE)" in source("src/proxy/headers.rs")
 assert 'version = "0.34.0"' in source("Cargo.toml")
 
+# Full exchange duration histogram still exports cumulative Prometheus series,
+# but only one exclusive bucket is updated per request; per-vhost and Docker
+# exporters must reconstruct bucket counts from exactly the same interface.
+histogram = source("src/metrics/vhost.rs")
+exporter = source("src/prometheus/docker_misc.rs")
+assert "let bucket = DURATION_BUCKETS_US.partition_point" in histogram
+assert "self.buckets[bucket].fetch_add(1, Ordering::Relaxed);" in histogram
+assert "pub fn duration_histogram(&self)" in histogram
+assert exporter.count("let (buckets, count) = m.duration_histogram();") == 2
+assert "rust_proxy_vhost_exchange_duration_seconds_bucket" in exporter
+assert "rust_proxy_docker_vhost_exchange_duration_seconds_bucket" in exporter
+assert "exclusive_bins_reconstruct_exact_prometheus_cumulative_boundaries" in source("src/metrics/vhost/tests.rs")
+
 for file in (ROOT / "src").rglob("*.rs"):
     if "/tests/" in file.as_posix() or file.name == "tests.rs":
         continue