Move transaction tracing to public methods. (#24740)

GitOrigin-RevId: 558d4614f8ff54cf41336eff9b70c10236931f49

Author: Preslav Le

crates/database/src/bootstrap_model/system_metadata.rs

@@ -34,6 +34,7 @@ impl<'a, RT: Runtime> SystemMetadataModel<'a, RT> {
 
     /// Creates a new document with given value in the specified table,
     /// enforcing that the transaction's identity is system or admin.
+    #[minitrace::trace]
     #[convex_macro::instrument_future]
     pub async fn insert(
         &mut self,
@@ -62,6 +63,7 @@ impl<'a, RT: Runtime> SystemMetadataModel<'a, RT> {
 
     /// Creates a new document with given value in the specified table without
     /// checking authorization. This also inserts table metadata.
+    #[minitrace::trace]
     #[convex_macro::instrument_future]
     pub async fn insert_metadata(
         &mut self,
@@ -80,6 +82,7 @@ impl<'a, RT: Runtime> SystemMetadataModel<'a, RT> {
 
     /// Merges the existing document with the given object. Will overwrite any
     /// conflicting fields.
+    #[minitrace::trace]
     #[convex_macro::instrument_future]
     pub async fn patch(
         &mut self,
@@ -91,6 +94,7 @@ impl<'a, RT: Runtime> SystemMetadataModel<'a, RT> {
         self.tx.patch_inner(id, value).await
     }
 
+    #[minitrace::trace]
     #[convex_macro::instrument_future]
     pub async fn replace(
         &mut self,
@@ -102,6 +106,7 @@ impl<'a, RT: Runtime> SystemMetadataModel<'a, RT> {
     }
 
     /// Delete the document at the given path.
+    #[minitrace::trace]
     #[convex_macro::instrument_future]
     pub async fn delete(&mut self, id: ResolvedDocumentId) -> anyhow::Result<ResolvedDocument> {
         anyhow::ensure!(self.tx.table_mapping().is_system(id.table().table_number));

crates/database/src/bootstrap_model/user_facing.rs

@@ -81,6 +81,7 @@ impl<'a, RT: Runtime> UserFacingModel<'a, RT> {
             .map(|(document, _)| document))
     }
 
+    #[minitrace::trace]
     #[convex_macro::instrument_future]
     pub async fn get_with_ts(
         &mut self,
@@ -117,6 +118,7 @@ impl<'a, RT: Runtime> UserFacingModel<'a, RT> {
     /// of the batch will throw similar errors.
     /// TODO(lee) dedupe duplicate fetches within a batch, which requires
     /// cloning errors.
+    #[minitrace::trace]
     #[convex_macro::instrument_future]
     pub async fn get_batch(
         &mut self,
@@ -184,6 +186,7 @@ impl<'a, RT: Runtime> UserFacingModel<'a, RT> {
     }
 
     /// Creates a new document with given value in the specified table.
+    #[minitrace::trace]
     #[convex_macro::instrument_future]
     pub async fn insert(
         &mut self,
@@ -238,6 +241,7 @@ impl<'a, RT: Runtime> UserFacingModel<'a, RT> {
 
     /// Merges the existing document with the given object. Will overwrite any
     /// conflicting fields.
+    #[minitrace::trace]
     #[convex_macro::instrument_future]
     pub async fn patch(
         &mut self,
@@ -265,6 +269,7 @@ impl<'a, RT: Runtime> UserFacingModel<'a, RT> {
     }
 
     /// Replace the document with the given value.
+    #[minitrace::trace]
     #[convex_macro::instrument_future]
     pub async fn replace(
         &mut self,
@@ -289,6 +294,7 @@ impl<'a, RT: Runtime> UserFacingModel<'a, RT> {
 
     /// Delete the document at the given path -- called from user facing APIs
     /// (e.g. syscalls)
+    #[minitrace::trace]
     #[convex_macro::instrument_future]
     pub async fn delete(&mut self, id: DeveloperDocumentId) -> anyhow::Result<DeveloperDocument> {
         if self.tx.is_system(*id.table())
@@ -373,6 +379,7 @@ impl<'a, RT: Runtime> UserFacingModel<'a, RT> {
 
     /// NOTE: returns a page of results. Callers must call record_read_document
     /// for all documents returned from the index stream.
+    #[minitrace::trace]
     #[convex_macro::instrument_future]
     pub async fn index_range_batch(
         &mut self,

crates/database/src/transaction.rs

@@ -479,7 +479,6 @@ impl<RT: Runtime> Transaction<RT> {
         self.get_inner(id, table_name).await
     }
 
-    #[minitrace::trace]
     #[convex_macro::instrument_future]
     pub(crate) async fn patch_inner(
         &mut self,
@@ -513,7 +512,6 @@ impl<RT: Runtime> Transaction<RT> {
             || self.virtual_table_mapping().number_exists(&table_number)
     }
 
-    #[minitrace::trace]
     #[convex_macro::instrument_future]
     pub(crate) async fn replace_inner(
         &mut self,
@@ -542,7 +540,6 @@ impl<RT: Runtime> Transaction<RT> {
         Ok(new_document)
     }
 
-    #[minitrace::trace]
     #[convex_macro::instrument_future]
     pub async fn delete_inner(
         &mut self,
@@ -1007,6 +1004,7 @@ impl<RT: Runtime> Transaction<RT> {
 
     /// NOTE: returns a page of results. Callers must call record_read_document
     /// for all documents returned from the index stream.
+    #[minitrace::trace]
     #[convex_macro::instrument_future]
     pub async fn index_range_batch(
         &mut self,

crates/database/src/virtual_tables/mod.rs

@@ -47,6 +47,7 @@ impl<'a, RT: Runtime> VirtualTable<'a, RT> {
         Self { tx }
     }
 
+    #[minitrace::trace]
     pub async fn get_batch(
         &mut self,
         mut ids: BTreeMap<BatchKey, (DeveloperDocumentId, Option<Version>)>,
@@ -99,6 +100,7 @@ impl<'a, RT: Runtime> VirtualTable<'a, RT> {
         results
     }
 
+    #[minitrace::trace]
     pub async fn index_range(
         &mut self,
         range_request: RangeRequest,