Fix tests

Author: kyli87

ffi/src/ffi_tracing.rs

@@ -1,7 +1,7 @@
 //! FFI functions to allow engines to receive log, tracing, and metrics events from kernel.
 //!
 //! We use a single global tracing subscriber, registered the first time any of
-//! [`enable_event_tracing`], [`enable_log_line_tracing`], [`enable_formatted_log_line_tracing`], or
+//! [`enable_event_tracing`], [`enable_log_line_tracing`], [`enable_formatted_log_line_tracing`],
 //! [`enable_metrics_reporting`], or [`enable_frame_reporting`] is called. The subscriber has
 //! independent layers for log events, metric reports, and frame lifecycle events:
 //!

kernel/src/metrics/frame_reporter.rs

@@ -162,12 +162,25 @@ mod tests {
 
     #[test]
     fn registers_interest_only_in_marked_spans() {
-        capture(|| {
+        let reporter = Arc::new(CapturingFrameReporter::default());
+        let layer = FrameReporterLayer::new(reporter);
+
+        with_default(Registry::default(), || {
             let unmarked = trace_span!("unmarked-trace");
             let marked = trace_span!("marked-trace", enable_call_frame = Empty);
-
-            assert!(unmarked.is_disabled());
-            assert!(!marked.is_disabled());
+            let unmarked_metadata = unmarked.metadata().unwrap();
+            let marked_metadata = marked.metadata().unwrap();
+
+            assert!(<FrameReporterLayer as Layer<Registry>>::register_callsite(
+                &layer,
+                unmarked_metadata
+            )
+            .is_never());
+            assert!(<FrameReporterLayer as Layer<Registry>>::register_callsite(
+                &layer,
+                marked_metadata
+            )
+            .is_always());
         });
     }