Added 'info' log level (#3026)

metalbear-co · Jan 21, 2025 · 78f9570 · 78f9570
1 parent 95c79bd
commit 78f9570
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 3 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/changelog.d/+added-log-leve.internal.md b/changelog.d/+added-log-leve.internal.md
@@ -0,0 +1 @@
+Extended `mirrord-protocol` with info logs from the agent.
diff --git a/mirrord/cli/src/execution.rs b/mirrord/cli/src/execution.rs
@@ -27,7 +27,7 @@ use tokio::{
     sync::mpsc::{self, UnboundedReceiver},
 };
 use tokio_util::sync::CancellationToken;
-use tracing::{debug, error, trace, warn, Level};
+use tracing::{debug, error, info, trace, warn, Level};
 
 #[cfg(all(target_os = "macos", target_arch = "aarch64"))]
 use crate::extract::extract_arm64;
@@ -550,6 +550,7 @@ impl MirrordExecution {
                     match msg.level {
                         LogLevel::Error => error!("Agent log: {}", msg.message),
                         LogLevel::Warn => warn!("Agent log: {}", msg.message),
+                        LogLevel::Info => info!("Agent log: {}", msg.message),
                     }
 
                     continue;

diff --git a/mirrord/cli/src/port_forward.rs b/mirrord/cli/src/port_forward.rs
@@ -315,6 +315,7 @@ impl PortForwarder {
             DaemonMessage::LogMessage(log_message) => match log_message.level {
                 LogLevel::Warn => tracing::warn!("agent log: {}", log_message.message),
                 LogLevel::Error => tracing::error!("agent log: {}", log_message.message),
+                LogLevel::Info => tracing::info!("agent log: {}", log_message.message),
             },
             DaemonMessage::Close(error) => {
                 return Err(PortForwardError::AgentError(error));
@@ -556,6 +557,7 @@ impl ReversePortForwarder {
             DaemonMessage::LogMessage(log_message) => match log_message.level {
                 LogLevel::Warn => tracing::warn!("agent log: {}", log_message.message),
                 LogLevel::Error => tracing::error!("agent log: {}", log_message.message),
+                LogLevel::Info => tracing::info!("agent log: {}", log_message.message),
             },
             DaemonMessage::Close(error) => {
                 return Err(PortForwardError::AgentError(error));

diff --git a/mirrord/intproxy/src/lib.rs b/mirrord/intproxy/src/lib.rs
@@ -329,6 +329,7 @@ impl IntProxy {
             DaemonMessage::LogMessage(log) => match log.level {
                 LogLevel::Error => tracing::error!("agent log: {}", log.message),
                 LogLevel::Warn => tracing::warn!("agent log: {}", log.message),
+                LogLevel::Info => tracing::info!("agent log: {}", log.message),
             },
             DaemonMessage::GetEnvVarsResponse(res) => {
                 self.task_txs

diff --git a/mirrord/protocol/Cargo.toml b/mirrord/protocol/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "mirrord-protocol"
-version = "1.13.3"
+version = "1.13.4"
 authors.workspace = true
 description.workspace = true
 documentation.workspace = true

diff --git a/mirrord/protocol/src/codec.rs b/mirrord/protocol/src/codec.rs
@@ -24,10 +24,16 @@ use crate::{
     ResponseError,
 };
 
+/// Minimal mirrord-protocol version that that allows [`LogLevel::Info`].
+pub static INFO_LOG_VERSION: LazyLock<VersionReq> =
+    LazyLock::new(|| ">=1.13.4".parse().expect("Bad Identifier"));
+
 #[derive(Encode, Decode, Debug, PartialEq, Eq, Clone, Copy)]
 pub enum LogLevel {
     Warn,
     Error,
+    /// Supported from [`INFO_LOG_VERSION`].
+    Info,
 }
 
 #[derive(Encode, Decode, Debug, PartialEq, Eq, Clone)]

diff --git a/mirrord/vpn/src/agent.rs b/mirrord/vpn/src/agent.rs
@@ -136,6 +136,9 @@ impl Stream for VpnAgent {
                     LogLevel::Warn => {
                         tracing::warn!(message = %message.message, "agent sent warn message")
                     }
+                    LogLevel::Info => {
+                        tracing::info!(message = %message.message, "agent sent info message")
+                    }
                 }
 
                 self.poll_next(cx)
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Extended `mirrord-protocol` with info logs from the agent.