feat(otel): move otel to oci

Author: paologallinaharbur

agent-control/agent-type-registry/newrelic/com.newrelic.opentelemetry.collector-0.1.0.yaml

@@ -40,15 +40,15 @@ variables:
         default: docker.io
         variants:
           ac_config_field: "oci_nrdot_registry_urls"
-          values: [ "docker.io"  ]
+          values: [ "docker.io" ]
       repository:
         description: "Package repository name"
         type: string
         required: false
         default: newrelic/nrdot-agent-artifacts
         variants:
           ac_config_field: "oci_nrdot_registry_repositories"
-          values: [ "newrelic/nrdot-agent-artifacts"  ]
+          values: [ "newrelic/nrdot-agent-artifacts" ]
     version:
       description: "Agent version"
       type: string
@@ -78,6 +78,27 @@ variables:
         type: number
         required: false
         default: 13133
+    oci:
+      registry:
+        description: "Package registry url"
+        type: string
+        required: false
+        default: docker.io
+        variants:
+          ac_config_field: "oci_nrdot_registry_repositories"
+          values: [ "docker.io" ]
+      repository:
+        description: "Package repository name"
+        type: string
+        required: false
+        default: pgallina/poc
+        variants:
+          ac_config_field: "oci_nrdot_registry_repositories"
+          values: [ "pgallina/poc" ]
+    version:
+      description: "Agent version"
+      type: string
+      required: true
   k8s:
     chart_values:
       nr-k8s-otel-collector:
@@ -161,6 +182,14 @@ deployment:
             backoff_delay: ${nr-var:backoff_delay}
 
   linux:
+    packages:
+      nrdot:
+        type: tar
+        download:
+          oci:
+            registry: ${nr-var:oci.registry}
+            repository: ${nr-var:oci.repository}
+            version: ${nr-var:version}
     health:
       interval: 5s
       initial_delay: 5s
@@ -169,7 +198,7 @@ deployment:
         path: "${nr-var:health_check.path}"
         port: ${nr-var:health_check.port}
     version:
-      path: /usr/bin/nrdot-collector
+      path: ${nr-sub:packages.nrdot.dir}/nrdot-collector
       args:
         - -v
       regex: \d+\.\d+\.\d+
@@ -180,7 +209,7 @@ deployment:
     executables:
       - # Important to note the binary name is nrdot-collector matching the new nrdot binary
         id: nrdot-collector
-        path: /usr/bin/nrdot-collector
+        path: ${nr-sub:packages.nrdot.dir}/nrdot-collector
         args:
           - --config
           - ${nr-sub:filesystem_agent_dir}/otel-config/config.yaml

agent-control/src/agent_type/definition/agent_type_validation_tests.rs

@@ -414,10 +414,28 @@ static AGENT_TYPE_OTEL_COLLECTOR: LazyLock<AgentTypeValuesTestCase> =
         .into(),
         values_linux: AgentTypeValues {
             cases: HashMap::from([
-                ("mandatory fields only", ""),
+                ("mandatory fields only", r#"version: "some-version""#),
                 (
                     "check all value types are correct",
                     r#"
+                version: "some-version"
+                config: "some file contents"
+                backoff_delay: "10s"
+                health_check.path: "/health"
+                health_check.port: 12345
+                "#,
+                ),
+            ]),
+            ..Default::default()
+        }
+        .into(),
+        values_windows: AgentTypeValues {
+            cases: HashMap::from([
+                ("mandatory fields only", r#"version: "some-version""#),
+                (
+                    "check all value types are correct",
+                    r#"
+                version: "some-version"
                 config: "some file contents"
                 backoff_delay: "10s"
                 health_check.path: "/health"
@@ -428,7 +446,6 @@ static AGENT_TYPE_OTEL_COLLECTOR: LazyLock<AgentTypeValuesTestCase> =
             ..Default::default()
         }
         .into(),
-        ..Default::default()
     });
 
 static AGENT_TYPE_OTEL_COLLECTOR_OLD: LazyLock<AgentTypeValuesTestCase> =

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

@@ -5,7 +5,7 @@ use tracing::info;
 
 // TODO we should get the version dynamically from the recipe itself
 pub const INFRA_AGENT_VERSION: &str = "1.72.1";
-pub const NRDOT_VERSION: &str = "1.8.0";
+const NRDOT_VERSION: &str = "1.8.0";
 
 /// Updates the agent control config in `config_path` to include the content specified in `new_content`
 pub fn update_config(config_path: impl AsRef<str>, new_content: impl AsRef<str>) {
@@ -111,7 +111,16 @@ pub fn append_to_config_file(config_path: &str, content: &str) {
     });
 }
 
-pub const NRDOT_CONFIG: &str = r#"
+pub fn nrdot_config() -> String {
+    format!(
+        r#"
+version: {NRDOT_VERSION}
+{NRDOT_CONFIG}
+"#
+    )
+}
+
+const NRDOT_CONFIG: &str = r#"
 config:
   extensions:
     health_check:

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

@@ -1,6 +1,6 @@
-use crate::common::config::NRDOT_CONFIG;
-use crate::common::config::NRDOT_VERSION;
-use crate::common::config::{ac_debug_logging_config, update_config, write_agent_local_config};
+use crate::common::config::{
+    ac_debug_logging_config, nrdot_config, update_config, write_agent_local_config,
+};
 use crate::common::on_drop::CleanUp;
 use crate::common::test::retry_panic;
 use crate::common::{Args, RecipeData};
@@ -56,11 +56,3 @@ agents:
         nrql::check_query_results_are_not_empty(&recipe_data.args, &nrql_query)
     });
 }
-
-pub fn nrdot_config() -> String {
-    format!(
-        r#"
-{NRDOT_CONFIG}
-"#
-    )
-}

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

@@ -1,6 +1,6 @@
-use crate::common::config::NRDOT_CONFIG;
-use crate::common::config::NRDOT_VERSION;
-use crate::common::config::{ac_debug_logging_config, update_config, write_agent_local_config};
+use crate::common::config::{
+    ac_debug_logging_config, nrdot_config, update_config, write_agent_local_config,
+};
 use crate::common::on_drop::CleanUp;
 use crate::common::test::{retry, retry_panic};
 use crate::common::{Args, RecipeData, nrql};
@@ -75,12 +75,3 @@ agents:
 
     info!("Test completed successfully");
 }
-
-pub fn nrdot_config() -> String {
-    format!(
-        r#"
-version: {NRDOT_VERSION}
-{NRDOT_CONFIG}
-"#
-    )
-}