feat(OpAMP): adding new attributes

Signed-off-by: Paolo Gallina <[email protected]>

Author: paologallinaharbur

agent-control/src/agent_control/defaults.rs

@@ -21,8 +21,8 @@ pub const OPAMP_CD_CHART_VERSION_ATTRIBUTE_KEY: &str = "cd.chart.version";
 pub const OPAMP_SERVICE_NAME: &str = "service.name";
 pub const OPAMP_SERVICE_VERSION: &str = "service.version";
 pub const OPAMP_SERVICE_NAMESPACE: &str = "service.namespace";
-// we leverage the service.instance.id to send info regarding the agentID (not the ULID)
-pub const OPAMP_SERVICE_INSTANCE_ID: &str = "service.instance.id";
+// This is the key name in the agents{} map of the AC config
+pub const OPAMP_SUPERVISOR_KEY: &str = "supervisor.key";
 
 pub const OPAMP_AGENT_VERSION_ATTRIBUTE_KEY: &str = "agent.version";
 
@@ -35,10 +35,10 @@ pub const HOST_NAME_ATTRIBUTE_KEY: &str = opentelemetry_semantic_conventions::at
 pub const CLUSTER_NAME_ATTRIBUTE_KEY: &str = "cluster.name";
 pub const HOST_ID_ATTRIBUTE_KEY: &str = opentelemetry_semantic_conventions::attribute::HOST_ID;
 pub const FLEET_ID_ATTRIBUTE_KEY: &str = "fleet.guid";
-pub const OS_ATTRIBUTE_KEY: &str = "os.type";
 
+pub const OS_ATTRIBUTE_KEY: &str = "os.type";
 #[cfg(target_os = "macos")]
-pub const OS_ATTRIBUTE_VALUE: &str = "macos";
+pub const OS_ATTRIBUTE_VALUE: &str = "darwin";
 #[cfg(target_os = "linux")]
 pub const OS_ATTRIBUTE_VALUE: &str = "linux";
 #[cfg(target_os = "windows")]

agent-control/src/opamp/operations.rs

@@ -4,7 +4,7 @@ use super::{
     instance_id::getter::InstanceIDGetter,
 };
 use crate::agent_control::defaults::{
-    OPAMP_SERVICE_INSTANCE_ID, OPAMP_SERVICE_NAME, OPAMP_SERVICE_NAMESPACE,
+    OPAMP_SERVICE_NAME, OPAMP_SERVICE_NAMESPACE, OPAMP_SUPERVISOR_KEY,
     PARENT_AGENT_ID_ATTRIBUTE_KEY, default_capabilities, get_custom_capabilities,
 };
 use crate::sub_agent::identity::AgentIdentity;
@@ -95,7 +95,7 @@ pub fn start_settings(
             agent_identity.agent_type_id.namespace().into(),
         ),
         (
-            OPAMP_SERVICE_INSTANCE_ID.to_string(),
+            OPAMP_SUPERVISOR_KEY.to_string(),
             agent_identity.id.to_string().into(),
         ),
     ]);

agent-control/src/sub_agent/on_host/builder.rs

@@ -193,7 +193,7 @@ mod tests {
     use super::*;
     use crate::agent_control::agent_id::AgentID;
     use crate::agent_control::defaults::{
-        OPAMP_SERVICE_INSTANCE_ID, OPAMP_SERVICE_NAME, OPAMP_SERVICE_NAMESPACE,
+        OPAMP_SERVICE_NAME, OPAMP_SERVICE_NAMESPACE, OPAMP_SUPERVISOR_KEY,
         PARENT_AGENT_ID_ATTRIBUTE_KEY, default_capabilities, default_sub_agent_custom_capabilities,
     };
     use crate::agent_type::agent_type_id::AgentTypeID;
@@ -481,7 +481,7 @@ mod tests {
                 agent_identity.agent_type_id.namespace().into(),
             ),
             (
-                OPAMP_SERVICE_INSTANCE_ID.to_string(),
+                OPAMP_SUPERVISOR_KEY.to_string(),
                 agent_identity.id.to_string().into(),
             ),
             (

agent-control/tests/k8s/flux_self_update.rs

@@ -30,8 +30,8 @@ use kube::{Api, Client};
 use newrelic_agent_control::agent_control::agent_id::AgentID;
 use newrelic_agent_control::agent_control::defaults::{
     AGENT_CONTROL_ID, AGENT_CONTROL_VERSION, OPAMP_AC_CHART_VERSION_ATTRIBUTE_KEY,
-    OPAMP_AGENT_VERSION_ATTRIBUTE_KEY, OPAMP_CD_CHART_VERSION_ATTRIBUTE_KEY,
-    OPAMP_SERVICE_INSTANCE_ID, OPAMP_SERVICE_NAME, OPAMP_SERVICE_NAMESPACE,
+    OPAMP_AGENT_VERSION_ATTRIBUTE_KEY, OPAMP_CD_CHART_VERSION_ATTRIBUTE_KEY, OPAMP_SERVICE_NAME,
+    OPAMP_SERVICE_NAMESPACE, OPAMP_SUPERVISOR_KEY,
 };
 use newrelic_agent_control::cli::k8s::install::flux::HELM_REPOSITORY_NAME;
 use opamp_client::opamp::proto::any_value::Value;
@@ -230,7 +230,7 @@ fn expected_identifying_attributes(
 ) -> Vec<KeyValue> {
     convert_to_vec_key_value(Vec::from([
         (
-            OPAMP_SERVICE_INSTANCE_ID,
+            OPAMP_SUPERVISOR_KEY,
             Value::StringValue(AGENT_CONTROL_ID.to_string()),
         ),
         (

agent-control/tests/k8s/scenarios/attributes.rs

@@ -12,9 +12,9 @@ use crate::k8s::tools::{
 use newrelic_agent_control::agent_control::agent_id::AgentID;
 use newrelic_agent_control::agent_control::defaults::{
     AGENT_CONTROL_VERSION, CLUSTER_NAME_ATTRIBUTE_KEY, FLEET_ID_ATTRIBUTE_KEY,
-    HOST_NAME_ATTRIBUTE_KEY, OPAMP_AGENT_VERSION_ATTRIBUTE_KEY, OPAMP_SERVICE_INSTANCE_ID,
-    OPAMP_SERVICE_NAME, OPAMP_SERVICE_NAMESPACE, OPAMP_SERVICE_VERSION,
-    OPAMP_SUBAGENT_CHART_VERSION_ATTRIBUTE_KEY, PARENT_AGENT_ID_ATTRIBUTE_KEY,
+    HOST_NAME_ATTRIBUTE_KEY, OPAMP_AGENT_VERSION_ATTRIBUTE_KEY, OPAMP_SERVICE_NAME,
+    OPAMP_SERVICE_NAMESPACE, OPAMP_SERVICE_VERSION, OPAMP_SUBAGENT_CHART_VERSION_ATTRIBUTE_KEY,
+    OPAMP_SUPERVISOR_KEY, PARENT_AGENT_ID_ATTRIBUTE_KEY,
 };
 use nix::unistd::gethostname;
 use opamp_client::opamp::proto::any_value::Value;
@@ -62,7 +62,7 @@ agents:
 
     let ac_expected_identifying_attributes = convert_to_vec_key_value(Vec::from([
         (
-            OPAMP_SERVICE_INSTANCE_ID,
+            OPAMP_SUPERVISOR_KEY,
             Value::StringValue("agent-control".to_string()),
         ),
         (
@@ -115,7 +115,7 @@ agents:
 
     let sub_agent_expected_identifying_attributes = convert_to_vec_key_value(Vec::from([
         (
-            OPAMP_SERVICE_INSTANCE_ID,
+            OPAMP_SUPERVISOR_KEY,
             Value::StringValue("hello-world".to_string()),
         ),
         (

agent-control/tests/on_host/scenarios/attributes.rs

@@ -13,10 +13,8 @@ use crate::on_host::tools::instance_id::get_instance_id;
 use newrelic_agent_control::agent_control::agent_id::AgentID;
 use newrelic_agent_control::agent_control::defaults::{
     AGENT_CONTROL_NAMESPACE, HOST_NAME_ATTRIBUTE_KEY, OPAMP_AGENT_VERSION_ATTRIBUTE_KEY,
-    OPAMP_SERVICE_INSTANCE_ID, OPAMP_SERVICE_NAME, OPAMP_SERVICE_NAME, OPAMP_SERVICE_NAMESPACE,
-    OPAMP_SERVICE_NAMESPACE, OPAMP_SERVICE_VERSION, OPAMP_SERVICE_VERSION, OS_ATTRIBUTE_KEY,
-    OS_ATTRIBUTE_KEY, OS_ATTRIBUTE_VALUE, OS_VERSION_ATTRIBUTE_VALUE,
-    PARENT_AGENT_ID_ATTRIBUTE_KEY, PARENT_AGENT_ID_ATTRIBUTE_KEY,
+    OPAMP_SERVICE_NAME, OPAMP_SERVICE_NAMESPACE, OPAMP_SERVICE_VERSION, OPAMP_SUPERVISOR_KEY,
+    OS_ATTRIBUTE_KEY, OS_ATTRIBUTE_VALUE, PARENT_AGENT_ID_ATTRIBUTE_KEY,
 };
 use newrelic_agent_control::agent_control::run::{BasePaths, Environment};
 use nix::unistd::gethostname;
@@ -77,7 +75,7 @@ fn test_attributes_from_non_existing_agent_type() {
             Value::StringValue(DEFAULT_NAME.to_string()),
         ),
         (
-            OPAMP_SERVICE_INSTANCE_ID,
+            OPAMP_SUPERVISOR_KEY,
             Value::StringValue(agent_id.to_string()),
         ),
         (
@@ -179,7 +177,7 @@ agents:
             Value::StringValue("0.1.0".to_string()),
         ),
         (
-            OPAMP_SERVICE_INSTANCE_ID,
+            OPAMP_SUPERVISOR_KEY,
             Value::StringValue(agent_id.to_string()),
         ),
         (