[runtime] Add page cache metrics

.github/scripts/check_conformance_label.sh

@@ -7,11 +7,13 @@ required_labels=(
   breaking-api
 )
 
-# Get changed files
-diff=$(gh pr diff "$PR_NUMBER" --name-only)
+# GitHub may refuse to render full PR diffs once they exceed the API's line cap.
+# Use the paginated files API instead so large PRs still work.
+repo="${GITHUB_REPOSITORY:-$(gh repo view --json nameWithOwner --jq '.nameWithOwner')}"
+files=$(gh api --paginate --slurp "/repos/${repo}/pulls/${PR_NUMBER}/files")
 
 # Filter for conformance.toml files
-changed=$(echo "$diff" | grep 'conformance\.toml$' || true)
+changed=$(jq -r '.[] | .[] | select(.filename | endswith("conformance.toml")) | .filename' <<<"$files")
 
 if [ -z "$changed" ]; then
   echo "No conformance.toml files changed"
@@ -22,21 +24,39 @@ echo "Conformance files changed:"
 echo "$changed"
 echo ""
 
-# Check if any conformance.toml changes include deletions
+# Check if any conformance.toml changes include deletions or other non-additive edits.
+# If GitHub omits the patch for an existing file, require a label conservatively since
+# we can no longer prove the change is additive.
 has_deletions=false
-current_file=""
-while IFS= read -r line; do
-  # Track which file we're in
-  if [[ "$line" =~ ^diff\ --git\ a/(.*)\ b/ ]]; then
-    current_file="${BASH_REMATCH[1]}"
+while IFS= read -r file; do
+  filename=$(jq -r '.filename' <<<"$file")
+  status=$(jq -r '.status' <<<"$file")
+  patch_present=$(jq -r 'has("patch")' <<<"$file")
+
+  if [[ "$status" == "removed" || "$status" == "renamed" ]]; then
+    has_deletions=true
+    echo "Deletion/modification found in: $filename ($status)"
+    break
   fi
-  # If we're in a conformance.toml file and see a deletion line (starts with - but not ---)
-  if [[ "$current_file" == *conformance.toml ]] && [[ "$line" =~ ^-[^-] ]]; then
+
+  if [[ "$status" != "added" && "$patch_present" != "true" ]]; then
     has_deletions=true
-    echo "Deletion/modification found in: $current_file"
+    echo "Unable to inspect patch for existing conformance file: $filename"
     break
   fi
-done < <(gh pr diff "$PR_NUMBER")
+
+  if jq -e '
+    (.patch // "")
+    | split("\n")
+    | any(startswith("-") and (startswith("---") | not))
+  ' <<<"$file" >/dev/null; then
+    has_deletions=true
+    echo "Deletion/modification found in: $filename"
+    break
+  fi
+done < <(
+  jq -c '.[] | .[] | select(.filename | endswith("conformance.toml"))' <<<"$files"
+)
 
 if [ "$has_deletions" = "false" ]; then
   echo "All conformance.toml changes are additive, no label required"

broadcast/fuzz/fuzz_targets/broadcast_engine_operations.rs

@@ -12,7 +12,7 @@ use commonware_cryptography::{
     Digestible, Hasher, Sha256, Signer,
 };
 use commonware_p2p::{simulated::Network, Recipients};
-use commonware_runtime::{deterministic, Buf, BufMut, Clock, Metrics, Quota, Runner};
+use commonware_runtime::{deterministic, Buf, BufMut, Clock, Quota, Runner, Supervisor};
 use commonware_utils::NZUsize;
 use libfuzzer_sys::fuzz_target;
 use rand::{seq::SliceRandom, SeedableRng};
@@ -183,7 +183,7 @@ fn fuzz(input: FuzzInput) {
 
         // Create network
         let (network, oracle) = Network::<deterministic::Context, PublicKey>::new_with_peers(
-            context.with_label("network"),
+            context.child("network"),
             commonware_p2p::simulated::Config {
                 max_size: 1024 * 1024,
                 disconnect_on_block: false,
@@ -215,7 +215,7 @@ fn fuzz(input: FuzzInput) {
             };
 
             // Create engine
-            let engine_context = context.with_label("peer").with_attribute("index", i);
+            let engine_context = context.child("peer").with_attribute("index", i);
             let (engine, mailbox) =
                 Engine::<_, PublicKey, FuzzMessage, _>::new(engine_context, config);
             mailboxes.insert(public_key.clone(), mailbox);

broadcast/src/buffered/engine.rs

@@ -120,8 +120,7 @@ where
         let (mailbox_sender, mailbox_receiver) = mpsc::channel(cfg.mailbox_size);
         let mailbox = Mailbox::<P, M>::new(mailbox_sender);
 
-        // TODO(#1833): Metrics should use the post-start context
-        let metrics = metrics::Metrics::init(context.clone());
+        let metrics = metrics::Metrics::init(&context);
 
         let result = Self {
             context: ContextCell::new(context),

broadcast/src/buffered/metrics.rs

@@ -22,7 +22,6 @@ impl SequencerLabel {
 }
 
 /// Metrics for the [super::Engine]
-#[derive(Default)]
 pub struct Metrics {
     /// Number of broadcasts received by peer
     pub peer: Family<SequencerLabel, Counter>,
@@ -39,33 +38,33 @@ pub struct Metrics {
 
 impl Metrics {
     /// Create and return a new set of metrics, registered with the given context.
-    pub fn init<E: RuntimeMetrics>(context: E) -> Self {
-        let metrics = Self::default();
-        context.register(
-            "peer",
-            "Number of broadcasts received by peer",
-            metrics.peer.clone(),
-        );
-        context.register(
-            "receive",
-            "Number of received messages by status",
-            metrics.receive.clone(),
-        );
-        context.register(
-            "subscribe",
-            "Number of `subscribe` requests by status",
-            metrics.subscribe.clone(),
-        );
-        context.register(
-            "get",
-            "Number of `get` requests by status",
-            metrics.get.clone(),
-        );
-        context.register(
-            "waiters",
-            "Number of digests being awaited",
-            metrics.waiters.clone(),
-        );
-        metrics
+    pub fn init<E: RuntimeMetrics>(context: &E) -> Self {
+        Self {
+            peer: context.register(
+                "peer",
+                "Number of broadcasts received by peer",
+                Family::default(),
+            ),
+            receive: context.register(
+                "receive",
+                "Number of received messages by status",
+                status::Counter::default(),
+            ),
+            subscribe: context.register(
+                "subscribe",
+                "Number of `subscribe` requests by status",
+                status::Counter::default(),
+            ),
+            get: context.register(
+                "get",
+                "Number of `get` requests by status",
+                status::Counter::default(),
+            ),
+            waiters: context.register(
+                "waiters",
+                "Number of digests being awaited",
+                Gauge::default(),
+            ),
+        }
     }
 }