feat(ci/cd): adding a e2e with infra agent

Author: paologallinaharbur

test/e2e-runner/src/common.rs

@@ -10,7 +10,7 @@ pub mod test;
 
 /// Arguments to be set for every test that needs Agent Control installation
 #[derive(Default, Debug, Clone, clap::Parser)]
-pub struct InstallArgs {
+pub struct Args {
     /// Folder where '.deb' packages are stored
     #[arg(long)]
     pub artifacts_package_dir: Option<PathBuf>,
@@ -62,7 +62,7 @@ pub struct InstallArgs {
 
 /// Data to set up installation
 pub struct RecipeData {
-    pub args: InstallArgs,
+    pub args: Args,
     pub fleet_id: String,
     pub fleet_enabled: String,
     pub recipe_list: String,

test/e2e-runner/src/common/nrql.rs

@@ -1,4 +1,4 @@
-use crate::common::InstallArgs;
+use crate::common::Args;
 use crate::common::test::TestResult;
 use reqwest::blocking::Client;
 use serde::Serialize;
@@ -58,7 +58,7 @@ impl Region {
 /// * `Ok(Vec<Value>)` - The NRQL query results on success
 /// * `Err` - Error if the query fails, returns errors, or has no results
 pub fn check_query_results_are_not_empty(
-    install_args: &InstallArgs,
+    install_args: &Args,
     nrql_query: &str,
 ) -> TestResult<Vec<Value>> {
     let client = Client::builder().timeout(CLIENT_TIMEOUT).build()?;

test/e2e-runner/src/linux/scenarios/ebpf_agent.rs

@@ -1,4 +1,4 @@
-use crate::common::InstallArgs;
+use crate::common::Args;
 use crate::common::RecipeData;
 use crate::{
     common::{config, logs::ShowLogsOnDrop, nrql, test::retry},
@@ -7,7 +7,7 @@ use crate::{
 use std::time::Duration;
 use tracing::info;
 
-pub fn test_ebpf_agent(args: InstallArgs) {
+pub fn test_ebpf_agent(args: Args) {
     let recipe_data = RecipeData {
         args,
         monitoring_source: "infra-agent".to_string(),

test/e2e-runner/src/linux/scenarios/infra_agent.rs

@@ -1,12 +1,12 @@
-use crate::common::{InstallArgs, RecipeData};
+use crate::common::{Args, RecipeData};
 use crate::{
     common::{config, logs::ShowLogsOnDrop, nrql, test::retry},
     linux::{self, install::install_agent_control_from_recipe},
 };
 use std::time::Duration;
 use tracing::info;
 
-pub fn test_installation_with_infra_agent(args: InstallArgs) {
+pub fn test_installation_with_infra_agent(args: Args) {
     let recipe_data = RecipeData {
         args,
         monitoring_source: "infra-agent".to_string(),
@@ -29,9 +29,7 @@ pub fn test_installation_with_infra_agent(args: InstallArgs) {
     info!(nrql = nrql_query, "Checking results of NRQL");
     let retries = 120;
     retry(retries, Duration::from_secs(10), "nrql assertion", || {
-        retry(retries, Duration::from_secs(10), "nrql assertion", || {
-            nrql::check_query_results_are_not_empty(&recipe_data.args, &nrql_query)
-        })
+        nrql::check_query_results_are_not_empty(&recipe_data.args, &nrql_query)
     })
     .unwrap_or_else(|err| {
         panic!("query '{nrql_query}' failed after {retries} retries: {err}");

test/e2e-runner/src/linux/scenarios/migration.rs

@@ -1,12 +1,12 @@
-use crate::common::{InstallArgs, RecipeData};
+use crate::common::{Args, RecipeData};
 use crate::{
     common::{config, nrql, test::retry},
     linux::{self, bash::exec_bash_command, install::install_agent_control_from_recipe, service},
 };
 use std::{fs, time::Duration};
 use tracing::{debug, info};
 
-pub fn test_migration(args: InstallArgs) {
+pub fn test_migration(args: Args) {
     let test_id = format!(
         "onhost-e2e-infra-agent_{}",
         chrono::Local::now().format("%Y-%m-%d_%H-%M-%S")
@@ -22,9 +22,7 @@ pub fn test_migration(args: InstallArgs) {
     info!(nrql = nrql_query, "Checking results of NRQL");
     let retries = 12;
     retry(retries, Duration::from_secs(10), "nrql assertion", || {
-        retry(retries, Duration::from_secs(10), "nrql assertion", || {
-            nrql::check_query_results_are_not_empty(&args, &nrql_query)
-        })
+        nrql::check_query_results_are_not_empty(&args, &nrql_query)
     })
     .unwrap_or_else(|err| {
         panic!("query '{nrql_query}' failed after {retries} retries: {err}");
@@ -54,16 +52,14 @@ pub fn test_migration(args: InstallArgs) {
     info!(nrql = nrql_query, "Checking results of NRQL");
     let retries = 12;
     retry(retries, Duration::from_secs(10), "nrql assertion", || {
-        retry(retries, Duration::from_secs(10), "nrql assertion", || {
-            nrql::check_query_results_are_not_empty(&recipe_data.args, &nrql_query)
-        })
+        nrql::check_query_results_are_not_empty(&recipe_data.args, &nrql_query)
     })
     .unwrap_or_else(|err| {
         panic!("query '{nrql_query}' failed after {retries} retries: {err}");
     });
 }
 
-fn install_and_setup_infra_agent_with_mysql(args: &InstallArgs, test_id: &str) {
+fn install_and_setup_infra_agent_with_mysql(args: &Args, test_id: &str) {
     // Install infra agent
     let install_command = format!(
         r#"

test/e2e-runner/src/linux/scenarios/nrdot_agent.rs

@@ -1,12 +1,12 @@
-use crate::common::{InstallArgs, RecipeData};
+use crate::common::{Args, RecipeData};
 use crate::{
     common::{config, logs::ShowLogsOnDrop, nrql, test::retry},
     linux::{self, install::install_agent_control_from_recipe},
 };
 use std::time::Duration;
 use tracing::info;
 
-pub fn test_nrdot_agent(args: InstallArgs) {
+pub fn test_nrdot_agent(args: Args) {
     let recipe_data = RecipeData {
         args,
         monitoring_source: "otel".to_string(),
@@ -32,9 +32,7 @@ pub fn test_nrdot_agent(args: InstallArgs) {
     info!(nrql = nrql_query, "Checking results of NRQL");
     let retries = 120;
     retry(retries, Duration::from_secs(10), "nrql assertion", || {
-        retry(retries, Duration::from_secs(10), "nrql assertion", || {
-            nrql::check_query_results_are_not_empty(&recipe_data.args, &nrql_query)
-        })
+        nrql::check_query_results_are_not_empty(&recipe_data.args, &nrql_query)
     })
     .unwrap_or_else(|err| {
         panic!("query '{nrql_query}' failed after {retries} retries: {err}");

test/e2e-runner/src/linux/scenarios/proxy.rs

@@ -1,4 +1,4 @@
-use crate::common::{InstallArgs, RecipeData};
+use crate::common::{Args, RecipeData};
 use crate::{
     common::{config, logs::ShowLogsOnDrop, nrql, test::retry},
     linux::{self, bash::exec_bash_command, install::install_agent_control_from_recipe},
@@ -28,7 +28,7 @@ const EXPECTED_DOMAINS: &[&str] = &[
     "infra-api.newrelic.com",
 ];
 
-pub fn test_agent_control_proxy(args: InstallArgs) {
+pub fn test_agent_control_proxy(args: Args) {
     info!("Setting up mitmproxy container");
     setup_mitmproxy();
 
@@ -60,9 +60,7 @@ pub fn test_agent_control_proxy(args: InstallArgs) {
     info!(nrql = nrql_query, "Checking results of NRQL");
     let retries = 120;
     retry(retries, Duration::from_secs(10), "nrql assertion", || {
-        retry(retries, Duration::from_secs(10), "nrql assertion", || {
-            nrql::check_query_results_are_not_empty(&recipe_data.args, &nrql_query)
-        })
+        nrql::check_query_results_are_not_empty(&recipe_data.args, &nrql_query)
     })
     .unwrap_or_else(|err| {
         panic!("query '{nrql_query}' failed after {retries} retries: {err}");

test/e2e-runner/src/linux/scenarios/remote_config.rs

@@ -1,4 +1,4 @@
-use crate::common::{InstallArgs, RecipeData};
+use crate::common::{Args, RecipeData};
 use crate::{
     common::{config, logs::ShowLogsOnDrop, nrql, test::retry},
     linux::{self, install::install_agent_control_from_recipe},
@@ -11,7 +11,7 @@ const FLEET_ID: &str = "NjQyNTg2NXxOR0VQfEZMRUVUfDAxOTkyOGQyLTg3OTAtNzJlNC05ODgw
 
 const ENV_VARS_FILE: &str = "/etc/newrelic-agent-control/environment_variables.yaml";
 
-pub fn test_remote_config_is_applied(args: InstallArgs) {
+pub fn test_remote_config_is_applied(args: Args) {
     let recipe_data = RecipeData {
         args,
         monitoring_source: "infra-agent".to_string(),
@@ -55,9 +55,7 @@ config_agent:
     info!(nrql = nrql_query, "Checking results of NRQL");
     let retries = 60;
     retry(retries, Duration::from_secs(5), "nrql assertion", || {
-        retry(retries, Duration::from_secs(10), "nrql assertion", || {
-            nrql::check_query_results_are_not_empty(&recipe_data.args, &nrql_query)
-        })
+        nrql::check_query_results_are_not_empty(&recipe_data.args, &nrql_query)
     })
     .unwrap_or_else(|err| {
         panic!("query '{nrql_query}' failed after {retries} retries: {err}");
@@ -71,9 +69,7 @@ config_agent:
     info!(nrql = nrql_query, "Checking results of NRQL");
     let retries = 120;
     retry(retries, Duration::from_secs(10), "nrql assertion", || {
-        retry(retries, Duration::from_secs(10), "nrql assertion", || {
-            nrql::check_query_results_are_not_empty(&recipe_data.args, &nrql_query)
-        })
+        nrql::check_query_results_are_not_empty(&recipe_data.args, &nrql_query)
     })
     .unwrap_or_else(|err| {
         panic!("query '{nrql_query}' failed after {retries} retries: {err}");

test/e2e-runner/src/main.rs

@@ -2,7 +2,7 @@ mod common;
 mod linux;
 mod windows;
 
-use crate::common::InstallArgs;
+use crate::common::Args;
 use clap::Parser;
 use std::process;
 use tracing_subscriber::EnvFilter;
@@ -22,27 +22,27 @@ fn main() {
 #[derive(Debug, clap::Subcommand)]
 enum LinuxScenarios {
     /// Local installation of Agent Control with Infrastructure Agent. It checks that the infra-agent eventually reports data.
-    InfraAgent(InstallArgs),
+    InfraAgent(Args),
     /// Local installation of Agent Control with eBPF agent. Uses the infra agent to generate traffic and checks that
     /// the eBPF agent reports data.
-    EBPFAgent(InstallArgs),
+    EBPFAgent(Args),
     /// Migration of an Infrastructure Agent installation. It spawns a mysql docker service, reports mysql metrics
     /// through the infra-agent and checks that metrics keep reporting after migration.
-    Migration(InstallArgs),
+    Migration(Args),
     /// Local installation of Agent Control with NRDot. It checks that nr-dot eventually reports data.
-    NrdotAgent(InstallArgs),
+    NrdotAgent(Args),
     /// Checks that remote configuration for a sub-agent has been applied.
-    RemoteConfig(InstallArgs),
+    RemoteConfig(Args),
     /// Checks that the Agent Control proxy support works as expected. It uses mitproxy as a docker service.
-    Proxy(InstallArgs),
+    Proxy(Args),
 }
 
 #[derive(Debug, clap::Subcommand)]
 enum WindowsScenarios {
     /// Simple installation of Agent Control on Windows
-    Install(InstallArgs),
+    Install(Args),
     /// Simple installation of Agent Control on Windows with an Infrastructure Agent
-    InfraAgent(InstallArgs),
+    InfraAgent(Args),
 }
 
 #[derive(Parser)]

test/e2e-runner/src/windows/scenarios/installation.rs

@@ -1,6 +1,6 @@
 use crate::common::logs::ShowLogsOnDrop;
 use crate::common::test::retry;
-use crate::common::{InstallArgs, RecipeData, config};
+use crate::common::{Args, RecipeData, config};
 use crate::windows;
 use crate::windows::cleanup::CleanAcOnDrop;
 use crate::windows::install::install_agent_control_from_recipe;
@@ -12,7 +12,7 @@ const DEFAULT_STATUS_PORT: u16 = 51200;
 const SERVICE_NAME: &str = "newrelic-agent-control";
 
 /// Runs a complete Windows E2E installation test.
-pub fn test_installation(args: InstallArgs) {
+pub fn test_installation(args: Args) {
     let recipe_data = RecipeData {
         args,
         ..Default::default()