mdebray/tvl-depot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(tvix): use tracing::field::Empty for all indicatif.pb_show

Browse source 
This prevents the field from getting printed to stderr, apparently.

Change-Id: Ia9860e4ff37224003154db88ee5f83103060e626
Reviewed-on: https://cl.tvl.fyi/c/depot/+/12756
Autosubmit: flokli <flokli@flokli.de>
Tested-by: BuildkiteCI
Reviewed-by: Ilan Joselevich <personal@ilanjoselevich.com>
This commit is contained in:
Florian Klink 2024-10-21 15:24:06 +02:00 committed by clbot
parent 0c5ad94914
commit 72bc4e0270
4 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
tvix/cli/src/lib.rs
View file

@ -229,7 +229,7 @@ impl InterpretResult {
/// Interprets the given code snippet, printing out warnings, errors /// Interprets the given code snippet, printing out warnings, errors
/// and the result itself. The return value indicates whether /// and the result itself. The return value indicates whether
/// evaluation succeeded. /// evaluation succeeded.
#[instrument(skip_all, fields(indicatif.pb_show=1))] #[instrument(skip_all, fields(indicatif.pb_show=tracing::field::Empty))]
#[allow(clippy::too_many_arguments)] #[allow(clippy::too_many_arguments)]
pub fn interpret( pub fn interpret(
tvix_store_io: Rc<TvixStoreIO>, tvix_store_io: Rc<TvixStoreIO>,

2
tvix/glue/src/fetchers/mod.rs
View file

@ -196,7 +196,7 @@ impl<BS, DS, PS, NS> Fetcher<BS, DS, PS, NS> {
/// Constructs a HTTP request to the passed URL, and returns a AsyncReadBuf to it. /// Constructs a HTTP request to the passed URL, and returns a AsyncReadBuf to it.
/// In case the URI uses the file:// scheme, use tokio::fs to open it. /// In case the URI uses the file:// scheme, use tokio::fs to open it.
#[instrument(skip_all, fields(url, indicatif.pb_show=1), err)] #[instrument(skip_all, fields(url, indicatif.pb_show=tracing::field::Empty), err)]
async fn download( async fn download(
&self, &self,
url: Url, url: Url,

2
tvix/glue/src/tvix_store_io.rs
View file

@ -99,7 +99,7 @@ impl TvixStoreIO {
/// ///
/// In case there is no PathInfo yet, this means we need to build it /// In case there is no PathInfo yet, this means we need to build it
/// (which currently is stubbed out still). /// (which currently is stubbed out still).
#[instrument(skip(self, store_path), fields(store_path=%store_path, indicatif.pb_show=1), ret(level = Level::TRACE), err(level = Level::TRACE))] #[instrument(skip(self, store_path), fields(store_path=%store_path, indicatif.pb_show=tracing::field::Empty), ret(level = Level::TRACE), err(level = Level::TRACE))]
async fn store_path_to_node( async fn store_path_to_node(
&self, &self,
store_path: &StorePath<String>, store_path: &StorePath<String>,

2
tvix/store/src/pathinfoservice/grpc.rs
View file

@ -119,7 +119,7 @@ where
<T::ResponseBody as tonic::codegen::Body>::Error: Into<tonic::codegen::StdError> + Send, <T::ResponseBody as tonic::codegen::Body>::Error: Into<tonic::codegen::StdError> + Send,
T::Future: Send, T::Future: Send,
{ {
#[instrument(level = "trace", skip_all, fields(root_node = ?root_node, indicatif.pb_show=1))] #[instrument(level = "trace", skip_all, fields(root_node = ?root_node, indicatif.pb_show=tracing::field::Empty))]
async fn calculate_nar(&self, root_node: &Node) -> Result<(u64, [u8; 32]), Error> { async fn calculate_nar(&self, root_node: &Node) -> Result<(u64, [u8; 32]), Error> {
let span = Span::current(); let span = Span::current();
span.pb_set_message("Waiting for NAR calculation"); span.pb_set_message("Waiting for NAR calculation");