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
+119
-61
@@ -1,13 +1,22 @@
|
||||
mod common;
|
||||
|
||||
use gitks::pb::tree_service_server::TreeService;
|
||||
use gitks::pb::*;
|
||||
|
||||
#[test]
|
||||
fn test_list_tree_recursive() {
|
||||
let (_dir, gb) = common::setup_bare_repo();
|
||||
let result = gb
|
||||
.list_tree(ListTreeRequest {
|
||||
repository: None,
|
||||
fn hdr() -> RepositoryHeader {
|
||||
RepositoryHeader {
|
||||
relative_path: "test-repo".into(),
|
||||
..Default::default()
|
||||
}
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
async fn test_list_tree_recursive() {
|
||||
let (dir, _gb) = common::setup_bare_repo();
|
||||
let svc = common::setup_service(dir.path());
|
||||
let result = svc
|
||||
.list_tree(tonic::Request::new(ListTreeRequest {
|
||||
repository: Some(hdr()),
|
||||
revision: Some(ObjectSelector {
|
||||
selector: Some(object_selector::Selector::Revision(ObjectName {
|
||||
revision: "main".into(),
|
||||
@@ -16,8 +25,10 @@ fn test_list_tree_recursive() {
|
||||
path: String::new(),
|
||||
recursive: true,
|
||||
pagination: None,
|
||||
})
|
||||
.expect("list_tree recursive");
|
||||
}))
|
||||
.await
|
||||
.unwrap()
|
||||
.into_inner();
|
||||
|
||||
let paths: Vec<String> = result.entries.iter().map(|e| e.path.clone()).collect();
|
||||
assert!(
|
||||
@@ -27,33 +38,38 @@ fn test_list_tree_recursive() {
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_get_tree_subpath() {
|
||||
let (_dir, gb) = common::setup_bare_repo();
|
||||
let result = gb
|
||||
.get_tree(GetTreeRequest {
|
||||
repository: None,
|
||||
#[tokio::test]
|
||||
async fn test_get_tree_subpath() {
|
||||
let (dir, _gb) = common::setup_bare_repo();
|
||||
let svc = common::setup_service(dir.path());
|
||||
let result = svc
|
||||
.get_tree(tonic::Request::new(GetTreeRequest {
|
||||
repository: Some(hdr()),
|
||||
revision: Some(ObjectSelector {
|
||||
selector: Some(object_selector::Selector::Revision(ObjectName {
|
||||
revision: "main".into(),
|
||||
})),
|
||||
}),
|
||||
path: "src".into(),
|
||||
})
|
||||
.expect("get_tree subpath");
|
||||
}))
|
||||
.await
|
||||
.unwrap()
|
||||
.into_inner();
|
||||
|
||||
assert!(result.oid.is_some());
|
||||
let root_tree = gb
|
||||
.get_tree(GetTreeRequest {
|
||||
repository: None,
|
||||
let root_tree = svc
|
||||
.get_tree(tonic::Request::new(GetTreeRequest {
|
||||
repository: Some(hdr()),
|
||||
revision: Some(ObjectSelector {
|
||||
selector: Some(object_selector::Selector::Revision(ObjectName {
|
||||
revision: "main".into(),
|
||||
})),
|
||||
}),
|
||||
path: String::new(),
|
||||
})
|
||||
.expect("get_tree root");
|
||||
}))
|
||||
.await
|
||||
.unwrap()
|
||||
.into_inner();
|
||||
assert_ne!(
|
||||
result.oid.unwrap().hex,
|
||||
root_tree.oid.unwrap().hex,
|
||||
@@ -61,12 +77,13 @@ fn test_get_tree_subpath() {
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_find_files() {
|
||||
let (_dir, gb) = common::setup_bare_repo();
|
||||
let result = gb
|
||||
.find_files(FindFilesRequest {
|
||||
repository: None,
|
||||
#[tokio::test]
|
||||
async fn test_find_files() {
|
||||
let (dir, _gb) = common::setup_bare_repo();
|
||||
let svc = common::setup_service(dir.path());
|
||||
let result = svc
|
||||
.find_files(tonic::Request::new(FindFilesRequest {
|
||||
repository: Some(hdr()),
|
||||
revision: Some(ObjectSelector {
|
||||
selector: Some(object_selector::Selector::Revision(ObjectName {
|
||||
revision: "main".into(),
|
||||
@@ -75,19 +92,22 @@ fn test_find_files() {
|
||||
pattern: "mod.rs".into(),
|
||||
pathspec: vec![],
|
||||
pagination: None,
|
||||
})
|
||||
.expect("find_files");
|
||||
}))
|
||||
.await
|
||||
.unwrap()
|
||||
.into_inner();
|
||||
|
||||
assert!(!result.files.is_empty());
|
||||
assert!(result.files.iter().all(|f| f.path.contains("mod.rs")));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_get_blob() {
|
||||
let (_dir, gb) = common::setup_bare_repo();
|
||||
let blob = gb
|
||||
.get_blob(GetBlobRequest {
|
||||
repository: None,
|
||||
#[tokio::test]
|
||||
async fn test_get_blob() {
|
||||
let (dir, _gb) = common::setup_bare_repo();
|
||||
let svc = common::setup_service(dir.path());
|
||||
let blob = svc
|
||||
.get_blob(tonic::Request::new(GetBlobRequest {
|
||||
repository: Some(hdr()),
|
||||
revision: Some(ObjectSelector {
|
||||
selector: Some(object_selector::Selector::Revision(ObjectName {
|
||||
revision: "main".into(),
|
||||
@@ -96,8 +116,10 @@ fn test_get_blob() {
|
||||
path: "README.md".into(),
|
||||
oid: None,
|
||||
max_bytes: 0,
|
||||
})
|
||||
.expect("get_blob");
|
||||
}))
|
||||
.await
|
||||
.unwrap()
|
||||
.into_inner();
|
||||
|
||||
let content = String::from_utf8_lossy(&blob.data);
|
||||
assert!(content.contains("# Test"));
|
||||
@@ -105,12 +127,13 @@ fn test_get_blob() {
|
||||
assert!(!blob.binary);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_get_blob_with_truncation() {
|
||||
let (_dir, gb) = common::setup_bare_repo();
|
||||
let blob = gb
|
||||
.get_blob(GetBlobRequest {
|
||||
repository: None,
|
||||
#[tokio::test]
|
||||
async fn test_get_blob_with_truncation() {
|
||||
let (dir, _gb) = common::setup_bare_repo();
|
||||
let svc = common::setup_service(dir.path());
|
||||
let blob = svc
|
||||
.get_blob(tonic::Request::new(GetBlobRequest {
|
||||
repository: Some(hdr()),
|
||||
revision: Some(ObjectSelector {
|
||||
selector: Some(object_selector::Selector::Revision(ObjectName {
|
||||
revision: "main".into(),
|
||||
@@ -119,8 +142,10 @@ fn test_get_blob_with_truncation() {
|
||||
path: "README.md".into(),
|
||||
oid: None,
|
||||
max_bytes: 5,
|
||||
})
|
||||
.expect("get_blob truncated");
|
||||
}))
|
||||
.await
|
||||
.unwrap()
|
||||
.into_inner();
|
||||
|
||||
assert_eq!(blob.data.len(), 5);
|
||||
assert!(blob.truncated);
|
||||
@@ -130,32 +155,36 @@ fn test_get_blob_with_truncation() {
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_get_file_metadata() {
|
||||
let (_dir, gb) = common::setup_bare_repo();
|
||||
let meta = gb
|
||||
.get_file_metadata(GetFileMetadataRequest {
|
||||
repository: None,
|
||||
#[tokio::test]
|
||||
async fn test_get_file_metadata() {
|
||||
let (dir, _gb) = common::setup_bare_repo();
|
||||
let svc = common::setup_service(dir.path());
|
||||
let meta = svc
|
||||
.get_file_metadata(tonic::Request::new(GetFileMetadataRequest {
|
||||
repository: Some(hdr()),
|
||||
revision: Some(ObjectSelector {
|
||||
selector: Some(object_selector::Selector::Revision(ObjectName {
|
||||
revision: "main".into(),
|
||||
})),
|
||||
}),
|
||||
path: "README.md".into(),
|
||||
})
|
||||
.expect("get_file_metadata");
|
||||
}))
|
||||
.await
|
||||
.unwrap()
|
||||
.into_inner();
|
||||
|
||||
assert_eq!(meta.path, "README.md");
|
||||
assert!(meta.oid.is_some());
|
||||
assert_eq!(meta.r#type, ObjectType::Blob as i32);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_list_tree_with_pagination() {
|
||||
let (_dir, gb) = common::setup_bare_repo();
|
||||
let result = gb
|
||||
.list_tree(ListTreeRequest {
|
||||
repository: None,
|
||||
#[tokio::test]
|
||||
async fn test_list_tree_with_pagination() {
|
||||
let (dir, _gb) = common::setup_bare_repo();
|
||||
let svc = common::setup_service(dir.path());
|
||||
let result = svc
|
||||
.list_tree(tonic::Request::new(ListTreeRequest {
|
||||
repository: Some(hdr()),
|
||||
revision: Some(ObjectSelector {
|
||||
selector: Some(object_selector::Selector::Revision(ObjectName {
|
||||
revision: "main".into(),
|
||||
@@ -167,10 +196,39 @@ fn test_list_tree_with_pagination() {
|
||||
page_size: 1,
|
||||
page_token: String::new(),
|
||||
}),
|
||||
})
|
||||
.expect("list_tree paginated");
|
||||
}))
|
||||
.await
|
||||
.unwrap()
|
||||
.into_inner();
|
||||
|
||||
assert_eq!(result.entries.len(), 1);
|
||||
let pi = result.page_info.unwrap();
|
||||
assert!(pi.has_next_page);
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
async fn test_get_raw_blob() {
|
||||
let (dir, _gb) = common::setup_bare_repo();
|
||||
let svc = common::setup_service(dir.path());
|
||||
let stream = svc
|
||||
.get_raw_blob(tonic::Request::new(GetRawBlobRequest {
|
||||
repository: Some(hdr()),
|
||||
revision: Some(ObjectSelector {
|
||||
selector: Some(object_selector::Selector::Revision(ObjectName {
|
||||
revision: "main".into(),
|
||||
})),
|
||||
}),
|
||||
path: "README.md".into(),
|
||||
oid: None,
|
||||
}))
|
||||
.await
|
||||
.unwrap()
|
||||
.into_inner();
|
||||
|
||||
let chunks: Vec<_> = tokio_stream::StreamExt::collect(stream).await;
|
||||
assert!(!chunks.is_empty(), "should have raw blob data");
|
||||
let data = &chunks[0].as_ref().unwrap().data;
|
||||
assert!(!data.is_empty(), "raw blob should not be empty");
|
||||
let content = String::from_utf8_lossy(data);
|
||||
assert!(content.contains("# Test"));
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user