Skip to content

Commit d6a279f

Browse files
author
Jonathan Woollett-Light
committed
feat: Remove Running Firecracker start-up log
There is no clear value in the log and it introduces additional complexity. Signed-off-by: Jonathan Woollett-Light <jcawl@amazon.co.uk>
1 parent b859e50 commit d6a279f

File tree

5 files changed

+1
-22
lines changed

5 files changed

+1
-22
lines changed

src/firecracker/src/main.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,6 @@ fn main() -> ExitCode {
9393
fn main_exec() -> Result<(), MainError> {
9494
// Initialize the logger.
9595
LOGGER.init().map_err(MainError::SetLogger)?;
96-
info!("Running Firecracker v{FIRECRACKER_VERSION}");
9796

9897
register_signal_handlers().map_err(MainError::RegisterSignalHandlers)?;
9998

src/logger/Cargo.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ name = "logger"
33
version = "0.1.0"
44
authors = ["Amazon Firecracker team <firecracker-devel@amazon.com>"]
55
edition = "2021"
6-
build = "../../build.rs"
76
license = "Apache-2.0"
87

98
[lib]

src/logger/src/logger.rs

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,6 @@ const DEFAULT_LEVEL: log::LevelFilter = log::LevelFilter::Info;
2222
pub const DEFAULT_INSTANCE_ID: &str = "anonymous-instance";
2323
/// Instance id.
2424
pub static INSTANCE_ID: OnceLock<String> = OnceLock::new();
25-
/// Semver version of Firecracker.
26-
const FIRECRACKER_VERSION: &str = env!("FIRECRACKER_VERSION");
2725

2826
/// The logger.
2927
///
@@ -96,13 +94,6 @@ impl Logger {
9694
guard.filter.module = Some(module);
9795
}
9896

99-
// Ensure we drop the guard before attempting to log, otherwise this
100-
// would deadlock.
101-
drop(guard);
102-
if target_changed {
103-
log::info!("Running Firecracker v{FIRECRACKER_VERSION}");
104-
}
105-
10697
Ok(())
10798
}
10899
}

tests/framework/microvm.py

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -316,9 +316,7 @@ def _validate_api_response_times(self):
316316
def firecracker_version(self):
317317
"""Return the version of the Firecracker executable."""
318318
_, stdout, _ = utils.run_cmd(f"{self._fc_binary_path} --version")
319-
# The 1st line will be `Running Firecracker vX.Y.Z`
320-
# The 2nd line will be the output from `--version`.
321-
line = stdout.split("\n")[1]
319+
line = stdout.partition("\n")[0]
322320
result = re.match(r"^Firecracker v(.+)", line)
323321
return result.group(1)
324322

@@ -504,8 +502,6 @@ def spawn(
504502
# and leave 0.2 delay between them.
505503
if "no-api" not in self.jailer.extra_args:
506504
self._wait_create()
507-
if self.log_file and log_level in ("Trace", "Debug", "Info"):
508-
self.check_log_message("Running Firecracker")
509505

510506
@retry(delay=0.2, tries=5)
511507
def _wait_create(self):

tests/integration_tests/functional/test_logging.py

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -235,12 +235,6 @@ def _test_log_config(microvm, log_level="Info", show_level=True, show_origin=Tru
235235

236236
lines = microvm.log_data.splitlines()
237237

238-
# Check for `Running Firecracker` message.
239-
configured_level_no = LOG_LEVELS.index(to_formal_log_level(log_level))
240-
info_level_no = LOG_LEVELS.index("INFO")
241-
if info_level_no <= configured_level_no:
242-
assert "Running Firecracker" in lines[0]
243-
244238
# Check format of messages
245239
for line in lines:
246240
check_log_message_format(line, microvm.id, log_level, show_level, show_origin)

0 commit comments

Comments
 (0)