bitsquid_dt/dtmt
bitsquid_dt/dtmt
2
Fork 0
Code Issues 34 Pull requests 11 Projects 1 Releases 3 Packages 1 Wiki Activity
Var Dump: 
dumpVar: only available in dev mode
Mailing List

bug: Fix tracing spans not being entered

Browse source
This commit is contained in:
Lucas Schwiderski 2023-01-06 13:32:16 +01:00
parent 20c0382c22
commit 385e1f98e2
Signed by: lucas
GPG key ID: AA12679AAA6DF4D8
2 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/sdk/src/bundle/file.rs
View file

@ -414,7 +414,9 @@ impl BundleFile {
let mut variants = Vec::with_capacity(header_count); let mut variants = Vec::with_capacity(header_count);
for (i, header) in headers.into_iter().enumerate() { for (i, header) in headers.into_iter().enumerate() {
let _span = tracing::trace_span!("Read file header {}", i, size = header.size); let span = tracing::info_span!("Read file header {}", i, size = header.size);
let _enter = span.enter();
let mut data = vec![0; header.size]; let mut data = vec![0; header.size];
r.read_exact(&mut data) r.read_exact(&mut data)
.wrap_err_with(|| format!("failed to read header {i}"))?; .wrap_err_with(|| format!("failed to read header {i}"))?;

12
lib/sdk/src/bundle/mod.rs
View file

@ -160,7 +160,8 @@ impl Bundle {
let mut unpacked_size_tracked = unpacked_size; let mut unpacked_size_tracked = unpacked_size;
for (chunk_index, chunk_size) in chunk_sizes.into_iter().enumerate() { for (chunk_index, chunk_size) in chunk_sizes.into_iter().enumerate() {
let _span = tracing::debug_span!("Decompressing chunk", chunk_index, chunk_size); let span = tracing::debug_span!("Decompressing chunk", chunk_index, chunk_size);
let _enter = span.enter();
let inner_chunk_size = r.read_u32()? as usize; let inner_chunk_size = r.read_u32()? as usize;
@ -239,7 +240,8 @@ impl Bundle {
} }
let unpacked_data = { let unpacked_data = {
let _span = tracing::trace_span!("Write bundle files"); let span = tracing::trace_span!("Write bundle files");
let _enter = span.enter();
tracing::trace!(num_files = self.files.len()); tracing::trace!(num_files = self.files.len());
self.files self.files
@ -352,7 +354,8 @@ where
// Pipe the header into the output // Pipe the header into the output
{ {
let _span = tracing::debug_span!("Pipe file header", chunks_start); let span = tracing::debug_span!("Pipe file header", chunks_start);
let _enter = span.enter();
r.rewind()?; r.rewind()?;
let mut buf = vec![0; chunks_start as usize]; let mut buf = vec![0; chunks_start as usize];
@ -363,7 +366,8 @@ where
} }
for chunk_index in 0..num_chunks { for chunk_index in 0..num_chunks {
let _span = tracing::debug_span!("Decompressing chunk", chunk_index); let span = tracing::debug_span!("Decompressing chunk", chunk_index);
let _enter = span.enter();
let chunk_size = r.read_u32()? as usize; let chunk_size = r.read_u32()? as usize;
tracing::trace!(chunk_size); tracing::trace!(chunk_size);