From 038a8301fc583aba4e71e5991b6a9e0d6702d93f Mon Sep 17 00:00:00 2001 From: Nick Larsen Date: Fri, 25 Apr 2025 14:22:47 +0200 Subject: [PATCH 1/2] chore: Remove instrumentation from trivial functions Note: These functions are not cpu/io bound, so they are rather uninteresting in the context of tracing. --- crates/stackable-operator/src/builder/pod/container.rs | 2 -- crates/stackable-operator/src/builder/pod/mod.rs | 3 +-- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/crates/stackable-operator/src/builder/pod/container.rs b/crates/stackable-operator/src/builder/pod/container.rs index fc5cafec..7ab5cbc5 100644 --- a/crates/stackable-operator/src/builder/pod/container.rs +++ b/crates/stackable-operator/src/builder/pod/container.rs @@ -7,7 +7,6 @@ use k8s_openapi::api::core::v1::{ SecurityContext, VolumeMount, }; use snafu::{ResultExt as _, Snafu}; -use tracing::instrument; #[cfg(doc)] use {k8s_openapi::api::core::v1::PodSpec, std::collections::BTreeMap}; @@ -211,7 +210,6 @@ impl ContainerBuilder { /// /// Previously, this function unconditionally added [`VolumeMount`]s, which resulted in invalid /// [`PodSpec`]s. - #[instrument(skip(self))] fn add_volume_mount_impl(&mut self, volume_mount: VolumeMount) -> Result<&mut Self> { if let Some(existing_volume_mount) = self.volume_mounts.get(&volume_mount.mount_path) { if existing_volume_mount != &volume_mount { diff --git a/crates/stackable-operator/src/builder/pod/mod.rs b/crates/stackable-operator/src/builder/pod/mod.rs index 03aab690..f94e802c 100644 --- a/crates/stackable-operator/src/builder/pod/mod.rs +++ b/crates/stackable-operator/src/builder/pod/mod.rs @@ -10,7 +10,7 @@ use k8s_openapi::{ apimachinery::pkg::{api::resource::Quantity, apis::meta::v1::ObjectMeta}, }; use snafu::{OptionExt, ResultExt, Snafu}; -use tracing::{instrument, warn}; +use tracing::warn; use crate::{ builder::{ @@ -291,7 +291,6 @@ impl PodBuilder { /// /// Previously, this function unconditionally added [`Volume`]s, which resulted in invalid /// [`PodSpec`]s. - #[instrument(skip(self))] pub fn add_volume(&mut self, volume: Volume) -> Result<&mut Self> { if let Some(existing_volume) = self.volumes.get(&volume.name) { if existing_volume != &volume { From 67adc8e111af16cd58678956e736b6ad0a3f3ef7 Mon Sep 17 00:00:00 2001 From: Nick Larsen Date: Fri, 25 Apr 2025 14:25:44 +0200 Subject: [PATCH 2/2] chore: Use fully-qualified tracing::warn! --- crates/stackable-operator/src/builder/pod/mod.rs | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/crates/stackable-operator/src/builder/pod/mod.rs b/crates/stackable-operator/src/builder/pod/mod.rs index f94e802c..197a8517 100644 --- a/crates/stackable-operator/src/builder/pod/mod.rs +++ b/crates/stackable-operator/src/builder/pod/mod.rs @@ -10,7 +10,6 @@ use k8s_openapi::{ apimachinery::pkg::{api::resource::Quantity, apis::meta::v1::ObjectMeta}, }; use snafu::{OptionExt, ResultExt, Snafu}; -use tracing::warn; use crate::{ builder::{ @@ -609,19 +608,19 @@ impl PodBuilder { pod_spec .check_resource_requirement(ResourceRequirementsType::Limits, "cpu") - .unwrap_or_else(|err| warn!("{}", err)); + .unwrap_or_else(|err| tracing::warn!("{err}")); pod_spec .check_resource_requirement(ResourceRequirementsType::Limits, "memory") - .unwrap_or_else(|err| warn!("{}", err)); + .unwrap_or_else(|err| tracing::warn!("{err}")); pod_spec .check_limit_to_request_ratio(&ComputeResource::Cpu, LIMIT_REQUEST_RATIO_CPU) - .unwrap_or_else(|err| warn!("{}", err)); + .unwrap_or_else(|err| tracing::warn!("{err}")); pod_spec .check_limit_to_request_ratio(&ComputeResource::Memory, LIMIT_REQUEST_RATIO_MEMORY) - .unwrap_or_else(|err| warn!("{}", err)); + .unwrap_or_else(|err| tracing::warn!("{err}")); pod_spec }