maurice/snix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor(tvix): make indicatif.pb_show=1 more explicit

Browse source 
This pushes generating spans with pb_show up to the caller.
They usually have more context on how to present things, if at all.

Change-Id: Icfcaa64a8a57dce50c0261f2d06e7c051e3946c2
Reviewed-on: https://cl.tvl.fyi/c/depot/+/12657
Autosubmit: flokli <flokli@flokli.de>
Tested-by: BuildkiteCI
Reviewed-by: raitobezarius <tvl@lahfa.xyz>
This commit is contained in:
Florian Klink 2024-10-15 16:16:11 +03:00 • committed by flokli
parent 3fda90602d
commit d52d889f2b
3 changed files with 125 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

25
tvix/castore/src/import/fs.rs
View file

@ -8,7 +8,9 @@ use std::os::unix::fs::MetadataExt;
use std::os::unix::fs::PermissionsExt;
use tokio::io::BufReader;
use tokio_util::io::InspectReader;
use tracing::info_span;
use tracing::instrument;
use tracing::Instrument;
use tracing::Span;
use tracing_indicatif::span_ext::IndicatifSpanExt;
use walkdir::DirEntry;
@ -30,7 +32,11 @@ use super::IngestionError;
///
/// This function will walk the filesystem using `walkdir` and will consume
/// `O(#number of entries)` space.
#[instrument(skip(blob_service, directory_service, reference_scanner), fields(path, indicatif.pb_show=1), err)]
#[instrument(
skip(blob_service, directory_service, reference_scanner),
fields(path),
err
)]
pub async fn ingest_path<BS, DS, P, P2>(
blob_service: BS,
directory_service: DS,
@ -44,8 +50,6 @@ where
P2: AsRef<[u8]> + Send + Sync,
{
let span = Span::current();
span.pb_set_message(&format!("Ingesting {:?}", path));
span.pb_start();
let iter = WalkDir::new(path.as_ref())
.follow_links(false)
@ -158,8 +162,15 @@ where
.metadata()
.map_err(|e| Error::Stat(entry.path().to_path_buf(), e.into()))?;
let digest =
upload_blob(blob_service, entry.path().to_path_buf(), reference_scanner).await?;
let digest = upload_blob(blob_service, entry.path().to_path_buf(), reference_scanner)
.instrument({
let span = info_span!("upload_blob", "indicatif.pb_show" = tracing::field::Empty);
span.pb_set_message(&format!("Uploading blob for {:?}", fs_path));
span.pb_set_style(&tvix_tracing::PB_TRANSFER_STYLE);
span
})
.await?;
Ok(IngestionEntry::Regular {
path,
@ -175,7 +186,7 @@ where
}
/// Uploads the file at the provided [Path] the the [BlobService].
#[instrument(skip(blob_service, reference_scanner), fields(path, indicatif.pb_show=1), err)]
#[instrument(skip(blob_service, reference_scanner), fields(path), err)]
async fn upload_blob<BS, P>(
blob_service: BS,
path: impl AsRef<std::path::Path>,
@ -186,8 +197,6 @@ where
P: AsRef<[u8]>,
{
let span = Span::current();
span.pb_set_style(&tvix_tracing::PB_TRANSFER_STYLE);
span.pb_set_message(&format!("Uploading blob for {:?}", path.as_ref()));
span.pb_start();
let file = tokio::fs::File::open(path.as_ref())