(inlong) branch master updated: [INLONG-11333][Agent] Retrieve IP from configuration file during audit reporting (#11334)

[wenweihuang]

This is an automated email from the ASF dual-hosted git repository.

wenweihuang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/inlong.git


The following commit(s) were added to refs/heads/master by this push:
     new 40f4b2cb93 [INLONG-11333][Agent] Retrieve IP from configuration file 
during audit reporting (#11334)
40f4b2cb93 is described below

commit 40f4b2cb93dfb49d916e0c745dab6503c11224d8
Author: justinwwhuang <hww_jus...@163.com>
AuthorDate: Fri Oct 11 15:58:09 2024 +0800

    [INLONG-11333][Agent] Retrieve IP from configuration file during audit 
reporting (#11334)
---
 .../main/java/org/apache/inlong/agent/metrics/audit/AuditUtils.java    | 3 ++-
 .../src/test/java/org/apache/inlong/agent/AgentBaseTestsHelper.java    | 1 +
 .../test/java/org/apache/inlong/agent/core/AgentBaseTestsHelper.java   | 1 +
 .../agent-installer/src/test/java/installer/BaseTestsHelper.java       | 1 +
 .../test/java/org/apache/inlong/agent/plugin/AgentBaseTestsHelper.java | 1 +
 5 files changed, 6 insertions(+), 1 deletion(-)

diff --git 
a/inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/metrics/audit/AuditUtils.java
 
b/inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/metrics/audit/AuditUtils.java
index 9cc5e5fd6e..fa425d7782 100644
--- 
a/inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/metrics/audit/AuditUtils.java
+++ 
b/inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/metrics/audit/AuditUtils.java
@@ -18,6 +18,7 @@
 package org.apache.inlong.agent.metrics.audit;
 
 import org.apache.inlong.agent.conf.AbstractConfiguration;
+import org.apache.inlong.agent.constant.AgentConstants;
 import org.apache.inlong.audit.AuditOperator;
 import org.apache.inlong.audit.entity.AuditComponent;
 
@@ -59,7 +60,6 @@ public class AuditUtils {
     public static int AUDIT_ID_AGENT_ADD_INSTANCE_MEM_FAILED = 1073741842;
     public static int AUDIT_ID_AGENT_DEL_INSTANCE_MEM_UNUSUAL = 1073741843;
     private static boolean IS_AUDIT = true;
-    private static AbstractConfiguration conf;
 
     /**
      * Init audit config
@@ -69,6 +69,7 @@ public class AuditUtils {
         if (IS_AUDIT) {
             AuditOperator.getInstance().setAuditProxy(AuditComponent.AGENT, 
conf.get(AGENT_MANAGER_ADDR),
                     conf.get(AGENT_MANAGER_AUTH_SECRET_ID), 
conf.get(AGENT_MANAGER_AUTH_SECRET_KEY));
+            
AuditOperator.getInstance().setLocalIP(conf.get(AgentConstants.AGENT_LOCAL_IP));
         }
     }
 
diff --git 
a/inlong-agent/agent-common/src/test/java/org/apache/inlong/agent/AgentBaseTestsHelper.java
 
b/inlong-agent/agent-common/src/test/java/org/apache/inlong/agent/AgentBaseTestsHelper.java
index ad3238d8d2..52d05ca053 100755
--- 
a/inlong-agent/agent-common/src/test/java/org/apache/inlong/agent/AgentBaseTestsHelper.java
+++ 
b/inlong-agent/agent-common/src/test/java/org/apache/inlong/agent/AgentBaseTestsHelper.java
@@ -48,6 +48,7 @@ public class AgentBaseTestsHelper {
         boolean result = testRootDir.toFile().mkdirs();
         LOGGER.info("try to create {}, result is {}", testRootDir, result);
         AgentConfiguration.getAgentConf().set(AgentConstants.AGENT_HOME, 
testRootDir.toString());
+        AgentConfiguration.getAgentConf().set(AgentConstants.AGENT_LOCAL_IP, 
"127.0.0.1");
         return this;
     }
 
diff --git 
a/inlong-agent/agent-core/src/test/java/org/apache/inlong/agent/core/AgentBaseTestsHelper.java
 
b/inlong-agent/agent-core/src/test/java/org/apache/inlong/agent/core/AgentBaseTestsHelper.java
index e0d140315a..fa37fa2f1c 100755
--- 
a/inlong-agent/agent-core/src/test/java/org/apache/inlong/agent/core/AgentBaseTestsHelper.java
+++ 
b/inlong-agent/agent-core/src/test/java/org/apache/inlong/agent/core/AgentBaseTestsHelper.java
@@ -57,6 +57,7 @@ public class AgentBaseTestsHelper {
         LOGGER.info("try to create {}, result is {}", testRootDir, result);
         AgentConfiguration.getAgentConf().set(AgentConstants.AGENT_HOME, 
testRootDir.toString());
         
AgentConfiguration.getAgentConf().set(FetcherConstants.AGENT_MANAGER_ADDR, "");
+        AgentConfiguration.getAgentConf().set(AgentConstants.AGENT_LOCAL_IP, 
"127.0.0.1");
         return this;
     }
 
diff --git 
a/inlong-agent/agent-installer/src/test/java/installer/BaseTestsHelper.java 
b/inlong-agent/agent-installer/src/test/java/installer/BaseTestsHelper.java
index 1b9d02c8c9..58b28d0c06 100755
--- a/inlong-agent/agent-installer/src/test/java/installer/BaseTestsHelper.java
+++ b/inlong-agent/agent-installer/src/test/java/installer/BaseTestsHelper.java
@@ -52,6 +52,7 @@ public class BaseTestsHelper {
         LOGGER.info("try to create {}, result is {}", testRootDir, result);
         
InstallerConfiguration.getInstallerConf().set(AgentConstants.AGENT_HOME, 
testRootDir.toString());
         
InstallerConfiguration.getInstallerConf().set(FetcherConstants.AGENT_MANAGER_ADDR,
 "");
+        
InstallerConfiguration.getInstallerConf().set(AgentConstants.AGENT_LOCAL_IP, 
"127.0.0.1");
         return this;
     }
 
diff --git 
a/inlong-agent/agent-plugins/src/test/java/org/apache/inlong/agent/plugin/AgentBaseTestsHelper.java
 
b/inlong-agent/agent-plugins/src/test/java/org/apache/inlong/agent/plugin/AgentBaseTestsHelper.java
index a7693f7da4..7730bb29c8 100755
--- 
a/inlong-agent/agent-plugins/src/test/java/org/apache/inlong/agent/plugin/AgentBaseTestsHelper.java
+++ 
b/inlong-agent/agent-plugins/src/test/java/org/apache/inlong/agent/plugin/AgentBaseTestsHelper.java
@@ -60,6 +60,7 @@ public class AgentBaseTestsHelper {
         LOGGER.info("try to create {}, result is {}", testRootDir, result);
         AgentConfiguration.getAgentConf().set(AgentConstants.AGENT_HOME, 
testRootDir.toString());
         
AgentConfiguration.getAgentConf().set(FetcherConstants.AGENT_MANAGER_ADDR, "");
+        AgentConfiguration.getAgentConf().set(AgentConstants.AGENT_LOCAL_IP, 
"127.0.0.1");
         return this;
     }