svm repo split: rename log collector (#7430)

svm repo split: rename `log-collector` to `svm-log-collector`

Author: buffalojoec

Cargo.lock

@@ -51,7 +51,6 @@ members = [
     "ledger-tool",
     "local-cluster",
     "log-analyzer",
-    "log-collector",
     "measure",
     "memory-management",
     "merkle-tree",
@@ -105,6 +104,7 @@ members = [
     "svm",
     "svm-callback",
     "svm-feature-set",
+    "svm-log-collector",
     "svm-transaction",
     "syscalls",
     "syscalls/gen-syscall-list",
@@ -450,7 +450,6 @@ solana-loader-v3-interface = "5.0.0"
 solana-loader-v4-interface = "2.2.1"
 solana-loader-v4-program = { path = "programs/loader-v4", version = "=3.0.0" }
 solana-local-cluster = { path = "local-cluster", version = "=3.0.0" }
-solana-log-collector = { path = "log-collector", version = "=3.0.0" }
 solana-logger = "3.0.0"
 solana-measure = { path = "measure", version = "=3.0.0" }
 solana-merkle-tree = { path = "merkle-tree", version = "=3.0.0" }
@@ -523,6 +522,7 @@ solana-streamer = { path = "streamer", version = "=3.0.0" }
 solana-svm = { path = "svm", version = "=3.0.0" }
 solana-svm-callback = { path = "svm-callback", version = "=3.0.0" }
 solana-svm-feature-set = { path = "svm-feature-set", version = "=3.0.0" }
+solana-svm-log-collector = { path = "svm-log-collector", version = "=3.0.0" }
 solana-svm-transaction = { path = "svm-transaction", version = "=3.0.0" }
 solana-system-interface = "1.0"
 solana-system-program = { path = "programs/system", version = "=3.0.0" }

Cargo.toml

@@ -58,7 +58,6 @@ solana-instruction = { workspace = true }
 solana-keypair = { workspace = true }
 solana-ledger = { workspace = true, features = ["dev-context-only-utils"] }
 solana-loader-v3-interface = { workspace = true }
-solana-log-collector = { workspace = true }
 solana-logger = "=3.0.0"
 solana-measure = { workspace = true }
 solana-message = { workspace = true }
@@ -79,6 +78,7 @@ solana-storage-bigtable = { workspace = true }
 solana-streamer = { workspace = true }
 solana-svm-callback = { workspace = true }
 solana-svm-feature-set = { workspace = true }
+solana-svm-log-collector = { workspace = true }
 solana-system-interface = { workspace = true }
 solana-transaction = { workspace = true }
 solana-transaction-context = { workspace = true }

ledger-tool/Cargo.toml

@@ -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-log-collector = { workspace = true }
 solana-measure = { workspace = true }
 solana-metrics = { workspace = true, optional = true }
 solana-program-entrypoint = { workspace = true }
@@ -56,6 +55,7 @@ solana-sdk-ids = { workspace = true }
 solana-slot-hashes = { workspace = true }
 solana-svm-callback = { workspace = true }
 solana-svm-feature-set = { workspace = true }
+solana-svm-log-collector = { workspace = true }
 solana-svm-transaction = { workspace = true }
 solana-system-interface = { workspace = true }
 solana-sysvar = { workspace = true }

program-runtime/Cargo.toml

@@ -13,7 +13,6 @@ use {
     solana_epoch_schedule::EpochSchedule,
     solana_hash::Hash,
     solana_instruction::{error::InstructionError, AccountMeta, Instruction},
-    solana_log_collector::{ic_msg, LogCollector},
     solana_measure::measure::Measure,
     solana_pubkey::Pubkey,
     solana_sbpf::{
@@ -28,6 +27,7 @@ use {
     },
     solana_svm_callback::InvokeContextCallback,
     solana_svm_feature_set::SVMFeatureSet,
+    solana_svm_log_collector::{ic_msg, LogCollector},
     solana_svm_transaction::{instruction::SVMInstruction, svm_message::SVMMessage},
     solana_timings::{ExecuteDetailsTimings, ExecuteTimings},
     solana_transaction_context::{
@@ -785,8 +785,8 @@ macro_rules! with_mock_invoke_context_with_feature_set {
         $transaction_accounts:expr $(,)?
     ) => {
         use {
-            solana_log_collector::LogCollector,
             solana_svm_callback::InvokeContextCallback,
+            solana_svm_log_collector::LogCollector,
             $crate::{
                 __private::{Hash, ReadableAccount, Rent, TransactionContext},
                 execution_budget::{SVMTransactionExecutionBudget, SVMTransactionExecutionCost},

program-runtime/src/invoke_context.rs

@@ -5,8 +5,8 @@
 use {
     base64::{prelude::BASE64_STANDARD, Engine},
     itertools::Itertools,
-    solana_log_collector::{ic_logger_msg, LogCollector},
     solana_pubkey::Pubkey,
+    solana_svm_log_collector::{ic_logger_msg, LogCollector},
     std::{cell::RefCell, rc::Rc},
 };
 

program-runtime/src/stable_log.rs

@@ -35,7 +35,6 @@ solana-hash = { workspace = true }
 solana-instruction = { workspace = true }
 solana-keypair = { workspace = true }
 solana-loader-v3-interface = { workspace = true }
-solana-log-collector = { workspace = true }
 solana-logger = { workspace = true }
 solana-message = { workspace = true }
 solana-msg = { workspace = true }
@@ -53,6 +52,7 @@ solana-signer = { workspace = true }
 solana-stable-layout = { workspace = true }
 solana-stake-interface = { workspace = true }
 solana-svm = { workspace = true }
+solana-svm-log-collector = { workspace = true }
 solana-system-interface = { workspace = true }
 solana-sysvar = { workspace = true }
 solana-sysvar-id = { workspace = true }

program-test/Cargo.toml

@@ -23,7 +23,6 @@ use {
         Instruction,
     },
     solana_keypair::Keypair,
-    solana_log_collector::ic_msg,
     solana_native_token::sol_to_lamports,
     solana_poh_config::PohConfig,
     solana_program_entrypoint::{deserialize, SUCCESS},
@@ -42,6 +41,7 @@ use {
         runtime_config::RuntimeConfig,
     },
     solana_signer::Signer,
+    solana_svm_log_collector::ic_msg,
     solana_sysvar::Sysvar,
     solana_sysvar_id::SysvarId,
     solana_timings::ExecuteTimings,

program-test/src/lib.rs

@@ -36,7 +36,6 @@ solana-clock = { workspace = true }
 solana-instruction = { workspace = true }
 solana-loader-v3-interface = { workspace = true, features = ["serde"] }
 solana-loader-v4-interface = { workspace = true, features = ["bincode"] }
-solana-log-collector = { workspace = true }
 solana-measure = { workspace = true }
 solana-packet = { workspace = true }
 solana-program-entrypoint = { workspace = true }
@@ -45,6 +44,7 @@ solana-pubkey = { workspace = true }
 solana-sbpf = { workspace = true }
 solana-sdk-ids = { workspace = true }
 solana-svm-feature-set = { workspace = true }
+solana-svm-log-collector = { workspace = true }
 solana-system-interface = { workspace = true }
 solana-transaction-context = { workspace = true, features = ["bincode"] }
 solana-type-overrides = { workspace = true }

programs/bpf_loader/Cargo.toml

@@ -10,7 +10,6 @@ use {
     solana_loader_v3_interface::{
         instruction::UpgradeableLoaderInstruction, state::UpgradeableLoaderState,
     },
-    solana_log_collector::{ic_logger_msg, ic_msg, LogCollector},
     solana_measure::measure::Measure,
     solana_program_entrypoint::{MAX_PERMITTED_DATA_INCREASE, SUCCESS},
     solana_program_runtime::{
@@ -38,6 +37,7 @@ use {
     solana_sdk_ids::{
         bpf_loader, bpf_loader_deprecated, bpf_loader_upgradeable, loader_v4, native_loader,
     },
+    solana_svm_log_collector::{ic_logger_msg, ic_msg, LogCollector},
     solana_system_interface::{instruction as system_instruction, MAX_PERMITTED_DATA_LENGTH},
     solana_transaction_context::{IndexOfAccount, InstructionContext, TransactionContext},
     solana_type_overrides::sync::{atomic::Ordering, Arc},