Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@ logforth = { version = "0.26.0", features = [
"layout-json",
] }
mea = { version = "0.3.11" }
mixtrics = { version = "0.2", features = ["opentelemetry_0_30"] }
opentelemetry = { version = "0.30.0", features = ["trace", "metrics"] }
opentelemetry-otlp = { version = "0.30.0", features = [
"trace",
Expand Down
2 changes: 2 additions & 0 deletions cmd/percas/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,10 @@ ctrlc = { workspace = true }
exn = { workspace = true }
log = { workspace = true }
mea = { workspace = true }
mixtrics = { workspace = true }
percas-cluster = { workspace = true }
percas-core = { workspace = true }
percas-metrics = { workspace = true }
percas-server = { workspace = true }
percas-version = { workspace = true }
serde = { workspace = true }
Expand Down
5 changes: 5 additions & 0 deletions cmd/percas/src/start.rs
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ use clap::ValueHint;
use exn::Result;
use exn::ResultExt;
use mea::shutdown::ShutdownRecv;
use mixtrics::registry::opentelemetry_0_30::OpenTelemetryMetricsRegistry;
use percas_cluster::GossipFuture;
use percas_cluster::GossipState;
use percas_cluster::NodeInfo;
Expand All @@ -30,6 +31,7 @@ use percas_core::ServerConfig;
use percas_core::make_runtime;
use percas_core::node_file_path;
use percas_core::num_cpus;
use percas_metrics::GlobalMetrics;
use percas_server::PercasContext;
use percas_server::server::make_acceptor_and_advertise_addr;
use percas_server::telemetry;
Expand Down Expand Up @@ -141,6 +143,9 @@ async fn run_server(server_rt: &Runtime, gossip_rt: &Runtime, config: Config) ->
config.storage.memory_capacity,
config.storage.disk_capacity,
config.storage.disk_throttle,
Some(OpenTelemetryMetricsRegistry::new(
GlobalMetrics::get().meter.clone(),
)),
)
.await
.or_raise(make_error)?;
Expand Down
1 change: 1 addition & 0 deletions crates/core/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ foyer = { workspace = true }
jemallocator = { workspace = true }
jiff = { workspace = true }
log = { workspace = true }
mixtrics = { workspace = true }
pin-project = { workspace = true }
serde = { workspace = true }
sysinfo = { workspace = true }
Expand Down
4 changes: 2 additions & 2 deletions crates/core/benches/benchmark.rs
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ fn foyer_engine(c: &mut Criterion) {
{
let dir = tempdir_in("/tmp").unwrap();
let engine = runtime.block_on(async {
FoyerEngine::try_new(dir.path(), Some(0), 4 * 1024 * 1024 * 1024, None)
FoyerEngine::try_new(dir.path(), Some(0), 4 * 1024 * 1024 * 1024, None, None)
.await
.unwrap()
});
Expand All @@ -58,7 +58,7 @@ fn foyer_engine(c: &mut Criterion) {
.for_each(|len| {
let dir = tempdir_in("/tmp").unwrap();
let engine = runtime.block_on(async {
FoyerEngine::try_new(dir.path(), Some(0), 4 * 1024 * 1024 * 1024, None)
FoyerEngine::try_new(dir.path(), Some(0), 4 * 1024 * 1024 * 1024, None, None)
.await
.unwrap()
});
Expand Down
13 changes: 10 additions & 3 deletions crates/core/src/engine.rs
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@ use foyer::IoEngineBuilder;
use foyer::PsyncIoEngineBuilder;
use foyer::RecoverMode;
use foyer::RuntimeOptions;
use mixtrics::registry::noop::NoopMetricsRegistry;
use mixtrics::registry::opentelemetry_0_30::OpenTelemetryMetricsRegistry;
use thiserror::Error;

use crate::available_memory;
Expand All @@ -54,6 +56,7 @@ impl FoyerEngine {
memory_capacity: Option<u64>,
disk_capacity: u64,
disk_throttle: Option<DiskThrottle>,
metrics_registry: Option<OpenTelemetryMetricsRegistry>,
) -> Result<Self, EngineError> {
let _ = std::fs::create_dir_all(data_dir);
if !data_dir.exists() {
Expand All @@ -74,6 +77,9 @@ impl FoyerEngine {
let parallelism = num_cpus().get();
let cache = HybridCacheBuilder::new()
.with_policy(HybridCachePolicy::WriteOnInsertion)
.with_metrics_registry(
metrics_registry.map_or(Box::new(NoopMetricsRegistry), |v| Box::new(v)),
)
.memory(
(memory_capacity.map_or_else(|| available_memory().get(), |v| v as usize) as f64
* DEFAULT_MEMORY_CAPACITY_FACTOR) as usize,
Expand Down Expand Up @@ -146,9 +152,10 @@ mod tests {
async fn test_get() {
let temp_dir = tempfile::tempdir().unwrap();

let engine = FoyerEngine::try_new(temp_dir.path(), Some(512 * 1024), 1024 * 1024, None)
.await
.unwrap();
let engine =
FoyerEngine::try_new(temp_dir.path(), Some(512 * 1024), 1024 * 1024, None, None)
.await
.unwrap();
engine.put(b"foo".to_vec().as_ref(), b"bar".to_vec().as_ref());

assert_compact_debug_snapshot!(
Expand Down
1 change: 1 addition & 0 deletions tests/toolkit/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,7 @@ pub fn start_test_server(_test_name: &str, rt: &Runtime) -> Option<TestServerSta
config.storage.memory_capacity,
config.storage.disk_capacity,
config.storage.disk_throttle,
None,
)
.await
.unwrap();
Expand Down
Loading