Tiny

metalbear-co · Jan 28, 2025 · de738d4 · de738d4
1 parent 2393d06
commit de738d4
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/mirrord/intproxy/src/lib.rs b/mirrord/intproxy/src/lib.rs
@@ -276,7 +276,7 @@ impl IntProxy {
 
     /// Routes most messages from the agent to the correct background task.
     /// Some messages are handled here.
-    #[tracing::instrument(level = Level::TRACE, skip(self))]
+    #[tracing::instrument(level = Level::TRACE, skip(self), err)]
     async fn handle_agent_message(&mut self, message: DaemonMessage) -> Result<(), IntProxyError> {
         match message {
             DaemonMessage::Pong => self.task_txs.ping_pong.send(AgentSentPong).await,
@@ -361,7 +361,7 @@ impl IntProxy {
     }
 
     /// Routes a message from the layer to the correct background task.
-    #[tracing::instrument(level = Level::TRACE, skip(self))]
+    #[tracing::instrument(level = Level::TRACE, skip(self), err)]
     async fn handle_layer_message(&self, message: FromLayer) -> Result<(), IntProxyError> {
         let FromLayer {
             message_id,
@@ -410,7 +410,7 @@ impl IntProxy {
         Ok(())
     }
 
-    #[tracing::instrument(level = Level::TRACE, skip(self))]
+    #[tracing::instrument(level = Level::TRACE, skip(self), err)]
     async fn handle_connection_refresh(&self) -> Result<(), IntProxyError> {
         self.task_txs
             .incoming

diff --git a/mirrord/intproxy/src/main_tasks.rs b/mirrord/intproxy/src/main_tasks.rs
@@ -19,7 +19,7 @@ pub enum ProxyMessage {
     FromLayer(FromLayer),
     /// New layer instance to serve.
     NewLayer(NewLayer),
-    /// Connection to agent was dropped and need reload.
+    /// Connection to agent was dropped and needs reload.
     ConnectionRefresh,
 }
 

diff --git a/mirrord/kube/src/api/kubernetes/portforwarder.rs b/mirrord/kube/src/api/kubernetes/portforwarder.rs
@@ -168,13 +168,13 @@ impl SinglePortForwarder {
                     if let Some(error) = error {
                         tracing::warn!(?connect_info, %error, "error while performing port-forward");
                     } else {
-                        tracing::warn!(?connect_info, "connection exited without error");
+                        tracing::warn!(?connect_info, "port-forward connection closed without any error published in relevant channel");
 
                         break;
                     }
 
                     if retry_strategy.peek().is_none() {
-                        tracing::warn!(?connect_info, "finished retry strategy, closing connection");
+                        tracing::warn!(?connect_info, "port-forward connection retry strategy has reached it's limit on attempts to connect, not attempting again.");
 
                         break;
                     }