chore: improve const maintainability

Author: gsanchezgavier

agent-control/src/agent_control/defaults.rs

@@ -87,6 +87,10 @@ pub(crate) fn get_custom_capabilities(agent_type_id: &AgentTypeID) -> Option<Cus
 pub const AGENT_TYPE_NAME_INFRA_AGENT: &str = "com.newrelic.infrastructure";
 pub const AGENT_TYPE_NAME_NRDOT: &str = "com.newrelic.opentelemetry.collector";
 
+// Fleet Control auto generated agent id
+pub const AGENT_ID_INFRA_AGENT: &str = "nr-infra";
+pub const AGENT_ID_NRDOT: &str = "nrdot";
+
 #[cfg(test)]
 pub(crate) mod tests {
     use super::*;

agent-control/src/cli/on_host/host_monitoring_gen/infra_config.rs

@@ -1,5 +1,6 @@
 use crate::cli::error::CliError;
 use crate::cli::on_host::config_gen::region::Region;
+use crate::cli::on_host::systemd_gen::NEW_RELIC_LICENSE_CONFIG_KEY;
 use std::collections::HashMap;
 
 const INFRA_AGENT_TYPE_FIELD: &str = "config_agent";
@@ -17,7 +18,7 @@ impl Default for InfraConfig {
             values: HashMap::from([
                 (
                     "license_key".to_string(),
-                    serde_yaml::Value::String("{{NEW_RELIC_LICENSE_KEY}}".to_string()),
+                    serde_yaml::Value::String(format!("{{{{{NEW_RELIC_LICENSE_CONFIG_KEY}}}}}")),
                 ),
                 (
                     "enable_process_metrics".to_string(),

agent-control/src/cli/on_host/host_monitoring_gen/otel_config_gen.rs

@@ -1,3 +1,6 @@
+use crate::agent_control::defaults::{
+    AGENT_CONTROL_LOCAL_DATA_DIR, AGENT_ID_NRDOT, SUB_AGENT_DIR, VALUES_DIR, VALUES_FILENAME,
+};
 use crate::cli::error::CliError;
 use std::path::PathBuf;
 use tracing::info;
@@ -11,12 +14,12 @@ pub struct OtelConfigGen {
 impl Default for OtelConfigGen {
     fn default() -> Self {
         Self {
-            otel_agent_values_path: PathBuf::from(
-                "/etc/newrelic-agent-control/fleet/agents.d/nrdot/values",
-            ),
-            otel_config_source_path: PathBuf::from(
-                "/etc/newrelic-agent-control/examples/values-nr-otel-collector-agent-linux.yaml",
-            ),
+            otel_agent_values_path: PathBuf::from(AGENT_CONTROL_LOCAL_DATA_DIR)
+                .join(SUB_AGENT_DIR)
+                .join(AGENT_ID_NRDOT)
+                .join(VALUES_DIR),
+            otel_config_source_path: PathBuf::from(AGENT_CONTROL_LOCAL_DATA_DIR)
+                .join("examples/values-nr-otel-collector-agent-linux.yaml"),
         }
     }
 }
@@ -42,7 +45,7 @@ impl OtelConfigGen {
 
     fn modify_values_yaml(&self) -> Result<(), CliError> {
         let source_path = self.otel_config_source_path.clone();
-        let file_path = self.otel_agent_values_path.join("values.yaml");
+        let file_path = self.otel_agent_values_path.join(VALUES_FILENAME);
         let content = std::fs::read_to_string(source_path)
             .map_err(|err| CliError::Command(format!("error reading otel values file: {err}")))?;
 

agent-control/src/cli/on_host/systemd_gen.rs

@@ -1,13 +1,15 @@
 //! Implementation of the generate-config command for the on-host cli.
 
+use crate::agent_control::defaults::AGENT_CONTROL_LOCAL_DATA_DIR;
 use crate::cli::error::CliError;
 use crate::cli::on_host::config_gen::region::{Region, region_parser};
 use std::fs::OpenOptions;
 use std::io::Write;
+use std::path::{Path, PathBuf};
 use tracing::info;
 
-const CONFIG_PATH: &str = "/etc/newrelic-agent-control/newrelic-agent-control.conf";
-const NEW_RELIC_LICENSE_CONFIG_KEY: &str = "NEW_RELIC_LICENSE_KEY";
+const SERVICE_CONFIG_FILE: &str = "newrelic-agent-control.conf";
+pub const NEW_RELIC_LICENSE_CONFIG_KEY: &str = "NEW_RELIC_LICENSE_KEY";
 const OTEL_EXPORTER_OTLP_ENDPOINT_CONFIG_KEY: &str = "OTEL_EXPORTER_OTLP_ENDPOINT";
 
 /// Generates the Agent Control configuration for host environments.
@@ -26,13 +28,23 @@ pub struct Args {
 pub fn generate_systemd_config(args: Args) -> Result<(), CliError> {
     info!("Adding required values to newrelic-agent-control.conf ");
 
-    update_config(CONFIG_PATH, &args.newrelic_license_key, args.region)?;
+    let config_path = PathBuf::from(AGENT_CONTROL_LOCAL_DATA_DIR).join(SERVICE_CONFIG_FILE);
+
+    update_config(
+        config_path.as_path(),
+        &args.newrelic_license_key,
+        args.region,
+    )?;
 
     info!("Host monitoring values generated successfully");
     Ok(())
 }
 
-fn update_config(config_path: &str, new_license_key: &str, region: Region) -> Result<(), CliError> {
+fn update_config(
+    config_path: &Path,
+    new_license_key: &str,
+    region: Region,
+) -> Result<(), CliError> {
     // Read the content from the configuration file
     let content = std::fs::read_to_string(config_path)
         .map_err(|err| CliError::Command(format!("error reading agent control .conf file: {err}")))?
@@ -90,7 +102,7 @@ mod tests {
         let new_license_key = "new_key";
         let region = Region::EU; // Assuming Region::EU is a valid variant
 
-        let result = update_config(file_path.to_str().unwrap(), new_license_key, region);
+        let result = update_config(file_path.as_path(), new_license_key, region);
         assert!(result.is_ok());
 
         let updated_content = std::fs::read_to_string(&file_path).unwrap();

test/onhost-e2e/ansible/infra_agent.yaml

@@ -19,25 +19,25 @@
             monitoring_source: "infra-agent"
             fleet_enabled: "false"
 
+        - name: Set test identifier
+          set_fact:
+            test_id: "onhost-e2e-infra-agent_{{ lookup('pipe', 'date +%Y-%m-%d_%H-%M-%S') }}"
+
         - name: Setup AC config
           include_role:
             name: edit_yaml_config
           vars:
             config_path: "/etc/newrelic-agent-control/config.yaml"
+            # Setting a custom host id makes the test assertion faster than custom attributes
+            # as skip the attribute decoration on the BE
+            host_id: "{{ test_id }}"
             update_config:
               log:
                 format:
                   formatter: pretty
                   target: true
                 level: debug
 
-        - name: Set test identifier
-          set_fact:
-            test_id: "onhost-e2e-infra-agent_{{ lookup('pipe', 'date +%Y-%m-%d_%H-%M-%S') }}"
-
-        - name: Add infra agent test_id attribute
-          shell: echo 'NRIA_CUSTOM_ATTRIBUTES='\''{"label.test_id":"{{ test_id }}"}'\''' >> {{ agent_control_service_conf }}
-
         - name: Restart Agent Control
           include_role:
             name: caos.ansible_roles.service_status
@@ -54,9 +54,8 @@
             nrql_query: >-
               SELECT *
               FROM SystemSample
-              WHERE `label.test_id` = '{{ test_id }}'
+              WHERE `host.id` = '{{ test_id }}'
               LIMIT 1
-            # This was taking about 5m when the test was created
             retries: 120
             delay: 10