feat(OpAMP): adding new attributes

Signed-off-by: Paolo Gallina <paologallina1992@gmail.com>

Author: paologallinaharbur

Tiltfile

@@ -1,7 +1,5 @@
 # -*- mode: Python -*-
 # This Tiltfile is used by the e2e tests to setup the environment and for local development.
-ci_settings(readiness_timeout = '10m')
-
 load('ext://helm_resource', 'helm_repo','helm_resource')
 load('ext://git_resource', 'git_checkout')
 

agent-control/agent-type-registry/newrelic/com.newrelic.apm_java-0.1.0.yaml

@@ -23,6 +23,11 @@ variables:
       type: yaml
       default: [ ]
       required: false
+    app_id_poc:
+      description: "Application ID"
+      type: string
+      default: ""
+      required: false
     health_env:
       description: "environment variables to pass to health sidecar"
       type: yaml

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

@@ -1,6 +1,9 @@
 use crate::agent_control::config::K8sConfig;
-use crate::agent_control::defaults::{CLUSTER_NAME_ATTRIBUTE_KEY, OPAMP_SERVICE_VERSION};
+use crate::agent_control::defaults::{
+    CLUSTER_NAME_ATTRIBUTE_KEY, OPAMP_SERVICE_VERSION, default_capabilities,
+};
 use crate::agent_control::run::Environment;
+use crate::agent_type::templates::Templateable;
 use crate::event::SubAgentEvent;
 use crate::event::broadcaster::unbounded::UnboundedBroadcast;
 use crate::event::channel::pub_sub;
@@ -94,6 +97,18 @@ where
         agent_identity: &AgentIdentity,
     ) -> Result<Self::NotStartedSubAgent, SubAgentBuilderError> {
         debug!("building subAgent");
+        let unknown = "unknown";
+        let app_id_poc = self
+            .config_repository
+            .load_remote_fallback_local(&agent_identity.id, &default_capabilities())
+            .unwrap_or_default()
+            .unwrap_or_default()
+            .get_yaml_config()
+            .get("app_id_poc")
+            .map(|x| x.as_str())
+            .unwrap_or_default()
+            .unwrap_or_else(|| &unknown)
+            .to_string();
 
         let (maybe_opamp_client, sub_agent_opamp_consumer) = self
             .opamp_builder
@@ -102,10 +117,13 @@ where
                     builder,
                     self.instance_id_getter,
                     agent_identity,
-                    HashMap::from([(
-                        OPAMP_SERVICE_VERSION.to_string(),
-                        agent_identity.agent_type_id.version().to_string().into(),
-                    )]),
+                    HashMap::from([
+                        (
+                            OPAMP_SERVICE_VERSION.to_string(),
+                            agent_identity.agent_type_id.version().to_string().into(),
+                        ),
+                        ("apm.application.id".to_string(), app_id_poc.into()),
+                    ]),
                     HashMap::from([(
                         CLUSTER_NAME_ATTRIBUTE_KEY.to_string(),
                         DescriptionValueType::String(self.k8s_config.cluster_name.to_string()),

agent-control/src/values/yaml_config.rs

@@ -4,6 +4,7 @@ use crate::agent_type::templates::Templateable;
 use opamp_client::opamp::proto::AgentCapabilities;
 use opamp_client::operation::capabilities::Capabilities;
 use serde::{Deserialize, Serialize};
+use serde_yaml::Value;
 use std::collections::HashMap;
 use thiserror::Error;
 
@@ -36,6 +37,17 @@ impl Templateable for HashMap<String, serde_yaml::Value> {
     }
 }
 
+impl YAMLConfig {
+    pub(crate) fn new(values: HashMap<String, Value>) -> Self {
+        Self(values)
+    }
+
+    #[allow(dead_code)]
+    pub(crate) fn get(&self, key: &str) -> Option<&Value> {
+        self.0.get(key)
+    }
+}
+
 impl From<YAMLConfig> for HashMap<String, serde_yaml::Value> {
     fn from(values: YAMLConfig) -> Self {
         values.0
@@ -88,17 +100,6 @@ mod tests {
 
     use super::*;
 
-    impl YAMLConfig {
-        pub(crate) fn new(values: HashMap<String, Value>) -> Self {
-            Self(values)
-        }
-
-        #[allow(dead_code)]
-        pub(crate) fn get(&self, key: &str) -> Option<&Value> {
-            self.0.get(key)
-        }
-    }
-
     const EXAMPLE_CONFIG: &str = r#"
 description:
   name: newrelic-infra

test/k8s-e2e/apm/ac-values-apm.yml

@@ -35,6 +35,7 @@ agentControlDeployment:
             - key: "app"
               operator: "In"
               values: [ "javaapp" ]
+        app_id_poc: my-java-app-id
       python-agent:
         podLabelSelector:
           matchExpressions: