diff --git a/crates/git_ui/src/file_diff_view.rs b/crates/git_ui/src/file_diff_view.rs
index 1967254db664bf4a1f52c25295a7860fdbba82da..e985f02d8d06d50076643af74199fe488b05ae70 100644
--- a/crates/git_ui/src/file_diff_view.rs
+++ b/crates/git_ui/src/file_diff_view.rs
@@ -36,6 +36,7 @@ pub struct FileDiffView {
 const RECALCULATE_DIFF_DEBOUNCE: Duration = Duration::from_millis(250);
 
 impl FileDiffView {
+    #[ztracing::instrument(skip_all)]
     pub fn open(
         old_path: PathBuf,
         new_path: PathBuf,
@@ -162,6 +163,7 @@ impl FileDiffView {
     }
 }
 
+#[ztracing::instrument(skip_all)]
 async fn build_buffer_diff(
     old_buffer: &Entity<Buffer>,
     new_buffer: &Entity<Buffer>,
diff --git a/crates/language/src/buffer.rs b/crates/language/src/buffer.rs
index c609c51ef995972000010e837d6c731bbf9a2496..5158e3ece98cbacf102c3e6362772c8579faed0b 100644
--- a/crates/language/src/buffer.rs
+++ b/crates/language/src/buffer.rs
@@ -1158,6 +1158,7 @@ impl Buffer {
         }
     }
 
+    #[ztracing::instrument(skip_all)]
     pub fn build_snapshot(
         text: Rope,
         language: Option<Arc<Language>>,
@@ -1300,6 +1301,7 @@ impl Buffer {
         })
     }
 
+    #[ztracing::instrument(skip_all)]
     pub fn preview_edits(
         &self,
         edits: Arc<[(Range<Anchor>, Arc<str>)]>,
diff --git a/crates/language/src/language.rs b/crates/language/src/language.rs
index 63fbc28f3cca111bfa1cfc1783b1a52e703caeb1..79a588a5d52a837c31582e83e3ca884bab0dcaa7 100644
--- a/crates/language/src/language.rs
+++ b/crates/language/src/language.rs
@@ -97,6 +97,7 @@ pub use tree_sitter::{Node, Parser, Tree, TreeCursor};
 static QUERY_CURSORS: Mutex<Vec<QueryCursor>> = Mutex::new(vec![]);
 static PARSERS: Mutex<Vec<Parser>> = Mutex::new(vec![]);
 
+#[ztracing::instrument(skip_all)]
 pub fn with_parser<F, R>(func: F) -> R
 where
     F: FnOnce(&mut Parser) -> R,
diff --git a/crates/language/src/language_registry.rs b/crates/language/src/language_registry.rs
index edcf143ccd8702f687e119cb69694f02a9acbf5c..339887274bcfec12e217acb23803440e8a52ef4b 100644
--- a/crates/language/src/language_registry.rs
+++ b/crates/language/src/language_registry.rs
@@ -741,6 +741,7 @@ impl LanguageRegistry {
         self.language_for_file_internal(path, None, None)
     }
 
+    #[ztracing::instrument(skip_all)]
     pub fn load_language_for_file_path<'a>(
         self: &Arc<Self>,
         path: &'a Path,
diff --git a/crates/language/src/syntax_map.rs b/crates/language/src/syntax_map.rs
index d1da17d9a380224b34d5f809f6bee1ccaba46a29..bd24424679f3e6cb02303c91e0d86db335cd0a26 100644
--- a/crates/language/src/syntax_map.rs
+++ b/crates/language/src/syntax_map.rs
@@ -416,6 +416,7 @@ impl SyntaxSnapshot {
         self.layers = layers;
     }
 
+    #[ztracing::instrument(skip_all)]
     pub fn reparse(
         &mut self,
         text: &BufferSnapshot,
@@ -425,6 +426,7 @@ impl SyntaxSnapshot {
         self.reparse_(text, registry, root_language, None).ok();
     }
 
+    #[ztracing::instrument(skip_all)]
     pub fn reparse_with_timeout(
         &mut self,
         text: &BufferSnapshot,
diff --git a/crates/ztracing/src/lib.rs b/crates/ztracing/src/lib.rs
index bae75dbb0a2207af9342a34596411f48aa13a908..853633ac48ccbfd27d536842f5052f9f0afa33b5 100644
--- a/crates/ztracing/src/lib.rs
+++ b/crates/ztracing/src/lib.rs
@@ -4,13 +4,17 @@ pub use tracing::{Level, field};
 pub use tracing::{
     Span, debug_span, error_span, event, info_span, instrument, span, trace_span, warn_span,
 };
+
 #[cfg(not(ztracing))]
 pub use ztracing_macro::instrument;
 
+#[cfg(ztracing)]
+const MAX_CALLSTACK_DEPTH: u16 = 16;
+
 #[cfg(all(ztracing, ztracing_with_memory))]
 #[global_allocator]
 static GLOBAL: tracy_client::ProfiledAllocator<std::alloc::System> =
-    tracy_client::ProfiledAllocator::new(std::alloc::System, 100);
+    tracy_client::ProfiledAllocator::new(std::alloc::System, MAX_CALLSTACK_DEPTH);
 
 #[cfg(not(ztracing))]
 pub use __consume_all_tokens as trace_span;
@@ -67,7 +71,7 @@ pub fn init() {
         }
 
         fn stack_depth(&self, _: &tracing::Metadata) -> u16 {
-            8
+            MAX_CALLSTACK_DEPTH
         }
 
         fn format_fields_in_zone_name(&self) -> bool {