diff --git a/ipa-core/benches/oneshot/ipa.rs b/ipa-core/benches/oneshot/ipa.rs index 7b4ddcce5..47fe92946 100644 --- a/ipa-core/benches/oneshot/ipa.rs +++ b/ipa-core/benches/oneshot/ipa.rs @@ -1,4 +1,5 @@ use std::{ + env, num::{NonZeroU32, NonZeroU64, NonZeroUsize}, time::Instant, }; @@ -102,9 +103,11 @@ async fn run(args: Args) -> Result<(), Error> { gateway_config: GatewayConfig::new(args.active()), ..TestWorldConfig::default() }; + // Construct TestWorld early to initialize logging. + let world = TestWorld::new_with(&config); let seed = args.random_seed.unwrap_or_else(|| random()); - tracing::trace!( + tracing::info!( "Using random seed: {seed} for {q} records", q = args.query_size ); @@ -154,12 +157,11 @@ async fn run(args: Args) -> Result<(), Error> { &order, ); - let world = TestWorld::new_with(config.clone()); tracing::trace!("Preparation complete in {:?}", _prep_time.elapsed()); let _protocol_time = Instant::now(); test_oprf_ipa::(&world, raw_data, &expected_results, args.config()).await; - tracing::trace!( + tracing::info!( "{m:?} IPA for {q} records took {t:?}", m = args.mode, q = args.query_size, @@ -172,6 +174,12 @@ fn main() -> Result<(), Error> { #[cfg(feature = "dhat-heap")] let _profiler = dhat::Profiler::new_heap(); + // The default in test_fixture::logging is to enable logging for ipa-core only. Override that to + // include logs from the bench as well. + if env::var_os("RUST_LOG").is_none() { + env::set_var("RUST_LOG", format!("{}=INFO,{}=INFO", ipa_core::CRATE_NAME, env!("CARGO_CRATE_NAME"))); + } + let args = Args::parse(); let rt = Builder::new_multi_thread() .worker_threads(args.threads) diff --git a/ipa-core/src/lib.rs b/ipa-core/src/lib.rs index 984ba0f12..5cf0f3666 100644 --- a/ipa-core/src/lib.rs +++ b/ipa-core/src/lib.rs @@ -145,6 +145,8 @@ pub(crate) mod test_executor { } } +pub const CRATE_NAME: &'static str = env!("CARGO_CRATE_NAME"); + #[macro_export] macro_rules! const_assert { ($x:expr $(,)?) => {