diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7b4b9b8..f199757 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,12 @@ All notable changes to this project will be documented in this file.
 
 ## [Unreleased]
 
+### Changed
+
+- All output is now wrapped in a "containerdebug" span ([#18]).
+
+[#18]: https://github.com/stackabletech/containerdebug/pull/18
+
 ## [0.1.0] - 2024-12-09
 
 ### Added
diff --git a/src/main.rs b/src/main.rs
index cd142e0..c2fc08d 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -42,6 +42,10 @@ fn main() {
         APP_NAME,
         opts.tracing_target,
     );
+
+    // Wrap *all* output in a span, to separate it from main app output.
+    let _span = tracing::error_span!("containerdebug").entered();
+
     stackable_operator::utils::print_startup_string(
         crate_description!(),
         crate_version!(),
@@ -62,7 +66,6 @@ fn main() {
         let system_information = SystemInformation::collect();
 
         let serialized = serde_json::to_string_pretty(&system_information).unwrap();
-        // println!("{serialized}");
         if let Some(output_path) = &opts.output {
             std::fs::write(output_path, &serialized).unwrap();
         }