From 7900839b1ce466ba358676d08c845b6014c91bd9 Mon Sep 17 00:00:00 2001 From: Kirill Fomichev Date: Thu, 21 Nov 2024 22:56:41 +0200 Subject: [PATCH] solana-program-runtime: remove solana-metrics for wasm --- Cargo.lock | 1 - program-runtime/Cargo.toml | 2 +- program-runtime/src/lib.rs | 4 ++-- program-runtime/src/loaded_programs.rs | 16 ++++++++-------- 4 files changed, 11 insertions(+), 12 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index d3125d7da0..19a3689093 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -6864,7 +6864,6 @@ dependencies = [ "solana-frozen-abi-macro", "solana-logger", "solana-measure", - "solana-metrics", "solana-sdk", "solana-type-overrides", "solana-vote", diff --git a/program-runtime/Cargo.toml b/program-runtime/Cargo.toml index c714945419..8c8a101005 100644 --- a/program-runtime/Cargo.toml +++ b/program-runtime/Cargo.toml @@ -26,7 +26,7 @@ solana-compute-budget = { workspace = true } solana-frozen-abi = { workspace = true, optional = true } solana-frozen-abi-macro = { workspace = true, optional = true } solana-measure = { workspace = true } -solana-metrics = { workspace = true } +# solana-metrics = { workspace = true } solana-sdk = { workspace = true } solana-type-overrides = { workspace = true } solana-vote = { workspace = true } diff --git a/program-runtime/src/lib.rs b/program-runtime/src/lib.rs index 3627569bc5..b96e4bfcac 100644 --- a/program-runtime/src/lib.rs +++ b/program-runtime/src/lib.rs @@ -5,8 +5,8 @@ #[macro_use] extern crate eager; -#[macro_use] -extern crate solana_metrics; +// #[macro_use] +// extern crate solana_metrics; pub use solana_rbpf; pub mod invoke_context; diff --git a/program-runtime/src/loaded_programs.rs b/program-runtime/src/loaded_programs.rs index eab5a21e57..c65012ef8e 100644 --- a/program-runtime/src/loaded_programs.rs +++ b/program-runtime/src/loaded_programs.rs @@ -303,14 +303,14 @@ impl LoadProgramMetrics { saturating_add_assign!(timings.create_executor_load_elf_us, self.load_elf_us); saturating_add_assign!(timings.create_executor_verify_code_us, self.verify_code_us); saturating_add_assign!(timings.create_executor_jit_compile_us, self.jit_compile_us); - datapoint_trace!( - "create_executor_trace", - ("program_id", self.program_id, String), - ("register_syscalls_us", self.register_syscalls_us, i64), - ("load_elf_us", self.load_elf_us, i64), - ("verify_code_us", self.verify_code_us, i64), - ("jit_compile_us", self.jit_compile_us, i64), - ); + // datapoint_trace!( + // "create_executor_trace", + // ("program_id", self.program_id, String), + // ("register_syscalls_us", self.register_syscalls_us, i64), + // ("load_elf_us", self.load_elf_us, i64), + // ("verify_code_us", self.verify_code_us, i64), + // ("jit_compile_us", self.jit_compile_us, i64), + // ); } }