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/merge.rs

@@ -9,8 +9,12 @@ impl merge_service_server::MergeService for GitksService {
         request: tonic::Request<CheckMergeRequest>,
     ) -> Result<tonic::Response<MergeResult>, tonic::Status> {
         let inner = request.into_inner();
+        let repo = self.repo_label(inner.repository.as_ref());
+        let span = tracing::info_span!("merge.check_merge", %repo);
+        let _enter = span.enter();
         let gb = self.resolve(inner.repository.as_ref())?;
         let resp = gb.check_merge(inner).map_err(into_status)?;
+        tracing::info!(%repo, status = resp.status, "check_merge done");
         Ok(tonic::Response::new(resp))
     }
 
@@ -19,8 +23,13 @@ impl merge_service_server::MergeService for GitksService {
         request: tonic::Request<MergeRequest>,
     ) -> Result<tonic::Response<MergeResult>, tonic::Status> {
         let inner = request.into_inner();
+        let repo = self.repo_label(inner.repository.as_ref());
+        let target = inner.target_branch.clone();
+        let span = tracing::info_span!("merge.merge", %repo, %target);
+        let _enter = span.enter();
         let gb = self.resolve(inner.repository.as_ref())?;
         let resp = gb.merge(inner).map_err(into_status)?;
+        tracing::info!(%repo, %target, status = resp.status, "merge done");
         Ok(tonic::Response::new(resp))
     }
 
@@ -29,8 +38,12 @@ impl merge_service_server::MergeService for GitksService {
         request: tonic::Request<ListMergeConflictsRequest>,
     ) -> Result<tonic::Response<ListMergeConflictsResponse>, tonic::Status> {
         let inner = request.into_inner();
+        let repo = self.repo_label(inner.repository.as_ref());
+        let span = tracing::info_span!("merge.list_merge_conflicts", %repo);
+        let _enter = span.enter();
         let gb = self.resolve(inner.repository.as_ref())?;
         let resp = gb.list_merge_conflicts(inner).map_err(into_status)?;
+        tracing::info!(%repo, conflicts = resp.conflicts.len(), "list_merge_conflicts done");
         Ok(tonic::Response::new(resp))
     }
 
@@ -39,8 +52,13 @@ impl merge_service_server::MergeService for GitksService {
         request: tonic::Request<ResolveMergeConflictsRequest>,
     ) -> Result<tonic::Response<MergeResult>, tonic::Status> {
         let inner = request.into_inner();
+        let repo = self.repo_label(inner.repository.as_ref());
+        let target = inner.target_branch.clone();
+        let span = tracing::info_span!("merge.resolve_merge_conflicts", %repo, %target);
+        let _enter = span.enter();
         let gb = self.resolve(inner.repository.as_ref())?;
         let resp = gb.resolve_merge_conflicts(inner).map_err(into_status)?;
+        tracing::info!(%repo, %target, status = resp.status, "merge conflicts resolved");
         Ok(tonic::Response::new(resp))
     }
 
@@ -49,8 +67,13 @@ impl merge_service_server::MergeService for GitksService {
         request: tonic::Request<RebaseRequest>,
     ) -> Result<tonic::Response<RebaseResult>, 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!("merge.rebase", %repo, %branch);
+        let _enter = span.enter();
         let gb = self.resolve(inner.repository.as_ref())?;
         let resp = gb.rebase(inner).map_err(into_status)?;
+        tracing::info!(%repo, %branch, status = resp.status, "rebase done");
         Ok(tonic::Response::new(resp))
     }
 }