Ver Fonte

v3.0: program-runtime: drop metrics (backport of #7807) (#7827)

program-runtime: drop metrics (#7807)

program-runtime: remove metrics dependency

Co-authored-by: Joe C <joe.caulfield@anza.xyz>
mergify[bot] há 2 meses atrás
pai
commit
602c0e6dab

+ 0 - 1
Cargo.lock

@@ -9689,7 +9689,6 @@ dependencies = [
  "solana-instruction-error",
  "solana-instruction-error",
  "solana-keypair",
  "solana-keypair",
  "solana-last-restart-slot",
  "solana-last-restart-slot",
- "solana-metrics",
  "solana-program-entrypoint",
  "solana-program-entrypoint",
  "solana-program-runtime",
  "solana-program-runtime",
  "solana-pubkey",
  "solana-pubkey",

+ 1 - 2
program-runtime/Cargo.toml

@@ -20,7 +20,7 @@ name = "solana_program_runtime"
 dev-context-only-utils = []
 dev-context-only-utils = []
 dummy-for-ci-check = ["metrics"]
 dummy-for-ci-check = ["metrics"]
 frozen-abi = ["dep:solana-frozen-abi", "dep:solana-frozen-abi-macro"]
 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"]
 shuttle-test = ["solana-sbpf/shuttle-test", "solana-svm-type-overrides/shuttle-test"]
 
 
 [dependencies]
 [dependencies]
@@ -45,7 +45,6 @@ solana-frozen-abi-macro = { workspace = true, optional = true, features = [
 solana-hash = { workspace = true }
 solana-hash = { workspace = true }
 solana-instruction = { workspace = true }
 solana-instruction = { workspace = true }
 solana-last-restart-slot = { workspace = true }
 solana-last-restart-slot = { workspace = true }
-solana-metrics = { workspace = true, optional = true }
 solana-program-entrypoint = { workspace = true }
 solana-program-entrypoint = { workspace = true }
 solana-pubkey = { workspace = true }
 solana-pubkey = { workspace = true }
 solana-rent = { workspace = true }
 solana-rent = { workspace = true }

+ 0 - 4
program-runtime/src/lib.rs

@@ -2,10 +2,6 @@
 #![deny(clippy::arithmetic_side_effects)]
 #![deny(clippy::arithmetic_side_effects)]
 #![deny(clippy::indexing_slicing)]
 #![deny(clippy::indexing_slicing)]
 
 
-#[cfg(feature = "metrics")]
-#[macro_use]
-extern crate solana_metrics;
-
 pub use solana_sbpf;
 pub use solana_sbpf;
 pub mod execution_budget;
 pub mod execution_budget;
 pub mod invoke_context;
 pub mod invoke_context;

+ 0 - 8
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_load_elf_us += self.load_elf_us;
         timings.create_executor_verify_code_us += self.verify_code_us;
         timings.create_executor_verify_code_us += self.verify_code_us;
         timings.create_executor_jit_compile_us += self.jit_compile_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),
-        );
     }
     }
 }
 }
 
 

+ 0 - 1
programs/sbf/Cargo.lock

@@ -7564,7 +7564,6 @@ dependencies = [
  "solana-hash",
  "solana-hash",
  "solana-instruction",
  "solana-instruction",
  "solana-last-restart-slot",
  "solana-last-restart-slot",
- "solana-metrics",
  "solana-program-entrypoint",
  "solana-program-entrypoint",
  "solana-pubkey",
  "solana-pubkey",
  "solana-rent",
  "solana-rent",