github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-07-16 08:26:16 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2813 from liubin/fix/2812-flush-root-span

Browse Source 
agent: flush root span before process finish
This commit is contained in:
Bin Liu 2021-10-11 18:46:09 +08:00 committed by GitHub
commit b7cd4ca2b8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/agent/src/main.rs
View File

@ -200,12 +200,12 @@ async fn real_main() -> std::result::Result<(), Box<dyn std::error::Error>> {
let _ = tracer::setup_tracing(NAME, &logger, &config)?; let _ = tracer::setup_tracing(NAME, &logger, &config)?;
} }
let root = span!(tracing::Level::TRACE, "root-span", work_units = 2); let root_span = span!(tracing::Level::TRACE, "root-span");
// XXX: Start the root trace transaction. // XXX: Start the root trace transaction.
// //
// XXX: Note that *ALL* spans needs to start after this point!! // XXX: Note that *ALL* spans needs to start after this point!!
let _enter = root.enter(); let span_guard = root_span.enter();
// Start the sandbox and wait for its ttRPC server to end // Start the sandbox and wait for its ttRPC server to end
start_sandbox(&logger, &config, init_mode, &mut tasks, shutdown_rx.clone()).await?; start_sandbox(&logger, &config, init_mode, &mut tasks, shutdown_rx.clone()).await?;
@ -235,6 +235,10 @@ async fn real_main() -> std::result::Result<(), Box<dyn std::error::Error>> {
} }
} }
// force flushing spans
drop(span_guard);
drop(root_span);
if config.tracing != tracer::TraceType::Disabled { if config.tracing != tracer::TraceType::Disabled {
tracer::end_tracing(); tracer::end_tracing();
} }