Replace procinfo with procfs (#2433)

This PR will replace [procinfo](https://crates.io/crates/procinfo) crate
which is not maintained for over 5 years with
[procfs](https://crates.io/crates/procfs).

Signed-off-by: Pranoy Kumar Kundu <pranoy1998k@gmail.com>

Fixes linkerd/linkerd2/issues/10819

Author: pranoyk

Cargo.lock

@@ -230,7 +230,7 @@ version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766"
 dependencies = [
- "nom 7.1.0",
+ "nom",
 ]
 
 [[package]]
@@ -965,7 +965,7 @@ dependencies = [
  "pin-project",
  "quickcheck",
  "regex",
- "semver 1.0.17",
+ "semver",
  "serde_json",
  "thiserror",
  "tokio",
@@ -1793,7 +1793,7 @@ name = "linkerd-system"
 version = "0.1.0"
 dependencies = [
  "libc",
- "procinfo",
+ "procfs",
  "tracing",
 ]
 
@@ -1934,6 +1934,12 @@ dependencies = [
  "tonic",
 ]
 
+[[package]]
+name = "linux-raw-sys"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f051f77a7c8e6957c0696eac88f26b0117e54f52d3fc682ab19397a8812846a4"
+
 [[package]]
 name = "linux-raw-sys"
 version = "0.3.0"
@@ -2046,12 +2052,6 @@ version = "0.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e5ce46fe64a9d73be07dcbe690a38ce1b293be448fd8ce1e6c1b8062c9f72c6a"
 
-[[package]]
-name = "nom"
-version = "2.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf51a729ecf40266a2368ad335a5fdde43471f545a967109cd62146ecf8b66ff"
-
 [[package]]
 name = "nom"
 version = "7.1.0"
@@ -2218,15 +2218,16 @@ dependencies = [
 ]
 
 [[package]]
-name = "procinfo"
-version = "0.4.2"
+name = "procfs"
+version = "0.15.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ab1427f3d2635891f842892dda177883dca0639e05fe66796a62c9d2f23b49c"
+checksum = "943ca7f9f29bab5844ecd8fdb3992c5969b6622bb9609b9502fef9b4310e3f1f"
 dependencies = [
+ "bitflags 1.3.2",
  "byteorder",
- "libc",
- "nom 2.2.1",
- "rustc_version",
+ "hex",
+ "lazy_static",
+ "rustix 0.36.14",
 ]
 
 [[package]]
@@ -2419,12 +2420,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
 
 [[package]]
-name = "rustc_version"
-version = "0.2.3"
+name = "rustix"
+version = "0.36.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a"
+checksum = "14e4d67015953998ad0eb82887a0eb0129e18a7e2f3b7b0f6c422fddcd503d62"
 dependencies = [
- "semver 0.9.0",
+ "bitflags 1.3.2",
+ "errno",
+ "io-lifetimes",
+ "libc",
+ "linux-raw-sys 0.1.4",
+ "windows-sys 0.45.0",
 ]
 
 [[package]]
@@ -2437,7 +2443,7 @@ dependencies = [
  "errno",
  "io-lifetimes",
  "libc",
- "linux-raw-sys",
+ "linux-raw-sys 0.3.0",
  "windows-sys 0.45.0",
 ]
 
@@ -2500,27 +2506,12 @@ dependencies = [
  "untrusted",
 ]
 
-[[package]]
-name = "semver"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403"
-dependencies = [
- "semver-parser",
-]
-
 [[package]]
 name = "semver"
 version = "1.0.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bebd363326d05ec3e2f532ab7660680f3b02130d780c299bca73469d521bc0ed"
 
-[[package]]
-name = "semver-parser"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3"
-
 [[package]]
 name = "serde"
 version = "1.0.159"
@@ -2630,7 +2621,7 @@ dependencies = [
  "cfg-if",
  "fastrand",
  "redox_syscall 0.3.5",
- "rustix",
+ "rustix 0.37.4",
  "windows-sys 0.45.0",
 ]
 

deny.toml

@@ -64,8 +64,9 @@ skip = [
     { name = "bitflags", version = "1" },
 ]
 skip-tree = [
-    # Hasn't seen a new release since 2017. Pulls in an older version of nom.
-    { name = "procinfo" },
+    # right now we have a mix of versions of this crate in the ecosystem
+    # procfs uses 0.36.14, tempfile uses 0.37.4
+    { name = "rustix" },
 ]
 
 [sources]

linkerd/app/core/src/telemetry/process.rs

@@ -161,7 +161,7 @@ mod linux {
             };
 
             if let Some(mpt) = self.ms_per_tick {
-                let clock_ticks = stat.utime as u64 + stat.stime as u64;
+                let clock_ticks = stat.utime + stat.stime;
                 let cpu_ms = clock_ticks * mpt;
                 process_cpu_seconds_total.fmt_help(f)?;
                 process_cpu_seconds_total.fmt_metric(f, &Counter::from(cpu_ms))?;
@@ -170,11 +170,11 @@ mod linux {
             }
 
             process_virtual_memory_bytes.fmt_help(f)?;
-            process_virtual_memory_bytes.fmt_metric(f, &Gauge::from(stat.vsize as u64))?;
+            process_virtual_memory_bytes.fmt_metric(f, &Gauge::from(stat.vsize))?;
 
             if let Some(ps) = self.page_size {
                 process_resident_memory_bytes.fmt_help(f)?;
-                process_resident_memory_bytes.fmt_metric(f, &Gauge::from(stat.rss as u64 * ps))?;
+                process_resident_memory_bytes.fmt_metric(f, &Gauge::from(stat.rss * ps))?;
             } else {
                 warn!("Could not determine process_resident_memory_bytes");
             }
@@ -190,8 +190,7 @@ mod linux {
             }
 
             match sys::max_fds() {
-                Ok(None) => {}
-                Ok(Some(max_fds)) => {
+                Ok(max_fds) => {
                     process_max_fds.fmt_help(f)?;
                     process_max_fds.fmt_metric(f, &max_fds.into())?;
                 }

linkerd/system/Cargo.toml

@@ -14,4 +14,4 @@ tracing = "0.1"
 
 [target.'cfg(target_os = "linux")'.dependencies]
 libc = "0.2"
-procinfo = "0.4"
+procfs = { version = "0.15.1", default-features = false }

linkerd/system/src/linux.rs

@@ -1,9 +1,12 @@
 use libc::{self, pid_t};
-use procinfo::pid;
+use procfs::{
+    process::{self, LimitValue, Process},
+    ProcResult,
+};
 use std::{fs, io};
 use tracing::{error, warn};
 
-pub use procinfo::pid::Stat;
+pub use process::Stat;
 
 pub fn page_size() -> io::Result<u64> {
     sysconf(libc::_SC_PAGESIZE, "page size")
@@ -24,8 +27,8 @@ pub fn ms_per_tick() -> io::Result<u64> {
     Ok(ms_per_tick)
 }
 
-pub fn blocking_stat() -> io::Result<Stat> {
-    pid::stat_self()
+pub fn blocking_stat() -> ProcResult<Stat> {
+    Process::myself()?.stat()
 }
 
 pub fn open_fds(pid: pid_t) -> io::Result<u64> {
@@ -38,10 +41,15 @@ pub fn open_fds(pid: pid_t) -> io::Result<u64> {
     Ok(open)
 }
 
-pub fn max_fds() -> io::Result<Option<u64>> {
-    let limit = pid::limits_self()?.max_open_files;
-    let max_fds = limit.soft.or(limit.hard).map(|max| max as u64);
-    Ok(max_fds)
+pub fn max_fds() -> ProcResult<u64> {
+    let limits = Process::myself()?.limits()?.max_open_files;
+    match limits.soft_limit {
+        LimitValue::Unlimited => match limits.hard_limit {
+            LimitValue::Unlimited => Ok(0),
+            LimitValue::Value(hard) => Ok(hard),
+        },
+        LimitValue::Value(soft) => Ok(soft),
+    }
 }
 
 #[allow(unsafe_code)]