Add tracer

pageserver/src/layered_repository.rs

@@ -567,6 +567,14 @@ impl Repository {
             .unwrap_or(self.conf.default_tenant_conf.max_lsn_wal_lag)
     }
 
+    // TODO is there a need for all this boilerplate?
+    pub fn get_trace_read_requests(&self) -> bool {
+        let tenant_conf = self.tenant_conf.read().unwrap();
+        tenant_conf
+            .trace_read_requests
+            .unwrap_or(self.conf.default_tenant_conf.trace_read_requests)
+    }
+
     pub fn update_tenant_config(&self, new_tenant_conf: TenantConfOpt) -> Result<()> {
         let mut tenant_conf = self.tenant_conf.write().unwrap();
 

pageserver/src/lib.rs

@@ -17,6 +17,7 @@ pub mod tenant_mgr;
 pub mod tenant_tasks;
 pub mod thread_mgr;
 pub mod timelines;
+pub mod trace;
 pub mod virtual_file;
 pub mod walingest;
 pub mod walreceiver;

pageserver/src/page_service.rs

@@ -38,6 +38,7 @@ use crate::reltag::RelTag;
 use crate::tenant_mgr;
 use crate::thread_mgr;
 use crate::thread_mgr::ThreadKind;
+use crate::trace::Tracer;
 use crate::CheckpointConfig;
 use postgres_ffi::v14::xlog_utils::to_pg_timestamp;
 
@@ -448,6 +449,15 @@ impl PageServerHandler {
         //       so there is no need to reset the association
         thread_mgr::associate_with(Some(tenant_id), Some(timeline_id));
 
+        // Make request tracer if needed
+        let repo = tenant_mgr::get_repository_for_tenant(tenant_id)?;
+        let trace_read_requests = repo.get_trace_read_requests();
+        let tracer = if trace_read_requests {
+            Some(Tracer::new())
+        } else {
+            None
+        };
+
         // Check that the timeline exists
         let timeline = get_local_timeline(tenant_id, timeline_id)?;
 
@@ -472,7 +482,11 @@ impl PageServerHandler {
                         let tenant_id = tenant_id.to_string();
                         let timeline_id = timeline_id.to_string();
 
-                        // TODO(now) append to trace if tenant is configured for read tracing
+                        // Trace request if needed
+                        if let Some(t) = tracer {
+                            t.trace() // TODO(now) pass zenith_fe_msg
+                        }
+
                         let response = match zenith_fe_msg {
                             PagestreamFeMessage::Exists(req) => SMGR_QUERY_TIME
                                 .with_label_values(&["get_rel_exists", &tenant_id, &timeline_id])
@@ -855,8 +869,6 @@ impl postgres_backend::Handler for PageServerHandler {
 
             self.check_permission(Some(tenantid))?;
 
-            // TODO(now) make trace logger if tenant is configured for read tracing.
-            //           Also flush trace logger on drop.
             self.handle_pagerequests(pgb, timelineid, tenantid)?;
         } else if query_string.starts_with("basebackup ") {
             let (_, params_raw) = query_string.split_at("basebackup ".len());

pageserver/src/trace.rs

@@ -0,0 +1,21 @@
+pub struct Tracer {}
+
+impl Drop for Tracer {
+    fn drop(&mut self) {
+        self.flush()
+    }
+}
+
+impl Tracer {
+    pub fn new() -> Self {
+        Tracer {}
+    }
+
+    pub fn trace(&mut self) {
+        // TODO(now) implement
+    }
+
+    pub fn flush(&mut self) {
+        // TODO(now) implement
+    }
+}