feat: support report agent info for sae scenario (alibaba#2379)

* add agentinfo content

* add ut

* add dest id

---------

Co-authored-by: Tom Yu <yyuuttaaoo@gmail.com>

Author: KayzzzZ

core/ebpf/plugin/network_observer/Connection.cpp

@@ -281,6 +281,7 @@ void Connection::TryAttachPeerMeta(int family, uint32_t ip) {
     }
     if (!K8sMetadata::GetInstance().Enable()) {
         // k8smetadata not enable, mark attached ...
+        updatePeerPodMetaForExternal();
         MarkPeerMetaAttached();
         return;
     }

core/ebpf/plugin/network_observer/NetworkObserverManager.cpp

@@ -20,6 +20,7 @@
 #include "rapidjson/stringbuffer.h"
 #include "rapidjson/writer.h"
 
+#include "application/Application.h"
 #include "collection_pipeline/queue/ProcessQueueItem.h"
 #include "collection_pipeline/queue/ProcessQueueManager.h"
 #include "common/HashUtil.h"
@@ -51,6 +52,7 @@ extern "C" {
 DEFINE_FLAG_INT32(ebpf_networkobserver_max_connections, "maximum connections", 5000);
 DEFINE_FLAG_STRING(ebpf_networkobserver_enable_protocols, "enable application protocols, split by comma", "HTTP");
 DEFINE_FLAG_DOUBLE(ebpf_networkobserver_default_sample_rate, "ebpf network observer default sample rate", 1.0);
+DEFINE_FLAG_STRING(ebpf_networkobserver_agent_env, "deploy env: ACSK8S,Serverless,ECS_AUTO", "ACSK8S");
 
 namespace logtail::ebpf {
 
@@ -1680,9 +1682,6 @@ const static std::string kAgentInfoServiceIdKey = "acs_arms_service_id";
 const static std::string kAgentInfoWorkspaceKey = "acs_cms_workspace";
 const static std::string kAgentInfoPropertiesKey = "properties";
 
-const static std::string kAgentInfoAgentEnvACKVal = "ACSK8S";
-const static std::string kAgentInfoAgentEnvECSAutoVal = "ECS_AUTO";
-const static std::string kAgentInfoAgentEnvDefaultVal = "DEFAULT";
 const static std::string kAgentInfoPropertiesKeyClusterId = "k8s.cluster.uid";
 const static std::string kAgentInfoPropertiesKeyClusterName = "k8s.cluster.name";
 const static std::string kAgentInfoPropertiesKeyNamespace = "k8s.namespace.name";
@@ -1740,18 +1739,26 @@ bool NetworkObserverManager::reportAgentInfo(const time_t& now,
         event->SetContent(kAgentInfoAppIdKey, appConfig->mAppId);
         event->SetContent(kAgentInfoAppnameKey, appConfig->mAppName);
         event->SetContent(kAgentInfoAgentVersionKey, ILOGTAIL_VERSION);
-        event->SetContentNoCopy(kAgentInfoAgentEnvKey, kAgentInfoAgentEnvACKVal);
+        event->SetContentNoCopy(kAgentInfoAgentEnvKey, STRING_FLAG(ebpf_networkobserver_agent_env));
+        event->SetContent(kAgentInfoAppIdKey, appConfig->mAppId);
+        event->SetContent(kAgentInfoServiceIdKey, appConfig->mServiceId);
+        event->SetContent(kAgentInfoWorkspaceKey, appConfig->mWorkspace);
         if (Connection::gSelfPodIp.empty()) {
             event->SetContent(kAgentInfoIpKey, GetHostIp());
         } else {
             event->SetContentNoCopy(kAgentInfoIpKey, Connection::gSelfPodIp);
         }
-
         if (Connection::gSelfPodName.empty()) {
             event->SetContent(kAgentInfoHostnameKey, GetHostName());
         } else {
             event->SetContentNoCopy(kAgentInfoHostnameKey, Connection::gSelfPodName);
         }
+        event->SetContent(kAgentInfoAppnameKey, appConfig->mAppName);
+        event->SetContent(kAgentInfoLanguageKey, appConfig->mLanguage);
+        event->SetContentNoCopy(kAgentInfoAgentVersionKey, ILOGTAIL_VERSION);
+        static auto sStartTime = ToString(Application::GetInstance()->GetStartTime()) + "000";
+        event->SetContent(kAgentInfoStartTsKey, sStartTime); // ms
+        event->SetContent(kAgentInfoTimestampKey, ToString(now * 1000));
         event->SetTimestamp(now, 0);
     } else {
         if (!K8sMetadata::GetInstance().Enable()) {
@@ -1769,6 +1776,7 @@ bool NetworkObserverManager::reportAgentInfo(const time_t& now,
             LOG_DEBUG(sLogger, ("[AgentInfo] generate for cid", containerId)("podName", podMeta->mPodName));
 
             auto* event = eventGroup.AddLogEvent(true, mEventPool);
+            event->SetContentNoCopy(kAgentInfoAgentEnvKey, STRING_FLAG(ebpf_networkobserver_agent_env));
             event->SetContent(kAgentInfoAppIdKey, appConfig->mAppId);
             event->SetContent(kAgentInfoServiceIdKey, appConfig->mServiceId);
             event->SetContent(kAgentInfoWorkspaceKey, appConfig->mWorkspace);

core/unittest/ebpf/NetworkObserverUnittest.cpp

@@ -792,6 +792,15 @@ void NetworkObserverManagerUnittest::TestReportAgentInfo() {
     mManager->ReportAgentInfo();
     APSARA_TEST_EQUAL(mManager->mAgentInfoEventGroups.size(), 1UL);
     APSARA_TEST_EQUAL(mManager->mAgentInfoEventGroups[0].GetEvents().size(), 1UL);
+    APSARA_TEST_TRUE(mManager->mAgentInfoEventGroups[0].GetEvents()[0].Is<LogEvent>());
+    auto* logEvent = mManager->mAgentInfoEventGroups[0].GetEvents()[0].Get<LogEvent>();
+    APSARA_TEST_EQUAL(logEvent->GetContent("pid"), "test-app-id");
+    APSARA_TEST_EQUAL(logEvent->GetContent("acs_cms_workspace"), "test-workspace");
+    APSARA_TEST_EQUAL(logEvent->GetContent("acs_arms_service_id"), "test-service-id");
+    APSARA_TEST_EQUAL(logEvent->GetContent("appName"), "test-app");
+    APSARA_TEST_EQUAL(logEvent->GetContent("agentEnv"), "ACSK8S");
+    APSARA_TEST_TRUE(logEvent->GetContent("timestamp") != "");
+    APSARA_TEST_TRUE(logEvent->GetContent("startTimestamp") != "");
 
     // 测试有 workload 配置和 container 时调用 ReportAgentInfo
     options.mSelectors = {{"test-workload", "deployment", "test-namespace"}};