feat/improve agent type not found log (#1019)

* feat: improve agent type not found log

Author: danielorihuela

agent-control/src/agent_type/agent_type_registry.rs

@@ -5,8 +5,8 @@ use super::definition::AgentTypeDefinition;
 
 #[derive(Error, Debug)]
 pub enum AgentRepositoryError {
-    #[error("agent not found")]
-    NotFound,
+    #[error("agent type `{0}` not found")]
+    NotFound(String),
     #[error("agent `{0}` already exists")]
     AlreadyExists(String),
     #[error("`{0}`")]
@@ -48,7 +48,7 @@ pub mod tests {
             self.expect_get()
                 .with(predicate::eq(name.clone()))
                 .once()
-                .returning(move |_| Err(AgentRepositoryError::NotFound));
+                .returning(move |_| Err(AgentRepositoryError::NotFound(name.clone())));
         }
     }
 }

agent-control/src/agent_type/embedded_registry.rs

@@ -41,7 +41,7 @@ impl AgentRegistry for EmbeddedRegistry {
         self.0
             .get(name)
             .cloned()
-            .ok_or(AgentRepositoryError::NotFound)
+            .ok_or(AgentRepositoryError::NotFound(name.to_string()))
     }
 }
 
@@ -149,7 +149,7 @@ pub mod tests {
         assert_eq!(definitions[1], agent_2);
 
         let err = registry.get("not-existent").unwrap_err();
-        assert_matches!(err, AgentRepositoryError::NotFound);
+        assert_matches!(err, AgentRepositoryError::NotFound(_));
     }
 
     #[test]

agent-control/src/sub_agent/effective_agents_assembler.rs

@@ -383,7 +383,7 @@ pub(crate) mod tests {
 
         assert!(result.is_err());
         assert_eq!(
-            "error assembling agents: `agent not found`",
+            "error assembling agents: `agent type `namespace/some_fqn:0.0.1` not found`",
             result.unwrap_err().to_string()
         );
     }

agent-control/src/sub_agent/sub_agent.rs

@@ -259,7 +259,7 @@ where
             .supervisor_assembler
             .assemble_supervisor(&self.maybe_opamp_client)
             .inspect_err(
-                |e| error!(agent_id = %self.agent_id, error = %e,"cannot assemble supervisor"),
+                |e| error!(agent_id = %self.agent_id, agent_type=%self.agent_cfg.agent_type, error = %e,"cannot assemble supervisor"),
             )
             .ok();
 

agent-control/src/sub_agent/supervisor/assembler.rs

@@ -96,7 +96,6 @@ where
                             |e| error!(%self.agent_id, %e, "error reporting remote config status"),
                         );
                 }
-                error!(agent_id=%self.agent_id, err = %e, "Error building the supervisor");
                 Err(SupervisorAssemblerError::AgentAssembleError(e.to_string()))
             }
             Ok(effective_agent) => {

test/e2e/ansible/agent_control_invalid_remote_config.yaml

@@ -161,7 +161,7 @@
 
     - name: get latest logs from the Agent Control
       # We were expecting this error:
-      # "Error applying Agent Control remote config: .config assembler error: .error assembling agents: .agent not found..."'
+      # "Error applying Agent Control remote config: .config assembler error: .error assembling agents: .agent type `{agent type}` not found..."'
       # But OpAMP call fails because now on the server they return a 500 when an agent_type doesn't exist,
       # so the builder throws the opamp error instead:
       shell: 'journalctl -u newrelic-agent-control --since "1min ago" | grep -E "Error applying Agent Control remote config: .OpAMP client error"'