Merge pull request #296 from newrelic/0.5.2_fixes

0.5.2 fixes

Author: rubenruizdegauna

Cargo.lock

@@ -1,7 +1,7 @@
 [package]
 name = "newrelic_super_agent"
 description = "New Relic Super Agent Limited Preview"
-version = "0.5.2"
+version = "0.5.3"
 edition = "2021"
 authors = ["The New Relic Core Agent & Open Standards (CAOS) Team"]
 publish = false

Cargo.toml

@@ -3,11 +3,15 @@ use newrelic_super_agent::opamp::instance_id::getter::ULIDInstanceIDGetter;
 use newrelic_super_agent::opamp::instance_id::{self, Identifiers, Storer};
 use newrelic_super_agent::opamp::remote_config_hash::HashRepositoryFile;
 use newrelic_super_agent::sub_agent::values::values_repository::ValuesRepositoryFile;
-use newrelic_super_agent::super_agent::defaults::SUPER_AGENT_TYPE;
 use newrelic_super_agent::super_agent::error::AgentError;
 use newrelic_super_agent::super_agent::opamp::client_builder::SuperAgentOpAMPHttpBuilder;
-use newrelic_super_agent::super_agent::super_agent::{SuperAgent, SuperAgentEvent};
+use newrelic_super_agent::super_agent::super_agent::{
+    super_agent_fqn, SuperAgent, SuperAgentEvent,
+};
 use newrelic_super_agent::{cli::Cli, context::Context, logging::Logging};
+use nix::unistd::gethostname;
+use opamp_client::operation::settings::DescriptionValueType;
+use std::collections::HashMap;
 use std::error::Error;
 use tracing::{error, info};
 
@@ -83,11 +87,8 @@ fn run_super_agent(
     opamp_client_builder: Option<SuperAgentOpAMPHttpBuilder>,
     instance_id_getter: ULIDInstanceIDGetter<Storer>,
 ) -> Result<(), AgentError> {
-    use std::collections::HashMap;
-
     use newrelic_super_agent::{
-        config::super_agent_configs::{AgentID, AgentTypeFQN},
-        opamp::operations::build_opamp_and_start_client,
+        config::super_agent_configs::AgentID, opamp::operations::build_opamp_and_start_client,
         sub_agent::opamp::client_builder::SubAgentOpAMPHttpBuilder,
         super_agent::effective_agents_assembler::LocalEffectiveAgentsAssembler,
     };
@@ -119,8 +120,8 @@ fn run_super_agent(
         opamp_client_builder.as_ref(),
         &instance_id_getter,
         AgentID::new_super_agent_id(),
-        &AgentTypeFQN::from(SUPER_AGENT_TYPE),
-        HashMap::new(),
+        &super_agent_fqn(),
+        super_agent_opamp_non_identifying_attributes(),
     )?;
 
     SuperAgent::new(
@@ -141,11 +142,8 @@ fn run_super_agent(
     opamp_client_builder: Option<SuperAgentOpAMPHttpBuilder>,
     instance_id_getter: ULIDInstanceIDGetter<Storer>,
 ) -> Result<(), AgentError> {
-    use std::collections::HashMap;
-
     use newrelic_super_agent::{
-        config::super_agent_configs::{AgentID, AgentTypeFQN},
-        opamp::operations::build_opamp_and_start_client,
+        config::super_agent_configs::AgentID, opamp::operations::build_opamp_and_start_client,
     };
 
     let hash_repository = HashRepositoryFile::default();
@@ -163,8 +161,8 @@ fn run_super_agent(
         opamp_client_builder.as_ref(),
         &instance_id_getter,
         AgentID::new_super_agent_id(),
-        &AgentTypeFQN::from(SUPER_AGENT_TYPE),
-        HashMap::new(),
+        &super_agent_fqn(),
+        super_agent_opamp_non_identifying_attributes(),
     )?;
 
     SuperAgent::new(
@@ -190,3 +188,14 @@ fn create_shutdown_signal_handler(
 
     Ok(())
 }
+
+fn super_agent_opamp_non_identifying_attributes() -> HashMap<String, DescriptionValueType> {
+    HashMap::from([(
+        "host.name".to_string(),
+        gethostname()
+            .unwrap_or_default()
+            .into_string()
+            .unwrap()
+            .into(),
+    )])
+}

src/bin/main.rs

@@ -1,7 +1,6 @@
 use crate::config::super_agent_configs::SuperAgentConfig;
 use crate::{config::error::SuperAgentConfigError, super_agent::defaults::SUPER_AGENT_DATA_DIR};
 use std::fs;
-use std::fs::OpenOptions;
 use std::path::{Path, PathBuf};
 use thiserror::Error;
 use tracing::warn;
@@ -81,12 +80,6 @@ impl SuperAgentConfigStoreFile {
 
     pub fn with_remote(self) -> Result<Self, SuperAgentConfigStoreError> {
         let remote_path = format!("{}/{}", SUPER_AGENT_DATA_DIR, "config.yaml");
-        // create and open the file in read-write mode even if does not exists
-        let _ = OpenOptions::new()
-            .read(true)
-            .write(true)
-            .create(true)
-            .open(&remote_path)?;
 
         Ok(Self {
             local_path: self.local_path,
@@ -119,6 +112,7 @@ impl SuperAgentConfigStoreFile {
         &self,
         sub_agents: &SubAgentsConfig,
     ) -> Result<(), SuperAgentConfigStoreError> {
+        //TODO we should inject DirectoryManager and ensure the directory exists
         if let Some(remote_path_file) = &self.remote_path {
             Ok(serde_yaml::to_writer(
                 fs::File::create(remote_path_file)?,

src/config/store.rs

@@ -4,7 +4,7 @@ use crate::config::error::SuperAgentConfigError;
 use crate::config::persister::config_writer_file::WriterFile;
 use crate::config::persister::directory_manager::DirectoryManagerFs;
 use crate::config::store::{SubAgentsConfigStore, SuperAgentConfigStoreFile};
-use crate::config::super_agent_configs::{AgentID, SubAgentConfig, SubAgentsConfig};
+use crate::config::super_agent_configs::{AgentID, AgentTypeFQN, SubAgentConfig, SubAgentsConfig};
 use crate::context::Context;
 use crate::opamp::callbacks::AgentCallbacks;
 use crate::opamp::remote_config::{RemoteConfig, RemoteConfigError};
@@ -20,6 +20,7 @@ use crate::sub_agent::SubAgentBuilder;
 
 use crate::sub_agent::values::values_repository::{ValuesRepository, ValuesRepositoryFile};
 use crate::sub_agent::{error::SubAgentError, NotStartedSubAgent};
+use crate::super_agent::defaults::{SUPER_AGENT_NAMESPACE, SUPER_AGENT_TYPE, SUPER_AGENT_VERSION};
 use crate::super_agent::error::AgentError;
 use crate::super_agent::super_agent::EffectiveAgentsError::{
     EffectiveAgentExists, EffectiveAgentNotFound,
@@ -107,6 +108,16 @@ where
     }
 }
 
+pub fn super_agent_fqn() -> AgentTypeFQN {
+    AgentTypeFQN::from(
+        format!(
+            "{}/{}:{}",
+            SUPER_AGENT_NAMESPACE, SUPER_AGENT_TYPE, SUPER_AGENT_VERSION
+        )
+        .as_str(),
+    )
+}
+
 impl<'a, S, O, HR, SL, HRS, VR> SuperAgent<'a, S, O, HR, SL, HRS, VR>
 where
     O: StartedClient<SuperAgentCallbacks>,