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
This commit is contained in:
+61
-15
@@ -21,6 +21,9 @@ impl repository_service_server::RepositoryService for GitksService {
|
||||
request: tonic::Request<GetRepositoryRequest>,
|
||||
) -> Result<tonic::Response<Repository>, tonic::Status> {
|
||||
let inner = request.into_inner();
|
||||
let repo = self.repo_label(inner.repository.as_ref());
|
||||
let span = tracing::info_span!("repo.get_repository", %repo);
|
||||
let _enter = span.enter();
|
||||
let gb = self.resolve(inner.repository.as_ref())?;
|
||||
let bare = gb.bare_dir.join("HEAD").exists();
|
||||
let object_format = gb.object_format();
|
||||
@@ -38,9 +41,13 @@ impl repository_service_server::RepositoryService for GitksService {
|
||||
request: tonic::Request<InitRepositoryRequest>,
|
||||
) -> Result<tonic::Response<Repository>, tonic::Status> {
|
||||
let inner = request.into_inner();
|
||||
let repo = self.repo_label(inner.repository.as_ref());
|
||||
let span = tracing::info_span!("repo.init_repository", %repo);
|
||||
let _enter = span.enter();
|
||||
let bare_dir = self.resolve_for_init(inner.repository.as_ref())?;
|
||||
let gb = crate::bare::GitBare { bare_dir };
|
||||
let gb = crate::bare::GitBare::new(bare_dir);
|
||||
gb.init_repository(inner.bare).map_err(into_status)?;
|
||||
tracing::info!(%repo, bare = inner.bare, "repository initialized");
|
||||
Ok(tonic::Response::new(Repository {
|
||||
header: inner.repository,
|
||||
bare: inner.bare,
|
||||
@@ -53,8 +60,13 @@ impl repository_service_server::RepositoryService for GitksService {
|
||||
request: tonic::Request<DeleteRepositoryRequest>,
|
||||
) -> Result<tonic::Response<()>, tonic::Status> {
|
||||
let inner = request.into_inner();
|
||||
let repo = self.repo_label(inner.repository.as_ref());
|
||||
let span = tracing::info_span!("repo.delete_repository", %repo);
|
||||
let _enter = span.enter();
|
||||
let bare_dir = self.resolve_for_init(inner.repository.as_ref())?;
|
||||
tracing::warn!(%repo, path = %bare_dir.display(), "deleting repository");
|
||||
std::fs::remove_dir_all(&bare_dir).map_err(|e| tonic::Status::internal(e.to_string()))?;
|
||||
tracing::info!(%repo, "repository deleted");
|
||||
Ok(tonic::Response::new(()))
|
||||
}
|
||||
|
||||
@@ -63,6 +75,9 @@ impl repository_service_server::RepositoryService for GitksService {
|
||||
request: tonic::Request<RepositoryExistsRequest>,
|
||||
) -> Result<tonic::Response<RepositoryExistsResponse>, tonic::Status> {
|
||||
let inner = request.into_inner();
|
||||
let repo = self.repo_label(inner.repository.as_ref());
|
||||
let span = tracing::info_span!("repo.repository_exists", %repo);
|
||||
let _enter = span.enter();
|
||||
let bare_dir = self.resolve_for_init(inner.repository.as_ref())?;
|
||||
let exists = bare_dir.exists() && bare_dir.is_dir() && bare_dir.join("HEAD").exists();
|
||||
Ok(tonic::Response::new(RepositoryExistsResponse { exists }))
|
||||
@@ -73,6 +88,9 @@ impl repository_service_server::RepositoryService for GitksService {
|
||||
request: tonic::Request<RepositoryObjectFormatRequest>,
|
||||
) -> Result<tonic::Response<RepositoryObjectFormatResponse>, tonic::Status> {
|
||||
let inner = request.into_inner();
|
||||
let repo = self.repo_label(inner.repository.as_ref());
|
||||
let span = tracing::info_span!("repo.get_object_format", %repo);
|
||||
let _enter = span.enter();
|
||||
let gb = self.resolve(inner.repository.as_ref())?;
|
||||
Ok(tonic::Response::new(RepositoryObjectFormatResponse {
|
||||
object_format: gb.object_format() as i32,
|
||||
@@ -84,6 +102,9 @@ impl repository_service_server::RepositoryService for GitksService {
|
||||
request: tonic::Request<GetDefaultBranchRequest>,
|
||||
) -> Result<tonic::Response<GetDefaultBranchResponse>, tonic::Status> {
|
||||
let inner = request.into_inner();
|
||||
let repo = self.repo_label(inner.repository.as_ref());
|
||||
let span = tracing::info_span!("repo.get_default_branch", %repo);
|
||||
let _enter = span.enter();
|
||||
let gb = self.resolve(inner.repository.as_ref())?;
|
||||
Ok(tonic::Response::new(GetDefaultBranchResponse {
|
||||
name: default_branch_name(&gb),
|
||||
@@ -95,6 +116,10 @@ impl repository_service_server::RepositoryService for GitksService {
|
||||
request: tonic::Request<SetDefaultBranchRequest>,
|
||||
) -> Result<tonic::Response<()>, tonic::Status> {
|
||||
let inner = request.into_inner();
|
||||
let repo = self.repo_label(inner.repository.as_ref());
|
||||
let name = inner.name.clone();
|
||||
let span = tracing::info_span!("repo.set_default_branch", %repo, %name);
|
||||
let _enter = span.enter();
|
||||
let gb = self.resolve(inner.repository.as_ref())?;
|
||||
let refname = format!("refs/heads/{}", inner.name);
|
||||
let out = git_cmd(&gb, &["symbolic-ref", "HEAD", &refname])?;
|
||||
@@ -103,6 +128,7 @@ impl repository_service_server::RepositoryService for GitksService {
|
||||
String::from_utf8_lossy(&out.stderr).trim().to_string(),
|
||||
));
|
||||
}
|
||||
tracing::info!(%repo, %name, "default branch set");
|
||||
Ok(tonic::Response::new(()))
|
||||
}
|
||||
|
||||
@@ -111,6 +137,9 @@ impl repository_service_server::RepositoryService for GitksService {
|
||||
request: tonic::Request<GetRepositoryConfigRequest>,
|
||||
) -> Result<tonic::Response<GetRepositoryConfigResponse>, tonic::Status> {
|
||||
let inner = request.into_inner();
|
||||
let repo = self.repo_label(inner.repository.as_ref());
|
||||
let span = tracing::info_span!("repo.get_repository_config", %repo);
|
||||
let _enter = span.enter();
|
||||
let gb = self.resolve(inner.repository.as_ref())?;
|
||||
let mut entries = Vec::new();
|
||||
if inner.keys.is_empty() {
|
||||
@@ -156,6 +185,9 @@ impl repository_service_server::RepositoryService for GitksService {
|
||||
request: tonic::Request<SetRepositoryConfigRequest>,
|
||||
) -> Result<tonic::Response<()>, tonic::Status> {
|
||||
let inner = request.into_inner();
|
||||
let repo = self.repo_label(inner.repository.as_ref());
|
||||
let span = tracing::info_span!("repo.set_repository_config", %repo);
|
||||
let _enter = span.enter();
|
||||
let gb = self.resolve(inner.repository.as_ref())?;
|
||||
for entry in &inner.entries {
|
||||
if entry.values.is_empty() {
|
||||
@@ -178,6 +210,9 @@ impl repository_service_server::RepositoryService for GitksService {
|
||||
request: tonic::Request<RepositoryStatisticsRequest>,
|
||||
) -> Result<tonic::Response<RepositoryStatistics>, tonic::Status> {
|
||||
let inner = request.into_inner();
|
||||
let repo = self.repo_label(inner.repository.as_ref());
|
||||
let span = tracing::info_span!("repo.get_repository_statistics", %repo);
|
||||
let _enter = span.enter();
|
||||
let gb = self.resolve(inner.repository.as_ref())?;
|
||||
Ok(tonic::Response::new(repository_maint::get_statistics(&gb)))
|
||||
}
|
||||
@@ -187,11 +222,13 @@ impl repository_service_server::RepositoryService for GitksService {
|
||||
request: tonic::Request<RepositoryHealthRequest>,
|
||||
) -> Result<tonic::Response<RepositoryHealthResponse>, tonic::Status> {
|
||||
let inner = request.into_inner();
|
||||
let repo = self.repo_label(inner.repository.as_ref());
|
||||
let span = tracing::info_span!("repo.check_repository_health", %repo);
|
||||
let _enter = span.enter();
|
||||
let gb = self.resolve(inner.repository.as_ref())?;
|
||||
Ok(tonic::Response::new(repository_maint::check_health(
|
||||
&gb,
|
||||
inner.connectivity_only,
|
||||
)?))
|
||||
let resp = repository_maint::check_health(&gb, inner.connectivity_only)?;
|
||||
tracing::info!(%repo, ok = resp.ok, errors = resp.errors.len(), warnings = resp.warnings.len(), "health check done");
|
||||
Ok(tonic::Response::new(resp))
|
||||
}
|
||||
|
||||
async fn garbage_collect(
|
||||
@@ -199,12 +236,13 @@ impl repository_service_server::RepositoryService for GitksService {
|
||||
request: tonic::Request<GarbageCollectRequest>,
|
||||
) -> Result<tonic::Response<RepositoryMaintenanceResponse>, tonic::Status> {
|
||||
let inner = request.into_inner();
|
||||
let repo = self.repo_label(inner.repository.as_ref());
|
||||
let span = tracing::info_span!("repo.garbage_collect", %repo);
|
||||
let _enter = span.enter();
|
||||
let gb = self.resolve(inner.repository.as_ref())?;
|
||||
Ok(tonic::Response::new(repository_maint::run_gc(
|
||||
&gb,
|
||||
inner.prune,
|
||||
inner.aggressive,
|
||||
)?))
|
||||
let resp = repository_maint::run_gc(&gb, inner.prune, inner.aggressive)?;
|
||||
tracing::info!(%repo, ok = resp.ok, "gc done");
|
||||
Ok(tonic::Response::new(resp))
|
||||
}
|
||||
|
||||
async fn repack(
|
||||
@@ -212,13 +250,18 @@ impl repository_service_server::RepositoryService for GitksService {
|
||||
request: tonic::Request<RepackRequest>,
|
||||
) -> Result<tonic::Response<RepositoryMaintenanceResponse>, tonic::Status> {
|
||||
let inner = request.into_inner();
|
||||
let repo = self.repo_label(inner.repository.as_ref());
|
||||
let span = tracing::info_span!("repo.repack", %repo);
|
||||
let _enter = span.enter();
|
||||
let gb = self.resolve(inner.repository.as_ref())?;
|
||||
Ok(tonic::Response::new(repository_maint::run_repack(
|
||||
let resp = repository_maint::run_repack(
|
||||
&gb,
|
||||
inner.full,
|
||||
inner.write_bitmaps,
|
||||
inner.write_multi_pack_index,
|
||||
)?))
|
||||
)?;
|
||||
tracing::info!(%repo, ok = resp.ok, "repack done");
|
||||
Ok(tonic::Response::new(resp))
|
||||
}
|
||||
|
||||
async fn write_commit_graph(
|
||||
@@ -226,9 +269,12 @@ impl repository_service_server::RepositoryService for GitksService {
|
||||
request: tonic::Request<WriteCommitGraphRequest>,
|
||||
) -> Result<tonic::Response<RepositoryMaintenanceResponse>, tonic::Status> {
|
||||
let inner = request.into_inner();
|
||||
let repo = self.repo_label(inner.repository.as_ref());
|
||||
let span = tracing::info_span!("repo.write_commit_graph", %repo);
|
||||
let _enter = span.enter();
|
||||
let gb = self.resolve(inner.repository.as_ref())?;
|
||||
Ok(tonic::Response::new(
|
||||
repository_maint::run_commit_graph_write(&gb, inner.split, inner.replace)?,
|
||||
))
|
||||
let resp = repository_maint::run_commit_graph_write(&gb, inner.split, inner.replace)?;
|
||||
tracing::info!(%repo, ok = resp.ok, "commit-graph write done");
|
||||
Ok(tonic::Response::new(resp))
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user