[Tracing] Add support for push_config (#24543)

Rewired the `http` endpoint tracing to capture the entire request execution + added support to trace `push_config` requests.

GitOrigin-RevId: c62edbfa24650c5763077079d2540a10c9acee0c

Author: jordanhunt22

Cargo.lock

@@ -1275,6 +1275,7 @@ impl<RT: Runtime> ApplicationFunctionRunner<RT> {
         }
     }
 
+    #[minitrace::trace]
     pub async fn build_deps(
         &self,
         deps: Vec<NodeDependency>,
@@ -1298,6 +1299,7 @@ impl<RT: Runtime> ApplicationFunctionRunner<RT> {
         )
     }
 
+    #[minitrace::trace]
     pub async fn analyze(
         &self,
         udf_config: UdfConfig,
@@ -1401,6 +1403,7 @@ impl<RT: Runtime> ApplicationFunctionRunner<RT> {
         Ok(Ok(result))
     }
 
+    #[minitrace::trace]
     async fn validate_cron_jobs(
         &self,
         modules: &BTreeMap<CanonicalizedModulePath, AnalyzedModule>,

crates/application/src/application_function_runner/mod.rs

@@ -1598,6 +1598,7 @@ impl<RT: Runtime> Application<RT> {
         Ok(schema)
     }
 
+    #[minitrace::trace]
     pub async fn get_evaluated_auth_config(
         runner: Arc<ApplicationFunctionRunner<RT>>,
         tx: &mut Transaction<RT>,
@@ -1701,6 +1702,7 @@ impl<RT: Runtime> Application<RT> {
         .await
     }
 
+    #[minitrace::trace]
     async fn _apply_config(
         runner: Arc<ApplicationFunctionRunner<RT>>,
         tx: &mut Transaction<RT>,
@@ -2006,6 +2008,7 @@ impl<RT: Runtime> Application<RT> {
         })
     }
 
+    #[minitrace::trace]
     pub async fn build_external_node_deps(
         &self,
         deps: Vec<NodeDependency>,
@@ -2042,6 +2045,7 @@ impl<RT: Runtime> Application<RT> {
         Ok((id, pkg))
     }
 
+    #[minitrace::trace]
     async fn _upload_external_deps_package(
         &self,
         external_deps_package: ExternalDepsPackage,

crates/application/src/lib.rs

@@ -69,6 +69,7 @@ use http::{
 use hyper::server::conn::AddrIncoming;
 use itertools::Itertools;
 use maplit::btreemap;
+use minitrace::future::FutureExt;
 use prometheus::TextEncoder;
 use sentry::integrations::tower as sentry_tower;
 use serde::{
@@ -715,26 +716,27 @@ pub async fn stats_middleware<RM: RouteMapper>(
 ) -> Result<impl IntoResponse, HttpResponseError> {
     let start = Instant::now();
     let method = req.method().clone();
-
-    let resp = next.run(req).await;
-
-    let client_version_s = client_version.to_string();
     // tag with the route. 404s lack matched query path - and the
     // uri is generally unhelpful for metrics aggregation, so leave it out there.
     let route = matched_path
         .map(|r| r.as_str().to_owned())
         .unwrap_or("unknown".to_owned());
 
-    let route = route_metric_mapper.map_route(route);
+    // Configure tracing
+    let root = {
+        let mut rng = rand::thread_rng();
+        get_sampled_span(
+            route.as_str(),
+            &mut rng,
+            btreemap!["request_id".to_owned() => request_id.to_string()],
+        )
+    };
 
-    // Configure tracing.
-    let mut rng = rand::thread_rng();
-    let root = get_sampled_span(
-        route.as_str(),
-        &mut rng,
-        btreemap!["request_id".to_owned() => request_id.to_string()],
-    );
-    let _guard = root.set_local_parent();
+    let resp = next.run(req).in_span(root).await;
+
+    let client_version_s = client_version.to_string();
+
+    let route = route_metric_mapper.map_route(route);
 
     // Add the request_id to sentry
     sentry::configure_scope(|scope| scope.set_tag("request_id", request_id.clone()));

crates/common/src/http/mod.rs

@@ -126,7 +126,6 @@ impl TransactionIndex {
     /// streamed from the database.
     /// The returned vec may be larger or smaller than `max_size` depending on
     /// pending writes.
-    #[minitrace::trace]
     async fn range_no_deps(
         &mut self,
         ranges: BTreeMap<BatchKey, RangeRequest>,
@@ -250,6 +249,7 @@ impl TransactionIndex {
         results
     }
 
+    #[minitrace::trace]
     pub async fn search(
         &mut self,
         reads: &mut TransactionReadSet,
@@ -411,6 +411,7 @@ impl TransactionIndex {
             .context("batch_key missing")?
     }
 
+    #[minitrace::trace]
     pub async fn preload_index_range(
         &mut self,
         reads: &mut TransactionReadSet,
@@ -748,6 +749,7 @@ impl SearchIndexManagerSnapshot {
             .clone()
     }
 
+    #[minitrace::trace]
     pub async fn search_with_compiled_query(
         &self,
         index: &Index,

crates/database/src/transaction_index.rs

@@ -424,7 +424,6 @@ impl DatabaseIndexSnapshot {
     }
 
     /// Query the given index at the snapshot.
-    #[minitrace::trace]
     pub async fn range_batch(
         &mut self,
         range_requests: BTreeMap<BatchKey, RangeRequest>,

crates/indexing/src/backend_in_memory_indexes.rs

@@ -88,6 +88,7 @@ use keybroker::{
     KeyBroker,
 };
 use minitrace::{
+    collector::SpanContext,
     full_name,
     future::FutureExt as _,
 };
@@ -790,6 +791,7 @@ impl<RT: Runtime> IsolateClient<RT> {
     }
 
     /// Analyze a set of user-defined modules.
+    #[minitrace::trace]
     pub async fn analyze(
         &self,
         udf_config: UdfConfig,
@@ -809,12 +811,10 @@ impl<RT: Runtime> IsolateClient<RT> {
             udf_config,
             environment_variables,
         };
-        // TODO(jordan): this is an incomplete state. eventually we will expand to trace
-        // other requests besides udfs
         self.send_request(Request::new(
             self.instance_name.clone(),
             request,
-            EncodedSpan::empty(),
+            EncodedSpan::from_parent(SpanContext::current_local_parent()),
         ))?;
         Self::receive_response(rx).await?.map_err(|e| {
             if e.is_overloaded() {

crates/isolate/src/client.rs

@@ -452,8 +452,8 @@ pub struct DatabaseSyscallsV1<RT: Runtime> {
 }
 
 impl<RT: Runtime> DatabaseSyscallsV1<RT> {
-    #[convex_macro::instrument_future]
     #[minitrace::trace]
+    #[convex_macro::instrument_future]
     async fn get_batch(
         env: &mut DatabaseUdfEnvironment<RT>,
         batch_args: Vec<JsonValue>,
@@ -840,6 +840,7 @@ impl<RT: Runtime> DatabaseSyscallsShared<RT> {
         ))
     }
 
+    #[minitrace::trace]
     async fn queryPage(
         env: &mut DatabaseUdfEnvironment<RT>,
         args: JsonValue,

crates/isolate/src/environment/udf/async_syscall.rs

@@ -377,6 +377,7 @@ pub async fn push_config(
     Ok(Json(EmptyResponse {}))
 }
 
+#[minitrace::trace]
 pub async fn push_config_handler(
     application: &Application<ProdRuntime>,
     config: ConfigJson,
@@ -478,6 +479,7 @@ pub async fn push_config_handler(
     ))
 }
 
+#[minitrace::trace]
 async fn analyze_modules_with_auth_config(
     application: &Application<ProdRuntime>,
     udf_config: UdfConfig,

crates/local_backend/src/deploy_config.rs

@@ -23,6 +23,7 @@ humansize = { workspace = true }
 keybroker = { path = "../keybroker" }
 maplit = { workspace = true }
 metrics = { path = "../metrics" }
+minitrace = { workspace = true }
 openidconnect = { workspace = true }
 pb = { path = "../pb" }
 proptest = { workspace = true, optional = true }
@@ -50,7 +51,9 @@ proptest = { workspace = true }
 proptest-derive = { workspace = true }
 runtime = { path = "../runtime", features = ["testing"] }
 storage = { path = "../storage" }
-sync_types = { package = "convex_sync_types", path = "../convex/sync_types", features = ["testing"] }
+sync_types = { package = "convex_sync_types", path = "../convex/sync_types", features = [
+    "testing",
+] }
 value = { path = "../value", features = ["testing"] }
 
 [features]