refactor: narrow startup compatibility shims (#3677)

rustfs/src/lib.rs

@@ -77,14 +77,12 @@ pub(crate) mod startup_embedded;
 pub(crate) mod startup_embedded_optional;
 pub mod startup_entrypoint;
 pub(crate) mod startup_fs_guard;
-pub mod startup_iam;
+pub(crate) mod startup_iam;
 pub(crate) mod startup_lifecycle;
 pub(crate) mod startup_notification;
 pub(crate) mod startup_observability;
 pub(crate) mod startup_optional_runtime_sidecars;
-pub mod startup_optional_runtimes;
 pub(crate) mod startup_preflight;
-pub mod startup_profiling;
 pub(crate) mod startup_protocols;
 pub(crate) mod startup_runtime;
 pub(crate) mod startup_runtime_hooks;

rustfs/src/startup_iam.rs

@@ -282,7 +282,8 @@ fn should_fail_test_init_attempt() -> bool {
 /// call re-reads the environment variable by restoring the sentinel value.
 /// Intended for use in integration tests that share a process.
 #[doc(hidden)]
-pub fn reset_test_failure_counter() {
+#[allow(dead_code)]
+pub(crate) fn reset_test_failure_counter() {
     use std::sync::atomic::Ordering;
     TEST_REMAINING_FAILURES.store(u64::MAX, Ordering::SeqCst);
 }

rustfs/src/startup_optional_runtimes.rs

@@ -1,18 +0,0 @@
-// Copyright 2024 RustFS Team
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-pub use crate::startup_optional_runtime_sidecars::{
-    OptionalRuntimeServices, init_optional_runtime_services, prepare_optional_runtime_shutdowns,
-    shutdown_optional_runtime_services,
-};

rustfs/src/startup_profiling.rs

@@ -1,15 +0,0 @@
-// Copyright 2024 RustFS Team
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-pub use crate::startup_runtime_hooks::{init_profiling_runtime, shutdown_profiling_runtime};

rustfs/src/startup_shutdown.rs

@@ -173,7 +173,7 @@ pub async fn run_startup_shutdown_sequence(
         state = "stopping",
         "Profiling shutdown started"
     );
-    crate::startup_profiling::shutdown_profiling_runtime();
+    crate::startup_runtime_hooks::shutdown_profiling_runtime();
 
     info!(
         target: "rustfs::main::handle_shutdown",