containerd
/
rust-extensions
mirror of https://github.com/containerd/rust-extensions.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

remove parent attribute in tracing macro 

Signed-off-by: jiaxiao zhou <jiazho@microsoft.com>
This commit is contained in:
jiaxiao zhou 2024-05-20 18:35:56 +00:00 committed by Maksym Pavlenko
parent 1a905f4daf
commit 200f788a0d
5 changed files with 30 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
crates/shim/src/args.rs
View File

@ -44,7 +44,7 @@ pub struct Flags {
} }
/// Parses command line arguments passed to the shim. /// Parses command line arguments passed to the shim.
#[cfg_attr(feature = "tracing", tracing::instrument(parent = tracing::Span::current(), skip_all, level = "Info"))] #[cfg_attr(feature = "tracing", tracing::instrument(skip_all, level = "Info"))]
pub fn parse<S: AsRef<OsStr>>(args: &[S]) -> Result<Flags> { pub fn parse<S: AsRef<OsStr>>(args: &[S]) -> Result<Flags> {
let mut flags = Flags::default(); let mut flags = Flags::default();

18
crates/shim/src/asynchronous/mod.rs
View File

@ -99,7 +99,7 @@ pub trait Shim {
} }
/// Async Shim entry point that must be invoked from tokio `main`. /// Async Shim entry point that must be invoked from tokio `main`.
#[cfg_attr(feature = "tracing", tracing::instrument(parent = tracing::Span::current(), level = "info"))] #[cfg_attr(feature = "tracing", tracing::instrument(level = "info"))]
pub async fn run<T>(runtime_id: &str, opts: Option<Config>) pub async fn run<T>(runtime_id: &str, opts: Option<Config>)
where where
T: Shim + Send + Sync + 'static, T: Shim + Send + Sync + 'static,
@ -110,7 +110,7 @@ where
} }
} }
#[cfg_attr(feature = "tracing", tracing::instrument(parent = tracing::Span::current(), level = "info"))] #[cfg_attr(feature = "tracing", tracing::instrument(level = "info"))]
async fn bootstrap<T>(runtime_id: &str, opts: Option<Config>) -> Result<()> async fn bootstrap<T>(runtime_id: &str, opts: Option<Config>) -> Result<()>
where where
T: Shim + Send + Sync + 'static, T: Shim + Send + Sync + 'static,
@ -241,7 +241,7 @@ impl ExitSignal {
/// Spawn is a helper func to launch shim process asynchronously. /// Spawn is a helper func to launch shim process asynchronously.
/// Typically this expected to be called from `StartShim`. /// Typically this expected to be called from `StartShim`.
#[cfg_attr(feature = "tracing", tracing::instrument(parent = tracing::Span::current(), level = "info"))] #[cfg_attr(feature = "tracing", tracing::instrument(level = "info"))]
pub async fn spawn(opts: StartOpts, grouping: &str, vars: Vec<(&str, &str)>) -> Result<String> { pub async fn spawn(opts: StartOpts, grouping: &str, vars: Vec<(&str, &str)>) -> Result<String> {
let cmd = env::current_exe().map_err(io_error!(e, ""))?; let cmd = env::current_exe().map_err(io_error!(e, ""))?;
let cwd = env::current_dir().map_err(io_error!(e, ""))?; let cwd = env::current_dir().map_err(io_error!(e, ""))?;
@ -302,7 +302,7 @@ pub async fn spawn(opts: StartOpts, grouping: &str, vars: Vec<(&str, &str)>) ->
Ok(address) Ok(address)
} }
#[cfg_attr(feature = "tracing", tracing::instrument(parent = tracing::Span::current(), skip_all, level = "info"))] #[cfg_attr(feature = "tracing", tracing::instrument(skip_all, level = "info"))]
fn setup_signals_tokio(config: &Config) -> Signals { fn setup_signals_tokio(config: &Config) -> Signals {
if config.no_reaper { if config.no_reaper {
Signals::new([SIGTERM, SIGINT, SIGPIPE]).expect("new signal failed") Signals::new([SIGTERM, SIGINT, SIGPIPE]).expect("new signal failed")
@ -311,7 +311,7 @@ fn setup_signals_tokio(config: &Config) -> Signals {
} }
} }
#[cfg_attr(feature = "tracing", tracing::instrument(parent = tracing::Span::current(), skip_all, level = "info"))] #[cfg_attr(feature = "tracing", tracing::instrument(skip_all, level = "info"))]
async fn handle_signals(signals: Signals) { async fn handle_signals(signals: Signals) {
let mut signals = signals.fuse(); let mut signals = signals.fuse();
while let Some(sig) = signals.next().await { while let Some(sig) = signals.next().await {
@ -365,14 +365,14 @@ async fn handle_signals(signals: Signals) {
} }
} }
#[cfg_attr(feature = "tracing", tracing::instrument(parent = tracing::Span::current(), level = "info"))] #[cfg_attr(feature = "tracing", tracing::instrument(level = "info"))]
async fn remove_socket_silently(address: &str) { async fn remove_socket_silently(address: &str) {
remove_socket(address) remove_socket(address)
.await .await
.unwrap_or_else(|e| warn!("failed to remove socket: {}", e)) .unwrap_or_else(|e| warn!("failed to remove socket: {}", e))
} }
#[cfg_attr(feature = "tracing", tracing::instrument(parent = tracing::Span::current(), level = "info"))] #[cfg_attr(feature = "tracing", tracing::instrument(level = "info"))]
async fn remove_socket(address: &str) -> Result<()> { async fn remove_socket(address: &str) -> Result<()> {
let path = parse_sockaddr(address); let path = parse_sockaddr(address);
if let Ok(md) = Path::new(path).metadata() { if let Ok(md) = Path::new(path).metadata() {
@ -387,7 +387,7 @@ async fn remove_socket(address: &str) -> Result<()> {
Ok(()) Ok(())
} }
#[cfg_attr(feature = "tracing", tracing::instrument(parent = tracing::Span::current(), skip_all, level = "info"))] #[cfg_attr(feature = "tracing", tracing::instrument(skip_all, level = "info"))]
async fn start_listener(address: &str) -> Result<UnixListener> { async fn start_listener(address: &str) -> Result<UnixListener> {
let addr = address.to_string(); let addr = address.to_string();
asyncify(move || -> Result<UnixListener> { asyncify(move || -> Result<UnixListener> {
@ -399,7 +399,7 @@ async fn start_listener(address: &str) -> Result<UnixListener> {
.await .await
} }
#[cfg_attr(feature = "tracing", tracing::instrument(parent = tracing::Span::current(), level = "info"))] #[cfg_attr(feature = "tracing", tracing::instrument(level = "info"))]
async fn wait_socket_working(address: &str, interval_in_ms: u64, count: u32) -> Result<()> { async fn wait_socket_working(address: &str, interval_in_ms: u64, count: u32) -> Result<()> {
for _i in 0..count { for _i in 0..count {
match Client::connect(address) { match Client::connect(address) {

20
crates/shim/src/cgroup.rs
View File

@ -37,7 +37,7 @@ use crate::error::{Error, Result};
// OOM_SCORE_ADJ_MAX is from https://github.com/torvalds/linux/blob/master/include/uapi/linux/oom.h#L10 // OOM_SCORE_ADJ_MAX is from https://github.com/torvalds/linux/blob/master/include/uapi/linux/oom.h#L10
const OOM_SCORE_ADJ_MAX: i64 = 1000; const OOM_SCORE_ADJ_MAX: i64 = 1000;
#[cfg_attr(feature = "tracing", tracing::instrument(parent = tracing::Span::current(), level = "Info"))] #[cfg_attr(feature = "tracing", tracing::instrument(level = "Info"))]
pub fn set_cgroup_and_oom_score(pid: u32) -> Result<()> { pub fn set_cgroup_and_oom_score(pid: u32) -> Result<()> {
if pid == 0 { if pid == 0 {
return Ok(()); return Ok(());
@ -63,7 +63,7 @@ pub fn set_cgroup_and_oom_score(pid: u32) -> Result<()> {
} }
/// Add a process to the given relative cgroup path /// Add a process to the given relative cgroup path
#[cfg_attr(feature = "tracing", tracing::instrument(parent = tracing::Span::current(), level = "Info"))] #[cfg_attr(feature = "tracing", tracing::instrument(level = "Info"))]
pub fn add_task_to_cgroup(path: &str, pid: u32) -> Result<()> { pub fn add_task_to_cgroup(path: &str, pid: u32) -> Result<()> {
let h = hierarchies::auto(); let h = hierarchies::auto();
// use relative path here, need to trim prefix '/' // use relative path here, need to trim prefix '/'
@ -76,7 +76,7 @@ pub fn add_task_to_cgroup(path: &str, pid: u32) -> Result<()> {
/// Sets the OOM score for the process to the parents OOM score + 1 /// Sets the OOM score for the process to the parents OOM score + 1
/// to ensure that they parent has a lower score than the shim /// to ensure that they parent has a lower score than the shim
#[cfg_attr(feature = "tracing", tracing::instrument(parent = tracing::Span::current(), level = "Info"))] #[cfg_attr(feature = "tracing", tracing::instrument(level = "Info"))]
pub fn adjust_oom_score(pid: u32) -> Result<()> { pub fn adjust_oom_score(pid: u32) -> Result<()> {
let score = read_process_oom_score(std::os::unix::process::parent_id())?; let score = read_process_oom_score(std::os::unix::process::parent_id())?;
if score < OOM_SCORE_ADJ_MAX { if score < OOM_SCORE_ADJ_MAX {
@ -85,7 +85,7 @@ pub fn adjust_oom_score(pid: u32) -> Result<()> {
Ok(()) Ok(())
} }
#[cfg_attr(feature = "tracing", tracing::instrument(parent = tracing::Span::current(), level = "info"))] #[cfg_attr(feature = "tracing", tracing::instrument(level = "info"))]
fn read_process_oom_score(pid: u32) -> Result<i64> { fn read_process_oom_score(pid: u32) -> Result<i64> {
let content = fs::read_to_string(format!("/proc/{}/oom_score_adj", pid)) let content = fs::read_to_string(format!("/proc/{}/oom_score_adj", pid))
.map_err(io_error!(e, "read oom score"))?; .map_err(io_error!(e, "read oom score"))?;
@ -96,14 +96,14 @@ fn read_process_oom_score(pid: u32) -> Result<i64> {
Ok(score) Ok(score)
} }
#[cfg_attr(feature = "tracing", tracing::instrument(parent = tracing::Span::current(), level = "info"))] #[cfg_attr(feature = "tracing", tracing::instrument(level = "info"))]
fn write_process_oom_score(pid: u32, score: i64) -> Result<()> { fn write_process_oom_score(pid: u32, score: i64) -> Result<()> {
fs::write(format!("/proc/{}/oom_score_adj", pid), score.to_string()) fs::write(format!("/proc/{}/oom_score_adj", pid), score.to_string())
.map_err(io_error!(e, "write oom score")) .map_err(io_error!(e, "write oom score"))
} }
/// Collect process cgroup stats, return only necessary parts of it /// Collect process cgroup stats, return only necessary parts of it
#[cfg_attr(feature = "tracing", tracing::instrument(parent = tracing::Span::current(), level = "info"))] #[cfg_attr(feature = "tracing", tracing::instrument(level = "info"))]
pub fn collect_metrics(pid: u32) -> Result<Metrics> { pub fn collect_metrics(pid: u32) -> Result<Metrics> {
let mut metrics = Metrics::new(); let mut metrics = Metrics::new();
@ -185,7 +185,7 @@ pub fn collect_metrics(pid: u32) -> Result<Metrics> {
} }
// get_cgroup will return either cgroup v1 or v2 depending on system configuration // get_cgroup will return either cgroup v1 or v2 depending on system configuration
#[cfg_attr(feature = "tracing", tracing::instrument(parent = tracing::Span::current(), level = "info"))] #[cfg_attr(feature = "tracing", tracing::instrument(level = "info"))]
fn get_cgroup(pid: u32) -> Result<Cgroup> { fn get_cgroup(pid: u32) -> Result<Cgroup> {
let hierarchies = hierarchies::auto(); let hierarchies = hierarchies::auto();
let cgroup = if hierarchies.v2() { let cgroup = if hierarchies.v2() {
@ -201,7 +201,7 @@ fn get_cgroup(pid: u32) -> Result<Cgroup> {
} }
/// Get the cgroups v2 path given a PID /// Get the cgroups v2 path given a PID
#[cfg_attr(feature = "tracing", tracing::instrument(parent = tracing::Span::current(), level = "info"))] #[cfg_attr(feature = "tracing", tracing::instrument(level = "info"))]
pub fn get_cgroups_v2_path_by_pid(pid: u32) -> Result<PathBuf> { pub fn get_cgroups_v2_path_by_pid(pid: u32) -> Result<PathBuf> {
// todo: should upstream to cgroups-rs // todo: should upstream to cgroups-rs
let path = format!("/proc/{}/cgroup", pid); let path = format!("/proc/{}/cgroup", pid);
@ -215,7 +215,7 @@ pub fn get_cgroups_v2_path_by_pid(pid: u32) -> Result<PathBuf> {
} }
// https://github.com/opencontainers/runc/blob/1950892f69597aa844cbf000fbdf77610dda3a44/libcontainer/cgroups/fs2/defaultpath.go#L83 // https://github.com/opencontainers/runc/blob/1950892f69597aa844cbf000fbdf77610dda3a44/libcontainer/cgroups/fs2/defaultpath.go#L83
#[cfg_attr(feature = "tracing", tracing::instrument(parent = tracing::Span::current(), level = "info"))] #[cfg_attr(feature = "tracing", tracing::instrument(level = "info"))]
fn parse_cgroups_v2_path(content: &str) -> Result<PathBuf> { fn parse_cgroups_v2_path(content: &str) -> Result<PathBuf> {
// the entry for cgroup v2 is always in the format like `0::$PATH` // the entry for cgroup v2 is always in the format like `0::$PATH`
// where 0 is the hierarchy ID, the controller name is omitted in cgroup v2 // where 0 is the hierarchy ID, the controller name is omitted in cgroup v2
@ -231,7 +231,7 @@ fn parse_cgroups_v2_path(content: &str) -> Result<PathBuf> {
} }
/// Update process cgroup limits /// Update process cgroup limits
#[cfg_attr(feature = "tracing", tracing::instrument(parent = tracing::Span::current(), level = "info"))] #[cfg_attr(feature = "tracing", tracing::instrument(level = "info"))]
pub fn update_resources(pid: u32, resources: &LinuxResources) -> Result<()> { pub fn update_resources(pid: u32, resources: &LinuxResources) -> Result<()> {
// get container main process cgroup // get container main process cgroup
let cgroup = get_cgroup(pid)?; let cgroup = get_cgroup(pid)?;

2
crates/shim/src/lib.rs
View File

@ -168,7 +168,7 @@ pub const SOCKET_ROOT: &str = "/var/run/containerd";
pub const SOCKET_ROOT: &str = r"\\.\pipe\containerd-containerd"; pub const SOCKET_ROOT: &str = r"\\.\pipe\containerd-containerd";
/// Make socket path from containerd socket path, namespace and id. /// Make socket path from containerd socket path, namespace and id.
#[cfg_attr(feature = "tracing", tracing::instrument(parent = tracing::Span::current(), level = "Info"))] #[cfg_attr(feature = "tracing", tracing::instrument(level = "Info"))]
pub fn socket_address(socket_path: &str, namespace: &str, id: &str) -> String { pub fn socket_address(socket_path: &str, namespace: &str, id: &str) -> String {
let path = PathBuf::from(socket_path) let path = PathBuf::from(socket_path)
.join(namespace) .join(namespace)

18
crates/shim/src/synchronous/mod.rs
View File

@ -182,7 +182,7 @@ pub trait Shim {
} }
/// Shim entry point that must be invoked from `main`. /// Shim entry point that must be invoked from `main`.
#[cfg_attr(feature = "tracing", tracing::instrument(parent = tracing::Span::current(), level = "info"))] #[cfg_attr(feature = "tracing", tracing::instrument(level = "info"))]
pub fn run<T>(runtime_id: &str, opts: Option<Config>) pub fn run<T>(runtime_id: &str, opts: Option<Config>)
where where
T: Shim + Send + Sync + 'static, T: Shim + Send + Sync + 'static,
@ -193,7 +193,7 @@ where
} }
} }
#[cfg_attr(feature = "tracing", tracing::instrument(parent = tracing::Span::current(), level = "info"))] #[cfg_attr(feature = "tracing", tracing::instrument(level = "info"))]
fn bootstrap<T>(runtime_id: &str, opts: Option<Config>) -> Result<()> fn bootstrap<T>(runtime_id: &str, opts: Option<Config>) -> Result<()>
where where
T: Shim + Send + Sync + 'static, T: Shim + Send + Sync + 'static,
@ -291,7 +291,7 @@ where
} }
} }
#[cfg_attr(feature = "tracing", tracing::instrument(parent = tracing::Span::current(), skip_all, level = "info"))] #[cfg_attr(feature = "tracing", tracing::instrument(skip_all, level = "info"))]
fn create_server(_flags: args::Flags) -> Result<Server> { fn create_server(_flags: args::Flags) -> Result<Server> {
let mut server = Server::new(); let mut server = Server::new();
@ -309,7 +309,7 @@ fn create_server(_flags: args::Flags) -> Result<Server> {
Ok(server) Ok(server)
} }
#[cfg_attr(feature = "tracing", tracing::instrument(parent = tracing::Span::current(), skip_all, level = "info"))] #[cfg_attr(feature = "tracing", tracing::instrument(skip_all, level = "info"))]
fn setup_signals(_config: &Config) -> Option<AppSignals> { fn setup_signals(_config: &Config) -> Option<AppSignals> {
#[cfg(unix)] #[cfg(unix)]
{ {
@ -345,7 +345,7 @@ unsafe extern "system" fn signal_handler(_: u32) -> i32 {
1 1
} }
#[cfg_attr(feature = "tracing", tracing::instrument(parent = tracing::Span::current(), skip_all, level = "info"))] #[cfg_attr(feature = "tracing", tracing::instrument(skip_all, level = "info"))]
fn handle_signals(mut _signals: Option<AppSignals>) { fn handle_signals(mut _signals: Option<AppSignals>) {
#[cfg(unix)] #[cfg(unix)]
{ {
@ -407,7 +407,7 @@ fn handle_signals(mut _signals: Option<AppSignals>) {
} }
} }
#[cfg_attr(feature = "tracing", tracing::instrument(parent = tracing::Span::current(), level = "info"))] #[cfg_attr(feature = "tracing", tracing::instrument(level = "info"))]
fn wait_socket_working(address: &str, interval_in_ms: u64, count: u32) -> Result<()> { fn wait_socket_working(address: &str, interval_in_ms: u64, count: u32) -> Result<()> {
for _i in 0..count { for _i in 0..count {
match Client::connect(address) { match Client::connect(address) {
@ -422,12 +422,12 @@ fn wait_socket_working(address: &str, interval_in_ms: u64, count: u32) -> Result
Err(other!("time out waiting for socket {}", address)) Err(other!("time out waiting for socket {}", address))
} }
#[cfg_attr(feature = "tracing", tracing::instrument(parent = tracing::Span::current(), level = "info"))] #[cfg_attr(feature = "tracing", tracing::instrument(level = "info"))]
fn remove_socket_silently(address: &str) { fn remove_socket_silently(address: &str) {
remove_socket(address).unwrap_or_else(|e| warn!("failed to remove file {} {:?}", address, e)) remove_socket(address).unwrap_or_else(|e| warn!("failed to remove file {} {:?}", address, e))
} }
#[cfg_attr(feature = "tracing", tracing::instrument(parent = tracing::Span::current(), level = "info"))] #[cfg_attr(feature = "tracing", tracing::instrument(level = "info"))]
fn remove_socket(address: &str) -> Result<()> { fn remove_socket(address: &str) -> Result<()> {
#[cfg(unix)] #[cfg(unix)]
{ {
@ -456,7 +456,7 @@ fn remove_socket(address: &str) -> Result<()> {
/// Spawn is a helper func to launch shim process. /// Spawn is a helper func to launch shim process.
/// Typically this expected to be called from `StartShim`. /// Typically this expected to be called from `StartShim`.
#[cfg_attr(feature = "tracing", tracing::instrument(parent = tracing::Span::current(), level = "info"))] #[cfg_attr(feature = "tracing", tracing::instrument(level = "info"))]
pub fn spawn(opts: StartOpts, grouping: &str, vars: Vec<(&str, &str)>) -> Result<(u32, String)> { pub fn spawn(opts: StartOpts, grouping: &str, vars: Vec<(&str, &str)>) -> Result<(u32, String)> {
let cmd = env::current_exe().map_err(io_error!(e, ""))?; let cmd = env::current_exe().map_err(io_error!(e, ""))?;
let cwd = env::current_dir().map_err(io_error!(e, ""))?; let cwd = env::current_dir().map_err(io_error!(e, ""))?;