diff --git a/Cargo.lock b/Cargo.lock index 4a4c8c8e5566e1..53de1f9cf109b9 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -9689,7 +9689,6 @@ dependencies = [ "solana-instruction-error", "solana-keypair", "solana-last-restart-slot", - "solana-metrics", "solana-program-entrypoint", "solana-program-runtime", "solana-pubkey", diff --git a/program-runtime/Cargo.toml b/program-runtime/Cargo.toml index 7d4182f24cda1d..1e0d4e6471e96c 100644 --- a/program-runtime/Cargo.toml +++ b/program-runtime/Cargo.toml @@ -20,7 +20,7 @@ name = "solana_program_runtime" dev-context-only-utils = [] dummy-for-ci-check = ["metrics"] frozen-abi = ["dep:solana-frozen-abi", "dep:solana-frozen-abi-macro"] -metrics = ["dep:solana-metrics"] +metrics = [] shuttle-test = ["solana-sbpf/shuttle-test", "solana-svm-type-overrides/shuttle-test"] [dependencies] @@ -45,7 +45,6 @@ solana-frozen-abi-macro = { workspace = true, optional = true, features = [ solana-hash = { workspace = true } solana-instruction = { workspace = true } solana-last-restart-slot = { workspace = true } -solana-metrics = { workspace = true, optional = true } solana-program-entrypoint = { workspace = true } solana-pubkey = { workspace = true } solana-rent = { workspace = true } diff --git a/program-runtime/src/lib.rs b/program-runtime/src/lib.rs index 4942513590016a..1a36dcd5992cdb 100644 --- a/program-runtime/src/lib.rs +++ b/program-runtime/src/lib.rs @@ -2,10 +2,6 @@ #![deny(clippy::arithmetic_side_effects)] #![deny(clippy::indexing_slicing)] -#[cfg(feature = "metrics")] -#[macro_use] -extern crate solana_metrics; - pub use solana_sbpf; pub mod execution_budget; pub mod invoke_context; diff --git a/program-runtime/src/loaded_programs.rs b/program-runtime/src/loaded_programs.rs index d9c7ef76f61804..ff00bbb884ae07 100644 --- a/program-runtime/src/loaded_programs.rs +++ b/program-runtime/src/loaded_programs.rs @@ -291,14 +291,6 @@ impl LoadProgramMetrics { timings.create_executor_load_elf_us += self.load_elf_us; timings.create_executor_verify_code_us += self.verify_code_us; 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), - ); } } diff --git a/programs/sbf/Cargo.lock b/programs/sbf/Cargo.lock index 1c778484551080..fc9e2526d2f037 100644 --- a/programs/sbf/Cargo.lock +++ b/programs/sbf/Cargo.lock @@ -7564,7 +7564,6 @@ dependencies = [ "solana-hash", "solana-instruction", "solana-last-restart-slot", - "solana-metrics", "solana-program-entrypoint", "solana-pubkey", "solana-rent",