aya: use Pid for uprobe scope

Update UProbeScope::OneProcess to take Pid instead of exposing
NonZeroU32 directly. This keeps the uprobe process scope API aligned
with PerfEventScope while preserving the non-zero PID invariant.

Update the uprobe scope integration test and public API fixture.

Author: swananan

aya/src/programs/uprobe.rs

@@ -6,7 +6,6 @@ use std::{
     fmt::{self, Write},
     fs,
     io::{self, BufRead as _, Cursor, Read as _},
-    num::NonZeroU32,
     os::unix::ffi::{OsStrExt as _, OsStringExt as _},
     path::{Path, PathBuf},
     sync::LazyLock,
@@ -19,7 +18,7 @@ use thiserror::Error;
 use crate::{
     VerifierLogLevel,
     programs::{
-        ProgramData, ProgramError, ProgramType, define_link_wrapper, impl_try_from_fdlink,
+        Pid, ProgramData, ProgramError, ProgramType, define_link_wrapper, impl_try_from_fdlink,
         impl_try_into_fdlink, load_program_without_attach_type,
         perf_attach::{PerfLinkIdInner, PerfLinkInner},
         probe::{OsStringExt as _, Probe, ProbeKind, attach},
@@ -97,7 +96,7 @@ pub enum UProbeScope {
     /// Fire only when the calling process/thread hits the attach point.
     CallingProcess,
     /// Fire only when the given process hits the attach point.
-    OneProcess(NonZeroU32),
+    OneProcess(Pid),
 }
 
 impl UProbe {

test/integration-test/src/tests/load.rs

@@ -1,14 +1,12 @@
-use std::{
-    convert::TryInto as _, fs::remove_file, num::NonZeroU32, path::Path, thread, time::Duration,
-};
+use std::{convert::TryInto as _, fs::remove_file, path::Path, thread, time::Duration};
 
 use assert_matches::assert_matches;
 use aya::{
     Ebpf,
     maps::{Array, RingBuf},
     pin::PinError,
     programs::{
-        FlowDissector, KProbe, LinkOrder, ProbeKind, Program, ProgramError, SchedClassifier,
+        FlowDissector, KProbe, LinkOrder, Pid, ProbeKind, Program, ProgramError, SchedClassifier,
         TcAttachType, TracePoint, UProbe, Xdp, XdpFlags,
         flow_dissector::{FlowDissectorLink, FlowDissectorLinkId},
         kprobe::{KProbeLink, KProbeLinkId},
@@ -370,7 +368,7 @@ fn basic_tracepoint() {
 #[test_case(UProbeScope::AllProcesses; "all_processes")]
 #[test_case(UProbeScope::CallingProcess; "calling_process")]
 #[test_case(
-    UProbeScope::OneProcess(NonZeroU32::new(std::process::id()).unwrap());
+    UProbeScope::OneProcess(Pid::current());
     "one_process"
 )]
 #[test_log::test]

xtask/public-api/aya.txt

@@ -4769,7 +4769,7 @@ impl !core::panic::unwind_safe::UnwindSafe for aya::programs::uprobe::UProbeErro
 pub enum aya::programs::uprobe::UProbeScope
 pub aya::programs::uprobe::UProbeScope::AllProcesses
 pub aya::programs::uprobe::UProbeScope::CallingProcess
-pub aya::programs::uprobe::UProbeScope::OneProcess(core::num::nonzero::NonZeroU32)
+pub aya::programs::uprobe::UProbeScope::OneProcess(aya::programs::Pid)
 impl core::clone::Clone for aya::programs::uprobe::UProbeScope
 pub fn aya::programs::uprobe::UProbeScope::clone(&self) -> aya::programs::uprobe::UProbeScope
 impl core::fmt::Debug for aya::programs::uprobe::UProbeScope