feat(server): add tracing spans and caching to archive and blame services

- Add tracing spans with repo labels for archive and blame operations
- Implement caching for archive list entries when using OID selectors
- Implement caching for blame operations when using OID selectors
- Add detailed

server/commit.rs

@@ -1,6 +1,6 @@
 use crate::pb::*;
 
-use super::{GitksService, into_status};
+use super::{GitksService, cache, into_status};
 
 #[tonic::async_trait]
 impl commit_service_server::CommitService for GitksService {
@@ -9,8 +9,18 @@ impl commit_service_server::CommitService for GitksService {
         request: tonic::Request<ListCommitsRequest>,
     ) -> Result<tonic::Response<ListCommitsResponse>, tonic::Status> {
         let inner = request.into_inner();
+        let repo = self.repo_label(inner.repository.as_ref());
+        let span = tracing::info_span!("commit.list_commits", %repo);
+        let _enter = span.enter();
         let gb = self.resolve(inner.repository.as_ref())?;
-        let resp = gb.list_commits(inner).map_err(into_status)?;
+        let resp = if !inner.all && cache::selector_is_oid(&inner.revision) {
+            cache::cached_response("commit.list_commits", &inner, || {
+                gb.list_commits(inner.clone()).map_err(into_status)
+            })?
+        } else {
+            gb.list_commits(inner).map_err(into_status)?
+        };
+        tracing::info!(%repo, count = resp.commits.len(), total = resp.page_info.as_ref().map(|p| p.total_count).unwrap_or(0), "list_commits done");
         Ok(tonic::Response::new(resp))
     }
 
@@ -19,8 +29,17 @@ impl commit_service_server::CommitService for GitksService {
         request: tonic::Request<GetCommitRequest>,
     ) -> Result<tonic::Response<Commit>, tonic::Status> {
         let inner = request.into_inner();
+        let repo = self.repo_label(inner.repository.as_ref());
+        let span = tracing::info_span!("commit.get_commit", %repo);
+        let _enter = span.enter();
         let gb = self.resolve(inner.repository.as_ref())?;
-        let resp = gb.get_commit(inner).map_err(into_status)?;
+        let resp = if cache::selector_is_oid(&inner.revision) {
+            cache::cached_response("commit.get_commit", &inner, || {
+                gb.get_commit(inner.clone()).map_err(into_status)
+            })?
+        } else {
+            gb.get_commit(inner).map_err(into_status)?
+        };
         Ok(tonic::Response::new(resp))
     }
 
@@ -29,8 +48,18 @@ impl commit_service_server::CommitService for GitksService {
         request: tonic::Request<GetCommitAncestorsRequest>,
     ) -> Result<tonic::Response<GetCommitAncestorsResponse>, tonic::Status> {
         let inner = request.into_inner();
+        let repo = self.repo_label(inner.repository.as_ref());
+        let span = tracing::info_span!("commit.get_commit_ancestors", %repo);
+        let _enter = span.enter();
         let gb = self.resolve(inner.repository.as_ref())?;
-        let resp = gb.get_commit_ancestors(inner).map_err(into_status)?;
+        let resp = if cache::selector_is_oid(&inner.revision) {
+            cache::cached_response("commit.get_commit_ancestors", &inner, || {
+                gb.get_commit_ancestors(inner.clone()).map_err(into_status)
+            })?
+        } else {
+            gb.get_commit_ancestors(inner).map_err(into_status)?
+        };
+        tracing::info!(%repo, count = resp.commits.len(), "get_commit_ancestors done");
         Ok(tonic::Response::new(resp))
     }
 
@@ -39,8 +68,16 @@ impl commit_service_server::CommitService for GitksService {
         request: tonic::Request<CreateCommitRequest>,
     ) -> Result<tonic::Response<CreateCommitResponse>, tonic::Status> {
         let inner = request.into_inner();
+        let repo = self.repo_label(inner.repository.as_ref());
+        let branch = inner.branch.clone();
+        let span = tracing::info_span!("commit.create_commit", %repo, %branch);
+        let _enter = span.enter();
         let gb = self.resolve(inner.repository.as_ref())?;
         let resp = gb.create_commit(inner).map_err(into_status)?;
+        let commit_hex = resp.commit.as_ref()
+            .and_then(|c| c.oid.as_ref().map(|o| o.hex.as_str()).or(Some("?")))
+            .unwrap_or("?");
+        tracing::info!(%repo, %branch, %commit_hex, "commit created");
         Ok(tonic::Response::new(resp))
     }
 
@@ -49,8 +86,13 @@ impl commit_service_server::CommitService for GitksService {
         request: tonic::Request<RevertCommitRequest>,
     ) -> Result<tonic::Response<CreateCommitResponse>, tonic::Status> {
         let inner = request.into_inner();
+        let repo = self.repo_label(inner.repository.as_ref());
+        let branch = inner.branch.clone();
+        let span = tracing::info_span!("commit.revert_commit", %repo, %branch);
+        let _enter = span.enter();
         let gb = self.resolve(inner.repository.as_ref())?;
         let resp = gb.revert_commit(inner).map_err(into_status)?;
+        tracing::info!(%repo, %branch, "commit reverted");
         Ok(tonic::Response::new(resp))
     }
 
@@ -59,8 +101,13 @@ impl commit_service_server::CommitService for GitksService {
         request: tonic::Request<CherryPickCommitRequest>,
     ) -> Result<tonic::Response<CreateCommitResponse>, tonic::Status> {
         let inner = request.into_inner();
+        let repo = self.repo_label(inner.repository.as_ref());
+        let branch = inner.branch.clone();
+        let span = tracing::info_span!("commit.cherry_pick_commit", %repo, %branch);
+        let _enter = span.enter();
         let gb = self.resolve(inner.repository.as_ref())?;
         let resp = gb.cherry_pick_commit(inner).map_err(into_status)?;
+        tracing::info!(%repo, %branch, "commit cherry-picked");
         Ok(tonic::Response::new(resp))
     }
 
@@ -69,8 +116,18 @@ impl commit_service_server::CommitService for GitksService {
         request: tonic::Request<CompareCommitsRequest>,
     ) -> Result<tonic::Response<CompareCommitsResponse>, tonic::Status> {
         let inner = request.into_inner();
+        let repo = self.repo_label(inner.repository.as_ref());
+        let span = tracing::info_span!("commit.compare_commits", %repo);
+        let _enter = span.enter();
         let gb = self.resolve(inner.repository.as_ref())?;
-        let resp = gb.compare_commits(inner).map_err(into_status)?;
+        let resp = if cache::selectors_are_oid(&inner.base, &inner.head) {
+            cache::cached_response("commit.compare_commits", &inner, || {
+                gb.compare_commits(inner.clone()).map_err(into_status)
+            })?
+        } else {
+            gb.compare_commits(inner).map_err(into_status)?
+        };
+        tracing::info!(%repo, count = resp.commits.len(), "compare_commits done");
         Ok(tonic::Response::new(resp))
     }
 }