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:
zhenyi
+128
-86
@@ -1,13 +1,24 @@
|
||||
mod common;
|
||||
|
||||
use gitks::pb::commit_service_server::CommitService;
|
||||
use gitks::pb::merge_service_server::MergeService;
|
||||
use gitks::pb::tree_service_server::TreeService;
|
||||
use gitks::pb::*;
|
||||
|
||||
#[test]
|
||||
fn test_check_merge_no_conflict() {
|
||||
let (_dir, gb) = common::setup_bare_repo();
|
||||
let result = gb
|
||||
.check_merge(CheckMergeRequest {
|
||||
repository: None,
|
||||
fn hdr() -> RepositoryHeader {
|
||||
RepositoryHeader {
|
||||
relative_path: "test-repo".into(),
|
||||
..Default::default()
|
||||
}
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
async fn test_check_merge_no_conflict() {
|
||||
let (dir, _gb) = common::setup_bare_repo();
|
||||
let svc = common::setup_service(dir.path());
|
||||
let result = svc
|
||||
.check_merge(tonic::Request::new(CheckMergeRequest {
|
||||
repository: Some(hdr()),
|
||||
target: Some(ObjectSelector {
|
||||
selector: Some(object_selector::Selector::Revision(ObjectName {
|
||||
revision: "main".into(),
|
||||
@@ -19,8 +30,10 @@ fn test_check_merge_no_conflict() {
|
||||
})),
|
||||
}),
|
||||
options: None,
|
||||
})
|
||||
.expect("check_merge");
|
||||
}))
|
||||
.await
|
||||
.unwrap()
|
||||
.into_inner();
|
||||
|
||||
assert!(
|
||||
result.status == merge_result::Status::MergeResultStatusMerged as i32
|
||||
@@ -31,12 +44,13 @@ fn test_check_merge_no_conflict() {
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_check_merge_with_conflict() {
|
||||
let (_dir, gb) = common::setup_bare_repo_with_conflict();
|
||||
let result = gb
|
||||
.check_merge(CheckMergeRequest {
|
||||
repository: None,
|
||||
#[tokio::test]
|
||||
async fn test_check_merge_with_conflict() {
|
||||
let (dir, _gb) = common::setup_bare_repo_with_conflict();
|
||||
let svc = common::setup_service(dir.path());
|
||||
let result = svc
|
||||
.check_merge(tonic::Request::new(CheckMergeRequest {
|
||||
repository: Some(hdr()),
|
||||
target: Some(ObjectSelector {
|
||||
selector: Some(object_selector::Selector::Revision(ObjectName {
|
||||
revision: "branch-a".into(),
|
||||
@@ -48,8 +62,10 @@ fn test_check_merge_with_conflict() {
|
||||
})),
|
||||
}),
|
||||
options: None,
|
||||
})
|
||||
.expect("check_merge with conflict");
|
||||
}))
|
||||
.await
|
||||
.unwrap()
|
||||
.into_inner();
|
||||
|
||||
assert_eq!(
|
||||
result.status,
|
||||
@@ -59,12 +75,13 @@ fn test_check_merge_with_conflict() {
|
||||
assert!(!result.conflicts.is_empty(), "should list conflicted files");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_check_merge_already_up_to_date() {
|
||||
let (_dir, gb) = common::setup_bare_repo();
|
||||
let result = gb
|
||||
.check_merge(CheckMergeRequest {
|
||||
repository: None,
|
||||
#[tokio::test]
|
||||
async fn test_check_merge_already_up_to_date() {
|
||||
let (dir, _gb) = common::setup_bare_repo();
|
||||
let svc = common::setup_service(dir.path());
|
||||
let result = svc
|
||||
.check_merge(tonic::Request::new(CheckMergeRequest {
|
||||
repository: Some(hdr()),
|
||||
target: Some(ObjectSelector {
|
||||
selector: Some(object_selector::Selector::Revision(ObjectName {
|
||||
revision: "main".into(),
|
||||
@@ -76,8 +93,10 @@ fn test_check_merge_already_up_to_date() {
|
||||
})),
|
||||
}),
|
||||
options: None,
|
||||
})
|
||||
.expect("check_merge same ref");
|
||||
}))
|
||||
.await
|
||||
.unwrap()
|
||||
.into_inner();
|
||||
|
||||
assert_eq!(
|
||||
result.status,
|
||||
@@ -85,12 +104,13 @@ fn test_check_merge_already_up_to_date() {
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_merge_fast_forward() {
|
||||
let (_dir, gb) = common::setup_bare_repo();
|
||||
let result = gb
|
||||
.merge(MergeRequest {
|
||||
repository: None,
|
||||
#[tokio::test]
|
||||
async fn test_merge_fast_forward() {
|
||||
let (dir, _gb) = common::setup_bare_repo();
|
||||
let svc = common::setup_service(dir.path());
|
||||
let result = svc
|
||||
.merge(tonic::Request::new(MergeRequest {
|
||||
repository: Some(hdr()),
|
||||
target_branch: "feature".into(),
|
||||
source: Some(ObjectSelector {
|
||||
selector: Some(object_selector::Selector::Revision(ObjectName {
|
||||
@@ -100,8 +120,10 @@ fn test_merge_fast_forward() {
|
||||
committer: None,
|
||||
message: String::new(),
|
||||
options: None,
|
||||
})
|
||||
.expect("merge fast-forward");
|
||||
}))
|
||||
.await
|
||||
.unwrap()
|
||||
.into_inner();
|
||||
|
||||
assert!(
|
||||
result.status == merge_result::Status::MergeResultStatusFastForward as i32
|
||||
@@ -111,12 +133,13 @@ fn test_merge_fast_forward() {
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_merge_with_conflict() {
|
||||
let (_dir, gb) = common::setup_bare_repo_with_conflict();
|
||||
let result = gb
|
||||
.merge(MergeRequest {
|
||||
repository: None,
|
||||
#[tokio::test]
|
||||
async fn test_merge_with_conflict() {
|
||||
let (dir, _gb) = common::setup_bare_repo_with_conflict();
|
||||
let svc = common::setup_service(dir.path());
|
||||
let result = svc
|
||||
.merge(tonic::Request::new(MergeRequest {
|
||||
repository: Some(hdr()),
|
||||
target_branch: "branch-a".into(),
|
||||
source: Some(ObjectSelector {
|
||||
selector: Some(object_selector::Selector::Revision(ObjectName {
|
||||
@@ -126,8 +149,10 @@ fn test_merge_with_conflict() {
|
||||
committer: None,
|
||||
message: String::new(),
|
||||
options: None,
|
||||
})
|
||||
.expect("merge with conflict");
|
||||
}))
|
||||
.await
|
||||
.unwrap()
|
||||
.into_inner();
|
||||
|
||||
assert_eq!(
|
||||
result.status,
|
||||
@@ -136,12 +161,13 @@ fn test_merge_with_conflict() {
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_merge_fast_forward_only_aborts_non_fast_forward() {
|
||||
let (_dir, gb) = common::setup_bare_repo_with_conflict();
|
||||
let result = gb
|
||||
.merge(MergeRequest {
|
||||
repository: None,
|
||||
#[tokio::test]
|
||||
async fn test_merge_fast_forward_only_aborts_non_fast_forward() {
|
||||
let (dir, _gb) = common::setup_bare_repo_with_conflict();
|
||||
let svc = common::setup_service(dir.path());
|
||||
let result = svc
|
||||
.merge(tonic::Request::new(MergeRequest {
|
||||
repository: Some(hdr()),
|
||||
target_branch: "branch-a".into(),
|
||||
source: Some(ObjectSelector {
|
||||
selector: Some(object_selector::Selector::Revision(ObjectName {
|
||||
@@ -154,8 +180,10 @@ fn test_merge_fast_forward_only_aborts_non_fast_forward() {
|
||||
fast_forward: merge_options::FastForwardMode::MergeFastForwardModeOnly as i32,
|
||||
..Default::default()
|
||||
}),
|
||||
})
|
||||
.expect("merge fast-forward only");
|
||||
}))
|
||||
.await
|
||||
.unwrap()
|
||||
.into_inner();
|
||||
|
||||
assert_eq!(
|
||||
result.status,
|
||||
@@ -164,12 +192,13 @@ fn test_merge_fast_forward_only_aborts_non_fast_forward() {
|
||||
assert!(result.commit.is_none());
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_list_merge_conflicts() {
|
||||
let (_dir, gb) = common::setup_bare_repo_with_conflict();
|
||||
let result = gb
|
||||
.list_merge_conflicts(ListMergeConflictsRequest {
|
||||
repository: None,
|
||||
#[tokio::test]
|
||||
async fn test_list_merge_conflicts() {
|
||||
let (dir, _gb) = common::setup_bare_repo_with_conflict();
|
||||
let svc = common::setup_service(dir.path());
|
||||
let result = svc
|
||||
.list_merge_conflicts(tonic::Request::new(ListMergeConflictsRequest {
|
||||
repository: Some(hdr()),
|
||||
target: Some(ObjectSelector {
|
||||
selector: Some(object_selector::Selector::Revision(ObjectName {
|
||||
revision: "branch-a".into(),
|
||||
@@ -181,8 +210,10 @@ fn test_list_merge_conflicts() {
|
||||
})),
|
||||
}),
|
||||
pagination: None,
|
||||
})
|
||||
.expect("list_merge_conflicts");
|
||||
}))
|
||||
.await
|
||||
.unwrap()
|
||||
.into_inner();
|
||||
|
||||
assert!(!result.conflicts.is_empty(), "should list conflicted files");
|
||||
assert!(
|
||||
@@ -191,13 +222,14 @@ fn test_list_merge_conflicts() {
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_resolve_merge_conflicts() {
|
||||
let (_dir, gb) = common::setup_bare_repo_with_conflict();
|
||||
#[tokio::test]
|
||||
async fn test_resolve_merge_conflicts() {
|
||||
let (dir, _gb) = common::setup_bare_repo_with_conflict();
|
||||
let svc = common::setup_service(dir.path());
|
||||
|
||||
let result = gb
|
||||
.resolve_merge_conflicts(ResolveMergeConflictsRequest {
|
||||
repository: None,
|
||||
let result = svc
|
||||
.resolve_merge_conflicts(tonic::Request::new(ResolveMergeConflictsRequest {
|
||||
repository: Some(hdr()),
|
||||
target_branch: "branch-a".into(),
|
||||
source: Some(ObjectSelector {
|
||||
selector: Some(object_selector::Selector::Revision(ObjectName {
|
||||
@@ -210,8 +242,10 @@ fn test_resolve_merge_conflicts() {
|
||||
}],
|
||||
committer: None,
|
||||
message: "resolved conflicts".into(),
|
||||
})
|
||||
.expect("resolve_merge_conflicts");
|
||||
}))
|
||||
.await
|
||||
.unwrap()
|
||||
.into_inner();
|
||||
|
||||
assert_eq!(
|
||||
result.status,
|
||||
@@ -219,9 +253,9 @@ fn test_resolve_merge_conflicts() {
|
||||
);
|
||||
assert!(result.commit.is_some());
|
||||
|
||||
let blob = gb
|
||||
.get_blob(GetBlobRequest {
|
||||
repository: None,
|
||||
let blob = svc
|
||||
.get_blob(tonic::Request::new(GetBlobRequest {
|
||||
repository: Some(hdr()),
|
||||
revision: Some(ObjectSelector {
|
||||
selector: Some(object_selector::Selector::Revision(ObjectName {
|
||||
revision: "branch-a".into(),
|
||||
@@ -230,17 +264,20 @@ fn test_resolve_merge_conflicts() {
|
||||
path: "file.txt".into(),
|
||||
oid: None,
|
||||
max_bytes: 0,
|
||||
})
|
||||
.expect("get resolved blob");
|
||||
}))
|
||||
.await
|
||||
.unwrap()
|
||||
.into_inner();
|
||||
assert_eq!(String::from_utf8_lossy(&blob.data), "resolved content\n");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_rebase() {
|
||||
let (_dir, gb) = common::setup_bare_repo();
|
||||
#[tokio::test]
|
||||
async fn test_rebase() {
|
||||
let (dir, _gb) = common::setup_bare_repo();
|
||||
let svc = common::setup_service(dir.path());
|
||||
|
||||
gb.create_commit(CreateCommitRequest {
|
||||
repository: None,
|
||||
svc.create_commit(tonic::Request::new(CreateCommitRequest {
|
||||
repository: Some(hdr()),
|
||||
branch: "feature".into(),
|
||||
message: "feature work".into(),
|
||||
author: None,
|
||||
@@ -261,12 +298,13 @@ fn test_rebase() {
|
||||
}),
|
||||
force: false,
|
||||
trailers: vec![],
|
||||
})
|
||||
.expect("create feature commit");
|
||||
}))
|
||||
.await
|
||||
.unwrap();
|
||||
|
||||
let result = gb
|
||||
.rebase(RebaseRequest {
|
||||
repository: None,
|
||||
let result = svc
|
||||
.rebase(tonic::Request::new(RebaseRequest {
|
||||
repository: Some(hdr()),
|
||||
branch: "feature".into(),
|
||||
upstream: Some(ObjectSelector {
|
||||
selector: Some(object_selector::Selector::Revision(ObjectName {
|
||||
@@ -274,8 +312,10 @@ fn test_rebase() {
|
||||
})),
|
||||
}),
|
||||
committer: None,
|
||||
})
|
||||
.expect("rebase");
|
||||
}))
|
||||
.await
|
||||
.unwrap()
|
||||
.into_inner();
|
||||
|
||||
assert_eq!(
|
||||
result.status,
|
||||
@@ -283,9 +323,9 @@ fn test_rebase() {
|
||||
);
|
||||
assert!(result.head.is_some());
|
||||
|
||||
let blob = gb
|
||||
.get_blob(GetBlobRequest {
|
||||
repository: None,
|
||||
let blob = svc
|
||||
.get_blob(tonic::Request::new(GetBlobRequest {
|
||||
repository: Some(hdr()),
|
||||
revision: Some(ObjectSelector {
|
||||
selector: Some(object_selector::Selector::Revision(ObjectName {
|
||||
revision: "feature".into(),
|
||||
@@ -294,7 +334,9 @@ fn test_rebase() {
|
||||
path: "feature.txt".into(),
|
||||
oid: None,
|
||||
max_bytes: 0,
|
||||
})
|
||||
.expect("get rebased feature file");
|
||||
}))
|
||||
.await
|
||||
.unwrap()
|
||||
.into_inner();
|
||||
assert_eq!(String::from_utf8_lossy(&blob.data), "feature content");
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user