Revert "svm repo split: fork metrics (#7442)"

Cargo.toml

@@ -105,7 +105,6 @@ members = [
     "svm-feature-set",
     "svm-log-collector",
     "svm-measure",
-    "svm-metrics",
     "svm-timings",
     "svm-transaction",
     "svm-type-overrides",
@@ -525,7 +524,6 @@ solana-svm-callback = { path = "svm-callback", version = "=3.1.0" }
 solana-svm-feature-set = { path = "svm-feature-set", version = "=3.1.0" }
 solana-svm-log-collector = { path = "svm-log-collector", version = "=3.1.0" }
 solana-svm-measure = { path = "svm-measure", version = "=3.1.0" }
-solana-svm-metrics = { path = "svm-metrics", version = "=3.1.0" }
 solana-svm-timings = { path = "svm-timings", version = "=3.1.0" }
 solana-svm-transaction = { path = "svm-transaction", version = "=3.1.0" }
 solana-svm-type-overrides = { path = "svm-type-overrides", version = "=3.1.0" }

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-svm-metrics"]
+metrics = ["dep:solana-metrics"]
 shuttle-test = ["solana-sbpf/shuttle-test", "solana-svm-type-overrides/shuttle-test"]
 
 [dependencies]
@@ -45,6 +45,7 @@ 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 }
@@ -56,7 +57,6 @@ solana-svm-callback = { workspace = true }
 solana-svm-feature-set = { workspace = true }
 solana-svm-log-collector = { workspace = true }
 solana-svm-measure = { workspace = true }
-solana-svm-metrics = { workspace = true, optional = true }
 solana-svm-timings = { workspace = true }
 solana-svm-transaction = { workspace = true }
 solana-svm-type-overrides = { workspace = true }

program-runtime/src/lib.rs

@@ -4,7 +4,7 @@
 
 #[cfg(feature = "metrics")]
 #[macro_use]
-extern crate solana_svm_metrics;
+extern crate solana_metrics;
 
 pub use solana_sbpf;
 pub mod execution_budget;