You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@inlong.apache.org by do...@apache.org on 2022/02/24 06:12:25 UTC
[incubator-inlong] branch master updated: [INLONG-2680][Common][Agent] Move common class from inlong-agent module to inlong-common (#2681)
This is an automated email from the ASF dual-hosted git repository.
dockerzhang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-inlong.git
The following commit(s) were added to refs/heads/master by this push:
new 8b19d12 [INLONG-2680][Common][Agent] Move common class from inlong-agent module to inlong-common (#2681)
8b19d12 is described below
commit 8b19d126c0744e39632ef143e1269c8a7be688fd
Author: healchow <he...@gmail.com>
AuthorDate: Thu Feb 24 14:12:16 2022 +0800
[INLONG-2680][Common][Agent] Move common class from inlong-agent module to inlong-common (#2681)
---
.../inlong/agent/conf/AgentConfiguration.java | 2 +-
.../org/apache/inlong/agent/conf/JobProfile.java | 2 +-
.../apache/inlong/agent/conf/TriggerProfile.java | 39 +++--
.../{constants => constant}/AgentConstants.java | 2 +-
.../inlong/agent/constant}/CommandConstants.java | 2 +-
.../{constants => constant}/CommonConstants.java | 2 +-
.../inlong/agent/constant}/FetcherConstants.java | 2 +-
.../{constants => constant}/JobConstants.java | 2 +-
.../org/apache/inlong/agent/db/BerkeleyDbImp.java | 6 +-
.../java/org/apache/inlong/agent/db/CommandDb.java | 4 +-
.../main/java/org/apache/inlong/agent/db/Db.java | 2 +-
.../org/apache/inlong/agent/db/JobProfileDb.java | 2 +-
.../org/apache/inlong/agent/db/RocksDbImp.java | 4 +-
.../apache/inlong/agent/db/TriggerProfileDb.java | 4 +-
.../apache/inlong/agent/message/ProxyMessage.java | 4 +-
.../inlong/agent/metrics/audit/AuditUtils.java | 8 +-
.../org/apache/inlong/agent/pojo}/BinlogJob.java | 2 +-
.../apache/inlong/agent/pojo}/CommandInfoDto.java | 2 +-
.../inlong/agent/pojo}/ConfirmAgentIpRequest.java | 2 +-
.../apache/inlong/agent/pojo}/DbCollectorTask.java | 2 +-
.../agent/pojo}/DbCollectorTaskReportDto.java | 2 +-
.../agent/pojo}/DbCollectorTaskReportResponse.java | 2 +-
.../agent/pojo}/DbCollectorTaskRequestDto.java | 2 +-
.../inlong/agent/pojo}/DbCollectorTaskResult.java | 2 +-
.../org/apache/inlong/agent/pojo}/FileJob.java | 2 +-
.../java/org/apache/inlong/agent/pojo}/Job.java | 2 +-
.../apache/inlong/agent/pojo}/JobProfileDto.java | 98 ++++++------
.../org/apache/inlong/agent/pojo}/KafkaJob.java | 2 +-
.../inlong/agent/pojo}/ManagerReturnDto.java | 2 +-
.../inlong/agent/pojo}/SqlJobProfileDto.java | 106 ++++++-------
.../org/apache/inlong/agent/utils/ConfigUtil.java | 4 +-
.../apache/inlong/agent/AgentBaseTestsHelper.java | 2 +-
.../inlong/agent/conf/TestConfiguration.java | 2 +-
.../apache/inlong/agent/db/TestBerkeleyDBImp.java | 2 +-
.../org/apache/inlong/agent/core/AgentMain.java | 4 +-
.../org/apache/inlong/agent/core/AgentManager.java | 8 +-
.../apache/inlong/agent/core/conf/ConfigJetty.java | 6 +-
.../java/org/apache/inlong/agent/core/job/Job.java | 2 +-
.../inlong/agent/core/job/JobJmxMetrics.java | 12 +-
.../apache/inlong/agent/core/job/JobManager.java | 18 +--
.../apache/inlong/agent/core/job/JobWrapper.java | 2 +-
.../inlong/agent/core/task/TaskJmxMetrics.java | 12 +-
.../apache/inlong/agent/core/task/TaskManager.java | 2 +-
.../agent/core/task/TaskPositionManager.java | 2 +-
.../apache/inlong/agent/core/task/TaskWrapper.java | 2 +-
.../inlong/agent/core/trigger/TriggerManager.java | 12 +-
.../inlong/agent/core/AgentBaseTestsHelper.java | 2 +-
.../apache/inlong/agent/core/TestConfigJetty.java | 8 +-
.../inlong/agent/plugin/channel/MemoryChannel.java | 2 +-
.../agent/plugin/fetcher/ManagerFetcher.java | 174 +++++++++------------
.../agent/plugin/fetcher/dtos/TaskRequestDto.java | 29 ----
.../agent/plugin/fetcher/dtos/TaskResult.java | 45 ------
.../agent/plugin/metrics/PluginJmxMetric.java | 8 +-
.../inlong/agent/plugin/metrics/SinkJmxMetric.java | 8 +-
.../agent/plugin/metrics/SourceJmxMetric.java | 8 +-
.../inlong/agent/plugin/sinks/AbstractSink.java | 2 +-
.../inlong/agent/plugin/sinks/ProxySink.java | 46 +++---
.../inlong/agent/plugin/sinks/PulsarSink.java | 48 +++---
.../inlong/agent/plugin/sinks/SenderManager.java | 6 +-
.../agent/plugin/sources/TextFileSource.java | 10 +-
.../agent/plugin/sources/reader/SqlReader.java | 4 +-
.../plugin/sources/reader/TextFileReader.java | 12 +-
.../agent/plugin/trigger/DirectoryTrigger.java | 4 +-
.../inlong/agent/plugin/utils/HttpManager.java | 8 +-
.../inlong/agent/plugin/utils/PluginUtils.java | 18 +--
.../inlong/agent/plugin/AgentBaseTestsHelper.java | 2 +-
.../org/apache/inlong/agent/plugin/MiniAgent.java | 2 +-
.../apache/inlong/agent/plugin/TestFileAgent.java | 16 +-
.../agent/plugin/filter/TestDateFormatRegex.java | 4 +-
.../agent/plugin/filter/TestStreamIdFilter.java | 2 +-
.../apache/inlong/agent/plugin/sinks/MockSink.java | 6 +-
.../agent/plugin/sources/TestTextFileReader.java | 10 +-
.../agent/plugin/trigger/TestWatchDirTrigger.java | 2 +-
inlong-agent/pom.xml | 15 +-
inlong-common/pom.xml | 96 ++----------
.../config/IDataProxyConfigHolder.java | 4 +-
.../{commons => common}/db/CommandEntity.java | 6 +-
.../{commons => common}/enums/ManagerOpEnum.java | 2 +-
.../{commons => common}/enums/TaskTypeEnum.java | 2 +-
.../metrics => common}/metric/CountMetric.java | 14 +-
.../metrics => common}/metric/Dimension.java | 15 +-
.../metrics => common}/metric/GaugeMetric.java | 14 +-
.../metrics => common}/metric/MetricDomain.java | 14 +-
.../metrics => common}/metric/MetricItem.java | 49 +++---
.../metrics => common}/metric/MetricItemMBean.java | 15 +-
.../metrics => common}/metric/MetricItemSet.java | 18 +--
.../metric/MetricItemSetMBean.java | 10 +-
.../metrics => common/metric}/MetricItemValue.java | 3 +-
.../metrics => common/metric}/MetricListener.java | 10 +-
.../metric}/MetricListenerRunnable.java | 7 +-
.../metrics => common/metric}/MetricObserver.java | 35 ++---
.../metrics => common}/metric/MetricRegister.java | 16 +-
.../metrics => common}/metric/MetricUtils.java | 19 +--
.../metrics => common}/metric/MetricValue.java | 4 +-
.../{commons => common}/monitor/CounterGroup.java | 2 +-
.../monitor/CounterGroupExt.java | 2 +-
.../{commons => common}/monitor/LogCounter.java | 2 +-
.../{commons => common}/monitor/MonitorIndex.java | 2 +-
.../monitor/MonitorIndexExt.java | 2 +-
.../{commons => common}/monitor/StatConstants.java | 2 +-
.../{commons => common}/monitor/StatRunner.java | 2 +-
.../msg/AttributeConstants.java | 2 +-
.../{commons => common}/msg/DataInputBuffer.java | 2 +-
.../{commons => common}/msg/DataOutputBuffer.java | 2 +-
.../inlong/{commons => common}/msg/InLongMsg.java | 2 +-
.../msg/InLongMsgAttrBuilder.java | 2 +-
.../dto => common/pojo/agent}/CmdConfig.java | 2 +-
.../dto => common/pojo/agent}/DataConfig.java | 3 +-
.../pojo/agent/TaskHeartbeatRequest.java} | 31 +++-
.../pojo/agent/TaskRequest.java} | 11 +-
.../inlong/common/pojo/agent/TaskResult.java | 13 +-
.../pojo/dataproxy/CacheClusterObject.java | 2 +-
.../pojo/dataproxy/CacheClusterSetObject.java | 2 +-
.../pojo/dataproxy/CacheTopicObject.java | 4 +-
.../pojo/dataproxy/DataProxyCluster.java | 2 +-
.../pojo/dataproxy/DataProxyConfig.java | 2 +-
.../pojo/dataproxy/DataProxyConfigResponse.java | 2 +-
.../pojo/dataproxy/IRepository.java | 2 +-
.../pojo/dataproxy/InLongIdObject.java | 2 +-
.../pojo/dataproxy/ProxyChannel.java | 2 +-
.../pojo/dataproxy/ProxyClusterObject.java | 2 +-
.../pojo/dataproxy/ProxyPulsarDTO.java | 2 +-
.../pojo/dataproxy/ProxySink.java | 2 +-
.../pojo/dataproxy/ProxySource.java | 2 +-
.../pojo/dataproxy/PulsarClusterInfo.java | 2 +-
.../pojo/dataproxy/RepositoryTimerTask.java | 2 +-
.../{commons => common}/util/NetworkUtils.java | 2 +-
.../metric/item/AgentMetricItem.java | 22 +--
.../metric/item/TestMetricItemMBean.java | 26 ++-
.../metric/set/DataProxyMetricItem.java | 10 +-
.../metric/set/DataProxyMetricItemSet.java | 4 +-
.../metric/set/TestMetricItemSetMBean.java | 14 +-
inlong-dataproxy/conf/log4j2.xml | 4 +-
.../channel/FailoverChannelProcessor.java | 2 +-
.../inlong/dataproxy/config/ConfigManager.java | 4 +-
.../inlong/dataproxy/config/RemoteConfigJson.java | 4 +-
.../dataproxy/config/RemoteConfigManager.java | 24 +--
.../loader/ManagerCacheClusterConfigLoader.java | 4 +-
.../config/loader/ManagerIdTopicConfigLoader.java | 4 +-
.../inlong/dataproxy/http/HttpBaseSource.java | 8 +-
.../inlong/dataproxy/http/MessageFilter.java | 2 +-
.../dataproxy/http/MessageProcessServlet.java | 2 +-
.../inlong/dataproxy/http/SimpleHttpSource.java | 4 +-
.../dataproxy/http/SimpleMessageHandler.java | 14 +-
.../dataproxy/metrics/DataProxyMetricItem.java | 8 +-
.../dataproxy/metrics/DataProxyMetricItemSet.java | 4 +-
.../prometheus/PrometheusMetricListener.java | 10 +-
.../apache/inlong/dataproxy/node/Application.java | 4 +-
.../org/apache/inlong/dataproxy/sink/MetaSink.java | 2 +-
.../apache/inlong/dataproxy/sink/PulsarSink.java | 8 +-
.../dataproxy/sink/SimpleMessageTubeSink.java | 2 +-
.../apache/inlong/dataproxy/sink/SinkContext.java | 2 +-
.../dataproxy/sink/pulsar/PulsarClientService.java | 2 +-
.../federation/PulsarFederationSinkContext.java | 2 +-
.../apache/inlong/dataproxy/source/BaseSource.java | 4 +-
.../dataproxy/source/ServerMessageFactory.java | 4 +-
.../dataproxy/source/ServerMessageHandler.java | 6 +-
.../dataproxy/source/SimpleMessageHandler.java | 2 +-
.../inlong/dataproxy/source/SimpleTcpSource.java | 2 +-
.../inlong/dataproxy/source/SourceContext.java | 2 +-
.../TestClassResourceCommonPropertiesLoader.java | 2 +-
.../metrics/TestDataProxyMetricItemSet.java | 12 +-
.../metrics/TestMetricListenerRunnable.java | 12 +-
.../inlong/manager/common/enums/GroupState.java | 2 +-
.../common/pojo/dataproxy/DataProxyClusterSet.java | 61 ++++----
.../dao/mapper/InlongGroupEntityMapper.java | 2 +-
.../resources/mappers/InlongGroupEntityMapper.xml | 2 +-
.../service/core/DataProxyClusterService.java | 13 +-
.../core/impl/DataProxyClusterServiceImpl.java | 8 +-
.../repository/DataProxyConfigRepository.java | 43 ++---
.../controller/openapi/DataProxyController.java | 6 +-
.../inlong/sdk/sort/metrics/SortSdkMetricItem.java | 8 +-
.../metrics/SortSdkPrometheusMetricListener.java | 4 +-
.../sort/standalone/metrics/MetricItemValue.java | 2 +-
.../standalone/metrics/MetricListenerRunnable.java | 12 +-
.../sort/standalone/metrics/SortMetricItem.java | 10 +-
.../sort/standalone/metrics/SortMetricItemSet.java | 6 +-
.../metrics/TestMetricListenerRunnable.java | 6 +-
.../standalone/metrics/TestSortMetricItemSet.java | 12 +-
.../prometheus/PrometheusMetricListener.java | 6 +-
.../inlong/sort/standalone/sink/SinkContext.java | 2 +-
.../sort/standalone/source/SourceContext.java | 3 +-
.../source/sortsdk/SortSdkSourceContext.java | 2 +-
.../TestDefaultEvent2IndexRequestHandler.java | 2 +-
.../sink/elasticsearch/TestEsCallbackListener.java | 2 +-
.../sink/elasticsearch/TestEsChannelWorker.java | 2 +-
.../sink/elasticsearch/TestEsOutputChannel.java | 2 +-
.../sink/elasticsearch/TestEsSinkContext.java | 2 +-
.../source/sortsdk/TestSortSdkSource.java | 2 +-
...MultiTenancyInLongMsgMixedDeserializerTest.java | 2 +-
.../AbstractInLongMsgFormatDeserializer.java | 2 +-
.../sort/formats/inlongmsg/InLongMsgBody.java | 2 +-
.../sort/formats/inlongmsg/InLongMsgHead.java | 2 +-
.../sort/formats/inlongmsg/InLongMsgUtils.java | 2 +-
.../InLongMsgCsvFormatDeserializerTest.java | 2 +-
.../deserialization/DeserializationFunction.java | 2 +-
.../DeserializationFunctionTest.java | 2 +-
pom.xml | 19 +++
198 files changed, 848 insertions(+), 1030 deletions(-)
diff --git a/inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/conf/AgentConfiguration.java b/inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/conf/AgentConfiguration.java
index 71a566a..847011a 100644
--- a/inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/conf/AgentConfiguration.java
+++ b/inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/conf/AgentConfiguration.java
@@ -25,7 +25,7 @@ import java.util.List;
import java.util.concurrent.locks.ReadWriteLock;
import java.util.concurrent.locks.ReentrantReadWriteLock;
import org.apache.commons.io.FileUtils;
-import org.apache.inlong.agent.constants.AgentConstants;
+import org.apache.inlong.agent.constant.AgentConstants;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/conf/JobProfile.java b/inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/conf/JobProfile.java
index df3092d..cce296a 100644
--- a/inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/conf/JobProfile.java
+++ b/inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/conf/JobProfile.java
@@ -18,7 +18,7 @@
package org.apache.inlong.agent.conf;
import com.google.gson.Gson;
-import org.apache.inlong.agent.constants.JobConstants;
+import org.apache.inlong.agent.constant.JobConstants;
/**
* job profile which contains details describing properties of one job.
diff --git a/inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/conf/TriggerProfile.java b/inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/conf/TriggerProfile.java
index 4a0e48a..6d1aa79 100755
--- a/inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/conf/TriggerProfile.java
+++ b/inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/conf/TriggerProfile.java
@@ -17,34 +17,52 @@
package org.apache.inlong.agent.conf;
-import org.apache.inlong.agent.constants.JobConstants;
+import org.apache.inlong.agent.constant.JobConstants;
+import org.apache.inlong.agent.pojo.JobProfileDto;
+import org.apache.inlong.common.pojo.agent.DataConfig;
/**
* profile used in trigger. Trigger profile is a special job profile
*/
public class TriggerProfile extends JobProfile {
- @Override
- public boolean allRequiredKeyExist() {
- return hasKey(JobConstants.JOB_TRIGGER) && super.allRequiredKeyExist();
- }
-
+ /**
+ * Parse a given json string and get a TriggerProfile
+ */
public static TriggerProfile parseJsonStr(String jsonStr) {
TriggerProfile conf = new TriggerProfile();
conf.loadJsonStrResource(jsonStr);
return conf;
}
- public String getTriggerId() {
- return get(JobConstants.JOB_ID);
- }
-
+ /**
+ * Parse a given JobProfile instance and get a TriggerProfile
+ */
public static TriggerProfile parseJobProfile(JobProfile jobProfile) {
TriggerProfile conf = new TriggerProfile();
conf.loadJsonStrResource(jobProfile.toJsonStr());
return conf;
}
+ /**
+ * Get a TriggerProfile from a DataConfig
+ */
+ public static TriggerProfile getTriggerProfiles(DataConfig dataConfig) {
+ if (dataConfig == null) {
+ return null;
+ }
+ return JobProfileDto.convertToTriggerProfile(dataConfig);
+ }
+
+ @Override
+ public boolean allRequiredKeyExist() {
+ return hasKey(JobConstants.JOB_TRIGGER) && super.allRequiredKeyExist();
+ }
+
+ public String getTriggerId() {
+ return get(JobConstants.JOB_ID);
+ }
+
public Integer getOpType() {
return getInt(JobConstants.JOB_OP);
}
@@ -52,4 +70,5 @@ public class TriggerProfile extends JobProfile {
public String getDeliveryTime() {
return get(JobConstants.JOB_DELIVERY_TIME);
}
+
}
diff --git a/inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/constants/AgentConstants.java b/inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/constant/AgentConstants.java
similarity index 99%
rename from inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/constants/AgentConstants.java
rename to inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/constant/AgentConstants.java
index 7ace2c9..83e051e 100755
--- a/inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/constants/AgentConstants.java
+++ b/inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/constant/AgentConstants.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.inlong.agent.constants;
+package org.apache.inlong.agent.constant;
import org.apache.inlong.agent.utils.AgentUtils;
diff --git a/inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/fetcher/constants/CommandConstants.java b/inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/constant/CommandConstants.java
similarity index 97%
rename from inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/fetcher/constants/CommandConstants.java
rename to inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/constant/CommandConstants.java
index 676dc08..38a7ad9 100644
--- a/inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/fetcher/constants/CommandConstants.java
+++ b/inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/constant/CommandConstants.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.inlong.agent.plugin.fetcher.constants;
+package org.apache.inlong.agent.constant;
/**
* old version of command result
diff --git a/inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/constants/CommonConstants.java b/inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/constant/CommonConstants.java
similarity index 99%
rename from inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/constants/CommonConstants.java
rename to inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/constant/CommonConstants.java
index 855904c..b66a8d8 100644
--- a/inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/constants/CommonConstants.java
+++ b/inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/constant/CommonConstants.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.inlong.agent.constants;
+package org.apache.inlong.agent.constant;
import org.apache.inlong.agent.utils.AgentUtils;
diff --git a/inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/fetcher/constants/FetcherConstants.java b/inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/constant/FetcherConstants.java
similarity index 97%
rename from inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/fetcher/constants/FetcherConstants.java
rename to inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/constant/FetcherConstants.java
index 3f7fd65..881661b 100644
--- a/inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/fetcher/constants/FetcherConstants.java
+++ b/inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/constant/FetcherConstants.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.inlong.agent.plugin.fetcher.constants;
+package org.apache.inlong.agent.constant;
public class FetcherConstants {
diff --git a/inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/constants/JobConstants.java b/inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/constant/JobConstants.java
similarity index 99%
rename from inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/constants/JobConstants.java
rename to inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/constant/JobConstants.java
index eb6f5a7..1db3a44 100755
--- a/inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/constants/JobConstants.java
+++ b/inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/constant/JobConstants.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.inlong.agent.constants;
+package org.apache.inlong.agent.constant;
/**
* Basic config for a single job
diff --git a/inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/db/BerkeleyDbImp.java b/inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/db/BerkeleyDbImp.java
index 59df4ee..520e7eb 100644
--- a/inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/db/BerkeleyDbImp.java
+++ b/inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/db/BerkeleyDbImp.java
@@ -31,9 +31,9 @@ import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.TimeUnit;
import org.apache.inlong.agent.conf.AgentConfiguration;
-import org.apache.inlong.agent.constants.AgentConstants;
-import org.apache.inlong.agent.constants.CommonConstants;
-import org.apache.inlong.commons.db.CommandEntity;
+import org.apache.inlong.agent.constant.AgentConstants;
+import org.apache.inlong.agent.constant.CommonConstants;
+import org.apache.inlong.common.db.CommandEntity;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/db/CommandDb.java b/inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/db/CommandDb.java
index 7986669..3593e11 100644
--- a/inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/db/CommandDb.java
+++ b/inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/db/CommandDb.java
@@ -19,7 +19,7 @@ package org.apache.inlong.agent.db;
import java.util.List;
import org.apache.inlong.agent.conf.TriggerProfile;
-import org.apache.inlong.commons.db.CommandEntity;
+import org.apache.inlong.common.db.CommandEntity;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -57,7 +57,7 @@ public class CommandDb {
*/
public void saveNormalCmds(TriggerProfile profile, boolean success) {
CommandEntity entity = new CommandEntity();
- entity.setId(CommandEntity.generateCommanid(profile.getTriggerId(), profile.getOpType()));
+ entity.setId(CommandEntity.generateCommandId(profile.getTriggerId(), profile.getOpType()));
entity.setTaskId(profile.getTriggerId());
entity.setDeliveryTime(profile.getDeliveryTime());
entity.setCommandResult(success ? MANAGER_SUCCESS_CODE : MANAGER_FAIL_CODE);
diff --git a/inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/db/Db.java b/inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/db/Db.java
index ca05e17..0d9f15e 100644
--- a/inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/db/Db.java
+++ b/inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/db/Db.java
@@ -17,7 +17,7 @@
package org.apache.inlong.agent.db;
-import org.apache.inlong.commons.db.CommandEntity;
+import org.apache.inlong.common.db.CommandEntity;
import java.io.Closeable;
import java.util.List;
diff --git a/inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/db/JobProfileDb.java b/inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/db/JobProfileDb.java
index 5898299..6469efc 100644
--- a/inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/db/JobProfileDb.java
+++ b/inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/db/JobProfileDb.java
@@ -21,7 +21,7 @@ package org.apache.inlong.agent.db;
import java.util.ArrayList;
import java.util.List;
import org.apache.inlong.agent.conf.JobProfile;
-import org.apache.inlong.agent.constants.JobConstants;
+import org.apache.inlong.agent.constant.JobConstants;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/db/RocksDbImp.java b/inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/db/RocksDbImp.java
index 5268a2f..617667f 100755
--- a/inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/db/RocksDbImp.java
+++ b/inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/db/RocksDbImp.java
@@ -21,8 +21,8 @@ import java.io.File;
import java.io.IOException;
import java.util.List;
import org.apache.inlong.agent.conf.AgentConfiguration;
-import org.apache.inlong.agent.constants.AgentConstants;
-import org.apache.inlong.commons.db.CommandEntity;
+import org.apache.inlong.agent.constant.AgentConstants;
+import org.apache.inlong.common.db.CommandEntity;
import org.rocksdb.Options;
import org.rocksdb.RocksDB;
import org.slf4j.Logger;
diff --git a/inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/db/TriggerProfileDb.java b/inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/db/TriggerProfileDb.java
index 20a606d..d317d16 100755
--- a/inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/db/TriggerProfileDb.java
+++ b/inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/db/TriggerProfileDb.java
@@ -20,8 +20,8 @@ package org.apache.inlong.agent.db;
import java.util.ArrayList;
import java.util.List;
import org.apache.inlong.agent.conf.TriggerProfile;
-import org.apache.inlong.agent.constants.CommonConstants;
-import org.apache.inlong.agent.constants.JobConstants;
+import org.apache.inlong.agent.constant.CommonConstants;
+import org.apache.inlong.agent.constant.JobConstants;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/message/ProxyMessage.java b/inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/message/ProxyMessage.java
index ca6d998..25ea7c5 100644
--- a/inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/message/ProxyMessage.java
+++ b/inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/message/ProxyMessage.java
@@ -17,8 +17,8 @@
package org.apache.inlong.agent.message;
-import static org.apache.inlong.agent.constants.CommonConstants.PROXY_KEY_GROUP_ID;
-import static org.apache.inlong.agent.constants.CommonConstants.PROXY_KEY_STREAM_ID;
+import static org.apache.inlong.agent.constant.CommonConstants.PROXY_KEY_GROUP_ID;
+import static org.apache.inlong.agent.constant.CommonConstants.PROXY_KEY_STREAM_ID;
import java.util.Map;
import org.apache.inlong.agent.plugin.Message;
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 87baa0e..0309d95 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
@@ -24,10 +24,10 @@ import org.apache.inlong.audit.util.AuditConfig;
import java.util.HashSet;
-import static org.apache.inlong.agent.constants.AgentConstants.AUDIT_ENABLE;
-import static org.apache.inlong.agent.constants.AgentConstants.DEFAULT_AUDIT_ENABLE;
-import static org.apache.inlong.agent.constants.AgentConstants.AUDIT_KEY_PROXYS;
-import static org.apache.inlong.agent.constants.AgentConstants.DEFAULT_AUDIT_PROXYS;
+import static org.apache.inlong.agent.constant.AgentConstants.AUDIT_ENABLE;
+import static org.apache.inlong.agent.constant.AgentConstants.DEFAULT_AUDIT_ENABLE;
+import static org.apache.inlong.agent.constant.AgentConstants.AUDIT_KEY_PROXYS;
+import static org.apache.inlong.agent.constant.AgentConstants.DEFAULT_AUDIT_PROXYS;
/**
* AuditUtils
diff --git a/inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/fetcher/dtos/BinlogJob.java b/inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/pojo/BinlogJob.java
similarity index 96%
rename from inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/fetcher/dtos/BinlogJob.java
rename to inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/pojo/BinlogJob.java
index 8e92fd0..8f68c7c 100644
--- a/inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/fetcher/dtos/BinlogJob.java
+++ b/inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/pojo/BinlogJob.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.inlong.agent.plugin.fetcher.dtos;
+package org.apache.inlong.agent.pojo;
import lombok.Data;
diff --git a/inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/fetcher/dtos/CommandInfoDto.java b/inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/pojo/CommandInfoDto.java
similarity index 95%
rename from inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/fetcher/dtos/CommandInfoDto.java
rename to inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/pojo/CommandInfoDto.java
index 7f948e6..0400595 100644
--- a/inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/fetcher/dtos/CommandInfoDto.java
+++ b/inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/pojo/CommandInfoDto.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.inlong.agent.plugin.fetcher.dtos;
+package org.apache.inlong.agent.pojo;
import lombok.Data;
diff --git a/inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/fetcher/dtos/ConfirmAgentIpRequest.java b/inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/pojo/ConfirmAgentIpRequest.java
similarity index 94%
rename from inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/fetcher/dtos/ConfirmAgentIpRequest.java
rename to inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/pojo/ConfirmAgentIpRequest.java
index bf05cdf..275011a 100644
--- a/inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/fetcher/dtos/ConfirmAgentIpRequest.java
+++ b/inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/pojo/ConfirmAgentIpRequest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.inlong.agent.plugin.fetcher.dtos;
+package org.apache.inlong.agent.pojo;
import java.util.List;
import lombok.AllArgsConstructor;
diff --git a/inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/fetcher/dtos/DbCollectorTask.java b/inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/pojo/DbCollectorTask.java
similarity index 96%
rename from inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/fetcher/dtos/DbCollectorTask.java
rename to inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/pojo/DbCollectorTask.java
index 0a5da64..c566bec 100644
--- a/inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/fetcher/dtos/DbCollectorTask.java
+++ b/inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/pojo/DbCollectorTask.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.inlong.agent.plugin.fetcher.dtos;
+package org.apache.inlong.agent.pojo;
import lombok.Data;
diff --git a/inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/fetcher/dtos/DbCollectorTaskReportDto.java b/inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/pojo/DbCollectorTaskReportDto.java
similarity index 94%
copy from inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/fetcher/dtos/DbCollectorTaskReportDto.java
copy to inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/pojo/DbCollectorTaskReportDto.java
index 4d08929..f5065d3 100644
--- a/inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/fetcher/dtos/DbCollectorTaskReportDto.java
+++ b/inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/pojo/DbCollectorTaskReportDto.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.inlong.agent.plugin.fetcher.dtos;
+package org.apache.inlong.agent.pojo;
import lombok.Data;
diff --git a/inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/fetcher/dtos/DbCollectorTaskReportResponse.java b/inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/pojo/DbCollectorTaskReportResponse.java
similarity index 94%
rename from inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/fetcher/dtos/DbCollectorTaskReportResponse.java
rename to inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/pojo/DbCollectorTaskReportResponse.java
index face9a6..2f5bc13 100644
--- a/inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/fetcher/dtos/DbCollectorTaskReportResponse.java
+++ b/inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/pojo/DbCollectorTaskReportResponse.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.inlong.agent.plugin.fetcher.dtos;
+package org.apache.inlong.agent.pojo;
import lombok.Data;
diff --git a/inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/fetcher/dtos/DbCollectorTaskRequestDto.java b/inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/pojo/DbCollectorTaskRequestDto.java
similarity index 94%
rename from inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/fetcher/dtos/DbCollectorTaskRequestDto.java
rename to inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/pojo/DbCollectorTaskRequestDto.java
index eec04c3..aecdf07 100644
--- a/inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/fetcher/dtos/DbCollectorTaskRequestDto.java
+++ b/inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/pojo/DbCollectorTaskRequestDto.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.inlong.agent.plugin.fetcher.dtos;
+package org.apache.inlong.agent.pojo;
import lombok.Data;
diff --git a/inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/fetcher/dtos/DbCollectorTaskResult.java b/inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/pojo/DbCollectorTaskResult.java
similarity index 96%
rename from inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/fetcher/dtos/DbCollectorTaskResult.java
rename to inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/pojo/DbCollectorTaskResult.java
index 6060474..0c1b396 100644
--- a/inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/fetcher/dtos/DbCollectorTaskResult.java
+++ b/inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/pojo/DbCollectorTaskResult.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.inlong.agent.plugin.fetcher.dtos;
+package org.apache.inlong.agent.pojo;
import lombok.Data;
import org.apache.inlong.agent.conf.JobProfile;
diff --git a/inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/fetcher/dtos/FileJob.java b/inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/pojo/FileJob.java
similarity index 96%
rename from inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/fetcher/dtos/FileJob.java
rename to inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/pojo/FileJob.java
index 6670f60..42bc3f7 100644
--- a/inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/fetcher/dtos/FileJob.java
+++ b/inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/pojo/FileJob.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.inlong.agent.plugin.fetcher.dtos;
+package org.apache.inlong.agent.pojo;
import lombok.Data;
diff --git a/inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/fetcher/dtos/Job.java b/inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/pojo/Job.java
similarity index 95%
rename from inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/fetcher/dtos/Job.java
rename to inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/pojo/Job.java
index 8ebf364..c032f65 100644
--- a/inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/fetcher/dtos/Job.java
+++ b/inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/pojo/Job.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.inlong.agent.plugin.fetcher.dtos;
+package org.apache.inlong.agent.pojo;
import lombok.Data;
diff --git a/inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/fetcher/dtos/JobProfileDto.java b/inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/pojo/JobProfileDto.java
similarity index 86%
rename from inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/fetcher/dtos/JobProfileDto.java
rename to inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/pojo/JobProfileDto.java
index cfaa4a4..32a673a 100644
--- a/inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/fetcher/dtos/JobProfileDto.java
+++ b/inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/pojo/JobProfileDto.java
@@ -15,70 +15,50 @@
* limitations under the License.
*/
-package org.apache.inlong.agent.plugin.fetcher.dtos;
-
-import static java.util.Objects.requireNonNull;
-import static org.apache.inlong.agent.plugin.fetcher.constants.FetcherConstants.AGENT_MANAGER_VIP_HTTP_HOST;
-import static org.apache.inlong.agent.plugin.fetcher.constants.FetcherConstants.AGENT_MANAGER_VIP_HTTP_PORT;
+package org.apache.inlong.agent.pojo;
import com.google.gson.Gson;
import lombok.Data;
import org.apache.inlong.agent.conf.AgentConfiguration;
import org.apache.inlong.agent.conf.TriggerProfile;
-import org.apache.inlong.commons.dto.DataConfig;
-import org.apache.inlong.commons.enums.TaskTypeEnum;
+import org.apache.inlong.common.pojo.agent.DataConfig;
+import org.apache.inlong.common.enums.TaskTypeEnum;
+
+import static java.util.Objects.requireNonNull;
+import static org.apache.inlong.agent.constant.FetcherConstants.AGENT_MANAGER_VIP_HTTP_HOST;
+import static org.apache.inlong.agent.constant.FetcherConstants.AGENT_MANAGER_VIP_HTTP_PORT;
@Data
public class JobProfileDto {
- private static final Gson GSON = new Gson();
-
- private Job job;
- private Proxy proxy;
-
public static final String DEFAULT_TRIGGER = "org.apache.inlong.agent.plugin.trigger.DirectoryTrigger";
-
public static final String DEFAULT_CHANNEL = "org.apache.inlong.agent.plugin.channel.MemoryChannel";
public static final String MANAGER_JOB = "MANAGER_JOB";
public static final String DEFAULT_DATAPROXY_SINK = "org.apache.inlong.agent.plugin.sinks.ProxySink";
- //filesource
+ /**
+ * file source
+ */
public static final String DEFAULT_SOURCE = "org.apache.inlong.agent.plugin.sources.TextFileSource";
- //binlogsource
+ /**
+ * binlog source
+ */
public static final String BINLOG_SOURCE = "org.apache.inlong.agent.plugin.sources.BinlogSource";
- //kafkasource
+ /**
+ * kafka source
+ */
public static final String KAFKA_SOURCE = "org.apache.inlong.agent.plugin.sources.KafkaSource";
- @Data
- public static class Job {
-
- private FileJob fileJob;
- private BinlogJob binlogJob;
- private KafkaJob kafkaJob;
- }
-
- @Data
- public static class Manager {
-
- private String port;
- private String host;
- }
-
- @Data
- public static class Proxy {
+ private static final Gson GSON = new Gson();
- private String inlongGroupId;
- private String inlongStreamId;
- private Manager manager;
- }
+ private Job job;
+ private Proxy proxy;
private static BinlogJob getBinlogJob(DataConfig dataConfigs) {
+ BinlogJob.BinlogJobTaskConfig binlogJobTaskConfig = GSON.fromJson(dataConfigs.getTaskConfig(),
+ BinlogJob.BinlogJobTaskConfig.class);
- BinlogJob.BinlogJobTaskConfig binlogJobTaskConfig = new BinlogJob.BinlogJobTaskConfig();
- Gson gson = new Gson();
- binlogJobTaskConfig = gson.fromJson(dataConfigs.getTaskConfig(), BinlogJob.BinlogJobTaskConfig.class);
BinlogJob binlogJob = new BinlogJob();
-
binlogJob.setHostname(binlogJobTaskConfig.getHostname());
binlogJob.setPassword(binlogJobTaskConfig.getPassword());
binlogJob.setTimeZone(binlogJobTaskConfig.getTimeZone());
@@ -100,7 +80,6 @@ public class JobProfileDto {
}
private static FileJob getFileJob(DataConfig dataConfigs) {
-
FileJob fileJob = new FileJob();
fileJob.setTrigger(DEFAULT_TRIGGER);
fileJob.setChannel(DEFAULT_CHANNEL);
@@ -108,9 +87,8 @@ public class JobProfileDto {
fileJob.setSource(DEFAULT_SOURCE);
fileJob.setSink(DEFAULT_DATAPROXY_SINK);
- FileJob.FileJobTaskConfig fileJobTaskConfig = new FileJob.FileJobTaskConfig();
- Gson gson = new Gson();
- fileJobTaskConfig = gson.fromJson(dataConfigs.getTaskConfig(), FileJob.FileJobTaskConfig.class);
+ FileJob.FileJobTaskConfig fileJobTaskConfig = GSON.fromJson(dataConfigs.getTaskConfig(),
+ FileJob.FileJobTaskConfig.class);
FileJob.Dir dir = new FileJob.Dir();
dir.setPattern(fileJobTaskConfig.getDataName());
@@ -134,11 +112,9 @@ public class JobProfileDto {
private static KafkaJob getKafkaJob(DataConfig dataConfigs) {
- KafkaJob.KafkaJobTaskConfig kafkaJobTaskConfig = new KafkaJob.KafkaJobTaskConfig();
- Gson gson = new Gson();
- kafkaJobTaskConfig = gson.fromJson(dataConfigs.getTaskConfig(), KafkaJob.KafkaJobTaskConfig.class);
+ KafkaJob.KafkaJobTaskConfig kafkaJobTaskConfig = GSON.fromJson(dataConfigs.getTaskConfig(),
+ KafkaJob.KafkaJobTaskConfig.class);
KafkaJob kafkaJob = new KafkaJob();
-
kafkaJob.setTopic(kafkaJobTaskConfig.getTopic());
kafkaJob.setKeyDeserializer(kafkaJobTaskConfig.getValueDeserializer());
kafkaJob.setValueDeserializer(kafkaJobTaskConfig.getKeyDeserializer());
@@ -201,4 +177,28 @@ public class JobProfileDto {
}
return TriggerProfile.parseJsonStr(GSON.toJson(profileDto));
}
+
+ @Data
+ public static class Job {
+
+ private FileJob fileJob;
+ private BinlogJob binlogJob;
+ private KafkaJob kafkaJob;
+ }
+
+ @Data
+ public static class Manager {
+
+ private String port;
+ private String host;
+ }
+
+ @Data
+ public static class Proxy {
+
+ private String inlongGroupId;
+ private String inlongStreamId;
+ private Manager manager;
+ }
+
}
\ No newline at end of file
diff --git a/inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/fetcher/dtos/KafkaJob.java b/inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/pojo/KafkaJob.java
similarity index 96%
rename from inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/fetcher/dtos/KafkaJob.java
rename to inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/pojo/KafkaJob.java
index 174a497..a6a2f62 100644
--- a/inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/fetcher/dtos/KafkaJob.java
+++ b/inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/pojo/KafkaJob.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.inlong.agent.plugin.fetcher.dtos;
+package org.apache.inlong.agent.pojo;
import lombok.Data;
diff --git a/inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/fetcher/dtos/ManagerReturnDto.java b/inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/pojo/ManagerReturnDto.java
similarity index 94%
rename from inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/fetcher/dtos/ManagerReturnDto.java
rename to inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/pojo/ManagerReturnDto.java
index 6ad40ad..4e85b4a 100644
--- a/inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/fetcher/dtos/ManagerReturnDto.java
+++ b/inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/pojo/ManagerReturnDto.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.inlong.agent.plugin.fetcher.dtos;
+package org.apache.inlong.agent.pojo;
import lombok.Data;
diff --git a/inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/fetcher/dtos/SqlJobProfileDto.java b/inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/pojo/SqlJobProfileDto.java
similarity index 90%
rename from inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/fetcher/dtos/SqlJobProfileDto.java
rename to inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/pojo/SqlJobProfileDto.java
index 87e049f..6293de6 100644
--- a/inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/fetcher/dtos/SqlJobProfileDto.java
+++ b/inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/pojo/SqlJobProfileDto.java
@@ -15,80 +15,27 @@
* limitations under the License.
*/
-package org.apache.inlong.agent.plugin.fetcher.dtos;
+package org.apache.inlong.agent.pojo;
import com.google.gson.Gson;
import lombok.Data;
import org.apache.inlong.agent.conf.AgentConfiguration;
import org.apache.inlong.agent.conf.JobProfile;
-import static org.apache.inlong.agent.plugin.fetcher.constants.FetcherConstants.AGENT_MANAGER_VIP_HTTP_HOST;
-import static org.apache.inlong.agent.plugin.fetcher.constants.FetcherConstants.AGENT_MANAGER_VIP_HTTP_PORT;
+import static org.apache.inlong.agent.constant.FetcherConstants.AGENT_MANAGER_VIP_HTTP_HOST;
+import static org.apache.inlong.agent.constant.FetcherConstants.AGENT_MANAGER_VIP_HTTP_PORT;
@Data
public class SqlJobProfileDto {
- private static final Gson GSON = new Gson();
- private Job job;
- private Proxy proxy;
-
public static final String SQL_JOB = "SQL_JOB";
public static final String DEFAULT_CHANNEL = "org.apache.inlong.agent.plugin.channel.MemoryChannel";
public static final String DEFAULT_DATAPROXY_SINK = "org.apache.inlong.agent.plugin.sinks.ProxySink";
public static final String DEFAULT_SOURCE = "org.apache.inlong.agent.plugin.sources.DatabaseSqlSource";
+ private static final Gson GSON = new Gson();
- @Data
- public static class Running {
-
- private String core;
- }
-
- @Data
- public static class Thread {
-
- private Running running;
- }
-
- @Data
- public static class Sql {
-
- private String user;
- private String password;
- private String hostname;
- private Integer port;
- private String command;
- }
-
- @Data
- public static class Job {
-
- private int id;
- private String name;
- private String source;
- private String sink;
- private String channel;
- private String dbName;
- private Integer totalLimit;
- private Integer onceLimit;
- private Integer timeLimit;
- private Integer retryTimes;
- private Sql sql;
- }
-
- @Data
- public static class Manager {
-
- private String port;
- private String host;
- }
-
- @Data
- public static class Proxy {
-
- private String inlongGroupId;
- private String inlongStreamId;
- private Manager manager;
- }
+ private Job job;
+ private Proxy proxy;
private static Job getJob(DbCollectorTask task) {
Sql sql = new Sql();
@@ -135,4 +82,45 @@ public class SqlJobProfileDto {
profileDto.setJob(job);
return JobProfile.parseJsonStr(GSON.toJson(profileDto));
}
+
+ @Data
+ public static class Sql {
+
+ private String user;
+ private String password;
+ private String hostname;
+ private Integer port;
+ private String command;
+ }
+
+ @Data
+ public static class Job {
+
+ private int id;
+ private String name;
+ private String source;
+ private String sink;
+ private String channel;
+ private String dbName;
+ private Integer totalLimit;
+ private Integer onceLimit;
+ private Integer timeLimit;
+ private Integer retryTimes;
+ private Sql sql;
+ }
+
+ @Data
+ public static class Manager {
+
+ private String port;
+ private String host;
+ }
+
+ @Data
+ public static class Proxy {
+
+ private String inlongGroupId;
+ private String inlongStreamId;
+ private Manager manager;
+ }
}
\ No newline at end of file
diff --git a/inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/utils/ConfigUtil.java b/inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/utils/ConfigUtil.java
index 5bae21d..5dd1dcd 100644
--- a/inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/utils/ConfigUtil.java
+++ b/inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/utils/ConfigUtil.java
@@ -21,8 +21,8 @@ package org.apache.inlong.agent.utils;
import org.apache.inlong.agent.conf.AgentConfiguration;
-import static org.apache.inlong.agent.constants.AgentConstants.DEFAULT_PROMETHEUS_ENABLE;
-import static org.apache.inlong.agent.constants.AgentConstants.PROMETHEUS_ENABLE;
+import static org.apache.inlong.agent.constant.AgentConstants.DEFAULT_PROMETHEUS_ENABLE;
+import static org.apache.inlong.agent.constant.AgentConstants.PROMETHEUS_ENABLE;
public class ConfigUtil {
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 398e7d2..d104b1e 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
@@ -21,7 +21,7 @@ import java.nio.file.Path;
import java.nio.file.Paths;
import org.apache.commons.io.FileUtils;
import org.apache.inlong.agent.conf.AgentConfiguration;
-import org.apache.inlong.agent.constants.AgentConstants;
+import org.apache.inlong.agent.constant.AgentConstants;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/inlong-agent/agent-common/src/test/java/org/apache/inlong/agent/conf/TestConfiguration.java b/inlong-agent/agent-common/src/test/java/org/apache/inlong/agent/conf/TestConfiguration.java
index 0f1b93f..ff150ac 100755
--- a/inlong-agent/agent-common/src/test/java/org/apache/inlong/agent/conf/TestConfiguration.java
+++ b/inlong-agent/agent-common/src/test/java/org/apache/inlong/agent/conf/TestConfiguration.java
@@ -19,7 +19,7 @@ package org.apache.inlong.agent.conf;
import static org.junit.Assert.assertEquals;
-import org.apache.inlong.agent.constants.JobConstants;
+import org.apache.inlong.agent.constant.JobConstants;
import org.junit.Assert;
import org.junit.BeforeClass;
import org.junit.Test;
diff --git a/inlong-agent/agent-common/src/test/java/org/apache/inlong/agent/db/TestBerkeleyDBImp.java b/inlong-agent/agent-common/src/test/java/org/apache/inlong/agent/db/TestBerkeleyDBImp.java
index 3e9b8f1..f66e3b6 100755
--- a/inlong-agent/agent-common/src/test/java/org/apache/inlong/agent/db/TestBerkeleyDBImp.java
+++ b/inlong-agent/agent-common/src/test/java/org/apache/inlong/agent/db/TestBerkeleyDBImp.java
@@ -20,7 +20,7 @@ package org.apache.inlong.agent.db;
import java.util.List;
import org.apache.inlong.agent.AgentBaseTestsHelper;
-import org.apache.inlong.commons.db.CommandEntity;
+import org.apache.inlong.common.db.CommandEntity;
import org.junit.AfterClass;
import org.junit.Assert;
import org.junit.BeforeClass;
diff --git a/inlong-agent/agent-core/src/main/java/org/apache/inlong/agent/core/AgentMain.java b/inlong-agent/agent-core/src/main/java/org/apache/inlong/agent/core/AgentMain.java
index a4f6303..0cd1d45 100644
--- a/inlong-agent/agent-core/src/main/java/org/apache/inlong/agent/core/AgentMain.java
+++ b/inlong-agent/agent-core/src/main/java/org/apache/inlong/agent/core/AgentMain.java
@@ -33,8 +33,8 @@ import org.slf4j.LoggerFactory;
import java.util.Iterator;
-import static org.apache.inlong.agent.constants.AgentConstants.DEFAULT_PROMETHEUS_EXPORTER_PORT;
-import static org.apache.inlong.agent.constants.AgentConstants.PROMETHEUS_EXPORTER_PORT;
+import static org.apache.inlong.agent.constant.AgentConstants.DEFAULT_PROMETHEUS_EXPORTER_PORT;
+import static org.apache.inlong.agent.constant.AgentConstants.PROMETHEUS_EXPORTER_PORT;
/**
* Agent entrance class
diff --git a/inlong-agent/agent-core/src/main/java/org/apache/inlong/agent/core/AgentManager.java b/inlong-agent/agent-core/src/main/java/org/apache/inlong/agent/core/AgentManager.java
index 274106f..6a86035 100755
--- a/inlong-agent/agent-core/src/main/java/org/apache/inlong/agent/core/AgentManager.java
+++ b/inlong-agent/agent-core/src/main/java/org/apache/inlong/agent/core/AgentManager.java
@@ -17,9 +17,9 @@
package org.apache.inlong.agent.core;
-import static org.apache.inlong.agent.constants.AgentConstants.AGENT_CONF_PARENT;
-import static org.apache.inlong.agent.constants.AgentConstants.DEFAULT_AGENT_CONF_PARENT;
-import static org.apache.inlong.agent.constants.JobConstants.JOB_TRIGGER;
+import static org.apache.inlong.agent.constant.AgentConstants.AGENT_CONF_PARENT;
+import static org.apache.inlong.agent.constant.AgentConstants.DEFAULT_AGENT_CONF_PARENT;
+import static org.apache.inlong.agent.constant.JobConstants.JOB_TRIGGER;
import java.lang.reflect.Constructor;
import java.util.List;
@@ -29,7 +29,7 @@ import org.apache.inlong.agent.conf.AgentConfiguration;
import org.apache.inlong.agent.conf.JobProfile;
import org.apache.inlong.agent.conf.ProfileFetcher;
import org.apache.inlong.agent.conf.TriggerProfile;
-import org.apache.inlong.agent.constants.AgentConstants;
+import org.apache.inlong.agent.constant.AgentConstants;
import org.apache.inlong.agent.core.conf.ConfigJetty;
import org.apache.inlong.agent.core.job.JobManager;
import org.apache.inlong.agent.core.task.TaskManager;
diff --git a/inlong-agent/agent-core/src/main/java/org/apache/inlong/agent/core/conf/ConfigJetty.java b/inlong-agent/agent-core/src/main/java/org/apache/inlong/agent/core/conf/ConfigJetty.java
index 3afee90..f59ad78 100644
--- a/inlong-agent/agent-core/src/main/java/org/apache/inlong/agent/core/conf/ConfigJetty.java
+++ b/inlong-agent/agent-core/src/main/java/org/apache/inlong/agent/core/conf/ConfigJetty.java
@@ -17,14 +17,14 @@
package org.apache.inlong.agent.core.conf;
-import static org.apache.inlong.agent.constants.JobConstants.JOB_DIR_FILTER_PATTERN;
-import static org.apache.inlong.agent.constants.JobConstants.JOB_TRIGGER;
+import static org.apache.inlong.agent.constant.JobConstants.JOB_DIR_FILTER_PATTERN;
+import static org.apache.inlong.agent.constant.JobConstants.JOB_TRIGGER;
import java.io.Closeable;
import org.apache.inlong.agent.conf.AgentConfiguration;
import org.apache.inlong.agent.conf.JobProfile;
import org.apache.inlong.agent.conf.TriggerProfile;
-import org.apache.inlong.agent.constants.AgentConstants;
+import org.apache.inlong.agent.constant.AgentConstants;
import org.apache.inlong.agent.core.job.JobManager;
import org.apache.inlong.agent.core.trigger.TriggerManager;
import org.eclipse.jetty.server.Connector;
diff --git a/inlong-agent/agent-core/src/main/java/org/apache/inlong/agent/core/job/Job.java b/inlong-agent/agent-core/src/main/java/org/apache/inlong/agent/core/job/Job.java
index 0a4f876..6f752a3 100644
--- a/inlong-agent/agent-core/src/main/java/org/apache/inlong/agent/core/job/Job.java
+++ b/inlong-agent/agent-core/src/main/java/org/apache/inlong/agent/core/job/Job.java
@@ -20,7 +20,7 @@ package org.apache.inlong.agent.core.job;
import java.util.ArrayList;
import java.util.List;
import org.apache.inlong.agent.conf.JobProfile;
-import org.apache.inlong.agent.constants.JobConstants;
+import org.apache.inlong.agent.constant.JobConstants;
import org.apache.inlong.agent.core.task.Task;
import org.apache.inlong.agent.plugin.Channel;
import org.apache.inlong.agent.plugin.Reader;
diff --git a/inlong-agent/agent-core/src/main/java/org/apache/inlong/agent/core/job/JobJmxMetrics.java b/inlong-agent/agent-core/src/main/java/org/apache/inlong/agent/core/job/JobJmxMetrics.java
index 168680c..8c8da04 100644
--- a/inlong-agent/agent-core/src/main/java/org/apache/inlong/agent/core/job/JobJmxMetrics.java
+++ b/inlong-agent/agent-core/src/main/java/org/apache/inlong/agent/core/job/JobJmxMetrics.java
@@ -22,12 +22,12 @@ package org.apache.inlong.agent.core.job;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicLong;
-import org.apache.inlong.commons.metrics.metric.CountMetric;
-import org.apache.inlong.commons.metrics.metric.Dimension;
-import org.apache.inlong.commons.metrics.metric.GaugeMetric;
-import org.apache.inlong.commons.metrics.metric.MetricDomain;
-import org.apache.inlong.commons.metrics.metric.MetricItem;
-import org.apache.inlong.commons.metrics.metric.MetricRegister;
+import org.apache.inlong.common.metric.CountMetric;
+import org.apache.inlong.common.metric.Dimension;
+import org.apache.inlong.common.metric.GaugeMetric;
+import org.apache.inlong.common.metric.MetricDomain;
+import org.apache.inlong.common.metric.MetricItem;
+import org.apache.inlong.common.metric.MetricRegister;
@MetricDomain(name = "AgentJob")
public class JobJmxMetrics extends MetricItem implements JobMetrics {
diff --git a/inlong-agent/agent-core/src/main/java/org/apache/inlong/agent/core/job/JobManager.java b/inlong-agent/agent-core/src/main/java/org/apache/inlong/agent/core/job/JobManager.java
index c8f0854..6792611 100644
--- a/inlong-agent/agent-core/src/main/java/org/apache/inlong/agent/core/job/JobManager.java
+++ b/inlong-agent/agent-core/src/main/java/org/apache/inlong/agent/core/job/JobManager.java
@@ -21,7 +21,7 @@ import org.apache.inlong.agent.common.AbstractDaemon;
import org.apache.inlong.agent.common.AgentThreadFactory;
import org.apache.inlong.agent.conf.AgentConfiguration;
import org.apache.inlong.agent.conf.JobProfile;
-import org.apache.inlong.agent.constants.AgentConstants;
+import org.apache.inlong.agent.constant.AgentConstants;
import org.apache.inlong.agent.core.AgentManager;
import org.apache.inlong.agent.db.JobProfileDb;
import org.apache.inlong.agent.db.StateSearchKey;
@@ -38,14 +38,14 @@ import java.util.concurrent.ThreadPoolExecutor;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicLong;
-import static org.apache.inlong.agent.constants.AgentConstants.DEFAULT_JOB_DB_CACHE_CHECK_INTERVAL;
-import static org.apache.inlong.agent.constants.AgentConstants.DEFAULT_JOB_DB_CACHE_TIME;
-import static org.apache.inlong.agent.constants.AgentConstants.JOB_DB_CACHE_CHECK_INTERVAL;
-import static org.apache.inlong.agent.constants.AgentConstants.JOB_DB_CACHE_TIME;
-import static org.apache.inlong.agent.constants.JobConstants.JOB_ID;
-import static org.apache.inlong.agent.constants.JobConstants.JOB_ID_PREFIX;
-import static org.apache.inlong.agent.constants.JobConstants.SQL_JOB_ID;
-import static org.apache.inlong.agent.constants.JobConstants.JOB_INSTANCE_ID;
+import static org.apache.inlong.agent.constant.AgentConstants.DEFAULT_JOB_DB_CACHE_CHECK_INTERVAL;
+import static org.apache.inlong.agent.constant.AgentConstants.DEFAULT_JOB_DB_CACHE_TIME;
+import static org.apache.inlong.agent.constant.AgentConstants.JOB_DB_CACHE_CHECK_INTERVAL;
+import static org.apache.inlong.agent.constant.AgentConstants.JOB_DB_CACHE_TIME;
+import static org.apache.inlong.agent.constant.JobConstants.JOB_ID;
+import static org.apache.inlong.agent.constant.JobConstants.JOB_ID_PREFIX;
+import static org.apache.inlong.agent.constant.JobConstants.SQL_JOB_ID;
+import static org.apache.inlong.agent.constant.JobConstants.JOB_INSTANCE_ID;
/**
* JobManager maintains lots of jobs, and communicate between server and task manager.
diff --git a/inlong-agent/agent-core/src/main/java/org/apache/inlong/agent/core/job/JobWrapper.java b/inlong-agent/agent-core/src/main/java/org/apache/inlong/agent/core/job/JobWrapper.java
index 21900ff..281a33f 100644
--- a/inlong-agent/agent-core/src/main/java/org/apache/inlong/agent/core/job/JobWrapper.java
+++ b/inlong-agent/agent-core/src/main/java/org/apache/inlong/agent/core/job/JobWrapper.java
@@ -21,7 +21,7 @@ import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.TimeUnit;
import org.apache.inlong.agent.conf.AgentConfiguration;
-import org.apache.inlong.agent.constants.AgentConstants;
+import org.apache.inlong.agent.constant.AgentConstants;
import org.apache.inlong.agent.core.AgentManager;
import org.apache.inlong.agent.core.task.Task;
import org.apache.inlong.agent.core.task.TaskManager;
diff --git a/inlong-agent/agent-core/src/main/java/org/apache/inlong/agent/core/task/TaskJmxMetrics.java b/inlong-agent/agent-core/src/main/java/org/apache/inlong/agent/core/task/TaskJmxMetrics.java
index ffd429f..833008d 100644
--- a/inlong-agent/agent-core/src/main/java/org/apache/inlong/agent/core/task/TaskJmxMetrics.java
+++ b/inlong-agent/agent-core/src/main/java/org/apache/inlong/agent/core/task/TaskJmxMetrics.java
@@ -22,12 +22,12 @@ package org.apache.inlong.agent.core.task;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicLong;
-import org.apache.inlong.commons.metrics.metric.CountMetric;
-import org.apache.inlong.commons.metrics.metric.Dimension;
-import org.apache.inlong.commons.metrics.metric.GaugeMetric;
-import org.apache.inlong.commons.metrics.metric.MetricDomain;
-import org.apache.inlong.commons.metrics.metric.MetricItem;
-import org.apache.inlong.commons.metrics.metric.MetricRegister;
+import org.apache.inlong.common.metric.CountMetric;
+import org.apache.inlong.common.metric.Dimension;
+import org.apache.inlong.common.metric.GaugeMetric;
+import org.apache.inlong.common.metric.MetricDomain;
+import org.apache.inlong.common.metric.MetricItem;
+import org.apache.inlong.common.metric.MetricRegister;
/**
* metrics for agent task
diff --git a/inlong-agent/agent-core/src/main/java/org/apache/inlong/agent/core/task/TaskManager.java b/inlong-agent/agent-core/src/main/java/org/apache/inlong/agent/core/task/TaskManager.java
index f967c01..a4a4b8e 100755
--- a/inlong-agent/agent-core/src/main/java/org/apache/inlong/agent/core/task/TaskManager.java
+++ b/inlong-agent/agent-core/src/main/java/org/apache/inlong/agent/core/task/TaskManager.java
@@ -26,7 +26,7 @@ import java.util.concurrent.TimeUnit;
import org.apache.inlong.agent.common.AbstractDaemon;
import org.apache.inlong.agent.common.AgentThreadFactory;
import org.apache.inlong.agent.conf.AgentConfiguration;
-import org.apache.inlong.agent.constants.AgentConstants;
+import org.apache.inlong.agent.constant.AgentConstants;
import org.apache.inlong.agent.core.AgentManager;
import org.apache.inlong.agent.utils.AgentUtils;
import org.apache.inlong.agent.utils.ConfigUtil;
diff --git a/inlong-agent/agent-core/src/main/java/org/apache/inlong/agent/core/task/TaskPositionManager.java b/inlong-agent/agent-core/src/main/java/org/apache/inlong/agent/core/task/TaskPositionManager.java
index b4392fc..72fc137 100644
--- a/inlong-agent/agent-core/src/main/java/org/apache/inlong/agent/core/task/TaskPositionManager.java
+++ b/inlong-agent/agent-core/src/main/java/org/apache/inlong/agent/core/task/TaskPositionManager.java
@@ -17,7 +17,7 @@
package org.apache.inlong.agent.core.task;
-import static org.apache.inlong.agent.constants.CommonConstants.POSITION_SUFFIX;
+import static org.apache.inlong.agent.constant.CommonConstants.POSITION_SUFFIX;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.TimeUnit;
diff --git a/inlong-agent/agent-core/src/main/java/org/apache/inlong/agent/core/task/TaskWrapper.java b/inlong-agent/agent-core/src/main/java/org/apache/inlong/agent/core/task/TaskWrapper.java
index 6247b1e..7409ca1 100755
--- a/inlong-agent/agent-core/src/main/java/org/apache/inlong/agent/core/task/TaskWrapper.java
+++ b/inlong-agent/agent-core/src/main/java/org/apache/inlong/agent/core/task/TaskWrapper.java
@@ -26,7 +26,7 @@ import java.util.concurrent.atomic.AtomicInteger;
import org.apache.inlong.agent.common.AgentThreadFactory;
import org.apache.inlong.agent.conf.AgentConfiguration;
-import org.apache.inlong.agent.constants.AgentConstants;
+import org.apache.inlong.agent.constant.AgentConstants;
import org.apache.inlong.agent.core.AgentManager;
import org.apache.inlong.agent.message.EndMessage;
import org.apache.inlong.agent.plugin.Message;
diff --git a/inlong-agent/agent-core/src/main/java/org/apache/inlong/agent/core/trigger/TriggerManager.java b/inlong-agent/agent-core/src/main/java/org/apache/inlong/agent/core/trigger/TriggerManager.java
index 2b96ce5..4ba183c 100755
--- a/inlong-agent/agent-core/src/main/java/org/apache/inlong/agent/core/trigger/TriggerManager.java
+++ b/inlong-agent/agent-core/src/main/java/org/apache/inlong/agent/core/trigger/TriggerManager.java
@@ -17,10 +17,10 @@
package org.apache.inlong.agent.core.trigger;
-import static org.apache.inlong.agent.constants.AgentConstants.DEFAULT_TRIGGER_MAX_RUNNING_NUM;
-import static org.apache.inlong.agent.constants.AgentConstants.TRIGGER_MAX_RUNNING_NUM;
-import static org.apache.inlong.agent.constants.JobConstants.JOB_ID;
-import static org.apache.inlong.agent.constants.JobConstants.TRIGGER_ONLY_ONE_JOB;
+import static org.apache.inlong.agent.constant.AgentConstants.DEFAULT_TRIGGER_MAX_RUNNING_NUM;
+import static org.apache.inlong.agent.constant.AgentConstants.TRIGGER_MAX_RUNNING_NUM;
+import static org.apache.inlong.agent.constant.JobConstants.JOB_ID;
+import static org.apache.inlong.agent.constant.JobConstants.TRIGGER_ONLY_ONE_JOB;
import java.util.List;
import java.util.Map;
@@ -30,8 +30,8 @@ import org.apache.inlong.agent.common.AbstractDaemon;
import org.apache.inlong.agent.conf.AgentConfiguration;
import org.apache.inlong.agent.conf.JobProfile;
import org.apache.inlong.agent.conf.TriggerProfile;
-import org.apache.inlong.agent.constants.AgentConstants;
-import org.apache.inlong.agent.constants.JobConstants;
+import org.apache.inlong.agent.constant.AgentConstants;
+import org.apache.inlong.agent.constant.JobConstants;
import org.apache.inlong.agent.core.AgentManager;
import org.apache.inlong.agent.core.job.JobWrapper;
import org.apache.inlong.agent.db.TriggerProfileDb;
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 d92b2da..cd8d620 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
@@ -21,7 +21,7 @@ import java.nio.file.Path;
import java.nio.file.Paths;
import org.apache.commons.io.FileUtils;
import org.apache.inlong.agent.conf.AgentConfiguration;
-import org.apache.inlong.agent.constants.AgentConstants;
+import org.apache.inlong.agent.constant.AgentConstants;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/inlong-agent/agent-core/src/test/java/org/apache/inlong/agent/core/TestConfigJetty.java b/inlong-agent/agent-core/src/test/java/org/apache/inlong/agent/core/TestConfigJetty.java
index 7cac146..13a31fe 100755
--- a/inlong-agent/agent-core/src/test/java/org/apache/inlong/agent/core/TestConfigJetty.java
+++ b/inlong-agent/agent-core/src/test/java/org/apache/inlong/agent/core/TestConfigJetty.java
@@ -17,10 +17,10 @@
package org.apache.inlong.agent.core;
-import static org.apache.inlong.agent.constants.AgentConstants.AGENT_CONF_PARENT;
-import static org.apache.inlong.agent.constants.AgentConstants.AGENT_ENABLE_HTTP;
-import static org.apache.inlong.agent.constants.AgentConstants.AGENT_HTTP_PORT;
-import static org.apache.inlong.agent.constants.AgentConstants.DEFAULT_AGENT_HTTP_PORT;
+import static org.apache.inlong.agent.constant.AgentConstants.AGENT_CONF_PARENT;
+import static org.apache.inlong.agent.constant.AgentConstants.AGENT_ENABLE_HTTP;
+import static org.apache.inlong.agent.constant.AgentConstants.AGENT_HTTP_PORT;
+import static org.apache.inlong.agent.constant.AgentConstants.DEFAULT_AGENT_HTTP_PORT;
import com.google.gson.Gson;
import org.apache.http.client.config.RequestConfig;
diff --git a/inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/channel/MemoryChannel.java b/inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/channel/MemoryChannel.java
index d14958c..d53618c 100644
--- a/inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/channel/MemoryChannel.java
+++ b/inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/channel/MemoryChannel.java
@@ -20,7 +20,7 @@ package org.apache.inlong.agent.plugin.channel;
import java.util.concurrent.LinkedBlockingQueue;
import java.util.concurrent.TimeUnit;
import org.apache.inlong.agent.conf.JobProfile;
-import org.apache.inlong.agent.constants.AgentConstants;
+import org.apache.inlong.agent.constant.AgentConstants;
import org.apache.inlong.agent.plugin.Channel;
import org.apache.inlong.agent.plugin.Message;
import org.apache.inlong.agent.plugin.metrics.PluginJmxMetric;
diff --git a/inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/fetcher/ManagerFetcher.java b/inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/fetcher/ManagerFetcher.java
index e2452e4..78638c5 100755
--- a/inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/fetcher/ManagerFetcher.java
+++ b/inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/fetcher/ManagerFetcher.java
@@ -17,55 +17,10 @@
package org.apache.inlong.agent.plugin.fetcher;
-import static java.util.Objects.requireNonNull;
-import static org.apache.inlong.agent.constants.AgentConstants.AGENT_HOME;
-import static org.apache.inlong.agent.constants.AgentConstants.AGENT_LOCAL_CACHE;
-import static org.apache.inlong.agent.constants.AgentConstants.AGENT_LOCAL_CACHE_TIMEOUT;
-import static org.apache.inlong.agent.constants.AgentConstants.AGENT_LOCAL_IP;
-import static org.apache.inlong.agent.constants.AgentConstants.AGENT_UNIQ_ID;
-import static org.apache.inlong.agent.constants.AgentConstants.DEFAULT_AGENT_HOME;
-import static org.apache.inlong.agent.constants.AgentConstants.DEFAULT_AGENT_LOCAL_CACHE;
-import static org.apache.inlong.agent.constants.AgentConstants.DEFAULT_AGENT_LOCAL_CACHE_TIMEOUT;
-import static org.apache.inlong.agent.constants.AgentConstants.DEFAULT_AGENT_UNIQ_ID;
-import static org.apache.inlong.agent.constants.AgentConstants.AGENT_LOCAL_UUID;
-import static org.apache.inlong.agent.constants.JobConstants.JOB_OP;
-import static org.apache.inlong.agent.constants.JobConstants.JOB_RETRY_TIME;
-import static org.apache.inlong.agent.plugin.fetcher.ManagerResultFormatter.getResultData;
-import static org.apache.inlong.agent.plugin.fetcher.constants.FetcherConstants.AGENT_FETCHER_INTERVAL;
-import static org.apache.inlong.agent.plugin.fetcher.constants.FetcherConstants.AGENT_MANAGER_VIP_HTTP_HOST;
-import static org.apache.inlong.agent.plugin.fetcher.constants.FetcherConstants.AGENT_MANAGER_DBCOLLECT_GETTASK_HTTP_PATH;
-import static org.apache.inlong.agent.plugin.fetcher.constants.FetcherConstants.AGENT_MANAGER_VIP_HTTP_PORT;
-import static org.apache.inlong.agent.plugin.fetcher.constants.FetcherConstants.AGENT_MANAGER_IP_CHECK_HTTP_PATH;
-import static org.apache.inlong.agent.plugin.fetcher.constants.FetcherConstants.AGENT_MANAGER_RETURN_PARAM_DATA;
-import static org.apache.inlong.agent.plugin.fetcher.constants.FetcherConstants.AGENT_MANAGER_RETURN_PARAM_IP;
-import static org.apache.inlong.agent.plugin.fetcher.constants.FetcherConstants.AGENT_MANAGER_TASK_HTTP_PATH;
-import static org.apache.inlong.agent.plugin.fetcher.constants.FetcherConstants.AGENT_MANAGER_VIP_HTTP_PATH;
-import static org.apache.inlong.agent.plugin.fetcher.constants.FetcherConstants.AGENT_MANAGER_VIP_HTTP_PREFIX_PATH;
-import static org.apache.inlong.agent.plugin.fetcher.constants.FetcherConstants.DEFAULT_AGENT_MANAGER_DBCOLLECTOR_GETTASK_HTTP_PATH;
-import static org.apache.inlong.agent.plugin.fetcher.constants.FetcherConstants.DEFAULT_AGENT_FETCHER_INTERVAL;
-import static org.apache.inlong.agent.plugin.fetcher.constants.FetcherConstants.DEFAULT_AGENT_TDM_IP_CHECK_HTTP_PATH;
-import static org.apache.inlong.agent.plugin.fetcher.constants.FetcherConstants.DEFAULT_AGENT_MANAGER_TASK_HTTP_PATH;
-import static org.apache.inlong.agent.plugin.fetcher.constants.FetcherConstants.DEFAULT_AGENT_TDM_VIP_HTTP_PATH;
-import static org.apache.inlong.agent.plugin.fetcher.constants.FetcherConstants.DEFAULT_AGENT_MANAGER_VIP_HTTP_PREFIX_PATH;
-import static org.apache.inlong.agent.plugin.fetcher.constants.FetcherConstants.DEFAULT_LOCAL_IP;
-import static org.apache.inlong.agent.plugin.fetcher.constants.FetcherConstants.VERSION;
-import static org.apache.inlong.agent.plugin.utils.PluginUtils.copyJobProfile;
-
import com.google.gson.Gson;
import com.google.gson.JsonArray;
import com.google.gson.JsonElement;
import com.google.gson.JsonObject;
-
-import java.io.File;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.List;
-import java.util.concurrent.TimeUnit;
-import java.util.stream.Collectors;
-
import org.apache.inlong.agent.cache.LocalFileCache;
import org.apache.inlong.agent.common.AbstractDaemon;
import org.apache.inlong.agent.conf.AgentConfiguration;
@@ -74,32 +29,76 @@ import org.apache.inlong.agent.conf.ProfileFetcher;
import org.apache.inlong.agent.conf.TriggerProfile;
import org.apache.inlong.agent.core.AgentManager;
import org.apache.inlong.agent.db.CommandDb;
-import org.apache.inlong.commons.db.CommandEntity;
-import org.apache.inlong.commons.dto.CmdConfig;
-import org.apache.inlong.commons.dto.TaskRequestDto;
-import org.apache.inlong.commons.enums.ManagerOpEnum;
+import org.apache.inlong.agent.pojo.ConfirmAgentIpRequest;
+import org.apache.inlong.agent.pojo.DbCollectorTaskRequestDto;
+import org.apache.inlong.agent.pojo.DbCollectorTaskResult;
import org.apache.inlong.agent.plugin.Trigger;
-import org.apache.inlong.agent.plugin.fetcher.dtos.ConfirmAgentIpRequest;
-import org.apache.inlong.agent.plugin.fetcher.dtos.DbCollectorTaskRequestDto;
-import org.apache.inlong.agent.plugin.fetcher.dtos.DbCollectorTaskResult;
-import org.apache.inlong.agent.plugin.fetcher.dtos.TaskResult;
import org.apache.inlong.agent.plugin.utils.ExcuteLinux;
import org.apache.inlong.agent.plugin.utils.HttpManager;
import org.apache.inlong.agent.plugin.utils.PluginUtils;
import org.apache.inlong.agent.utils.AgentUtils;
+import org.apache.inlong.common.db.CommandEntity;
+import org.apache.inlong.common.enums.ManagerOpEnum;
+import org.apache.inlong.common.pojo.agent.CmdConfig;
+import org.apache.inlong.common.pojo.agent.DataConfig;
+import org.apache.inlong.common.pojo.agent.TaskRequest;
+import org.apache.inlong.common.pojo.agent.TaskResult;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.io.File;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.List;
+import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
+
+import static java.util.Objects.requireNonNull;
+import static org.apache.inlong.agent.constant.AgentConstants.AGENT_HOME;
+import static org.apache.inlong.agent.constant.AgentConstants.AGENT_LOCAL_CACHE;
+import static org.apache.inlong.agent.constant.AgentConstants.AGENT_LOCAL_CACHE_TIMEOUT;
+import static org.apache.inlong.agent.constant.AgentConstants.AGENT_LOCAL_IP;
+import static org.apache.inlong.agent.constant.AgentConstants.AGENT_LOCAL_UUID;
+import static org.apache.inlong.agent.constant.AgentConstants.AGENT_UNIQ_ID;
+import static org.apache.inlong.agent.constant.AgentConstants.DEFAULT_AGENT_HOME;
+import static org.apache.inlong.agent.constant.AgentConstants.DEFAULT_AGENT_LOCAL_CACHE;
+import static org.apache.inlong.agent.constant.AgentConstants.DEFAULT_AGENT_LOCAL_CACHE_TIMEOUT;
+import static org.apache.inlong.agent.constant.AgentConstants.DEFAULT_AGENT_UNIQ_ID;
+import static org.apache.inlong.agent.constant.FetcherConstants.AGENT_FETCHER_INTERVAL;
+import static org.apache.inlong.agent.constant.FetcherConstants.AGENT_MANAGER_DBCOLLECT_GETTASK_HTTP_PATH;
+import static org.apache.inlong.agent.constant.FetcherConstants.AGENT_MANAGER_IP_CHECK_HTTP_PATH;
+import static org.apache.inlong.agent.constant.FetcherConstants.AGENT_MANAGER_RETURN_PARAM_DATA;
+import static org.apache.inlong.agent.constant.FetcherConstants.AGENT_MANAGER_RETURN_PARAM_IP;
+import static org.apache.inlong.agent.constant.FetcherConstants.AGENT_MANAGER_TASK_HTTP_PATH;
+import static org.apache.inlong.agent.constant.FetcherConstants.AGENT_MANAGER_VIP_HTTP_HOST;
+import static org.apache.inlong.agent.constant.FetcherConstants.AGENT_MANAGER_VIP_HTTP_PATH;
+import static org.apache.inlong.agent.constant.FetcherConstants.AGENT_MANAGER_VIP_HTTP_PORT;
+import static org.apache.inlong.agent.constant.FetcherConstants.AGENT_MANAGER_VIP_HTTP_PREFIX_PATH;
+import static org.apache.inlong.agent.constant.FetcherConstants.DEFAULT_AGENT_FETCHER_INTERVAL;
+import static org.apache.inlong.agent.constant.FetcherConstants.DEFAULT_AGENT_MANAGER_DBCOLLECTOR_GETTASK_HTTP_PATH;
+import static org.apache.inlong.agent.constant.FetcherConstants.DEFAULT_AGENT_MANAGER_TASK_HTTP_PATH;
+import static org.apache.inlong.agent.constant.FetcherConstants.DEFAULT_AGENT_MANAGER_VIP_HTTP_PREFIX_PATH;
+import static org.apache.inlong.agent.constant.FetcherConstants.DEFAULT_AGENT_TDM_IP_CHECK_HTTP_PATH;
+import static org.apache.inlong.agent.constant.FetcherConstants.DEFAULT_AGENT_TDM_VIP_HTTP_PATH;
+import static org.apache.inlong.agent.constant.FetcherConstants.DEFAULT_LOCAL_IP;
+import static org.apache.inlong.agent.constant.FetcherConstants.VERSION;
+import static org.apache.inlong.agent.constant.JobConstants.JOB_OP;
+import static org.apache.inlong.agent.constant.JobConstants.JOB_RETRY_TIME;
+import static org.apache.inlong.agent.plugin.fetcher.ManagerResultFormatter.getResultData;
+import static org.apache.inlong.agent.plugin.utils.PluginUtils.copyJobProfile;
+
/**
* fetch command from manager
*/
public class ManagerFetcher extends AbstractDaemon implements ProfileFetcher {
+ public static final String AGENT = "agent";
private static final Logger LOGGER = LoggerFactory.getLogger(ManagerFetcher.class);
-
private static final Gson GSON = new Gson();
private static final int MAX_RETRY = 2;
- public static final String AGENT = "agent";
private final String managerVipUrl;
private final String baseManagerUrl;
private final String managerTaskUrl;
@@ -108,18 +107,14 @@ public class ManagerFetcher extends AbstractDaemon implements ProfileFetcher {
private final AgentConfiguration conf;
private final LocalFileCache localFileCache;
private final String uniqId;
- private List<String> managerList;
private final AgentManager agentManager;
private final HttpManager httpManager;
+ private List<String> managerList;
private String localIp;
private String uuid;
private CommandDb commandDb;
- private boolean requiredKeys(AgentConfiguration conf) {
- return conf.hasKey(AGENT_MANAGER_VIP_HTTP_HOST) && conf.hasKey(AGENT_MANAGER_VIP_HTTP_PORT);
- }
-
public ManagerFetcher(AgentManager agentManager) {
this.agentManager = agentManager;
this.conf = AgentConfiguration.getAgentConf();
@@ -138,6 +133,10 @@ public class ManagerFetcher extends AbstractDaemon implements ProfileFetcher {
}
}
+ private boolean requiredKeys(AgentConfiguration conf) {
+ return conf.hasKey(AGENT_MANAGER_VIP_HTTP_HOST) && conf.hasKey(AGENT_MANAGER_VIP_HTTP_PORT);
+ }
+
/**
* build base url for manager according to config
*
@@ -223,12 +222,12 @@ public class ManagerFetcher extends AbstractDaemon implements ProfileFetcher {
}
/**
- * request manager to get commands, make sure it not throwing exceptions
+ * request manager to get commands, make sure it is not throwing exceptions
*/
public void fetchCommand() {
List<CommandEntity> unackedCommands = commandDb.getUnackedCommands();
JsonObject resultData = getResultData(
- httpManager.doSentPost(managerTaskUrl, getFileCommdFetchRequest(unackedCommands)));
+ httpManager.doSentPost(managerTaskUrl, getFileCmdFetchRequest(unackedCommands)));
dealWithFileTaskResult(GSON.fromJson(resultData.get(AGENT_MANAGER_RETURN_PARAM_DATA).getAsJsonObject(),
TaskResult.class));
ackCommands(unackedCommands);
@@ -242,7 +241,7 @@ public class ManagerFetcher extends AbstractDaemon implements ProfileFetcher {
}
/**
- * request manager to get db collect task, make sure it not throwing exceptions
+ * request manager to get db collect task, make sure it is not throwing exceptions
*/
public void fetchDbCollectTask() {
if (agentManager.getJobManager().sqlJobExsit()) {
@@ -269,14 +268,15 @@ public class ManagerFetcher extends AbstractDaemon implements ProfileFetcher {
/**
* the fetch file command can be normal or special
- *
- * @param taskResult
*/
private void dealWithFileTaskResult(TaskResult taskResult) {
LOGGER.info("deal with fetch result {}", taskResult);
- for (TriggerProfile profile : taskResult.getTriggerProfiles()) {
+
+ for (DataConfig dataConfig : taskResult.getDataConfigs()) {
+ TriggerProfile profile = TriggerProfile.getTriggerProfiles(dataConfig);
dealWithTdmTriggerProfile(profile);
}
+
for (CmdConfig cmdConfig : taskResult.getCmdConfigs()) {
dealWithTdmCmd(cmdConfig);
}
@@ -284,23 +284,17 @@ public class ManagerFetcher extends AbstractDaemon implements ProfileFetcher {
/**
* form file command fetch request
- *
- * @param unackedCommands
- * @return
*/
- public TaskRequestDto getFileCommdFetchRequest(
- List<CommandEntity> unackedCommands) {
- TaskRequestDto requset = new TaskRequestDto();
- requset.setAgentIp(localIp);
- requset.setUuid(uuid);
- requset.setCommandInfo(unackedCommands);
- return requset;
+ public TaskRequest getFileCmdFetchRequest(List<CommandEntity> unackedCommands) {
+ TaskRequest request = new TaskRequest();
+ request.setAgentIp(localIp);
+ request.setUuid(uuid);
+ request.setCommandInfo(unackedCommands);
+ return request;
}
/**
* form db collector task fetch request
- *
- * @return
*/
public DbCollectorTaskRequestDto getSqlTaskRequest() {
DbCollectorTaskRequestDto request = new DbCollectorTaskRequestDto();
@@ -311,8 +305,6 @@ public class ManagerFetcher extends AbstractDaemon implements ProfileFetcher {
/**
* get command db
- *
- * @return
*/
public CommandDb getCommandDb() {
return commandDb;
@@ -320,8 +312,6 @@ public class ManagerFetcher extends AbstractDaemon implements ProfileFetcher {
/**
* deal with special command retry\backtrack
- *
- * @param cmdConfig
*/
public void dealWithTdmCmd(CmdConfig cmdConfig) {
Trigger trigger = agentManager.getTriggerManager().getTrigger(
@@ -346,14 +336,9 @@ public class ManagerFetcher extends AbstractDaemon implements ProfileFetcher {
/**
* execute commands
- *
- * @param triggerProfile
- * @param opType
- * @param dataTime
- * @return
*/
private boolean executeCmd(TriggerProfile triggerProfile,
- ManagerOpEnum opType, String dataTime) {
+ ManagerOpEnum opType, String dataTime) {
switch (opType) {
case RETRY:
case BACKTRACK:
@@ -370,10 +355,6 @@ public class ManagerFetcher extends AbstractDaemon implements ProfileFetcher {
/**
* when execute make up command, files scanned before should not be executed.
- *
- * @param triggerProfile
- * @param dataTime
- * @return
*/
private boolean makeUpFiles(TriggerProfile triggerProfile, String dataTime) {
LOGGER.info("start to make up files with trigger {}, dataTime {}",
@@ -381,7 +362,7 @@ public class ManagerFetcher extends AbstractDaemon implements ProfileFetcher {
Collection<File> suitFiles = PluginUtils.findSuitFiles(triggerProfile);
// filter files exited before
List<File> pendingFiles = suitFiles.stream().filter(file ->
- !agentManager.getJobManager().checkJobExsit(file.getAbsolutePath()))
+ !agentManager.getJobManager().checkJobExsit(file.getAbsolutePath()))
.collect(Collectors.toList());
for (File pendingFile : pendingFiles) {
JobProfile copiedProfile = copyJobProfile(triggerProfile, dataTime,
@@ -394,8 +375,6 @@ public class ManagerFetcher extends AbstractDaemon implements ProfileFetcher {
/**
* the trigger profile returned from manager should be parsed
- *
- * @param triggerProfile
*/
public void dealWithTdmTriggerProfile(TriggerProfile triggerProfile) {
ManagerOpEnum opType = ManagerOpEnum.getOpType(triggerProfile.getInt(JOB_OP));
@@ -431,9 +410,6 @@ public class ManagerFetcher extends AbstractDaemon implements ProfileFetcher {
/**
* confirm local ips from manager
- *
- * @param localIps
- * @return
*/
private String confirmLocalIps(List<String> localIps) {
ConfirmAgentIpRequest request = new ConfirmAgentIpRequest(AGENT, localIps);
@@ -446,7 +422,7 @@ public class ManagerFetcher extends AbstractDaemon implements ProfileFetcher {
}
/**
- * fetch manager list, make sure it not throwing exceptions
+ * fetch manager list, make sure it's not throwing exceptions
*
* @param isInitial - is initial
* @param retryTime - retry time
diff --git a/inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/fetcher/dtos/TaskRequestDto.java b/inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/fetcher/dtos/TaskRequestDto.java
deleted file mode 100644
index 3fd8d5e..0000000
--- a/inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/fetcher/dtos/TaskRequestDto.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.inlong.agent.plugin.fetcher.dtos;
-
-import java.util.ArrayList;
-import java.util.List;
-import lombok.Data;
-import org.apache.inlong.commons.db.CommandEntity;
-
-@Data
-public class TaskRequestDto {
- private String agentIp;
- private List<CommandEntity> commandInfo = new ArrayList<>();
-}
diff --git a/inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/fetcher/dtos/TaskResult.java b/inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/fetcher/dtos/TaskResult.java
deleted file mode 100644
index eb9bcf1..0000000
--- a/inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/fetcher/dtos/TaskResult.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.inlong.agent.plugin.fetcher.dtos;
-
-import lombok.Data;
-import org.apache.inlong.agent.conf.TriggerProfile;
-import org.apache.inlong.commons.dto.CmdConfig;
-import org.apache.inlong.commons.dto.DataConfig;
-
-import java.util.ArrayList;
-import java.util.List;
-
-@Data
-public class TaskResult {
-
- private List<CmdConfig> cmdConfigs;
- private List<DataConfig> dataConfigs;
-
- public List<TriggerProfile> getTriggerProfiles() {
- List<TriggerProfile> triggerProfiles = new ArrayList<>();
- if (dataConfigs == null || dataConfigs.isEmpty()) {
- return triggerProfiles;
- }
- dataConfigs.forEach(
- dataConfig -> triggerProfiles.add(JobProfileDto
- .convertToTriggerProfile(dataConfig))
- );
- return triggerProfiles;
- }
-}
\ No newline at end of file
diff --git a/inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/metrics/PluginJmxMetric.java b/inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/metrics/PluginJmxMetric.java
index f3cc676..5e75c3a 100644
--- a/inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/metrics/PluginJmxMetric.java
+++ b/inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/metrics/PluginJmxMetric.java
@@ -22,10 +22,10 @@ package org.apache.inlong.agent.plugin.metrics;
import java.util.concurrent.atomic.AtomicLong;
import org.apache.inlong.agent.metrics.Metric;
-import org.apache.inlong.commons.metrics.metric.Dimension;
-import org.apache.inlong.commons.metrics.metric.MetricDomain;
-import org.apache.inlong.commons.metrics.metric.MetricItem;
-import org.apache.inlong.commons.metrics.metric.MetricRegister;
+import org.apache.inlong.common.metric.Dimension;
+import org.apache.inlong.common.metric.MetricDomain;
+import org.apache.inlong.common.metric.MetricItem;
+import org.apache.inlong.common.metric.MetricRegister;
/**
* metrics for agent plugin
diff --git a/inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/metrics/SinkJmxMetric.java b/inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/metrics/SinkJmxMetric.java
index 60de75f..612eead 100644
--- a/inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/metrics/SinkJmxMetric.java
+++ b/inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/metrics/SinkJmxMetric.java
@@ -20,10 +20,10 @@
package org.apache.inlong.agent.plugin.metrics;
import org.apache.inlong.agent.metrics.Metric;
-import org.apache.inlong.commons.metrics.metric.Dimension;
-import org.apache.inlong.commons.metrics.metric.MetricDomain;
-import org.apache.inlong.commons.metrics.metric.MetricItem;
-import org.apache.inlong.commons.metrics.metric.MetricRegister;
+import org.apache.inlong.common.metric.Dimension;
+import org.apache.inlong.common.metric.MetricDomain;
+import org.apache.inlong.common.metric.MetricItem;
+import org.apache.inlong.common.metric.MetricRegister;
import java.util.concurrent.atomic.AtomicLong;
diff --git a/inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/metrics/SourceJmxMetric.java b/inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/metrics/SourceJmxMetric.java
index f1ad78c..3ab8945 100644
--- a/inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/metrics/SourceJmxMetric.java
+++ b/inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/metrics/SourceJmxMetric.java
@@ -20,10 +20,10 @@
package org.apache.inlong.agent.plugin.metrics;
import org.apache.inlong.agent.metrics.Metric;
-import org.apache.inlong.commons.metrics.metric.Dimension;
-import org.apache.inlong.commons.metrics.metric.MetricDomain;
-import org.apache.inlong.commons.metrics.metric.MetricItem;
-import org.apache.inlong.commons.metrics.metric.MetricRegister;
+import org.apache.inlong.common.metric.Dimension;
+import org.apache.inlong.common.metric.MetricDomain;
+import org.apache.inlong.common.metric.MetricItem;
+import org.apache.inlong.common.metric.MetricRegister;
import java.util.concurrent.atomic.AtomicLong;
diff --git a/inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/sinks/AbstractSink.java b/inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/sinks/AbstractSink.java
index ef9c068..2fa1475 100644
--- a/inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/sinks/AbstractSink.java
+++ b/inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/sinks/AbstractSink.java
@@ -17,7 +17,7 @@
package org.apache.inlong.agent.plugin.sinks;
-import static org.apache.inlong.agent.constants.AgentConstants.AGENT_MESSAGE_FILTER_CLASSNAME;
+import static org.apache.inlong.agent.constant.AgentConstants.AGENT_MESSAGE_FILTER_CLASSNAME;
import org.apache.inlong.agent.conf.JobProfile;
import org.apache.inlong.agent.plugin.MessageFilter;
diff --git a/inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/sinks/ProxySink.java b/inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/sinks/ProxySink.java
index 32d204a..e41f2a9 100755
--- a/inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/sinks/ProxySink.java
+++ b/inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/sinks/ProxySink.java
@@ -17,28 +17,28 @@
package org.apache.inlong.agent.plugin.sinks;
-import static org.apache.inlong.agent.constants.CommonConstants.DEFAULT_FIELD_SPLITTER;
-import static org.apache.inlong.agent.constants.CommonConstants.PROXY_INLONG_GROUP_ID;
-import static org.apache.inlong.agent.constants.CommonConstants.PROXY_KEY_AGENT_IP;
-import static org.apache.inlong.agent.constants.CommonConstants.PROXY_KEY_ID;
-import static org.apache.inlong.agent.constants.CommonConstants.PROXY_OCEANUS_BL;
-import static org.apache.inlong.agent.constants.CommonConstants.PROXY_OCEANUS_F;
-import static org.apache.inlong.agent.constants.CommonConstants.PROXY_INLONG_STREAM_ID;
-import static org.apache.inlong.agent.constants.JobConstants.PROXY_BATCH_FLUSH_INTERVAL;
-import static org.apache.inlong.agent.constants.JobConstants.PROXY_PACKAGE_MAX_SIZE;
-import static org.apache.inlong.agent.constants.JobConstants.PROXY_PACKAGE_MAX_TIMEOUT_MS;
-import static org.apache.inlong.agent.constants.JobConstants.PROXY_INLONG_STREAM_ID_QUEUE_MAX_NUMBER;
-import static org.apache.inlong.agent.constants.JobConstants.DEFAULT_PROXY_BATCH_FLUSH_INTERVAL;
-import static org.apache.inlong.agent.constants.JobConstants.DEFAULT_PROXY_PACKAGE_MAX_SIZE;
-import static org.apache.inlong.agent.constants.JobConstants.DEFAULT_PROXY_PACKAGE_MAX_TIMEOUT_MS;
-import static org.apache.inlong.agent.constants.JobConstants.DEFAULT_PROXY_INLONG_STREAM_ID_QUEUE_MAX_NUMBER;
-import static org.apache.inlong.agent.constants.JobConstants.JOB_ADDITION_STR;
-import static org.apache.inlong.agent.constants.JobConstants.JOB_CYCLE_UNIT;
-import static org.apache.inlong.agent.constants.JobConstants.JOB_DATA_TIME;
-import static org.apache.inlong.agent.constants.JobConstants.JOB_ID;
-import static org.apache.inlong.agent.constants.JobConstants.JOB_INSTANCE_ID;
-import static org.apache.inlong.agent.constants.JobConstants.JOB_IP;
-import static org.apache.inlong.agent.constants.JobConstants.JOB_RETRY;
+import static org.apache.inlong.agent.constant.CommonConstants.DEFAULT_FIELD_SPLITTER;
+import static org.apache.inlong.agent.constant.CommonConstants.PROXY_INLONG_GROUP_ID;
+import static org.apache.inlong.agent.constant.CommonConstants.PROXY_KEY_AGENT_IP;
+import static org.apache.inlong.agent.constant.CommonConstants.PROXY_KEY_ID;
+import static org.apache.inlong.agent.constant.CommonConstants.PROXY_OCEANUS_BL;
+import static org.apache.inlong.agent.constant.CommonConstants.PROXY_OCEANUS_F;
+import static org.apache.inlong.agent.constant.CommonConstants.PROXY_INLONG_STREAM_ID;
+import static org.apache.inlong.agent.constant.JobConstants.PROXY_BATCH_FLUSH_INTERVAL;
+import static org.apache.inlong.agent.constant.JobConstants.PROXY_PACKAGE_MAX_SIZE;
+import static org.apache.inlong.agent.constant.JobConstants.PROXY_PACKAGE_MAX_TIMEOUT_MS;
+import static org.apache.inlong.agent.constant.JobConstants.PROXY_INLONG_STREAM_ID_QUEUE_MAX_NUMBER;
+import static org.apache.inlong.agent.constant.JobConstants.DEFAULT_PROXY_BATCH_FLUSH_INTERVAL;
+import static org.apache.inlong.agent.constant.JobConstants.DEFAULT_PROXY_PACKAGE_MAX_SIZE;
+import static org.apache.inlong.agent.constant.JobConstants.DEFAULT_PROXY_PACKAGE_MAX_TIMEOUT_MS;
+import static org.apache.inlong.agent.constant.JobConstants.DEFAULT_PROXY_INLONG_STREAM_ID_QUEUE_MAX_NUMBER;
+import static org.apache.inlong.agent.constant.JobConstants.JOB_ADDITION_STR;
+import static org.apache.inlong.agent.constant.JobConstants.JOB_CYCLE_UNIT;
+import static org.apache.inlong.agent.constant.JobConstants.JOB_DATA_TIME;
+import static org.apache.inlong.agent.constant.JobConstants.JOB_ID;
+import static org.apache.inlong.agent.constant.JobConstants.JOB_INSTANCE_ID;
+import static org.apache.inlong.agent.constant.JobConstants.JOB_IP;
+import static org.apache.inlong.agent.constant.JobConstants.JOB_RETRY;
import java.nio.charset.StandardCharsets;
import java.util.HashMap;
@@ -54,7 +54,7 @@ import java.util.concurrent.atomic.AtomicLong;
import org.apache.commons.lang3.tuple.Pair;
import org.apache.inlong.agent.common.AgentThreadFactory;
import org.apache.inlong.agent.conf.JobProfile;
-import org.apache.inlong.agent.constants.CommonConstants;
+import org.apache.inlong.agent.constant.CommonConstants;
import org.apache.inlong.agent.message.ProxyMessage;
import org.apache.inlong.agent.message.EndMessage;
import org.apache.inlong.agent.metrics.audit.AuditUtils;
diff --git a/inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/sinks/PulsarSink.java b/inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/sinks/PulsarSink.java
index 8133a7e..ed7141f 100755
--- a/inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/sinks/PulsarSink.java
+++ b/inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/sinks/PulsarSink.java
@@ -47,30 +47,30 @@ import org.apache.pulsar.client.api.PulsarClientException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import static org.apache.inlong.agent.constants.CommonConstants.PROXY_INLONG_GROUP_ID;
-import static org.apache.inlong.agent.constants.CommonConstants.PROXY_INLONG_STREAM_ID;
-import static org.apache.inlong.agent.constants.CommonConstants.PULSAR_PRODUCER_THREAD_NUM;
-import static org.apache.inlong.agent.constants.CommonConstants.DEFAULT_PULSAR_PRODUCER_THREAD_NUM;
-import static org.apache.inlong.agent.constants.CommonConstants.PULSAR_PRODUCER_ASYNC;
-import static org.apache.inlong.agent.constants.CommonConstants.DEFAULT_PULSAR_PRODUCER_ASYNC;
-import static org.apache.inlong.agent.constants.CommonConstants.PULSAR_SINK_POLL_TIMEOUT;
-import static org.apache.inlong.agent.constants.CommonConstants.DEFAULT_PULSAR_SINK_POLL_TIMEOUT;
-import static org.apache.inlong.agent.constants.CommonConstants.PULSAR_SINK_CACHE_CAPACITY;
-import static org.apache.inlong.agent.constants.CommonConstants.DEFAULT_PULSAR_SINK_CACHE_CAPACITY;
-import static org.apache.inlong.agent.constants.CommonConstants.PULSAR_SERVERS;
-import static org.apache.inlong.agent.constants.CommonConstants.PULSAR_TOPIC;
-import static org.apache.inlong.agent.constants.CommonConstants.PULSAR_PRODUCER_MAX_PENDING_COUNT;
-import static org.apache.inlong.agent.constants.CommonConstants.DEFAULT_PULSAR_PRODUCER_MAX_PENDING_COUNT;
-import static org.apache.inlong.agent.constants.CommonConstants.PULSAR_PRODUCER_BATCH_MAXSIZE;
-import static org.apache.inlong.agent.constants.CommonConstants.DEFAULT_PULSAR_PRODUCER_BATCH_MAXSIZE;
-import static org.apache.inlong.agent.constants.CommonConstants.PULSAR_PRODUCER_BATCH_MAXCOUNT;
-import static org.apache.inlong.agent.constants.CommonConstants.DEFAULT_PULSAR_PRODUCER_BATCH_MAXCOUNT;
-import static org.apache.inlong.agent.constants.CommonConstants.PULSAR_PRODUCER_ENABLE_BATCH;
-import static org.apache.inlong.agent.constants.CommonConstants.DEFAULT_PULSAR_PRODUCER_ENABLE_BATCH;
-import static org.apache.inlong.agent.constants.CommonConstants.PULSAR_PRODUCER_BLOCK_QUEUE;
-import static org.apache.inlong.agent.constants.CommonConstants.DEFAULT_PULSAR_PRODUCER_BLOCK_QUEUE;
-import static org.apache.inlong.agent.constants.CommonConstants.PULSAR_PRODUCER_COMPRESS_TYPE;
-import static org.apache.inlong.agent.constants.CommonConstants.DEFAULT_PULSAR_PRODUCER_COMPRESS_TYPE;
+import static org.apache.inlong.agent.constant.CommonConstants.PROXY_INLONG_GROUP_ID;
+import static org.apache.inlong.agent.constant.CommonConstants.PROXY_INLONG_STREAM_ID;
+import static org.apache.inlong.agent.constant.CommonConstants.PULSAR_PRODUCER_THREAD_NUM;
+import static org.apache.inlong.agent.constant.CommonConstants.DEFAULT_PULSAR_PRODUCER_THREAD_NUM;
+import static org.apache.inlong.agent.constant.CommonConstants.PULSAR_PRODUCER_ASYNC;
+import static org.apache.inlong.agent.constant.CommonConstants.DEFAULT_PULSAR_PRODUCER_ASYNC;
+import static org.apache.inlong.agent.constant.CommonConstants.PULSAR_SINK_POLL_TIMEOUT;
+import static org.apache.inlong.agent.constant.CommonConstants.DEFAULT_PULSAR_SINK_POLL_TIMEOUT;
+import static org.apache.inlong.agent.constant.CommonConstants.PULSAR_SINK_CACHE_CAPACITY;
+import static org.apache.inlong.agent.constant.CommonConstants.DEFAULT_PULSAR_SINK_CACHE_CAPACITY;
+import static org.apache.inlong.agent.constant.CommonConstants.PULSAR_SERVERS;
+import static org.apache.inlong.agent.constant.CommonConstants.PULSAR_TOPIC;
+import static org.apache.inlong.agent.constant.CommonConstants.PULSAR_PRODUCER_MAX_PENDING_COUNT;
+import static org.apache.inlong.agent.constant.CommonConstants.DEFAULT_PULSAR_PRODUCER_MAX_PENDING_COUNT;
+import static org.apache.inlong.agent.constant.CommonConstants.PULSAR_PRODUCER_BATCH_MAXSIZE;
+import static org.apache.inlong.agent.constant.CommonConstants.DEFAULT_PULSAR_PRODUCER_BATCH_MAXSIZE;
+import static org.apache.inlong.agent.constant.CommonConstants.PULSAR_PRODUCER_BATCH_MAXCOUNT;
+import static org.apache.inlong.agent.constant.CommonConstants.DEFAULT_PULSAR_PRODUCER_BATCH_MAXCOUNT;
+import static org.apache.inlong.agent.constant.CommonConstants.PULSAR_PRODUCER_ENABLE_BATCH;
+import static org.apache.inlong.agent.constant.CommonConstants.DEFAULT_PULSAR_PRODUCER_ENABLE_BATCH;
+import static org.apache.inlong.agent.constant.CommonConstants.PULSAR_PRODUCER_BLOCK_QUEUE;
+import static org.apache.inlong.agent.constant.CommonConstants.DEFAULT_PULSAR_PRODUCER_BLOCK_QUEUE;
+import static org.apache.inlong.agent.constant.CommonConstants.PULSAR_PRODUCER_COMPRESS_TYPE;
+import static org.apache.inlong.agent.constant.CommonConstants.DEFAULT_PULSAR_PRODUCER_COMPRESS_TYPE;
public class PulsarSink extends AbstractDaemon implements Sink {
diff --git a/inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/sinks/SenderManager.java b/inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/sinks/SenderManager.java
index c72d0ed..9f9b59e 100755
--- a/inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/sinks/SenderManager.java
+++ b/inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/sinks/SenderManager.java
@@ -17,8 +17,8 @@
package org.apache.inlong.agent.plugin.sinks;
-import static org.apache.inlong.agent.plugin.fetcher.constants.FetcherConstants.AGENT_MANAGER_VIP_HTTP_HOST;
-import static org.apache.inlong.agent.plugin.fetcher.constants.FetcherConstants.AGENT_MANAGER_VIP_HTTP_PORT;
+import static org.apache.inlong.agent.constant.FetcherConstants.AGENT_MANAGER_VIP_HTTP_HOST;
+import static org.apache.inlong.agent.constant.FetcherConstants.AGENT_MANAGER_VIP_HTTP_PORT;
import java.util.ArrayList;
import java.util.List;
@@ -30,7 +30,7 @@ import java.util.concurrent.atomic.AtomicInteger;
import org.apache.inlong.agent.common.AgentThreadFactory;
import org.apache.inlong.agent.conf.AgentConfiguration;
import org.apache.inlong.agent.conf.JobProfile;
-import org.apache.inlong.agent.constants.CommonConstants;
+import org.apache.inlong.agent.constant.CommonConstants;
import org.apache.inlong.agent.core.task.TaskPositionManager;
import org.apache.inlong.agent.plugin.message.SequentialID;
import org.apache.inlong.agent.plugin.metrics.PluginJmxMetric;
diff --git a/inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/sources/TextFileSource.java b/inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/sources/TextFileSource.java
index 4a860ce..2d2972c 100755
--- a/inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/sources/TextFileSource.java
+++ b/inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/sources/TextFileSource.java
@@ -17,11 +17,11 @@
package org.apache.inlong.agent.plugin.sources;
-import static org.apache.inlong.agent.constants.CommonConstants.POSITION_SUFFIX;
-import static org.apache.inlong.agent.constants.JobConstants.DEFAULT_JOB_LINE_FILTER;
-import static org.apache.inlong.agent.constants.JobConstants.DEFAULT_JOB_READ_WAIT_TIMEOUT;
-import static org.apache.inlong.agent.constants.JobConstants.JOB_LINE_FILTER_PATTERN;
-import static org.apache.inlong.agent.constants.JobConstants.JOB_READ_WAIT_TIMEOUT;
+import static org.apache.inlong.agent.constant.CommonConstants.POSITION_SUFFIX;
+import static org.apache.inlong.agent.constant.JobConstants.DEFAULT_JOB_LINE_FILTER;
+import static org.apache.inlong.agent.constant.JobConstants.DEFAULT_JOB_READ_WAIT_TIMEOUT;
+import static org.apache.inlong.agent.constant.JobConstants.JOB_LINE_FILTER_PATTERN;
+import static org.apache.inlong.agent.constant.JobConstants.JOB_READ_WAIT_TIMEOUT;
import java.io.File;
import java.util.ArrayList;
diff --git a/inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/sources/reader/SqlReader.java b/inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/sources/reader/SqlReader.java
index fa3e9f5..61fe8d4 100755
--- a/inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/sources/reader/SqlReader.java
+++ b/inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/sources/reader/SqlReader.java
@@ -21,8 +21,8 @@ import static java.sql.Types.BINARY;
import static java.sql.Types.BLOB;
import static java.sql.Types.LONGVARBINARY;
import static java.sql.Types.VARBINARY;
-import static org.apache.inlong.agent.constants.CommonConstants.PROXY_INLONG_GROUP_ID;
-import static org.apache.inlong.agent.constants.CommonConstants.PROXY_INLONG_STREAM_ID;
+import static org.apache.inlong.agent.constant.CommonConstants.PROXY_INLONG_GROUP_ID;
+import static org.apache.inlong.agent.constant.CommonConstants.PROXY_INLONG_STREAM_ID;
import java.nio.charset.StandardCharsets;
import java.sql.Connection;
diff --git a/inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/sources/reader/TextFileReader.java b/inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/sources/reader/TextFileReader.java
index d3c0328..0b577a0 100755
--- a/inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/sources/reader/TextFileReader.java
+++ b/inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/sources/reader/TextFileReader.java
@@ -17,13 +17,13 @@
package org.apache.inlong.agent.plugin.sources.reader;
-import static org.apache.inlong.agent.constants.CommonConstants.PROXY_INLONG_GROUP_ID;
-import static org.apache.inlong.agent.constants.CommonConstants.PROXY_INLONG_STREAM_ID;
-import static org.apache.inlong.agent.constants.CommonConstants.DEFAULT_PROXY_INLONG_GROUP_ID;
-import static org.apache.inlong.agent.constants.CommonConstants.DEFAULT_PROXY_INLONG_STREAM_ID;
+import static org.apache.inlong.agent.constant.CommonConstants.PROXY_INLONG_GROUP_ID;
+import static org.apache.inlong.agent.constant.CommonConstants.PROXY_INLONG_STREAM_ID;
+import static org.apache.inlong.agent.constant.CommonConstants.DEFAULT_PROXY_INLONG_GROUP_ID;
+import static org.apache.inlong.agent.constant.CommonConstants.DEFAULT_PROXY_INLONG_STREAM_ID;
-import static org.apache.inlong.agent.constants.JobConstants.DEFAULT_JOB_FILE_MAX_WAIT;
-import static org.apache.inlong.agent.constants.JobConstants.JOB_FILE_MAX_WAIT;
+import static org.apache.inlong.agent.constant.JobConstants.DEFAULT_JOB_FILE_MAX_WAIT;
+import static org.apache.inlong.agent.constant.JobConstants.JOB_FILE_MAX_WAIT;
import java.io.File;
import java.nio.charset.StandardCharsets;
diff --git a/inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/trigger/DirectoryTrigger.java b/inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/trigger/DirectoryTrigger.java
index 0eabdc6..1e70736 100644
--- a/inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/trigger/DirectoryTrigger.java
+++ b/inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/trigger/DirectoryTrigger.java
@@ -37,8 +37,8 @@ import java.util.stream.Stream;
import org.apache.inlong.agent.common.AbstractDaemon;
import org.apache.inlong.agent.conf.JobProfile;
import org.apache.inlong.agent.conf.TriggerProfile;
-import org.apache.inlong.agent.constants.AgentConstants;
-import org.apache.inlong.agent.constants.JobConstants;
+import org.apache.inlong.agent.constant.AgentConstants;
+import org.apache.inlong.agent.constant.JobConstants;
import org.apache.inlong.agent.plugin.Trigger;
import org.apache.inlong.agent.plugin.utils.PluginUtils;
import org.slf4j.Logger;
diff --git a/inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/utils/HttpManager.java b/inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/utils/HttpManager.java
index 030113a..01f85bf 100644
--- a/inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/utils/HttpManager.java
+++ b/inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/utils/HttpManager.java
@@ -17,10 +17,10 @@
package org.apache.inlong.agent.plugin.utils;
-import static org.apache.inlong.agent.plugin.fetcher.constants.FetcherConstants.AGENT_HTTP_APPLICATION_JSON;
-import static org.apache.inlong.agent.plugin.fetcher.constants.FetcherConstants.AGENT_HTTP_SUCCESS_CODE;
-import static org.apache.inlong.agent.plugin.fetcher.constants.FetcherConstants.AGENT_MANAGER_REQUEST_TIMEOUT;
-import static org.apache.inlong.agent.plugin.fetcher.constants.FetcherConstants.DEFAULT_AGENT_MANAGER_REQUEST_TIMEOUT;
+import static org.apache.inlong.agent.constant.FetcherConstants.AGENT_HTTP_APPLICATION_JSON;
+import static org.apache.inlong.agent.constant.FetcherConstants.AGENT_HTTP_SUCCESS_CODE;
+import static org.apache.inlong.agent.constant.FetcherConstants.AGENT_MANAGER_REQUEST_TIMEOUT;
+import static org.apache.inlong.agent.constant.FetcherConstants.DEFAULT_AGENT_MANAGER_REQUEST_TIMEOUT;
import static org.apache.inlong.agent.plugin.utils.PluginUtils.toJsonStr;
import java.util.concurrent.TimeUnit;
diff --git a/inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/utils/PluginUtils.java b/inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/utils/PluginUtils.java
index 73def78..14d0e3a 100755
--- a/inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/utils/PluginUtils.java
+++ b/inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/utils/PluginUtils.java
@@ -17,14 +17,14 @@
package org.apache.inlong.agent.plugin.utils;
-import static org.apache.inlong.agent.constants.CommonConstants.AGENT_COLON;
-import static org.apache.inlong.agent.constants.CommonConstants.AGENT_NIX_OS;
-import static org.apache.inlong.agent.constants.CommonConstants.AGENT_NUX_OS;
-import static org.apache.inlong.agent.constants.CommonConstants.AGENT_OS_NAME;
-import static org.apache.inlong.agent.constants.CommonConstants.DEFAULT_FILE_MAX_NUM;
-import static org.apache.inlong.agent.constants.CommonConstants.FILE_MAX_NUM;
-import static org.apache.inlong.agent.constants.JobConstants.JOB_DIR_FILTER_PATTERN;
-import static org.apache.inlong.agent.constants.JobConstants.JOB_RETRY_TIME;
+import static org.apache.inlong.agent.constant.CommonConstants.AGENT_COLON;
+import static org.apache.inlong.agent.constant.CommonConstants.AGENT_NIX_OS;
+import static org.apache.inlong.agent.constant.CommonConstants.AGENT_NUX_OS;
+import static org.apache.inlong.agent.constant.CommonConstants.AGENT_OS_NAME;
+import static org.apache.inlong.agent.constant.CommonConstants.DEFAULT_FILE_MAX_NUM;
+import static org.apache.inlong.agent.constant.CommonConstants.FILE_MAX_NUM;
+import static org.apache.inlong.agent.constant.JobConstants.JOB_DIR_FILTER_PATTERN;
+import static org.apache.inlong.agent.constant.JobConstants.JOB_RETRY_TIME;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
@@ -39,7 +39,7 @@ import java.util.List;
import lombok.extern.slf4j.Slf4j;
import org.apache.inlong.agent.conf.JobProfile;
import org.apache.inlong.agent.conf.TriggerProfile;
-import org.apache.inlong.agent.constants.JobConstants;
+import org.apache.inlong.agent.constant.JobConstants;
import org.apache.inlong.agent.plugin.trigger.PathPattern;
import org.apache.inlong.agent.utils.AgentUtils;
import org.apache.pulsar.client.api.CompressionType;
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 894ad77..8d320b6 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
@@ -21,7 +21,7 @@ import java.nio.file.Path;
import java.nio.file.Paths;
import org.apache.commons.io.FileUtils;
import org.apache.inlong.agent.conf.AgentConfiguration;
-import org.apache.inlong.agent.constants.AgentConstants;
+import org.apache.inlong.agent.constant.AgentConstants;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/inlong-agent/agent-plugins/src/test/java/org/apache/inlong/agent/plugin/MiniAgent.java b/inlong-agent/agent-plugins/src/test/java/org/apache/inlong/agent/plugin/MiniAgent.java
index 353ec18..3a98f22 100755
--- a/inlong-agent/agent-plugins/src/test/java/org/apache/inlong/agent/plugin/MiniAgent.java
+++ b/inlong-agent/agent-plugins/src/test/java/org/apache/inlong/agent/plugin/MiniAgent.java
@@ -17,7 +17,7 @@
package org.apache.inlong.agent.plugin;
-import static org.apache.inlong.agent.constants.AgentConstants.AGENT_FETCH_CENTER_INTERVAL_SECONDS;
+import static org.apache.inlong.agent.constant.AgentConstants.AGENT_FETCH_CENTER_INTERVAL_SECONDS;
import java.util.concurrent.LinkedBlockingQueue;
import org.apache.inlong.agent.conf.AgentConfiguration;
diff --git a/inlong-agent/agent-plugins/src/test/java/org/apache/inlong/agent/plugin/TestFileAgent.java b/inlong-agent/agent-plugins/src/test/java/org/apache/inlong/agent/plugin/TestFileAgent.java
index 971775d..70762a9 100755
--- a/inlong-agent/agent-plugins/src/test/java/org/apache/inlong/agent/plugin/TestFileAgent.java
+++ b/inlong-agent/agent-plugins/src/test/java/org/apache/inlong/agent/plugin/TestFileAgent.java
@@ -17,14 +17,14 @@
package org.apache.inlong.agent.plugin;
-import static org.apache.inlong.agent.constants.AgentConstants.AGENT_MESSAGE_FILTER_CLASSNAME;
-import static org.apache.inlong.agent.constants.CommonConstants.PROXY_INLONG_GROUP_ID;
-import static org.apache.inlong.agent.constants.CommonConstants.PROXY_INLONG_STREAM_ID;
-import static org.apache.inlong.agent.constants.JobConstants.JOB_CYCLE_UNIT;
-import static org.apache.inlong.agent.constants.JobConstants.JOB_DIR_FILTER_PATTERN;
-import static org.apache.inlong.agent.constants.JobConstants.JOB_FILE_MAX_WAIT;
-import static org.apache.inlong.agent.constants.JobConstants.JOB_FILE_TIME_OFFSET;
-import static org.apache.inlong.agent.constants.JobConstants.JOB_READ_WAIT_TIMEOUT;
+import static org.apache.inlong.agent.constant.AgentConstants.AGENT_MESSAGE_FILTER_CLASSNAME;
+import static org.apache.inlong.agent.constant.CommonConstants.PROXY_INLONG_GROUP_ID;
+import static org.apache.inlong.agent.constant.CommonConstants.PROXY_INLONG_STREAM_ID;
+import static org.apache.inlong.agent.constant.JobConstants.JOB_CYCLE_UNIT;
+import static org.apache.inlong.agent.constant.JobConstants.JOB_DIR_FILTER_PATTERN;
+import static org.apache.inlong.agent.constant.JobConstants.JOB_FILE_MAX_WAIT;
+import static org.apache.inlong.agent.constant.JobConstants.JOB_FILE_TIME_OFFSET;
+import static org.apache.inlong.agent.constant.JobConstants.JOB_READ_WAIT_TIMEOUT;
import static org.awaitility.Awaitility.await;
import java.io.FileWriter;
diff --git a/inlong-agent/agent-plugins/src/test/java/org/apache/inlong/agent/plugin/filter/TestDateFormatRegex.java b/inlong-agent/agent-plugins/src/test/java/org/apache/inlong/agent/plugin/filter/TestDateFormatRegex.java
index 1417bbc..6e7a7ed 100755
--- a/inlong-agent/agent-plugins/src/test/java/org/apache/inlong/agent/plugin/filter/TestDateFormatRegex.java
+++ b/inlong-agent/agent-plugins/src/test/java/org/apache/inlong/agent/plugin/filter/TestDateFormatRegex.java
@@ -17,8 +17,8 @@
package org.apache.inlong.agent.plugin.filter;
-import static org.apache.inlong.agent.constants.JobConstants.JOB_DIR_FILTER_PATTERN;
-import static org.apache.inlong.agent.constants.JobConstants.JOB_INSTANCE_ID;
+import static org.apache.inlong.agent.constant.JobConstants.JOB_DIR_FILTER_PATTERN;
+import static org.apache.inlong.agent.constant.JobConstants.JOB_INSTANCE_ID;
import java.io.File;
import java.nio.file.Path;
diff --git a/inlong-agent/agent-plugins/src/test/java/org/apache/inlong/agent/plugin/filter/TestStreamIdFilter.java b/inlong-agent/agent-plugins/src/test/java/org/apache/inlong/agent/plugin/filter/TestStreamIdFilter.java
index 51841d6..645a46d 100644
--- a/inlong-agent/agent-plugins/src/test/java/org/apache/inlong/agent/plugin/filter/TestStreamIdFilter.java
+++ b/inlong-agent/agent-plugins/src/test/java/org/apache/inlong/agent/plugin/filter/TestStreamIdFilter.java
@@ -17,7 +17,7 @@
package org.apache.inlong.agent.plugin.filter;
-import static org.apache.inlong.agent.constants.AgentConstants.AGENT_MESSAGE_FILTER_CLASSNAME;
+import static org.apache.inlong.agent.constant.AgentConstants.AGENT_MESSAGE_FILTER_CLASSNAME;
import java.nio.charset.StandardCharsets;
import java.nio.file.Path;
diff --git a/inlong-agent/agent-plugins/src/test/java/org/apache/inlong/agent/plugin/sinks/MockSink.java b/inlong-agent/agent-plugins/src/test/java/org/apache/inlong/agent/plugin/sinks/MockSink.java
index 698bd29..3c7ddbb 100644
--- a/inlong-agent/agent-plugins/src/test/java/org/apache/inlong/agent/plugin/sinks/MockSink.java
+++ b/inlong-agent/agent-plugins/src/test/java/org/apache/inlong/agent/plugin/sinks/MockSink.java
@@ -17,9 +17,9 @@
package org.apache.inlong.agent.plugin.sinks;
-import static org.apache.inlong.agent.constants.JobConstants.JOB_CYCLE_UNIT;
-import static org.apache.inlong.agent.constants.JobConstants.JOB_DATA_TIME;
-import static org.apache.inlong.agent.constants.JobConstants.JOB_INSTANCE_ID;
+import static org.apache.inlong.agent.constant.JobConstants.JOB_CYCLE_UNIT;
+import static org.apache.inlong.agent.constant.JobConstants.JOB_DATA_TIME;
+import static org.apache.inlong.agent.constant.JobConstants.JOB_INSTANCE_ID;
import java.util.concurrent.atomic.AtomicLong;
import org.apache.inlong.agent.conf.JobProfile;
diff --git a/inlong-agent/agent-plugins/src/test/java/org/apache/inlong/agent/plugin/sources/TestTextFileReader.java b/inlong-agent/agent-plugins/src/test/java/org/apache/inlong/agent/plugin/sources/TestTextFileReader.java
index abdc1bb..e2e7dbd 100755
--- a/inlong-agent/agent-plugins/src/test/java/org/apache/inlong/agent/plugin/sources/TestTextFileReader.java
+++ b/inlong-agent/agent-plugins/src/test/java/org/apache/inlong/agent/plugin/sources/TestTextFileReader.java
@@ -17,11 +17,11 @@
package org.apache.inlong.agent.plugin.sources;
-import static org.apache.inlong.agent.constants.CommonConstants.PROXY_INLONG_GROUP_ID;
-import static org.apache.inlong.agent.constants.CommonConstants.PROXY_INLONG_STREAM_ID;
-import static org.apache.inlong.agent.constants.JobConstants.JOB_DIR_FILTER_PATTERN;
-import static org.apache.inlong.agent.constants.JobConstants.JOB_FILE_MAX_WAIT;
-import static org.apache.inlong.agent.constants.JobConstants.JOB_INSTANCE_ID;
+import static org.apache.inlong.agent.constant.CommonConstants.PROXY_INLONG_GROUP_ID;
+import static org.apache.inlong.agent.constant.CommonConstants.PROXY_INLONG_STREAM_ID;
+import static org.apache.inlong.agent.constant.JobConstants.JOB_DIR_FILTER_PATTERN;
+import static org.apache.inlong.agent.constant.JobConstants.JOB_FILE_MAX_WAIT;
+import static org.apache.inlong.agent.constant.JobConstants.JOB_INSTANCE_ID;
import java.io.BufferedReader;
import java.net.URI;
diff --git a/inlong-agent/agent-plugins/src/test/java/org/apache/inlong/agent/plugin/trigger/TestWatchDirTrigger.java b/inlong-agent/agent-plugins/src/test/java/org/apache/inlong/agent/plugin/trigger/TestWatchDirTrigger.java
index 1980774..95a3c23 100755
--- a/inlong-agent/agent-plugins/src/test/java/org/apache/inlong/agent/plugin/trigger/TestWatchDirTrigger.java
+++ b/inlong-agent/agent-plugins/src/test/java/org/apache/inlong/agent/plugin/trigger/TestWatchDirTrigger.java
@@ -20,7 +20,7 @@ package org.apache.inlong.agent.plugin.trigger;
import java.nio.file.Path;
import java.util.HashMap;
import org.apache.inlong.agent.conf.TriggerProfile;
-import org.apache.inlong.agent.constants.AgentConstants;
+import org.apache.inlong.agent.constant.AgentConstants;
import org.apache.inlong.agent.plugin.AgentBaseTestsHelper;
import org.junit.AfterClass;
import org.junit.Assert;
diff --git a/inlong-agent/pom.xml b/inlong-agent/pom.xml
index a04a33e..696d3ac 100644
--- a/inlong-agent/pom.xml
+++ b/inlong-agent/pom.xml
@@ -19,8 +19,8 @@
-->
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns="http://maven.apache.org/POM/4.0.0"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ xmlns="http://maven.apache.org/POM/4.0.0"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<packaging>pom</packaging>
<modelVersion>4.0.0</modelVersion>
<parent>
@@ -54,7 +54,7 @@
<mockito.version>3.3.3</mockito.version>
<plugin.assembly.version>3.2.0</plugin.assembly.version>
<slf4j.version>1.7.30</slf4j.version>
- <unit.version>4.13</unit.version>
+ <junit.version>4.13</junit.version>
<common.lang.version>2.4</common.lang.version>
<oro.version>2.0.8</oro.version>
<avro.version>1.7.2</avro.version>
@@ -86,13 +86,6 @@
</repository>
</repositories>
- <dependencies>
- <dependency>
- <groupId>org.projectlombok</groupId>
- <artifactId>lombok</artifactId>
- </dependency>
- </dependencies>
-
<dependencyManagement>
<dependencies>
<dependency>
@@ -237,7 +230,7 @@
<artifactId>junit</artifactId>
<groupId>junit</groupId>
<scope>test</scope>
- <version>${unit.version}</version>
+ <version>${junit.version}</version>
</dependency>
<dependency>
diff --git a/inlong-common/pom.xml b/inlong-common/pom.xml
index 06041d2..461a90f 100644
--- a/inlong-common/pom.xml
+++ b/inlong-common/pom.xml
@@ -17,8 +17,8 @@
specific language governing permissions and limitations
under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.inlong</groupId>
@@ -26,101 +26,72 @@
<version>1.1.0-incubating-SNAPSHOT</version>
</parent>
<packaging>jar</packaging>
- <groupId>org.apache.inlong</groupId>
<artifactId>inlong-common</artifactId>
<name>Apache InLong - Common</name>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <snappy-java.version>1.1.8.4</snappy-java.version>
+ <jackson.version>2.13.1</jackson.version>
+ <slf4j-api.version>1.7.36</slf4j-api.version>
+ <sleepycat.version>7.3.7</sleepycat.version>
<simpleclient_httpserver.version>0.14.1</simpleclient_httpserver.version>
- <gson.version>2.8.5</gson.version>
- <guava.version>11.0.2</guava.version>
<common.lang.version>2.4</common.lang.version>
<commons-lang3.version>3.3.2</commons-lang3.version>
</properties>
+
<dependencies>
<dependency>
<groupId>org.xerial.snappy</groupId>
<artifactId>snappy-java</artifactId>
- <version>1.1.0</version>
+ <version>${snappy-java.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-annotations</artifactId>
+ <version>${jackson.version}</version>
</dependency>
-
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
- <version>1.6.4</version>
- <type>jar</type>
- <scope>compile</scope>
+ <version>${slf4j-api.version}</version>
</dependency>
-
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.4</version>
<scope>test</scope>
</dependency>
-
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
- <version>${guava.version}</version>
</dependency>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
- <scope>compile</scope>
</dependency>
<dependency>
<groupId>com.sleepycat</groupId>
<artifactId>je</artifactId>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>${common.lang.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-lang3</artifactId>
- <version>${commons-lang3.version}</version>
- </dependency>
-
- <dependency>
- <groupId>io.prometheus</groupId>
- <artifactId>simpleclient_httpserver</artifactId>
- <version>${simpleclient_httpserver.version}</version>
</dependency>
-
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
- <version>${gson.version}</version>
</dependency>
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
<version>${common.lang.version}</version>
</dependency>
-
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>${commons-lang3.version}</version>
</dependency>
-
<dependency>
<groupId>io.prometheus</groupId>
<artifactId>simpleclient_httpserver</artifactId>
<version>${simpleclient_httpserver.version}</version>
</dependency>
-
- <dependency>
- <groupId>com.google.code.gson</groupId>
- <artifactId>gson</artifactId>
- <version>${gson.version}</version>
- </dependency>
</dependencies>
<build>
@@ -141,7 +112,7 @@
</descriptorRefs>
<archive>
<manifest>
- <mainClass></mainClass>
+ <mainClass/>
</manifest>
</archive>
</configuration>
@@ -154,7 +125,6 @@
</goals>
</execution>
</executions>
-
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -169,41 +139,5 @@
</executions>
</plugin>
</plugins>
- <pluginManagement>
- <plugins>
- <!--This plugin's configuration is used to store Eclipse m2e settings
- only. It has no influence on the Maven build itself. -->
- <plugin>
- <groupId>org.eclipse.m2e</groupId>
- <artifactId>lifecycle-mapping</artifactId>
- <version>1.0.0</version>
- <configuration>
- <lifecycleMappingMetadata>
- <pluginExecutions>
- <pluginExecution>
- <pluginExecutionFilter>
- <groupId>
- com.theoryinpractise
- </groupId>
- <artifactId>
- clojure-maven-plugin
- </artifactId>
- <versionRange>
- [1.3.8,)
- </versionRange>
- <goals>
- <goal>compile</goal>
- </goals>
- </pluginExecutionFilter>
- <action>
- <ignore></ignore>
- </action>
- </pluginExecution>
- </pluginExecutions>
- </lifecycleMappingMetadata>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
</build>
</project>
\ No newline at end of file
diff --git a/inlong-common/src/main/java/org/apache/inlong/commons/config/IDataProxyConfigHolder.java b/inlong-common/src/main/java/org/apache/inlong/common/config/IDataProxyConfigHolder.java
similarity index 90%
rename from inlong-common/src/main/java/org/apache/inlong/commons/config/IDataProxyConfigHolder.java
rename to inlong-common/src/main/java/org/apache/inlong/common/config/IDataProxyConfigHolder.java
index e8888eb..855a806 100644
--- a/inlong-common/src/main/java/org/apache/inlong/commons/config/IDataProxyConfigHolder.java
+++ b/inlong-common/src/main/java/org/apache/inlong/common/config/IDataProxyConfigHolder.java
@@ -15,11 +15,11 @@
* limitations under the License.
*/
-package org.apache.inlong.commons.config;
+package org.apache.inlong.common.config;
import java.util.concurrent.atomic.AtomicReference;
-import org.apache.inlong.commons.pojo.dataproxy.DataProxyCluster;
+import org.apache.inlong.common.pojo.dataproxy.DataProxyCluster;
/**
*
diff --git a/inlong-common/src/main/java/org/apache/inlong/commons/db/CommandEntity.java b/inlong-common/src/main/java/org/apache/inlong/common/db/CommandEntity.java
similarity index 92%
rename from inlong-common/src/main/java/org/apache/inlong/commons/db/CommandEntity.java
rename to inlong-common/src/main/java/org/apache/inlong/common/db/CommandEntity.java
index 35bb877..3ffe861 100644
--- a/inlong-common/src/main/java/org/apache/inlong/commons/db/CommandEntity.java
+++ b/inlong-common/src/main/java/org/apache/inlong/common/db/CommandEntity.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.inlong.commons.db;
+package org.apache.inlong.common.db;
import com.sleepycat.persist.model.Entity;
import com.sleepycat.persist.model.PrimaryKey;
@@ -30,6 +30,7 @@ import lombok.NoArgsConstructor;
@AllArgsConstructor
@NoArgsConstructor
public class CommandEntity {
+
@PrimaryKey
private String id;
private int commandResult;
@@ -38,7 +39,8 @@ public class CommandEntity {
private String taskId;
private String deliveryTime;
- public static String generateCommanid(String taskId, int opType) {
+ public static String generateCommandId(String taskId, int opType) {
return taskId + opType;
}
+
}
diff --git a/inlong-common/src/main/java/org/apache/inlong/commons/enums/ManagerOpEnum.java b/inlong-common/src/main/java/org/apache/inlong/common/enums/ManagerOpEnum.java
similarity index 97%
rename from inlong-common/src/main/java/org/apache/inlong/commons/enums/ManagerOpEnum.java
rename to inlong-common/src/main/java/org/apache/inlong/common/enums/ManagerOpEnum.java
index 1501404..0f98dfb 100644
--- a/inlong-common/src/main/java/org/apache/inlong/commons/enums/ManagerOpEnum.java
+++ b/inlong-common/src/main/java/org/apache/inlong/common/enums/ManagerOpEnum.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.inlong.commons.enums;
+package org.apache.inlong.common.enums;
import static java.util.Objects.requireNonNull;
diff --git a/inlong-common/src/main/java/org/apache/inlong/commons/enums/TaskTypeEnum.java b/inlong-common/src/main/java/org/apache/inlong/common/enums/TaskTypeEnum.java
similarity index 97%
rename from inlong-common/src/main/java/org/apache/inlong/commons/enums/TaskTypeEnum.java
rename to inlong-common/src/main/java/org/apache/inlong/common/enums/TaskTypeEnum.java
index e43e5c3..dcf1299 100644
--- a/inlong-common/src/main/java/org/apache/inlong/commons/enums/TaskTypeEnum.java
+++ b/inlong-common/src/main/java/org/apache/inlong/common/enums/TaskTypeEnum.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.inlong.commons.enums;
+package org.apache.inlong.common.enums;
import static java.util.Objects.requireNonNull;
diff --git a/inlong-common/src/main/java/org/apache/inlong/commons/metrics/metric/CountMetric.java b/inlong-common/src/main/java/org/apache/inlong/common/metric/CountMetric.java
similarity index 95%
rename from inlong-common/src/main/java/org/apache/inlong/commons/metrics/metric/CountMetric.java
rename to inlong-common/src/main/java/org/apache/inlong/common/metric/CountMetric.java
index db4f0e5..1eb7168 100644
--- a/inlong-common/src/main/java/org/apache/inlong/commons/metrics/metric/CountMetric.java
+++ b/inlong-common/src/main/java/org/apache/inlong/common/metric/CountMetric.java
@@ -1,4 +1,4 @@
-/**
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
@@ -15,21 +15,19 @@
* limitations under the License.
*/
-package org.apache.inlong.commons.metrics.metric;
-
-import static java.lang.annotation.ElementType.FIELD;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
+package org.apache.inlong.common.metric;
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
-@Retention(RUNTIME)
-@Target(FIELD)
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
/**
- *
* CountMetric
*/
+@Retention(RUNTIME)
+@Target(FIELD)
public @interface CountMetric {
/**
diff --git a/inlong-common/src/main/java/org/apache/inlong/commons/metrics/metric/Dimension.java b/inlong-common/src/main/java/org/apache/inlong/common/metric/Dimension.java
similarity index 95%
rename from inlong-common/src/main/java/org/apache/inlong/commons/metrics/metric/Dimension.java
rename to inlong-common/src/main/java/org/apache/inlong/common/metric/Dimension.java
index a01f106..b4d9fd9 100644
--- a/inlong-common/src/main/java/org/apache/inlong/commons/metrics/metric/Dimension.java
+++ b/inlong-common/src/main/java/org/apache/inlong/common/metric/Dimension.java
@@ -1,4 +1,4 @@
-/**
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
@@ -15,20 +15,19 @@
* limitations under the License.
*/
-package org.apache.inlong.commons.metrics.metric;
-
-import static java.lang.annotation.ElementType.FIELD;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
+package org.apache.inlong.common.metric;
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
-@Retention(RUNTIME)
-@Target(FIELD)
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
/**
- *
* Dimension
*/
+@Retention(RUNTIME)
+@Target(FIELD)
public @interface Dimension {
/**
diff --git a/inlong-common/src/main/java/org/apache/inlong/commons/metrics/metric/GaugeMetric.java b/inlong-common/src/main/java/org/apache/inlong/common/metric/GaugeMetric.java
similarity index 95%
rename from inlong-common/src/main/java/org/apache/inlong/commons/metrics/metric/GaugeMetric.java
rename to inlong-common/src/main/java/org/apache/inlong/common/metric/GaugeMetric.java
index 76897d2..9189116 100644
--- a/inlong-common/src/main/java/org/apache/inlong/commons/metrics/metric/GaugeMetric.java
+++ b/inlong-common/src/main/java/org/apache/inlong/common/metric/GaugeMetric.java
@@ -1,4 +1,4 @@
-/**
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
@@ -15,21 +15,19 @@
* limitations under the License.
*/
-package org.apache.inlong.commons.metrics.metric;
-
-import static java.lang.annotation.ElementType.FIELD;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
+package org.apache.inlong.common.metric;
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
-@Retention(RUNTIME)
-@Target(FIELD)
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
/**
- *
* GaugeMetric
*/
+@Retention(RUNTIME)
+@Target(FIELD)
public @interface GaugeMetric {
/**
diff --git a/inlong-common/src/main/java/org/apache/inlong/commons/metrics/metric/MetricDomain.java b/inlong-common/src/main/java/org/apache/inlong/common/metric/MetricDomain.java
similarity index 95%
rename from inlong-common/src/main/java/org/apache/inlong/commons/metrics/metric/MetricDomain.java
rename to inlong-common/src/main/java/org/apache/inlong/common/metric/MetricDomain.java
index d7ce722..27d53ba 100644
--- a/inlong-common/src/main/java/org/apache/inlong/commons/metrics/metric/MetricDomain.java
+++ b/inlong-common/src/main/java/org/apache/inlong/common/metric/MetricDomain.java
@@ -1,4 +1,4 @@
-/**
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
@@ -15,21 +15,19 @@
* limitations under the License.
*/
-package org.apache.inlong.commons.metrics.metric;
-
-import static java.lang.annotation.ElementType.TYPE;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
+package org.apache.inlong.common.metric;
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
-@Retention(RUNTIME)
-@Target(TYPE)
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
/**
- *
* MetricDomain
*/
+@Retention(RUNTIME)
+@Target(TYPE)
public @interface MetricDomain {
/**
diff --git a/inlong-common/src/main/java/org/apache/inlong/commons/metrics/metric/MetricItem.java b/inlong-common/src/main/java/org/apache/inlong/common/metric/MetricItem.java
similarity index 96%
rename from inlong-common/src/main/java/org/apache/inlong/commons/metrics/metric/MetricItem.java
rename to inlong-common/src/main/java/org/apache/inlong/common/metric/MetricItem.java
index 9505116..871e49b 100644
--- a/inlong-common/src/main/java/org/apache/inlong/commons/metrics/metric/MetricItem.java
+++ b/inlong-common/src/main/java/org/apache/inlong/common/metric/MetricItem.java
@@ -1,4 +1,4 @@
-/**
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
@@ -15,7 +15,10 @@
* limitations under the License.
*/
-package org.apache.inlong.commons.metrics.metric;
+package org.apache.inlong.common.metric;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import java.lang.annotation.Annotation;
import java.lang.reflect.Field;
@@ -26,11 +29,7 @@ import java.util.List;
import java.util.Map;
import java.util.concurrent.atomic.AtomicLong;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
/**
- *
* MetricItem
*/
public abstract class MetricItem implements MetricItemMBean {
@@ -43,16 +42,26 @@ public abstract class MetricItem implements MetricItemMBean {
private Map<String, AtomicLong> gaugeMetrics;
/**
+ * Get declare fields.
+ */
+ public static List<Field> getDeclaredFieldsIncludingInherited(Class<?> clazz) {
+ List<Field> fields = new ArrayList<>();
+ // check whether parent exists
+ while (clazz != null) {
+ fields.addAll(Arrays.asList(clazz.getDeclaredFields()));
+ clazz = clazz.getSuperclass();
+ }
+ return fields;
+ }
+
+ /**
* getDimensionsKey
- *
- * @return
*/
@Override
public String getDimensionsKey() {
if (key != null) {
return key;
}
- //
Map<String, String> dimensionMap = this.getDimensions();
this.key = MetricUtils.getDimensionsKey(dimensionMap);
return key;
@@ -60,8 +69,6 @@ public abstract class MetricItem implements MetricItemMBean {
/**
* getDimensions
- *
- * @return
*/
@Override
public Map<String, String> getDimensions() {
@@ -97,7 +104,7 @@ public abstract class MetricItem implements MetricItemMBean {
/**
* set dimensions
- *
+ *
* @param dimensions the dimensions to set
*/
public void setDimensions(Map<String, String> dimensions) {
@@ -107,8 +114,6 @@ public abstract class MetricItem implements MetricItemMBean {
/**
* snapshot
- *
- * @return
*/
@Override
public Map<String, MetricValue> snapshot() {
@@ -170,20 +175,4 @@ public abstract class MetricItem implements MetricItemMBean {
}
}
}
-
- /**
- * Get declare fields.
- *
- * @param clazz
- * @return
- */
- public static List<Field> getDeclaredFieldsIncludingInherited(Class<?> clazz) {
- List<Field> fields = new ArrayList<Field>();
- // check whether parent exists
- while (clazz != null) {
- fields.addAll(Arrays.asList(clazz.getDeclaredFields()));
- clazz = clazz.getSuperclass();
- }
- return fields;
- }
}
diff --git a/inlong-common/src/main/java/org/apache/inlong/commons/metrics/metric/MetricItemMBean.java b/inlong-common/src/main/java/org/apache/inlong/common/metric/MetricItemMBean.java
similarity index 93%
rename from inlong-common/src/main/java/org/apache/inlong/commons/metrics/metric/MetricItemMBean.java
rename to inlong-common/src/main/java/org/apache/inlong/common/metric/MetricItemMBean.java
index 841acc2..6ad63ea 100644
--- a/inlong-common/src/main/java/org/apache/inlong/commons/metrics/metric/MetricItemMBean.java
+++ b/inlong-common/src/main/java/org/apache/inlong/common/metric/MetricItemMBean.java
@@ -1,4 +1,4 @@
-/**
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
@@ -15,11 +15,10 @@
* limitations under the License.
*/
-package org.apache.inlong.commons.metrics.metric;
-
-import java.util.Map;
+package org.apache.inlong.common.metric;
import javax.management.MXBean;
+import java.util.Map;
/**
* MetricItemMBean<br>
@@ -39,21 +38,21 @@ public interface MetricItemMBean {
/**
* getDimensionsKey
- *
+ *
* @return key string composed of key/value pair of dimensions.
*/
String getDimensionsKey();
/**
* getDimensions
- *
- * @return key/value pair of all dimensions.
+ *
+ * @return a key/value pair of all dimensions.
*/
Map<String, String> getDimensions();
/**
* snapshot
- *
+ *
* @return get snapshot all metric of item, CountMetric will get metric value and set 0 to value, <br>
* GaugeMetric will only get metric value.
*/
diff --git a/inlong-common/src/main/java/org/apache/inlong/commons/metrics/metric/MetricItemSet.java b/inlong-common/src/main/java/org/apache/inlong/common/metric/MetricItemSet.java
similarity index 88%
rename from inlong-common/src/main/java/org/apache/inlong/commons/metrics/metric/MetricItemSet.java
rename to inlong-common/src/main/java/org/apache/inlong/common/metric/MetricItemSet.java
index 64ff1b6..f2c03f1 100644
--- a/inlong-common/src/main/java/org/apache/inlong/commons/metrics/metric/MetricItemSet.java
+++ b/inlong-common/src/main/java/org/apache/inlong/common/metric/MetricItemSet.java
@@ -1,4 +1,4 @@
-/**
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.inlong.commons.metrics.metric;
+package org.apache.inlong.common.metric;
import java.util.ArrayList;
import java.util.List;
@@ -23,7 +23,6 @@ import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
/**
- *
* MetricItemSet
*/
public abstract class MetricItemSet<T extends MetricItem> implements MetricItemSetMBean {
@@ -34,8 +33,6 @@ public abstract class MetricItemSet<T extends MetricItem> implements MetricItemS
/**
* Constructor
- *
- * @param name
*/
public MetricItemSet(String name) {
this.name = name;
@@ -43,8 +40,6 @@ public abstract class MetricItemSet<T extends MetricItem> implements MetricItemS
/**
* getName
- *
- * @return
*/
public String getName() {
return name;
@@ -52,15 +47,11 @@ public abstract class MetricItemSet<T extends MetricItem> implements MetricItemS
/**
* createItem
- *
- * @return
*/
protected abstract T createItem();
/**
* findMetricItem
- *
- * @param dimensions
*/
public T findMetricItem(Map<String, String> dimensions) {
String key = MetricUtils.getDimensionsKey(dimensions);
@@ -71,14 +62,11 @@ public abstract class MetricItemSet<T extends MetricItem> implements MetricItemS
currentItem = createItem();
currentItem.setDimensions(dimensions);
T oldItem = this.itemMap.putIfAbsent(key, currentItem);
- T returnItem = (oldItem == null) ? currentItem : oldItem;
- return returnItem;
+ return (oldItem == null) ? currentItem : oldItem;
}
/**
* snapshot
- *
- * @return
*/
@Override
public List<MetricItem> snapshot() {
diff --git a/inlong-common/src/main/java/org/apache/inlong/commons/metrics/metric/MetricItemSetMBean.java b/inlong-common/src/main/java/org/apache/inlong/common/metric/MetricItemSetMBean.java
similarity index 95%
rename from inlong-common/src/main/java/org/apache/inlong/commons/metrics/metric/MetricItemSetMBean.java
rename to inlong-common/src/main/java/org/apache/inlong/common/metric/MetricItemSetMBean.java
index 1951569..41bf16f 100644
--- a/inlong-common/src/main/java/org/apache/inlong/commons/metrics/metric/MetricItemSetMBean.java
+++ b/inlong-common/src/main/java/org/apache/inlong/common/metric/MetricItemSetMBean.java
@@ -1,4 +1,4 @@
-/**
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
@@ -15,14 +15,12 @@
* limitations under the License.
*/
-package org.apache.inlong.commons.metrics.metric;
-
-import java.util.List;
+package org.apache.inlong.common.metric;
import javax.management.MXBean;
+import java.util.List;
/**
- *
* MetricItemSetMBean<br>
* Provide access interface of metric items with JMX.<br>
* Decouple between metric item and monitor system, in particular scene, <br>
@@ -35,7 +33,7 @@ public interface MetricItemSetMBean {
/**
* snapshot
- *
+ *
* @return get snapshot all metric of item, CountMetric will get metric value and set 0 to value, <br>
* GaugeMetric will only get metric value.
*/
diff --git a/inlong-common/src/main/java/org/apache/inlong/commons/metrics/MetricItemValue.java b/inlong-common/src/main/java/org/apache/inlong/common/metric/MetricItemValue.java
similarity index 94%
rename from inlong-common/src/main/java/org/apache/inlong/commons/metrics/MetricItemValue.java
rename to inlong-common/src/main/java/org/apache/inlong/common/metric/MetricItemValue.java
index ecec375..22ac83b 100644
--- a/inlong-common/src/main/java/org/apache/inlong/commons/metrics/MetricItemValue.java
+++ b/inlong-common/src/main/java/org/apache/inlong/common/metric/MetricItemValue.java
@@ -15,11 +15,10 @@
* limitations under the License.
*/
-package org.apache.inlong.commons.metrics;
+package org.apache.inlong.common.metric;
import java.util.Map;
-import org.apache.inlong.commons.metrics.metric.MetricValue;
import com.google.gson.Gson;
/**
diff --git a/inlong-common/src/main/java/org/apache/inlong/commons/metrics/MetricListener.java b/inlong-common/src/main/java/org/apache/inlong/common/metric/MetricListener.java
similarity index 85%
rename from inlong-common/src/main/java/org/apache/inlong/commons/metrics/MetricListener.java
rename to inlong-common/src/main/java/org/apache/inlong/common/metric/MetricListener.java
index fdf23fb..57d7320 100644
--- a/inlong-common/src/main/java/org/apache/inlong/commons/metrics/MetricListener.java
+++ b/inlong-common/src/main/java/org/apache/inlong/common/metric/MetricListener.java
@@ -1,4 +1,4 @@
-/**
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
@@ -15,12 +15,11 @@
* limitations under the License.
*/
-package org.apache.inlong.commons.metrics;
+package org.apache.inlong.common.metric;
import java.util.List;
/**
- *
* MetricListener
*/
public interface MetricListener {
@@ -31,9 +30,6 @@ public interface MetricListener {
/**
* snapshot
- *
- * @param domain
- * @param itemValues
*/
- public void snapshot(String domain, List<MetricItemValue> itemValues);
+ void snapshot(String domain, List<MetricItemValue> itemValues);
}
diff --git a/inlong-common/src/main/java/org/apache/inlong/commons/metrics/MetricListenerRunnable.java b/inlong-common/src/main/java/org/apache/inlong/common/metric/MetricListenerRunnable.java
similarity index 94%
rename from inlong-common/src/main/java/org/apache/inlong/commons/metrics/MetricListenerRunnable.java
rename to inlong-common/src/main/java/org/apache/inlong/common/metric/MetricListenerRunnable.java
index 2b76590..a03c520 100644
--- a/inlong-common/src/main/java/org/apache/inlong/commons/metrics/MetricListenerRunnable.java
+++ b/inlong-common/src/main/java/org/apache/inlong/common/metric/MetricListenerRunnable.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.inlong.commons.metrics;
+package org.apache.inlong.common.metric;
import java.lang.management.ManagementFactory;
import java.util.ArrayList;
@@ -33,11 +33,6 @@ import javax.management.ObjectName;
import javax.management.ReflectionException;
import org.apache.commons.lang.ClassUtils;
-import org.apache.inlong.commons.metrics.metric.MetricItem;
-import org.apache.inlong.commons.metrics.metric.MetricItemMBean;
-import org.apache.inlong.commons.metrics.metric.MetricItemSetMBean;
-import org.apache.inlong.commons.metrics.metric.MetricRegister;
-import org.apache.inlong.commons.metrics.metric.MetricValue;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/inlong-common/src/main/java/org/apache/inlong/commons/metrics/MetricObserver.java b/inlong-common/src/main/java/org/apache/inlong/common/metric/MetricObserver.java
similarity index 88%
rename from inlong-common/src/main/java/org/apache/inlong/commons/metrics/MetricObserver.java
rename to inlong-common/src/main/java/org/apache/inlong/common/metric/MetricObserver.java
index 90f53eb..ced2f0f 100644
--- a/inlong-common/src/main/java/org/apache/inlong/commons/metrics/MetricObserver.java
+++ b/inlong-common/src/main/java/org/apache/inlong/common/metric/MetricObserver.java
@@ -1,4 +1,4 @@
-/**
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
@@ -15,11 +15,16 @@
* limitations under the License.
*/
-package org.apache.inlong.commons.metrics;
+package org.apache.inlong.common.metric;
import com.google.common.base.Preconditions;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Maps;
+import org.apache.commons.lang.ClassUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
@@ -30,13 +35,7 @@ import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
-import org.apache.commons.lang.ClassUtils;
-import org.apache.commons.lang3.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
/**
- *
* MetricObserver
*/
public class MetricObserver {
@@ -47,8 +46,6 @@ public class MetricObserver {
/**
* init
- *
- * @param commonProperties
*/
public static void init(Map<String, String> commonProperties) {
if (!isInited.compareAndSet(false, true)) {
@@ -71,12 +68,10 @@ public class MetricObserver {
continue;
}
// get snapshot interval
- long snapshotInterval =
- Long.parseLong(domainMap.getOrDefault(MetricListener.KEY_SNAPSHOT_INTERVAL,
- "60000"));
- LOG.info("begin to register domain:{},MetricListeners:{},snapshotInterval:{}",
- domain, listenerList);
- LOG.info("snapshotInterval:{}", snapshotInterval);
+ long snapshotInterval = Long.parseLong(
+ domainMap.getOrDefault(MetricListener.KEY_SNAPSHOT_INTERVAL, "60000"));
+ LOG.info("begin to register domain:{}, MetricListeners:{}, snapshotInterval:{}",
+ domain, listenerList, snapshotInterval);
statExecutor.scheduleWithFixedDelay(new MetricListenerRunnable(domain, listenerList), snapshotInterval,
snapshotInterval, TimeUnit.MILLISECONDS);
}
@@ -85,9 +80,6 @@ public class MetricObserver {
/**
* parseDomain
- *
- * @param domainMap
- * @return
*/
private static List<MetricListener> parseDomain(Map<String, String> domainMap) {
String listeners = domainMap.get(MetricListener.KEY_DOMAIN_LISTENERS);
@@ -110,7 +102,6 @@ public class MetricObserver {
} catch (Throwable t) {
LOG.error("Fail to init MetricListener:{},error:{}",
listenerType, t.getMessage());
- continue;
}
}
return listenerList;
@@ -125,8 +116,8 @@ public class MetricObserver {
synchronized (commonProperties) {
Iterator var4 = commonProperties.entrySet().iterator();
while (var4.hasNext()) {
- Entry<String, String> entry = (Entry)var4.next();
- String key = (String)entry.getKey();
+ Entry<String, String> entry = (Entry) var4.next();
+ String key = (String) entry.getKey();
if (key.startsWith(prefix)) {
String name = key.substring(prefix.length());
result.put(name, entry.getValue());
diff --git a/inlong-common/src/main/java/org/apache/inlong/commons/metrics/metric/MetricRegister.java b/inlong-common/src/main/java/org/apache/inlong/common/metric/MetricRegister.java
similarity index 96%
rename from inlong-common/src/main/java/org/apache/inlong/commons/metrics/metric/MetricRegister.java
rename to inlong-common/src/main/java/org/apache/inlong/common/metric/MetricRegister.java
index e65ccff..72790f2 100644
--- a/inlong-common/src/main/java/org/apache/inlong/commons/metrics/metric/MetricRegister.java
+++ b/inlong-common/src/main/java/org/apache/inlong/common/metric/MetricRegister.java
@@ -1,4 +1,4 @@
-/**
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
@@ -15,18 +15,16 @@
* limitations under the License.
*/
-package org.apache.inlong.commons.metrics.metric;
+package org.apache.inlong.common.metric;
-import java.lang.management.ManagementFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import javax.management.MBeanServer;
import javax.management.ObjectName;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import java.lang.management.ManagementFactory;
/**
- *
* MetricRegister
*/
public class MetricRegister {
@@ -36,8 +34,6 @@ public class MetricRegister {
/**
* register MetricItem
- *
- * @param obj
*/
public static void register(MetricItem obj) {
final MBeanServer mbs = ManagementFactory.getPlatformMBeanServer();
@@ -56,8 +52,6 @@ public class MetricRegister {
/**
* register MetricItemSet
- *
- * @param obj
*/
public static void register(MetricItemSet<? extends MetricItem> obj) {
final MBeanServer mbs = ManagementFactory.getPlatformMBeanServer();
diff --git a/inlong-common/src/main/java/org/apache/inlong/commons/metrics/metric/MetricUtils.java b/inlong-common/src/main/java/org/apache/inlong/common/metric/MetricUtils.java
similarity index 92%
rename from inlong-common/src/main/java/org/apache/inlong/commons/metrics/metric/MetricUtils.java
rename to inlong-common/src/main/java/org/apache/inlong/common/metric/MetricUtils.java
index a52aa32..13cefac 100644
--- a/inlong-common/src/main/java/org/apache/inlong/commons/metrics/metric/MetricUtils.java
+++ b/inlong-common/src/main/java/org/apache/inlong/common/metric/MetricUtils.java
@@ -1,4 +1,4 @@
-/**
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
@@ -15,7 +15,10 @@
* limitations under the License.
*/
-package org.apache.inlong.commons.metrics.metric;
+package org.apache.inlong.common.metric;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import java.lang.annotation.Annotation;
import java.util.ArrayList;
@@ -24,11 +27,7 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
/**
- *
* MetricUtils
*/
public class MetricUtils {
@@ -37,9 +36,6 @@ public class MetricUtils {
/**
* getDomain
- *
- * @param cls
- * @return
*/
public static String getDomain(Class<?> cls) {
for (Annotation annotation : cls.getAnnotations()) {
@@ -55,8 +51,6 @@ public class MetricUtils {
/**
* getDimensionsKey
- *
- * @return
*/
public static String getDimensionsKey(Map<String, String> dimensionMap) {
StringBuilder builder = new StringBuilder();
@@ -74,8 +68,7 @@ public class MetricUtils {
builder.append(fieldKey).append(MetricItemMBean.PROPERTY_EQUAL).append(fieldValue)
.append(MetricItemMBean.PROPERTY_SEPARATOR);
}
- String key = builder.substring(0, builder.length() - 1);
- return key;
+ return builder.substring(0, builder.length() - 1);
}
/**
diff --git a/inlong-common/src/main/java/org/apache/inlong/commons/metrics/metric/MetricValue.java b/inlong-common/src/main/java/org/apache/inlong/common/metric/MetricValue.java
similarity index 95%
rename from inlong-common/src/main/java/org/apache/inlong/commons/metrics/metric/MetricValue.java
rename to inlong-common/src/main/java/org/apache/inlong/common/metric/MetricValue.java
index 7939efc..69a6b89 100644
--- a/inlong-common/src/main/java/org/apache/inlong/commons/metrics/metric/MetricValue.java
+++ b/inlong-common/src/main/java/org/apache/inlong/common/metric/MetricValue.java
@@ -1,4 +1,4 @@
-/**
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.inlong.commons.metrics.metric;
+package org.apache.inlong.common.metric;
/**
*
diff --git a/inlong-common/src/main/java/org/apache/inlong/commons/monitor/CounterGroup.java b/inlong-common/src/main/java/org/apache/inlong/common/monitor/CounterGroup.java
similarity index 98%
rename from inlong-common/src/main/java/org/apache/inlong/commons/monitor/CounterGroup.java
rename to inlong-common/src/main/java/org/apache/inlong/common/monitor/CounterGroup.java
index 15c63d3..9e3034b 100644
--- a/inlong-common/src/main/java/org/apache/inlong/commons/monitor/CounterGroup.java
+++ b/inlong-common/src/main/java/org/apache/inlong/common/monitor/CounterGroup.java
@@ -13,7 +13,7 @@
* the License.
*/
-package org.apache.inlong.commons.monitor;
+package org.apache.inlong.common.monitor;
import java.util.HashMap;
import java.util.Iterator;
diff --git a/inlong-common/src/main/java/org/apache/inlong/commons/monitor/CounterGroupExt.java b/inlong-common/src/main/java/org/apache/inlong/common/monitor/CounterGroupExt.java
similarity index 98%
rename from inlong-common/src/main/java/org/apache/inlong/commons/monitor/CounterGroupExt.java
rename to inlong-common/src/main/java/org/apache/inlong/common/monitor/CounterGroupExt.java
index 9e181d0..75b7152 100644
--- a/inlong-common/src/main/java/org/apache/inlong/commons/monitor/CounterGroupExt.java
+++ b/inlong-common/src/main/java/org/apache/inlong/common/monitor/CounterGroupExt.java
@@ -13,7 +13,7 @@
* the License.
*/
-package org.apache.inlong.commons.monitor;
+package org.apache.inlong.common.monitor;
import java.util.HashMap;
import java.util.Iterator;
diff --git a/inlong-common/src/main/java/org/apache/inlong/commons/monitor/LogCounter.java b/inlong-common/src/main/java/org/apache/inlong/common/monitor/LogCounter.java
similarity index 97%
rename from inlong-common/src/main/java/org/apache/inlong/commons/monitor/LogCounter.java
rename to inlong-common/src/main/java/org/apache/inlong/common/monitor/LogCounter.java
index 958e644..76dc053 100644
--- a/inlong-common/src/main/java/org/apache/inlong/commons/monitor/LogCounter.java
+++ b/inlong-common/src/main/java/org/apache/inlong/common/monitor/LogCounter.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.inlong.commons.monitor;
+package org.apache.inlong.common.monitor;
import java.util.concurrent.atomic.AtomicInteger;
diff --git a/inlong-common/src/main/java/org/apache/inlong/commons/monitor/MonitorIndex.java b/inlong-common/src/main/java/org/apache/inlong/common/monitor/MonitorIndex.java
similarity index 99%
rename from inlong-common/src/main/java/org/apache/inlong/commons/monitor/MonitorIndex.java
rename to inlong-common/src/main/java/org/apache/inlong/common/monitor/MonitorIndex.java
index 0e489c7..3adcf73 100644
--- a/inlong-common/src/main/java/org/apache/inlong/commons/monitor/MonitorIndex.java
+++ b/inlong-common/src/main/java/org/apache/inlong/common/monitor/MonitorIndex.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.inlong.commons.monitor;
+package org.apache.inlong.common.monitor;
import java.util.HashMap;
import java.util.Map;
diff --git a/inlong-common/src/main/java/org/apache/inlong/commons/monitor/MonitorIndexExt.java b/inlong-common/src/main/java/org/apache/inlong/common/monitor/MonitorIndexExt.java
similarity index 99%
rename from inlong-common/src/main/java/org/apache/inlong/commons/monitor/MonitorIndexExt.java
rename to inlong-common/src/main/java/org/apache/inlong/common/monitor/MonitorIndexExt.java
index ab025ce..bbcfe78 100644
--- a/inlong-common/src/main/java/org/apache/inlong/commons/monitor/MonitorIndexExt.java
+++ b/inlong-common/src/main/java/org/apache/inlong/common/monitor/MonitorIndexExt.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.inlong.commons.monitor;
+package org.apache.inlong.common.monitor;
import java.util.HashMap;
import java.util.Map;
diff --git a/inlong-common/src/main/java/org/apache/inlong/commons/monitor/StatConstants.java b/inlong-common/src/main/java/org/apache/inlong/common/monitor/StatConstants.java
similarity index 97%
rename from inlong-common/src/main/java/org/apache/inlong/commons/monitor/StatConstants.java
rename to inlong-common/src/main/java/org/apache/inlong/common/monitor/StatConstants.java
index b8eac31..d5c4d7c 100644
--- a/inlong-common/src/main/java/org/apache/inlong/commons/monitor/StatConstants.java
+++ b/inlong-common/src/main/java/org/apache/inlong/common/monitor/StatConstants.java
@@ -13,7 +13,7 @@
* the License.
*/
-package org.apache.inlong.commons.monitor;
+package org.apache.inlong.common.monitor;
public class StatConstants {
diff --git a/inlong-common/src/main/java/org/apache/inlong/commons/monitor/StatRunner.java b/inlong-common/src/main/java/org/apache/inlong/common/monitor/StatRunner.java
similarity index 98%
rename from inlong-common/src/main/java/org/apache/inlong/commons/monitor/StatRunner.java
rename to inlong-common/src/main/java/org/apache/inlong/common/monitor/StatRunner.java
index e759444..047a5e7 100644
--- a/inlong-common/src/main/java/org/apache/inlong/commons/monitor/StatRunner.java
+++ b/inlong-common/src/main/java/org/apache/inlong/common/monitor/StatRunner.java
@@ -13,7 +13,7 @@
* the License.
*/
-package org.apache.inlong.commons.monitor;
+package org.apache.inlong.common.monitor;
import java.util.HashMap;
import java.util.Iterator;
diff --git a/inlong-common/src/main/java/org/apache/inlong/commons/msg/AttributeConstants.java b/inlong-common/src/main/java/org/apache/inlong/common/msg/AttributeConstants.java
similarity index 97%
rename from inlong-common/src/main/java/org/apache/inlong/commons/msg/AttributeConstants.java
rename to inlong-common/src/main/java/org/apache/inlong/common/msg/AttributeConstants.java
index 8811b14..4d4dcb4 100644
--- a/inlong-common/src/main/java/org/apache/inlong/commons/msg/AttributeConstants.java
+++ b/inlong-common/src/main/java/org/apache/inlong/common/msg/AttributeConstants.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.inlong.commons.msg;
+package org.apache.inlong.common.msg;
public interface AttributeConstants {
diff --git a/inlong-common/src/main/java/org/apache/inlong/commons/msg/DataInputBuffer.java b/inlong-common/src/main/java/org/apache/inlong/common/msg/DataInputBuffer.java
similarity index 98%
rename from inlong-common/src/main/java/org/apache/inlong/commons/msg/DataInputBuffer.java
rename to inlong-common/src/main/java/org/apache/inlong/common/msg/DataInputBuffer.java
index f6f1aa8..de736d6 100644
--- a/inlong-common/src/main/java/org/apache/inlong/commons/msg/DataInputBuffer.java
+++ b/inlong-common/src/main/java/org/apache/inlong/common/msg/DataInputBuffer.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.inlong.commons.msg;
+package org.apache.inlong.common.msg;
import java.io.ByteArrayInputStream;
import java.io.DataInputStream;
diff --git a/inlong-common/src/main/java/org/apache/inlong/commons/msg/DataOutputBuffer.java b/inlong-common/src/main/java/org/apache/inlong/common/msg/DataOutputBuffer.java
similarity index 98%
rename from inlong-common/src/main/java/org/apache/inlong/commons/msg/DataOutputBuffer.java
rename to inlong-common/src/main/java/org/apache/inlong/common/msg/DataOutputBuffer.java
index f189409..b1988b2 100644
--- a/inlong-common/src/main/java/org/apache/inlong/commons/msg/DataOutputBuffer.java
+++ b/inlong-common/src/main/java/org/apache/inlong/common/msg/DataOutputBuffer.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.inlong.commons.msg;
+package org.apache.inlong.common.msg;
import java.io.ByteArrayOutputStream;
import java.io.DataInput;
diff --git a/inlong-common/src/main/java/org/apache/inlong/commons/msg/InLongMsg.java b/inlong-common/src/main/java/org/apache/inlong/common/msg/InLongMsg.java
similarity index 99%
rename from inlong-common/src/main/java/org/apache/inlong/commons/msg/InLongMsg.java
rename to inlong-common/src/main/java/org/apache/inlong/common/msg/InLongMsg.java
index 2dcb62b..06e6155 100644
--- a/inlong-common/src/main/java/org/apache/inlong/commons/msg/InLongMsg.java
+++ b/inlong-common/src/main/java/org/apache/inlong/common/msg/InLongMsg.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.inlong.commons.msg;
+package org.apache.inlong.common.msg;
import com.google.common.base.Joiner;
import com.google.common.base.Splitter;
diff --git a/inlong-common/src/main/java/org/apache/inlong/commons/msg/InLongMsgAttrBuilder.java b/inlong-common/src/main/java/org/apache/inlong/common/msg/InLongMsgAttrBuilder.java
similarity index 99%
rename from inlong-common/src/main/java/org/apache/inlong/commons/msg/InLongMsgAttrBuilder.java
rename to inlong-common/src/main/java/org/apache/inlong/common/msg/InLongMsgAttrBuilder.java
index 30c0471..784740b 100644
--- a/inlong-common/src/main/java/org/apache/inlong/commons/msg/InLongMsgAttrBuilder.java
+++ b/inlong-common/src/main/java/org/apache/inlong/common/msg/InLongMsgAttrBuilder.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.inlong.commons.msg;
+package org.apache.inlong.common.msg;
import java.text.SimpleDateFormat;
import java.util.Date;
diff --git a/inlong-common/src/main/java/org/apache/inlong/commons/dto/CmdConfig.java b/inlong-common/src/main/java/org/apache/inlong/common/pojo/agent/CmdConfig.java
similarity index 95%
copy from inlong-common/src/main/java/org/apache/inlong/commons/dto/CmdConfig.java
copy to inlong-common/src/main/java/org/apache/inlong/common/pojo/agent/CmdConfig.java
index eab12df..4f2d0d3 100644
--- a/inlong-common/src/main/java/org/apache/inlong/commons/dto/CmdConfig.java
+++ b/inlong-common/src/main/java/org/apache/inlong/common/pojo/agent/CmdConfig.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.inlong.commons.dto;
+package org.apache.inlong.common.pojo.agent;
import lombok.Data;
diff --git a/inlong-common/src/main/java/org/apache/inlong/commons/dto/DataConfig.java b/inlong-common/src/main/java/org/apache/inlong/common/pojo/agent/DataConfig.java
similarity index 96%
rename from inlong-common/src/main/java/org/apache/inlong/commons/dto/DataConfig.java
rename to inlong-common/src/main/java/org/apache/inlong/common/pojo/agent/DataConfig.java
index ea0704a..f6c2aaa 100644
--- a/inlong-common/src/main/java/org/apache/inlong/commons/dto/DataConfig.java
+++ b/inlong-common/src/main/java/org/apache/inlong/common/pojo/agent/DataConfig.java
@@ -15,12 +15,13 @@
* limitations under the License.
*/
-package org.apache.inlong.commons.dto;
+package org.apache.inlong.common.pojo.agent;
import lombok.Data;
@Data
public class DataConfig {
+
private String inlongGroupId;
private String inlongStreamId;
private String deliveryTime;
diff --git a/inlong-common/src/main/java/org/apache/inlong/commons/dto/CmdConfig.java b/inlong-common/src/main/java/org/apache/inlong/common/pojo/agent/TaskHeartbeatRequest.java
similarity index 63%
rename from inlong-common/src/main/java/org/apache/inlong/commons/dto/CmdConfig.java
rename to inlong-common/src/main/java/org/apache/inlong/common/pojo/agent/TaskHeartbeatRequest.java
index eab12df..ed305e6 100644
--- a/inlong-common/src/main/java/org/apache/inlong/commons/dto/CmdConfig.java
+++ b/inlong-common/src/main/java/org/apache/inlong/common/pojo/agent/TaskHeartbeatRequest.java
@@ -15,14 +15,35 @@
* limitations under the License.
*/
-package org.apache.inlong.commons.dto;
+package org.apache.inlong.common.pojo.agent;
+import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
+import javax.annotation.Nonnull;
+import java.util.Date;
+
+/**
+ * Request of the agent task heartbeat
+ */
@Data
-public class CmdConfig {
- private String dataTime;
+public class TaskHeartbeatRequest {
+
+ /**
+ * The source id
+ */
+ @Nonnull
private Integer id;
- private Integer op;
- private Integer taskId;
+
+ /**
+ * Heartbeat of this source task
+ */
+ private String heartbeat;
+
+ /**
+ * Report time
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date reportTime;
+
}
diff --git a/inlong-common/src/main/java/org/apache/inlong/commons/dto/TaskRequestDto.java b/inlong-common/src/main/java/org/apache/inlong/common/pojo/agent/TaskRequest.java
similarity index 88%
rename from inlong-common/src/main/java/org/apache/inlong/commons/dto/TaskRequestDto.java
rename to inlong-common/src/main/java/org/apache/inlong/common/pojo/agent/TaskRequest.java
index bb3ce75..cc86605 100644
--- a/inlong-common/src/main/java/org/apache/inlong/commons/dto/TaskRequestDto.java
+++ b/inlong-common/src/main/java/org/apache/inlong/common/pojo/agent/TaskRequest.java
@@ -15,16 +15,19 @@
* limitations under the License.
*/
-package org.apache.inlong.commons.dto;
+package org.apache.inlong.common.pojo.agent;
+
+import lombok.Data;
+import org.apache.inlong.common.db.CommandEntity;
import java.util.ArrayList;
import java.util.List;
-import lombok.Data;
-import org.apache.inlong.commons.db.CommandEntity;
@Data
-public class TaskRequestDto {
+public class TaskRequest {
+
private String agentIp;
private String uuid;
private List<CommandEntity> commandInfo = new ArrayList<>();
+
}
diff --git a/inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/fetcher/dtos/DbCollectorTaskReportDto.java b/inlong-common/src/main/java/org/apache/inlong/common/pojo/agent/TaskResult.java
similarity index 82%
rename from inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/fetcher/dtos/DbCollectorTaskReportDto.java
rename to inlong-common/src/main/java/org/apache/inlong/common/pojo/agent/TaskResult.java
index 4d08929..d1dba24 100644
--- a/inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/fetcher/dtos/DbCollectorTaskReportDto.java
+++ b/inlong-common/src/main/java/org/apache/inlong/common/pojo/agent/TaskResult.java
@@ -15,13 +15,16 @@
* limitations under the License.
*/
-package org.apache.inlong.agent.plugin.fetcher.dtos;
+package org.apache.inlong.common.pojo.agent;
import lombok.Data;
+import java.util.List;
+
@Data
-public class DbCollectorTaskReportDto {
+public class TaskResult {
+
+ private List<CmdConfig> cmdConfigs;
+ private List<DataConfig> dataConfigs;
- private String version;
- private String md5;
-}
+}
\ No newline at end of file
diff --git a/inlong-common/src/main/java/org/apache/inlong/commons/pojo/dataproxy/CacheClusterObject.java b/inlong-common/src/main/java/org/apache/inlong/common/pojo/dataproxy/CacheClusterObject.java
similarity index 97%
rename from inlong-common/src/main/java/org/apache/inlong/commons/pojo/dataproxy/CacheClusterObject.java
rename to inlong-common/src/main/java/org/apache/inlong/common/pojo/dataproxy/CacheClusterObject.java
index 02d7f95..0df15a5 100644
--- a/inlong-common/src/main/java/org/apache/inlong/commons/pojo/dataproxy/CacheClusterObject.java
+++ b/inlong-common/src/main/java/org/apache/inlong/common/pojo/dataproxy/CacheClusterObject.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.inlong.commons.pojo.dataproxy;
+package org.apache.inlong.common.pojo.dataproxy;
import java.util.HashMap;
import java.util.Map;
diff --git a/inlong-common/src/main/java/org/apache/inlong/commons/pojo/dataproxy/CacheClusterSetObject.java b/inlong-common/src/main/java/org/apache/inlong/common/pojo/dataproxy/CacheClusterSetObject.java
similarity index 97%
rename from inlong-common/src/main/java/org/apache/inlong/commons/pojo/dataproxy/CacheClusterSetObject.java
rename to inlong-common/src/main/java/org/apache/inlong/common/pojo/dataproxy/CacheClusterSetObject.java
index f6d632b..156a90f 100644
--- a/inlong-common/src/main/java/org/apache/inlong/commons/pojo/dataproxy/CacheClusterSetObject.java
+++ b/inlong-common/src/main/java/org/apache/inlong/common/pojo/dataproxy/CacheClusterSetObject.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.inlong.commons.pojo.dataproxy;
+package org.apache.inlong.common.pojo.dataproxy;
import java.util.ArrayList;
import java.util.List;
diff --git a/inlong-common/src/main/java/org/apache/inlong/commons/pojo/dataproxy/CacheTopicObject.java b/inlong-common/src/main/java/org/apache/inlong/common/pojo/dataproxy/CacheTopicObject.java
similarity index 96%
rename from inlong-common/src/main/java/org/apache/inlong/commons/pojo/dataproxy/CacheTopicObject.java
rename to inlong-common/src/main/java/org/apache/inlong/common/pojo/dataproxy/CacheTopicObject.java
index 12a3798..d586214 100644
--- a/inlong-common/src/main/java/org/apache/inlong/commons/pojo/dataproxy/CacheTopicObject.java
+++ b/inlong-common/src/main/java/org/apache/inlong/common/pojo/dataproxy/CacheTopicObject.java
@@ -1,4 +1,4 @@
-/**
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.inlong.commons.pojo.dataproxy;
+package org.apache.inlong.common.pojo.dataproxy;
/**
* CacheTopic
diff --git a/inlong-common/src/main/java/org/apache/inlong/commons/pojo/dataproxy/DataProxyCluster.java b/inlong-common/src/main/java/org/apache/inlong/common/pojo/dataproxy/DataProxyCluster.java
similarity index 97%
rename from inlong-common/src/main/java/org/apache/inlong/commons/pojo/dataproxy/DataProxyCluster.java
rename to inlong-common/src/main/java/org/apache/inlong/common/pojo/dataproxy/DataProxyCluster.java
index c19ffd5..c293c11 100644
--- a/inlong-common/src/main/java/org/apache/inlong/commons/pojo/dataproxy/DataProxyCluster.java
+++ b/inlong-common/src/main/java/org/apache/inlong/common/pojo/dataproxy/DataProxyCluster.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.inlong.commons.pojo.dataproxy;
+package org.apache.inlong.common.pojo.dataproxy;
/**
* DataProxyCluster
diff --git a/inlong-common/src/main/java/org/apache/inlong/commons/pojo/dataproxy/DataProxyConfig.java b/inlong-common/src/main/java/org/apache/inlong/common/pojo/dataproxy/DataProxyConfig.java
similarity index 97%
rename from inlong-common/src/main/java/org/apache/inlong/commons/pojo/dataproxy/DataProxyConfig.java
rename to inlong-common/src/main/java/org/apache/inlong/common/pojo/dataproxy/DataProxyConfig.java
index 4ba51ab..4b0b655 100644
--- a/inlong-common/src/main/java/org/apache/inlong/commons/pojo/dataproxy/DataProxyConfig.java
+++ b/inlong-common/src/main/java/org/apache/inlong/common/pojo/dataproxy/DataProxyConfig.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.inlong.commons.pojo.dataproxy;
+package org.apache.inlong.common.pojo.dataproxy;
/**
* DataProxy config
diff --git a/inlong-common/src/main/java/org/apache/inlong/commons/pojo/dataproxy/DataProxyConfigResponse.java b/inlong-common/src/main/java/org/apache/inlong/common/pojo/dataproxy/DataProxyConfigResponse.java
similarity index 97%
rename from inlong-common/src/main/java/org/apache/inlong/commons/pojo/dataproxy/DataProxyConfigResponse.java
rename to inlong-common/src/main/java/org/apache/inlong/common/pojo/dataproxy/DataProxyConfigResponse.java
index 2dca533..3809328 100644
--- a/inlong-common/src/main/java/org/apache/inlong/commons/pojo/dataproxy/DataProxyConfigResponse.java
+++ b/inlong-common/src/main/java/org/apache/inlong/common/pojo/dataproxy/DataProxyConfigResponse.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.inlong.commons.pojo.dataproxy;
+package org.apache.inlong.common.pojo.dataproxy;
/**
* DataProxyConfigResponse
diff --git a/inlong-common/src/main/java/org/apache/inlong/commons/pojo/dataproxy/IRepository.java b/inlong-common/src/main/java/org/apache/inlong/common/pojo/dataproxy/IRepository.java
similarity index 95%
rename from inlong-common/src/main/java/org/apache/inlong/commons/pojo/dataproxy/IRepository.java
rename to inlong-common/src/main/java/org/apache/inlong/common/pojo/dataproxy/IRepository.java
index 4013d8d..86a2dff 100644
--- a/inlong-common/src/main/java/org/apache/inlong/commons/pojo/dataproxy/IRepository.java
+++ b/inlong-common/src/main/java/org/apache/inlong/common/pojo/dataproxy/IRepository.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.inlong.commons.pojo.dataproxy;
+package org.apache.inlong.common.pojo.dataproxy;
/**
* IRepository
diff --git a/inlong-common/src/main/java/org/apache/inlong/commons/pojo/dataproxy/InLongIdObject.java b/inlong-common/src/main/java/org/apache/inlong/common/pojo/dataproxy/InLongIdObject.java
similarity index 97%
rename from inlong-common/src/main/java/org/apache/inlong/commons/pojo/dataproxy/InLongIdObject.java
rename to inlong-common/src/main/java/org/apache/inlong/common/pojo/dataproxy/InLongIdObject.java
index 4973c90..db27350 100644
--- a/inlong-common/src/main/java/org/apache/inlong/commons/pojo/dataproxy/InLongIdObject.java
+++ b/inlong-common/src/main/java/org/apache/inlong/common/pojo/dataproxy/InLongIdObject.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.inlong.commons.pojo.dataproxy;
+package org.apache.inlong.common.pojo.dataproxy;
import java.util.HashMap;
import java.util.Map;
diff --git a/inlong-common/src/main/java/org/apache/inlong/commons/pojo/dataproxy/ProxyChannel.java b/inlong-common/src/main/java/org/apache/inlong/common/pojo/dataproxy/ProxyChannel.java
similarity index 97%
rename from inlong-common/src/main/java/org/apache/inlong/commons/pojo/dataproxy/ProxyChannel.java
rename to inlong-common/src/main/java/org/apache/inlong/common/pojo/dataproxy/ProxyChannel.java
index 2d1de34..322cdb2 100644
--- a/inlong-common/src/main/java/org/apache/inlong/commons/pojo/dataproxy/ProxyChannel.java
+++ b/inlong-common/src/main/java/org/apache/inlong/common/pojo/dataproxy/ProxyChannel.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.inlong.commons.pojo.dataproxy;
+package org.apache.inlong.common.pojo.dataproxy;
import java.util.HashMap;
import java.util.Map;
diff --git a/inlong-common/src/main/java/org/apache/inlong/commons/pojo/dataproxy/ProxyClusterObject.java b/inlong-common/src/main/java/org/apache/inlong/common/pojo/dataproxy/ProxyClusterObject.java
similarity index 98%
rename from inlong-common/src/main/java/org/apache/inlong/commons/pojo/dataproxy/ProxyClusterObject.java
rename to inlong-common/src/main/java/org/apache/inlong/common/pojo/dataproxy/ProxyClusterObject.java
index b620b33..4fbec1a 100644
--- a/inlong-common/src/main/java/org/apache/inlong/commons/pojo/dataproxy/ProxyClusterObject.java
+++ b/inlong-common/src/main/java/org/apache/inlong/common/pojo/dataproxy/ProxyClusterObject.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.inlong.commons.pojo.dataproxy;
+package org.apache.inlong.common.pojo.dataproxy;
import java.util.ArrayList;
import java.util.List;
diff --git a/inlong-common/src/main/java/org/apache/inlong/commons/pojo/dataproxy/ProxyPulsarDTO.java b/inlong-common/src/main/java/org/apache/inlong/common/pojo/dataproxy/ProxyPulsarDTO.java
similarity index 96%
rename from inlong-common/src/main/java/org/apache/inlong/commons/pojo/dataproxy/ProxyPulsarDTO.java
rename to inlong-common/src/main/java/org/apache/inlong/common/pojo/dataproxy/ProxyPulsarDTO.java
index b924929..0077e94 100644
--- a/inlong-common/src/main/java/org/apache/inlong/commons/pojo/dataproxy/ProxyPulsarDTO.java
+++ b/inlong-common/src/main/java/org/apache/inlong/common/pojo/dataproxy/ProxyPulsarDTO.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.inlong.commons.pojo.dataproxy;
+package org.apache.inlong.common.pojo.dataproxy;
import java.util.ArrayList;
import java.util.List;
diff --git a/inlong-common/src/main/java/org/apache/inlong/commons/pojo/dataproxy/ProxySink.java b/inlong-common/src/main/java/org/apache/inlong/common/pojo/dataproxy/ProxySink.java
similarity index 97%
rename from inlong-common/src/main/java/org/apache/inlong/commons/pojo/dataproxy/ProxySink.java
rename to inlong-common/src/main/java/org/apache/inlong/common/pojo/dataproxy/ProxySink.java
index 1f42409..c3456ef 100644
--- a/inlong-common/src/main/java/org/apache/inlong/commons/pojo/dataproxy/ProxySink.java
+++ b/inlong-common/src/main/java/org/apache/inlong/common/pojo/dataproxy/ProxySink.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.inlong.commons.pojo.dataproxy;
+package org.apache.inlong.common.pojo.dataproxy;
import java.util.HashMap;
import java.util.Map;
diff --git a/inlong-common/src/main/java/org/apache/inlong/commons/pojo/dataproxy/ProxySource.java b/inlong-common/src/main/java/org/apache/inlong/common/pojo/dataproxy/ProxySource.java
similarity index 98%
rename from inlong-common/src/main/java/org/apache/inlong/commons/pojo/dataproxy/ProxySource.java
rename to inlong-common/src/main/java/org/apache/inlong/common/pojo/dataproxy/ProxySource.java
index 15f4d49..aaa5c7e 100644
--- a/inlong-common/src/main/java/org/apache/inlong/commons/pojo/dataproxy/ProxySource.java
+++ b/inlong-common/src/main/java/org/apache/inlong/common/pojo/dataproxy/ProxySource.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.inlong.commons.pojo.dataproxy;
+package org.apache.inlong.common.pojo.dataproxy;
import java.util.ArrayList;
import java.util.HashMap;
diff --git a/inlong-common/src/main/java/org/apache/inlong/commons/pojo/dataproxy/PulsarClusterInfo.java b/inlong-common/src/main/java/org/apache/inlong/common/pojo/dataproxy/PulsarClusterInfo.java
similarity index 96%
rename from inlong-common/src/main/java/org/apache/inlong/commons/pojo/dataproxy/PulsarClusterInfo.java
rename to inlong-common/src/main/java/org/apache/inlong/common/pojo/dataproxy/PulsarClusterInfo.java
index 798b186..a942575 100644
--- a/inlong-common/src/main/java/org/apache/inlong/commons/pojo/dataproxy/PulsarClusterInfo.java
+++ b/inlong-common/src/main/java/org/apache/inlong/common/pojo/dataproxy/PulsarClusterInfo.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.inlong.commons.pojo.dataproxy;
+package org.apache.inlong.common.pojo.dataproxy;
import java.util.HashMap;
import java.util.Map;
diff --git a/inlong-common/src/main/java/org/apache/inlong/commons/pojo/dataproxy/RepositoryTimerTask.java b/inlong-common/src/main/java/org/apache/inlong/common/pojo/dataproxy/RepositoryTimerTask.java
similarity index 96%
rename from inlong-common/src/main/java/org/apache/inlong/commons/pojo/dataproxy/RepositoryTimerTask.java
rename to inlong-common/src/main/java/org/apache/inlong/common/pojo/dataproxy/RepositoryTimerTask.java
index 1c20b94..a18a03c 100644
--- a/inlong-common/src/main/java/org/apache/inlong/commons/pojo/dataproxy/RepositoryTimerTask.java
+++ b/inlong-common/src/main/java/org/apache/inlong/common/pojo/dataproxy/RepositoryTimerTask.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.inlong.commons.pojo.dataproxy;
+package org.apache.inlong.common.pojo.dataproxy;
import java.util.TimerTask;
diff --git a/inlong-common/src/main/java/org/apache/inlong/commons/util/NetworkUtils.java b/inlong-common/src/main/java/org/apache/inlong/common/util/NetworkUtils.java
similarity index 98%
rename from inlong-common/src/main/java/org/apache/inlong/commons/util/NetworkUtils.java
rename to inlong-common/src/main/java/org/apache/inlong/common/util/NetworkUtils.java
index 9411461..a59401c 100644
--- a/inlong-common/src/main/java/org/apache/inlong/commons/util/NetworkUtils.java
+++ b/inlong-common/src/main/java/org/apache/inlong/common/util/NetworkUtils.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.inlong.commons.util;
+package org.apache.inlong.common.util;
import java.net.InetAddress;
import java.net.NetworkInterface;
diff --git a/inlong-common/src/test/java/org/apache/inlong/commons/metrics/metric/item/AgentMetricItem.java b/inlong-common/src/test/java/org/apache/inlong/common/metric/item/AgentMetricItem.java
similarity index 81%
rename from inlong-common/src/test/java/org/apache/inlong/commons/metrics/metric/item/AgentMetricItem.java
rename to inlong-common/src/test/java/org/apache/inlong/common/metric/item/AgentMetricItem.java
index f68601c..efcbca7 100644
--- a/inlong-common/src/test/java/org/apache/inlong/commons/metrics/metric/item/AgentMetricItem.java
+++ b/inlong-common/src/test/java/org/apache/inlong/common/metric/item/AgentMetricItem.java
@@ -1,4 +1,4 @@
-/**
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
@@ -15,18 +15,17 @@
* limitations under the License.
*/
-package org.apache.inlong.commons.metrics.metric.item;
+package org.apache.inlong.common.metric.item;
-import java.util.concurrent.atomic.AtomicLong;
+import org.apache.inlong.common.metric.CountMetric;
+import org.apache.inlong.common.metric.Dimension;
+import org.apache.inlong.common.metric.GaugeMetric;
+import org.apache.inlong.common.metric.MetricDomain;
+import org.apache.inlong.common.metric.MetricItem;
-import org.apache.inlong.commons.metrics.metric.CountMetric;
-import org.apache.inlong.commons.metrics.metric.Dimension;
-import org.apache.inlong.commons.metrics.metric.GaugeMetric;
-import org.apache.inlong.commons.metrics.metric.MetricDomain;
-import org.apache.inlong.commons.metrics.metric.MetricItem;
+import java.util.concurrent.atomic.AtomicLong;
/**
- *
* AgentMetricItem, like PluginMetric
*/
@MetricDomain(name = "Agent")
@@ -56,7 +55,8 @@ public class AgentMetricItem extends MetricItem {
@CountMetric
public AtomicLong sendSuccessNum = new AtomicLong(0);
-
+
@GaugeMetric
public AtomicLong runningTasks = new AtomicLong(0);
-}
+
+}
\ No newline at end of file
diff --git a/inlong-common/src/test/java/org/apache/inlong/commons/metrics/metric/item/TestMetricItemMBean.java b/inlong-common/src/test/java/org/apache/inlong/common/metric/item/TestMetricItemMBean.java
similarity index 92%
rename from inlong-common/src/test/java/org/apache/inlong/commons/metrics/metric/item/TestMetricItemMBean.java
rename to inlong-common/src/test/java/org/apache/inlong/common/metric/item/TestMetricItemMBean.java
index 3f11f34..5c79d3d 100644
--- a/inlong-common/src/test/java/org/apache/inlong/commons/metrics/metric/item/TestMetricItemMBean.java
+++ b/inlong-common/src/test/java/org/apache/inlong/common/metric/item/TestMetricItemMBean.java
@@ -1,4 +1,4 @@
-/**
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
@@ -15,25 +15,23 @@
* limitations under the License.
*/
-package org.apache.inlong.commons.metrics.metric.item;
-
-import static org.junit.Assert.assertEquals;
+package org.apache.inlong.common.metric.item;
-import java.lang.management.ManagementFactory;
-import java.util.Map;
+import org.apache.inlong.common.metric.MetricItemMBean;
+import org.apache.inlong.common.metric.MetricRegister;
+import org.apache.inlong.common.metric.MetricUtils;
+import org.apache.inlong.common.metric.MetricValue;
+import org.junit.BeforeClass;
+import org.junit.Test;
import javax.management.MBeanServer;
import javax.management.ObjectName;
+import java.lang.management.ManagementFactory;
+import java.util.Map;
-import org.apache.inlong.commons.metrics.metric.MetricItemMBean;
-import org.apache.inlong.commons.metrics.metric.MetricRegister;
-import org.apache.inlong.commons.metrics.metric.MetricUtils;
-import org.apache.inlong.commons.metrics.metric.MetricValue;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import static org.junit.Assert.assertEquals;
/**
- *
* TestMetricItem
*/
public class TestMetricItemMBean {
@@ -57,8 +55,6 @@ public class TestMetricItemMBean {
/**
* testResult
- *
- * @throws Exception
*/
@SuppressWarnings("unchecked")
@Test
diff --git a/inlong-common/src/test/java/org/apache/inlong/commons/metrics/metric/set/DataProxyMetricItem.java b/inlong-common/src/test/java/org/apache/inlong/common/metric/set/DataProxyMetricItem.java
similarity index 89%
rename from inlong-common/src/test/java/org/apache/inlong/commons/metrics/metric/set/DataProxyMetricItem.java
rename to inlong-common/src/test/java/org/apache/inlong/common/metric/set/DataProxyMetricItem.java
index f46880c..6639354 100644
--- a/inlong-common/src/test/java/org/apache/inlong/commons/metrics/metric/set/DataProxyMetricItem.java
+++ b/inlong-common/src/test/java/org/apache/inlong/common/metric/set/DataProxyMetricItem.java
@@ -15,14 +15,14 @@
* limitations under the License.
*/
-package org.apache.inlong.commons.metrics.metric.set;
+package org.apache.inlong.common.metric.set;
import java.util.concurrent.atomic.AtomicLong;
-import org.apache.inlong.commons.metrics.metric.CountMetric;
-import org.apache.inlong.commons.metrics.metric.Dimension;
-import org.apache.inlong.commons.metrics.metric.MetricDomain;
-import org.apache.inlong.commons.metrics.metric.MetricItem;
+import org.apache.inlong.common.metric.CountMetric;
+import org.apache.inlong.common.metric.Dimension;
+import org.apache.inlong.common.metric.MetricDomain;
+import org.apache.inlong.common.metric.MetricItem;
/**
*
diff --git a/inlong-common/src/test/java/org/apache/inlong/commons/metrics/metric/set/DataProxyMetricItemSet.java b/inlong-common/src/test/java/org/apache/inlong/common/metric/set/DataProxyMetricItemSet.java
similarity index 93%
rename from inlong-common/src/test/java/org/apache/inlong/commons/metrics/metric/set/DataProxyMetricItemSet.java
rename to inlong-common/src/test/java/org/apache/inlong/common/metric/set/DataProxyMetricItemSet.java
index 9a59e8e..2870b7a 100644
--- a/inlong-common/src/test/java/org/apache/inlong/commons/metrics/metric/set/DataProxyMetricItemSet.java
+++ b/inlong-common/src/test/java/org/apache/inlong/common/metric/set/DataProxyMetricItemSet.java
@@ -15,9 +15,9 @@
* limitations under the License.
*/
-package org.apache.inlong.commons.metrics.metric.set;
+package org.apache.inlong.common.metric.set;
-import org.apache.inlong.commons.metrics.metric.MetricItemSet;
+import org.apache.inlong.common.metric.MetricItemSet;
/**
*
diff --git a/inlong-common/src/test/java/org/apache/inlong/commons/metrics/metric/set/TestMetricItemSetMBean.java b/inlong-common/src/test/java/org/apache/inlong/common/metric/set/TestMetricItemSetMBean.java
similarity index 94%
rename from inlong-common/src/test/java/org/apache/inlong/commons/metrics/metric/set/TestMetricItemSetMBean.java
rename to inlong-common/src/test/java/org/apache/inlong/common/metric/set/TestMetricItemSetMBean.java
index dd396b4..8a8d15c 100644
--- a/inlong-common/src/test/java/org/apache/inlong/commons/metrics/metric/set/TestMetricItemSetMBean.java
+++ b/inlong-common/src/test/java/org/apache/inlong/common/metric/set/TestMetricItemSetMBean.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.inlong.commons.metrics.metric.set;
+package org.apache.inlong.common.metric.set;
import static org.junit.Assert.assertEquals;
@@ -26,12 +26,12 @@ import java.util.Map;
import javax.management.MBeanServer;
import javax.management.ObjectName;
-import org.apache.inlong.commons.metrics.metric.MetricItem;
-import org.apache.inlong.commons.metrics.metric.MetricItemMBean;
-import org.apache.inlong.commons.metrics.metric.MetricItemSetMBean;
-import org.apache.inlong.commons.metrics.metric.MetricRegister;
-import org.apache.inlong.commons.metrics.metric.MetricUtils;
-import org.apache.inlong.commons.metrics.metric.MetricValue;
+import org.apache.inlong.common.metric.MetricItem;
+import org.apache.inlong.common.metric.MetricItemMBean;
+import org.apache.inlong.common.metric.MetricItemSetMBean;
+import org.apache.inlong.common.metric.MetricRegister;
+import org.apache.inlong.common.metric.MetricUtils;
+import org.apache.inlong.common.metric.MetricValue;
import org.junit.BeforeClass;
import org.junit.Test;
diff --git a/inlong-dataproxy/conf/log4j2.xml b/inlong-dataproxy/conf/log4j2.xml
index 615de41..34d2165 100644
--- a/inlong-dataproxy/conf/log4j2.xml
+++ b/inlong-dataproxy/conf/log4j2.xml
@@ -98,10 +98,10 @@
</appenders>
<loggers>
- <logger name="org.apache.inlong.commons.monitor.MonitorIndexExt" level="info" additivity="false">
+ <logger name="org.apache.inlong.common.monitor.MonitorIndexExt" level="info" additivity="false">
<appender-ref ref="MonitorFile"/>
</logger>
- <logger name="org.apache.inlong.commons.monitor.MonitorIndex" level="info" additivity="false">
+ <logger name="org.apache.inlong.common.monitor.MonitorIndex" level="info" additivity="false">
<appender-ref ref="IndexFile"/>
</logger>
<root level="${output_log_level}">
diff --git a/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/channel/FailoverChannelProcessor.java b/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/channel/FailoverChannelProcessor.java
index 498e7ce..5945ee6 100644
--- a/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/channel/FailoverChannelProcessor.java
+++ b/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/channel/FailoverChannelProcessor.java
@@ -35,7 +35,7 @@ import org.apache.flume.interceptor.Interceptor;
import org.apache.flume.interceptor.InterceptorBuilderFactory;
import org.apache.flume.interceptor.InterceptorChain;
import org.apache.inlong.dataproxy.consts.ConfigConstants;
-import org.apache.inlong.commons.monitor.LogCounter;
+import org.apache.inlong.common.monitor.LogCounter;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/config/ConfigManager.java b/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/config/ConfigManager.java
index 2aa2ce3..c9921f8 100644
--- a/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/config/ConfigManager.java
+++ b/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/config/ConfigManager.java
@@ -26,8 +26,8 @@ import org.apache.http.client.methods.HttpGet;
import org.apache.http.impl.client.CloseableHttpClient;
import org.apache.http.impl.client.HttpClientBuilder;
import org.apache.http.util.EntityUtils;
-import org.apache.inlong.commons.pojo.dataproxy.DataProxyConfig;
-import org.apache.inlong.commons.pojo.dataproxy.PulsarClusterInfo;
+import org.apache.inlong.common.pojo.dataproxy.DataProxyConfig;
+import org.apache.inlong.common.pojo.dataproxy.PulsarClusterInfo;
import org.apache.inlong.dataproxy.config.holder.FileConfigHolder;
import org.apache.inlong.dataproxy.config.holder.GroupIdPropertiesHolder;
import org.apache.inlong.dataproxy.config.holder.MxPropertiesHolder;
diff --git a/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/config/RemoteConfigJson.java b/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/config/RemoteConfigJson.java
index e0583bf..148b307 100644
--- a/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/config/RemoteConfigJson.java
+++ b/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/config/RemoteConfigJson.java
@@ -17,8 +17,8 @@
package org.apache.inlong.dataproxy.config;
-import org.apache.inlong.commons.pojo.dataproxy.DataProxyConfig;
-import org.apache.inlong.commons.pojo.dataproxy.PulsarClusterInfo;
+import org.apache.inlong.common.pojo.dataproxy.DataProxyConfig;
+import org.apache.inlong.common.pojo.dataproxy.PulsarClusterInfo;
import java.util.ArrayList;
import java.util.List;
diff --git a/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/config/RemoteConfigManager.java b/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/config/RemoteConfigManager.java
index ae8a035..f8b5d24 100644
--- a/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/config/RemoteConfigManager.java
+++ b/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/config/RemoteConfigManager.java
@@ -38,18 +38,18 @@ import org.apache.http.client.methods.HttpGet;
import org.apache.http.impl.client.CloseableHttpClient;
import org.apache.http.impl.client.HttpClientBuilder;
import org.apache.http.util.EntityUtils;
-import org.apache.inlong.commons.pojo.dataproxy.CacheClusterObject;
-import org.apache.inlong.commons.pojo.dataproxy.CacheClusterSetObject;
-import org.apache.inlong.commons.pojo.dataproxy.CacheTopicObject;
-import org.apache.inlong.commons.pojo.dataproxy.DataProxyCluster;
-import org.apache.inlong.commons.pojo.dataproxy.DataProxyConfigResponse;
-import org.apache.inlong.commons.pojo.dataproxy.IRepository;
-import org.apache.inlong.commons.pojo.dataproxy.InLongIdObject;
-import org.apache.inlong.commons.pojo.dataproxy.ProxyChannel;
-import org.apache.inlong.commons.pojo.dataproxy.ProxyClusterObject;
-import org.apache.inlong.commons.pojo.dataproxy.ProxySink;
-import org.apache.inlong.commons.pojo.dataproxy.ProxySource;
-import org.apache.inlong.commons.pojo.dataproxy.RepositoryTimerTask;
+import org.apache.inlong.common.pojo.dataproxy.CacheClusterObject;
+import org.apache.inlong.common.pojo.dataproxy.CacheClusterSetObject;
+import org.apache.inlong.common.pojo.dataproxy.CacheTopicObject;
+import org.apache.inlong.common.pojo.dataproxy.DataProxyCluster;
+import org.apache.inlong.common.pojo.dataproxy.DataProxyConfigResponse;
+import org.apache.inlong.common.pojo.dataproxy.IRepository;
+import org.apache.inlong.common.pojo.dataproxy.InLongIdObject;
+import org.apache.inlong.common.pojo.dataproxy.ProxyChannel;
+import org.apache.inlong.common.pojo.dataproxy.ProxyClusterObject;
+import org.apache.inlong.common.pojo.dataproxy.ProxySink;
+import org.apache.inlong.common.pojo.dataproxy.ProxySource;
+import org.apache.inlong.common.pojo.dataproxy.RepositoryTimerTask;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/config/loader/ManagerCacheClusterConfigLoader.java b/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/config/loader/ManagerCacheClusterConfigLoader.java
index 6eb5c2e..be8a7bb 100644
--- a/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/config/loader/ManagerCacheClusterConfigLoader.java
+++ b/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/config/loader/ManagerCacheClusterConfigLoader.java
@@ -21,8 +21,8 @@ import java.util.ArrayList;
import java.util.List;
import org.apache.flume.Context;
-import org.apache.inlong.commons.pojo.dataproxy.CacheClusterObject;
-import org.apache.inlong.commons.pojo.dataproxy.DataProxyCluster;
+import org.apache.inlong.common.pojo.dataproxy.CacheClusterObject;
+import org.apache.inlong.common.pojo.dataproxy.DataProxyCluster;
import org.apache.inlong.dataproxy.config.RemoteConfigManager;
import org.apache.inlong.dataproxy.config.pojo.CacheClusterConfig;
diff --git a/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/config/loader/ManagerIdTopicConfigLoader.java b/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/config/loader/ManagerIdTopicConfigLoader.java
index b48fe05..8db5ad8 100644
--- a/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/config/loader/ManagerIdTopicConfigLoader.java
+++ b/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/config/loader/ManagerIdTopicConfigLoader.java
@@ -22,8 +22,8 @@ import java.util.List;
import java.util.Map;
import org.apache.flume.Context;
-import org.apache.inlong.commons.pojo.dataproxy.DataProxyCluster;
-import org.apache.inlong.commons.pojo.dataproxy.InLongIdObject;
+import org.apache.inlong.common.pojo.dataproxy.DataProxyCluster;
+import org.apache.inlong.common.pojo.dataproxy.InLongIdObject;
import org.apache.inlong.dataproxy.config.RemoteConfigManager;
import org.apache.inlong.dataproxy.config.pojo.DataType;
import org.apache.inlong.dataproxy.config.pojo.IdTopicConfig;
diff --git a/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/http/HttpBaseSource.java b/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/http/HttpBaseSource.java
index dcfb175..1535e17 100644
--- a/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/http/HttpBaseSource.java
+++ b/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/http/HttpBaseSource.java
@@ -18,10 +18,10 @@
package org.apache.inlong.dataproxy.http;
import com.google.common.base.Preconditions;
-import org.apache.inlong.commons.monitor.CounterGroup;
-import org.apache.inlong.commons.monitor.CounterGroupExt;
-import org.apache.inlong.commons.monitor.StatConstants;
-import org.apache.inlong.commons.monitor.StatRunner;
+import org.apache.inlong.common.monitor.CounterGroup;
+import org.apache.inlong.common.monitor.CounterGroupExt;
+import org.apache.inlong.common.monitor.StatConstants;
+import org.apache.inlong.common.monitor.StatRunner;
import java.util.HashSet;
import java.util.Set;
import org.apache.flume.ChannelSelector;
diff --git a/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/http/MessageFilter.java b/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/http/MessageFilter.java
index 97fbdd2..b8c2440 100644
--- a/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/http/MessageFilter.java
+++ b/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/http/MessageFilter.java
@@ -33,7 +33,7 @@ import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.apache.commons.lang.StringUtils;
import org.apache.flume.ChannelException;
-import org.apache.inlong.commons.monitor.LogCounter;
+import org.apache.inlong.common.monitor.LogCounter;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/http/MessageProcessServlet.java b/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/http/MessageProcessServlet.java
index 46a10a3..820f048 100644
--- a/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/http/MessageProcessServlet.java
+++ b/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/http/MessageProcessServlet.java
@@ -24,7 +24,7 @@ import static org.apache.inlong.dataproxy.http.HttpSourceConstants.BODY;
import static org.apache.inlong.dataproxy.http.HttpSourceConstants.HTTP_REQUEST;
import static org.apache.inlong.dataproxy.http.HttpSourceConstants.HTTP_RESPONSE;
-import org.apache.inlong.commons.monitor.LogCounter;
+import org.apache.inlong.common.monitor.LogCounter;
import org.apache.inlong.dataproxy.http.exception.MessageProcessException;
import java.io.IOException;
diff --git a/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/http/SimpleHttpSource.java b/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/http/SimpleHttpSource.java
index 1f29ee5..f2e3051 100644
--- a/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/http/SimpleHttpSource.java
+++ b/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/http/SimpleHttpSource.java
@@ -19,8 +19,8 @@ package org.apache.inlong.dataproxy.http;
import com.google.common.base.Preconditions;
import com.google.common.base.Throwables;
-import org.apache.inlong.commons.monitor.CounterGroup;
-import org.apache.inlong.commons.monitor.CounterGroupExt;
+import org.apache.inlong.common.monitor.CounterGroup;
+import org.apache.inlong.common.monitor.CounterGroupExt;
import java.lang.reflect.Constructor;
import java.util.Map;
import org.apache.flume.Context;
diff --git a/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/http/SimpleMessageHandler.java b/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/http/SimpleMessageHandler.java
index c57a205..d82a0b4 100644
--- a/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/http/SimpleMessageHandler.java
+++ b/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/http/SimpleMessageHandler.java
@@ -32,13 +32,13 @@ import org.apache.flume.ChannelException;
import org.apache.flume.channel.ChannelProcessor;
import org.apache.flume.event.EventBuilder;
import org.apache.flume.Event;
-import org.apache.inlong.commons.monitor.CounterGroup;
-import org.apache.inlong.commons.monitor.CounterGroupExt;
-import org.apache.inlong.commons.monitor.MonitorIndex;
-import org.apache.inlong.commons.monitor.MonitorIndexExt;
-import org.apache.inlong.commons.monitor.StatConstants;
-import org.apache.inlong.commons.msg.InLongMsg;
-import org.apache.inlong.commons.util.NetworkUtils;
+import org.apache.inlong.common.monitor.CounterGroup;
+import org.apache.inlong.common.monitor.CounterGroupExt;
+import org.apache.inlong.common.monitor.MonitorIndex;
+import org.apache.inlong.common.monitor.MonitorIndexExt;
+import org.apache.inlong.common.monitor.StatConstants;
+import org.apache.inlong.common.msg.InLongMsg;
+import org.apache.inlong.common.util.NetworkUtils;
import org.apache.inlong.dataproxy.config.ConfigManager;
import org.apache.inlong.dataproxy.consts.AttributeConstants;
import org.apache.inlong.dataproxy.consts.ConfigConstants;
diff --git a/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/metrics/DataProxyMetricItem.java b/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/metrics/DataProxyMetricItem.java
index d60f7e4..2a8b118 100644
--- a/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/metrics/DataProxyMetricItem.java
+++ b/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/metrics/DataProxyMetricItem.java
@@ -21,10 +21,10 @@ import java.util.Map;
import java.util.concurrent.atomic.AtomicLong;
import org.apache.flume.Event;
-import org.apache.inlong.commons.metrics.metric.CountMetric;
-import org.apache.inlong.commons.metrics.metric.Dimension;
-import org.apache.inlong.commons.metrics.metric.MetricDomain;
-import org.apache.inlong.commons.metrics.metric.MetricItem;
+import org.apache.inlong.common.metric.CountMetric;
+import org.apache.inlong.common.metric.Dimension;
+import org.apache.inlong.common.metric.MetricDomain;
+import org.apache.inlong.common.metric.MetricItem;
import org.apache.inlong.dataproxy.config.holder.CommonPropertiesHolder;
import org.apache.inlong.dataproxy.consts.AttributeConstants;
import org.apache.inlong.dataproxy.metrics.audit.AuditUtils;
diff --git a/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/metrics/DataProxyMetricItemSet.java b/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/metrics/DataProxyMetricItemSet.java
index f452713..8114424 100644
--- a/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/metrics/DataProxyMetricItemSet.java
+++ b/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/metrics/DataProxyMetricItemSet.java
@@ -17,8 +17,8 @@
package org.apache.inlong.dataproxy.metrics;
-import org.apache.inlong.commons.metrics.metric.MetricDomain;
-import org.apache.inlong.commons.metrics.metric.MetricItemSet;
+import org.apache.inlong.common.metric.MetricDomain;
+import org.apache.inlong.common.metric.MetricItemSet;
/**
*
diff --git a/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/metrics/prometheus/PrometheusMetricListener.java b/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/metrics/prometheus/PrometheusMetricListener.java
index 7d37c6c..a38c78b 100644
--- a/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/metrics/prometheus/PrometheusMetricListener.java
+++ b/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/metrics/prometheus/PrometheusMetricListener.java
@@ -17,8 +17,8 @@
package org.apache.inlong.dataproxy.metrics.prometheus;
-import static org.apache.inlong.commons.metrics.metric.MetricItemMBean.DOMAIN_SEPARATOR;
-import static org.apache.inlong.commons.metrics.metric.MetricRegister.JMX_DOMAIN;
+import static org.apache.inlong.common.metric.MetricItemMBean.DOMAIN_SEPARATOR;
+import static org.apache.inlong.common.metric.MetricRegister.JMX_DOMAIN;
import static org.apache.inlong.dataproxy.metrics.DataProxyMetricItem.M_NODE_DURATION;
import static org.apache.inlong.dataproxy.metrics.DataProxyMetricItem.M_READ_FAIL_COUNT;
import static org.apache.inlong.dataproxy.metrics.DataProxyMetricItem.M_READ_FAIL_SIZE;
@@ -46,12 +46,12 @@ import java.util.concurrent.atomic.AtomicLong;
import javax.management.MBeanServer;
import javax.management.ObjectName;
-import org.apache.inlong.commons.metrics.metric.MetricValue;
+import org.apache.inlong.common.metric.MetricValue;
import org.apache.inlong.dataproxy.config.RemoteConfigManager;
import org.apache.inlong.dataproxy.config.holder.CommonPropertiesHolder;
import org.apache.inlong.dataproxy.metrics.DataProxyMetricItem;
-import org.apache.inlong.commons.metrics.MetricItemValue;
-import org.apache.inlong.commons.metrics.MetricListener;
+import org.apache.inlong.common.metric.MetricItemValue;
+import org.apache.inlong.common.metric.MetricListener;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/node/Application.java b/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/node/Application.java
index 64717e4..1f00ea8 100644
--- a/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/node/Application.java
+++ b/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/node/Application.java
@@ -51,10 +51,10 @@ import org.apache.flume.node.PollingZooKeeperConfigurationProvider;
import org.apache.flume.node.PropertiesFileConfigurationProvider;
import org.apache.flume.node.StaticZooKeeperConfigurationProvider;
import org.apache.flume.util.SSLUtil;
-import org.apache.inlong.commons.config.IDataProxyConfigHolder;
+import org.apache.inlong.common.config.IDataProxyConfigHolder;
import org.apache.inlong.dataproxy.config.ConfigManager;
import org.apache.inlong.dataproxy.config.RemoteConfigManager;
-import org.apache.inlong.commons.metrics.MetricObserver;
+import org.apache.inlong.common.metric.MetricObserver;
import org.apache.inlong.dataproxy.metrics.audit.AuditUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/sink/MetaSink.java b/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/sink/MetaSink.java
index 8f3f309..0a44aee 100644
--- a/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/sink/MetaSink.java
+++ b/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/sink/MetaSink.java
@@ -39,7 +39,7 @@ import org.apache.flume.Transaction;
import org.apache.flume.conf.Configurable;
import org.apache.flume.sink.AbstractSink;
import org.apache.flume.source.shaded.guava.RateLimiter;
-import org.apache.inlong.commons.metrics.metric.MetricRegister;
+import org.apache.inlong.common.metric.MetricRegister;
import org.apache.inlong.dataproxy.config.ConfigManager;
import org.apache.inlong.dataproxy.config.holder.ConfigUpdateCallback;
import org.apache.inlong.dataproxy.consts.AttributeConstants;
diff --git a/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/sink/PulsarSink.java b/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/sink/PulsarSink.java
index e2d374f..ccddbe6 100644
--- a/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/sink/PulsarSink.java
+++ b/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/sink/PulsarSink.java
@@ -24,7 +24,7 @@ import com.google.common.cache.LoadingCache;
import com.google.common.util.concurrent.RateLimiter;
import java.util.HashMap;
-import org.apache.inlong.commons.metrics.metric.MetricRegister;
+import org.apache.inlong.common.metric.MetricRegister;
import org.apache.inlong.dataproxy.base.HighPriorityThreadFactory;
import java.util.HashSet;
import java.util.Map;
@@ -43,9 +43,9 @@ import org.apache.flume.Transaction;
import org.apache.flume.conf.Configurable;
import org.apache.flume.instrumentation.SinkCounter;
import org.apache.flume.sink.AbstractSink;
-import org.apache.inlong.commons.monitor.LogCounter;
-import org.apache.inlong.commons.monitor.MonitorIndex;
-import org.apache.inlong.commons.monitor.MonitorIndexExt;
+import org.apache.inlong.common.monitor.LogCounter;
+import org.apache.inlong.common.monitor.MonitorIndex;
+import org.apache.inlong.common.monitor.MonitorIndexExt;
import org.apache.inlong.dataproxy.config.ConfigManager;
import org.apache.inlong.dataproxy.config.holder.ConfigUpdateCallback;
import org.apache.inlong.dataproxy.config.pojo.PulsarConfig;
diff --git a/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/sink/SimpleMessageTubeSink.java b/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/sink/SimpleMessageTubeSink.java
index 5221203..e2d2c2a 100644
--- a/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/sink/SimpleMessageTubeSink.java
+++ b/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/sink/SimpleMessageTubeSink.java
@@ -39,7 +39,7 @@ import org.apache.flume.Transaction;
import org.apache.flume.conf.Configurable;
import org.apache.flume.sink.AbstractSink;
import org.apache.flume.source.shaded.guava.RateLimiter;
-import org.apache.inlong.commons.metrics.metric.MetricRegister;
+import org.apache.inlong.common.metric.MetricRegister;
import org.apache.inlong.dataproxy.config.ConfigManager;
import org.apache.inlong.dataproxy.config.holder.ConfigUpdateCallback;
import org.apache.inlong.dataproxy.consts.AttributeConstants;
diff --git a/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/sink/SinkContext.java b/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/sink/SinkContext.java
index 015515e..5e4d430 100644
--- a/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/sink/SinkContext.java
+++ b/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/sink/SinkContext.java
@@ -23,7 +23,7 @@ import java.util.TimerTask;
import org.apache.flume.Channel;
import org.apache.flume.Context;
-import org.apache.inlong.commons.metrics.metric.MetricRegister;
+import org.apache.inlong.common.metric.MetricRegister;
import org.apache.inlong.dataproxy.config.holder.CommonPropertiesHolder;
import org.apache.inlong.dataproxy.metrics.DataProxyMetricItemSet;
import org.slf4j.Logger;
diff --git a/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/sink/pulsar/PulsarClientService.java b/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/sink/pulsar/PulsarClientService.java
index b121875..4fb2518 100644
--- a/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/sink/pulsar/PulsarClientService.java
+++ b/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/sink/pulsar/PulsarClientService.java
@@ -21,7 +21,7 @@ import com.google.common.base.Preconditions;
import org.apache.commons.lang.StringUtils;
import org.apache.flume.Event;
import org.apache.flume.FlumeException;
-import org.apache.inlong.commons.monitor.LogCounter;
+import org.apache.inlong.common.monitor.LogCounter;
import org.apache.inlong.dataproxy.config.ConfigManager;
import org.apache.inlong.dataproxy.config.pojo.PulsarConfig;
import org.apache.inlong.dataproxy.consts.AttributeConstants;
diff --git a/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/sink/pulsar/federation/PulsarFederationSinkContext.java b/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/sink/pulsar/federation/PulsarFederationSinkContext.java
index 26d72f7..5afe68e 100644
--- a/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/sink/pulsar/federation/PulsarFederationSinkContext.java
+++ b/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/sink/pulsar/federation/PulsarFederationSinkContext.java
@@ -21,7 +21,7 @@ import java.util.Map;
import org.apache.flume.Context;
import org.apache.flume.Event;
-import org.apache.inlong.commons.metrics.metric.MetricRegister;
+import org.apache.inlong.common.metric.MetricRegister;
import org.apache.inlong.dataproxy.config.RemoteConfigManager;
import org.apache.inlong.dataproxy.config.holder.CacheClusterConfigHolder;
import org.apache.inlong.dataproxy.config.holder.CommonPropertiesHolder;
diff --git a/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/source/BaseSource.java b/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/source/BaseSource.java
index 83bc962..3887ad3 100644
--- a/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/source/BaseSource.java
+++ b/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/source/BaseSource.java
@@ -36,8 +36,8 @@ import org.apache.flume.conf.Configurables;
import org.apache.flume.source.AbstractSource;
import org.apache.inlong.dataproxy.channel.FailoverChannelProcessor;
import org.apache.inlong.dataproxy.consts.ConfigConstants;
-import org.apache.inlong.commons.monitor.MonitorIndex;
-import org.apache.inlong.commons.monitor.MonitorIndexExt;
+import org.apache.inlong.common.monitor.MonitorIndex;
+import org.apache.inlong.common.monitor.MonitorIndexExt;
import org.apache.inlong.dataproxy.utils.FailoverChannelProcessorHolder;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/source/ServerMessageFactory.java b/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/source/ServerMessageFactory.java
index 91dd75d..69e8913 100644
--- a/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/source/ServerMessageFactory.java
+++ b/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/source/ServerMessageFactory.java
@@ -28,8 +28,8 @@ import java.util.concurrent.TimeUnit;
import org.apache.flume.channel.ChannelProcessor;
import org.apache.flume.source.AbstractSource;
import org.apache.inlong.dataproxy.consts.ConfigConstants;
-import org.apache.inlong.commons.monitor.MonitorIndex;
-import org.apache.inlong.commons.monitor.MonitorIndexExt;
+import org.apache.inlong.common.monitor.MonitorIndex;
+import org.apache.inlong.common.monitor.MonitorIndexExt;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/source/ServerMessageHandler.java b/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/source/ServerMessageHandler.java
index e433716..c5ea73e 100644
--- a/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/source/ServerMessageHandler.java
+++ b/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/source/ServerMessageHandler.java
@@ -45,9 +45,9 @@ import org.apache.flume.Event;
import org.apache.flume.channel.ChannelProcessor;
import org.apache.flume.event.EventBuilder;
import org.apache.flume.source.AbstractSource;
-import org.apache.inlong.commons.monitor.MonitorIndex;
-import org.apache.inlong.commons.monitor.MonitorIndexExt;
-import org.apache.inlong.commons.msg.InLongMsg;
+import org.apache.inlong.common.monitor.MonitorIndex;
+import org.apache.inlong.common.monitor.MonitorIndexExt;
+import org.apache.inlong.common.msg.InLongMsg;
import org.apache.inlong.dataproxy.base.ProxyMessage;
import org.apache.inlong.dataproxy.config.ConfigManager;
import org.apache.inlong.dataproxy.consts.AttributeConstants;
diff --git a/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/source/SimpleMessageHandler.java b/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/source/SimpleMessageHandler.java
index caae85e..ce766aa 100644
--- a/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/source/SimpleMessageHandler.java
+++ b/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/source/SimpleMessageHandler.java
@@ -46,7 +46,7 @@ import org.apache.flume.Event;
import org.apache.flume.channel.ChannelProcessor;
import org.apache.flume.event.EventBuilder;
import org.apache.flume.source.AbstractSource;
-import org.apache.inlong.commons.msg.InLongMsg;
+import org.apache.inlong.common.msg.InLongMsg;
import org.apache.inlong.dataproxy.base.ProxyMessage;
import org.apache.inlong.dataproxy.config.ConfigManager;
import org.apache.inlong.dataproxy.consts.AttributeConstants;
diff --git a/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/source/SimpleTcpSource.java b/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/source/SimpleTcpSource.java
index db61f1c..1f1a86e 100644
--- a/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/source/SimpleTcpSource.java
+++ b/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/source/SimpleTcpSource.java
@@ -39,7 +39,7 @@ import org.apache.commons.io.IOUtils;
import org.apache.flume.Context;
import org.apache.flume.EventDrivenSource;
import org.apache.flume.conf.Configurable;
-import org.apache.inlong.commons.metrics.metric.MetricRegister;
+import org.apache.inlong.common.metric.MetricRegister;
import org.apache.inlong.dataproxy.consts.ConfigConstants;
import org.apache.inlong.dataproxy.metrics.DataProxyMetricItemSet;
import org.apache.inlong.dataproxy.utils.EventLoopUtil;
diff --git a/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/source/SourceContext.java b/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/source/SourceContext.java
index 769c4ce..58abc2d 100644
--- a/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/source/SourceContext.java
+++ b/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/source/SourceContext.java
@@ -25,7 +25,7 @@ import java.util.TimerTask;
import org.apache.commons.lang.math.NumberUtils;
import org.apache.flume.Context;
import org.apache.flume.source.AbstractSource;
-import org.apache.inlong.commons.metrics.metric.MetricRegister;
+import org.apache.inlong.common.metric.MetricRegister;
import org.apache.inlong.dataproxy.config.RemoteConfigManager;
import org.apache.inlong.dataproxy.config.holder.CommonPropertiesHolder;
import org.apache.inlong.dataproxy.config.holder.IdTopicConfigHolder;
diff --git a/inlong-dataproxy/dataproxy-source/src/test/java/org/apache/inlong/dataproxy/config/loader/TestClassResourceCommonPropertiesLoader.java b/inlong-dataproxy/dataproxy-source/src/test/java/org/apache/inlong/dataproxy/config/loader/TestClassResourceCommonPropertiesLoader.java
index cf0499f..6ec998f 100644
--- a/inlong-dataproxy/dataproxy-source/src/test/java/org/apache/inlong/dataproxy/config/loader/TestClassResourceCommonPropertiesLoader.java
+++ b/inlong-dataproxy/dataproxy-source/src/test/java/org/apache/inlong/dataproxy/config/loader/TestClassResourceCommonPropertiesLoader.java
@@ -22,7 +22,7 @@ import static org.junit.Assert.assertEquals;
import java.util.Map;
import org.apache.inlong.dataproxy.config.RemoteConfigManager;
-import org.apache.inlong.commons.metrics.MetricListener;
+import org.apache.inlong.common.metric.MetricListener;
import org.junit.Test;
/**
diff --git a/inlong-dataproxy/dataproxy-source/src/test/java/org/apache/inlong/dataproxy/metrics/TestDataProxyMetricItemSet.java b/inlong-dataproxy/dataproxy-source/src/test/java/org/apache/inlong/dataproxy/metrics/TestDataProxyMetricItemSet.java
index 8e0f480..7729dea 100644
--- a/inlong-dataproxy/dataproxy-source/src/test/java/org/apache/inlong/dataproxy/metrics/TestDataProxyMetricItemSet.java
+++ b/inlong-dataproxy/dataproxy-source/src/test/java/org/apache/inlong/dataproxy/metrics/TestDataProxyMetricItemSet.java
@@ -28,12 +28,12 @@ import javax.management.MBeanServer;
import javax.management.ObjectInstance;
import javax.management.ObjectName;
-import org.apache.inlong.commons.metrics.metric.MetricItem;
-import org.apache.inlong.commons.metrics.metric.MetricItemMBean;
-import org.apache.inlong.commons.metrics.metric.MetricItemSetMBean;
-import org.apache.inlong.commons.metrics.metric.MetricRegister;
-import org.apache.inlong.commons.metrics.metric.MetricUtils;
-import org.apache.inlong.commons.metrics.metric.MetricValue;
+import org.apache.inlong.common.metric.MetricItem;
+import org.apache.inlong.common.metric.MetricItemMBean;
+import org.apache.inlong.common.metric.MetricItemSetMBean;
+import org.apache.inlong.common.metric.MetricRegister;
+import org.apache.inlong.common.metric.MetricUtils;
+import org.apache.inlong.common.metric.MetricValue;
import org.junit.BeforeClass;
import org.junit.Test;
diff --git a/inlong-dataproxy/dataproxy-source/src/test/java/org/apache/inlong/dataproxy/metrics/TestMetricListenerRunnable.java b/inlong-dataproxy/dataproxy-source/src/test/java/org/apache/inlong/dataproxy/metrics/TestMetricListenerRunnable.java
index d3d2b3d..3c4f4b1 100644
--- a/inlong-dataproxy/dataproxy-source/src/test/java/org/apache/inlong/dataproxy/metrics/TestMetricListenerRunnable.java
+++ b/inlong-dataproxy/dataproxy-source/src/test/java/org/apache/inlong/dataproxy/metrics/TestMetricListenerRunnable.java
@@ -23,12 +23,12 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Map;
-import org.apache.inlong.commons.metrics.metric.MetricRegister;
-import org.apache.inlong.commons.metrics.metric.MetricUtils;
-import org.apache.inlong.commons.metrics.metric.MetricValue;
-import org.apache.inlong.commons.metrics.MetricItemValue;
-import org.apache.inlong.commons.metrics.MetricListener;
-import org.apache.inlong.commons.metrics.MetricListenerRunnable;
+import org.apache.inlong.common.metric.MetricRegister;
+import org.apache.inlong.common.metric.MetricUtils;
+import org.apache.inlong.common.metric.MetricValue;
+import org.apache.inlong.common.metric.MetricItemValue;
+import org.apache.inlong.common.metric.MetricListener;
+import org.apache.inlong.common.metric.MetricListenerRunnable;
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/enums/GroupState.java b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/enums/GroupState.java
index bf760ba..59dcd35 100644
--- a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/enums/GroupState.java
+++ b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/enums/GroupState.java
@@ -39,7 +39,7 @@ public enum GroupState {
private static final Map<GroupState, Set<GroupState>> GROUP_FINITE_STATE_AUTOMATON = Maps.newHashMap();
- /**
+ /*
* Init group finite state machine
*/
static {
diff --git a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/dataproxy/DataProxyClusterSet.java b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/dataproxy/DataProxyClusterSet.java
index 8076016..642ced7 100644
--- a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/dataproxy/DataProxyClusterSet.java
+++ b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/dataproxy/DataProxyClusterSet.java
@@ -17,6 +17,13 @@
package org.apache.inlong.manager.common.pojo.dataproxy;
+import org.apache.inlong.common.pojo.dataproxy.CacheClusterSetObject;
+import org.apache.inlong.common.pojo.dataproxy.InLongIdObject;
+import org.apache.inlong.common.pojo.dataproxy.ProxyChannel;
+import org.apache.inlong.common.pojo.dataproxy.ProxyClusterObject;
+import org.apache.inlong.common.pojo.dataproxy.ProxySink;
+import org.apache.inlong.common.pojo.dataproxy.ProxySource;
+
import java.util.ArrayList;
import java.util.HashMap;
import java.util.HashSet;
@@ -24,13 +31,6 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
-import org.apache.inlong.commons.pojo.dataproxy.CacheClusterSetObject;
-import org.apache.inlong.commons.pojo.dataproxy.InLongIdObject;
-import org.apache.inlong.commons.pojo.dataproxy.ProxyChannel;
-import org.apache.inlong.commons.pojo.dataproxy.ProxyClusterObject;
-import org.apache.inlong.commons.pojo.dataproxy.ProxySink;
-import org.apache.inlong.commons.pojo.dataproxy.ProxySource;
-
/**
* DataProxyClusterSet
*/
@@ -53,7 +53,7 @@ public class DataProxyClusterSet {
/**
* get setName
- *
+ *
* @return the setName
*/
public String getSetName() {
@@ -62,7 +62,7 @@ public class DataProxyClusterSet {
/**
* set setName
- *
+ *
* @param setName the setName to set
*/
public void setSetName(String setName) {
@@ -71,7 +71,7 @@ public class DataProxyClusterSet {
/**
* get cacheClusterSet
- *
+ *
* @return the cacheClusterSet
*/
public CacheClusterSetObject getCacheClusterSet() {
@@ -80,7 +80,7 @@ public class DataProxyClusterSet {
/**
* set cacheClusterSet
- *
+ *
* @param cacheClusterSet the cacheClusterSet to set
*/
public void setCacheClusterSet(CacheClusterSetObject cacheClusterSet) {
@@ -89,7 +89,7 @@ public class DataProxyClusterSet {
/**
* get proxyClusterList
- *
+ *
* @return the proxyClusterList
*/
public List<ProxyClusterObject> getProxyClusterList() {
@@ -98,7 +98,7 @@ public class DataProxyClusterSet {
/**
* set proxyClusterList
- *
+ *
* @param proxyClusterList the proxyClusterList to set
*/
public void setProxyClusterList(List<ProxyClusterObject> proxyClusterList) {
@@ -107,7 +107,7 @@ public class DataProxyClusterSet {
/**
* get proxyChannelMap
- *
+ *
* @return the proxyChannelMap
*/
public Map<String, ProxyChannel> getProxyChannelMap() {
@@ -116,7 +116,7 @@ public class DataProxyClusterSet {
/**
* set proxyChannelMap
- *
+ *
* @param proxyChannelMap the proxyChannelMap to set
*/
public void setProxyChannelMap(Map<String, ProxyChannel> proxyChannelMap) {
@@ -125,7 +125,7 @@ public class DataProxyClusterSet {
/**
* get defaultConfigJson
- *
+ *
* @return the defaultConfigJson
*/
public String getDefaultConfigJson() {
@@ -134,7 +134,7 @@ public class DataProxyClusterSet {
/**
* set defaultConfigJson
- *
+ *
* @param defaultConfigJson the defaultConfigJson to set
*/
public void setDefaultConfigJson(String defaultConfigJson) {
@@ -143,7 +143,7 @@ public class DataProxyClusterSet {
/**
* get proxySourceMap
- *
+ *
* @return the proxySourceMap
*/
public Map<String, ProxySource> getProxySourceMap() {
@@ -152,7 +152,7 @@ public class DataProxyClusterSet {
/**
* set proxySourceMap
- *
+ *
* @param proxySourceMap the proxySourceMap to set
*/
public void setProxySourceMap(Map<String, ProxySource> proxySourceMap) {
@@ -161,7 +161,7 @@ public class DataProxyClusterSet {
/**
* get proxySinkMap
- *
+ *
* @return the proxySinkMap
*/
public Map<String, ProxySink> getProxySinkMap() {
@@ -170,7 +170,7 @@ public class DataProxyClusterSet {
/**
* set proxySinkMap
- *
+ *
* @param proxySinkMap the proxySinkMap to set
*/
public void setProxySinkMap(Map<String, ProxySink> proxySinkMap) {
@@ -179,7 +179,7 @@ public class DataProxyClusterSet {
/**
* get inlongIds
- *
+ *
* @return the inlongIds
*/
public List<InLongIdObject> getInlongIds() {
@@ -188,7 +188,7 @@ public class DataProxyClusterSet {
/**
* set inlongIds
- *
+ *
* @param inlongIds the inlongIds to set
*/
public void setInlongIds(List<InLongIdObject> inlongIds) {
@@ -197,7 +197,7 @@ public class DataProxyClusterSet {
/**
* get proxy2Cache
- *
+ *
* @return the proxy2Cache
*/
public Map<String, Set<String>> getProxy2Cache() {
@@ -206,7 +206,7 @@ public class DataProxyClusterSet {
/**
* set proxy2Cache
- *
+ *
* @param proxy2Cache the proxy2Cache to set
*/
public void setProxy2Cache(Map<String, Set<String>> proxy2Cache) {
@@ -214,9 +214,8 @@ public class DataProxyClusterSet {
}
/**
- *
* addProxy2Cache
- *
+ *
* @param proxyClusterName
* @param cacheClusterName
*/
@@ -231,7 +230,7 @@ public class DataProxyClusterSet {
/**
* get proxyConfigJson
- *
+ *
* @return the proxyConfigJson
*/
public Map<String, String> getProxyConfigJson() {
@@ -240,7 +239,7 @@ public class DataProxyClusterSet {
/**
* set proxyConfigJson
- *
+ *
* @param proxyConfigJson the proxyConfigJson to set
*/
public void setProxyConfigJson(Map<String, String> proxyConfigJson) {
@@ -249,7 +248,7 @@ public class DataProxyClusterSet {
/**
* get md5Map
- *
+ *
* @return the md5Map
*/
public Map<String, String> getMd5Map() {
@@ -258,7 +257,7 @@ public class DataProxyClusterSet {
/**
* set md5Map
- *
+ *
* @param md5Map the md5Map to set
*/
public void setMd5Map(Map<String, String> md5Map) {
diff --git a/inlong-manager/manager-dao/src/main/java/org/apache/inlong/manager/dao/mapper/InlongGroupEntityMapper.java b/inlong-manager/manager-dao/src/main/java/org/apache/inlong/manager/dao/mapper/InlongGroupEntityMapper.java
index c7c6d3f..9013ae1 100644
--- a/inlong-manager/manager-dao/src/main/java/org/apache/inlong/manager/dao/mapper/InlongGroupEntityMapper.java
+++ b/inlong-manager/manager-dao/src/main/java/org/apache/inlong/manager/dao/mapper/InlongGroupEntityMapper.java
@@ -18,7 +18,7 @@
package org.apache.inlong.manager.dao.mapper;
import org.apache.ibatis.annotations.Param;
-import org.apache.inlong.commons.pojo.dataproxy.DataProxyConfig;
+import org.apache.inlong.common.pojo.dataproxy.DataProxyConfig;
import org.apache.inlong.manager.common.pojo.group.InlongGroupPageRequest;
import org.apache.inlong.manager.dao.entity.InlongGroupEntity;
import org.springframework.stereotype.Repository;
diff --git a/inlong-manager/manager-dao/src/main/resources/mappers/InlongGroupEntityMapper.xml b/inlong-manager/manager-dao/src/main/resources/mappers/InlongGroupEntityMapper.xml
index fa2e90c..1872b22 100644
--- a/inlong-manager/manager-dao/src/main/resources/mappers/InlongGroupEntityMapper.xml
+++ b/inlong-manager/manager-dao/src/main/resources/mappers/InlongGroupEntityMapper.xml
@@ -112,7 +112,7 @@
</where>
order by modify_time desc
</select>
- <select id="selectDataProxyConfig" resultType="org.apache.inlong.commons.pojo.dataproxy.DataProxyConfig">
+ <select id="selectDataProxyConfig" resultType="org.apache.inlong.common.pojo.dataproxy.DataProxyConfig">
select biz.inlong_group_id as inlongGroupId, biz.mq_resource_obj as topic, d.sort_type as m
from inlong_group biz,
data_schema d
diff --git a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/DataProxyClusterService.java b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/DataProxyClusterService.java
index 213795e..a7ea886 100644
--- a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/DataProxyClusterService.java
+++ b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/DataProxyClusterService.java
@@ -18,8 +18,8 @@
package org.apache.inlong.manager.service.core;
import com.github.pagehelper.PageInfo;
-import org.apache.inlong.commons.pojo.dataproxy.DataProxyConfig;
-import org.apache.inlong.commons.pojo.dataproxy.ProxyPulsarDTO;
+import org.apache.inlong.common.pojo.dataproxy.DataProxyConfig;
+import org.apache.inlong.common.pojo.dataproxy.ProxyPulsarDTO;
import org.apache.inlong.manager.common.pojo.cluster.DataProxyClusterInfo;
import org.apache.inlong.manager.common.pojo.cluster.DataProxyClusterPageRequest;
import org.apache.inlong.manager.common.pojo.dataproxy.DataProxyIpRequest;
@@ -36,7 +36,7 @@ public interface DataProxyClusterService {
* Save DataProxy cluster information
*
* @param clusterInfo Cluster information
- * @param operator Current operator
+ * @param operator Current operator
* @return ID after saving
*/
Integer save(DataProxyClusterInfo clusterInfo, String operator);
@@ -61,7 +61,7 @@ public interface DataProxyClusterService {
* Change DataProxy cluster information
*
* @param clusterInfo The information to be modified
- * @param operator Current operator
+ * @param operator Current operator
* @return Whether succeed
*/
Boolean update(DataProxyClusterInfo clusterInfo, String operator);
@@ -69,7 +69,7 @@ public interface DataProxyClusterService {
/**
* Delete DataProxy cluster information
*
- * @param id Cluster ID to be deleted
+ * @param id Cluster ID to be deleted
* @param operator Current operator
* @return Whether succeed
*/
@@ -92,7 +92,7 @@ public interface DataProxyClusterService {
/**
* query data proxy config by cluster id
- *
+ *
* @param clusterName
* @param setName
* @param md5
@@ -102,6 +102,7 @@ public interface DataProxyClusterService {
/**
* query data proxy config by cluster id, result includes pulsar cluster configs and topic etc
+ *
* @param dataproxyClusterName
* @return
*/
diff --git a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/impl/DataProxyClusterServiceImpl.java b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/impl/DataProxyClusterServiceImpl.java
index 210b0f6..1e2d377 100644
--- a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/impl/DataProxyClusterServiceImpl.java
+++ b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/impl/DataProxyClusterServiceImpl.java
@@ -22,10 +22,10 @@ import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import com.google.gson.Gson;
import lombok.extern.slf4j.Slf4j;
-import org.apache.inlong.commons.pojo.dataproxy.DataProxyConfig;
-import org.apache.inlong.commons.pojo.dataproxy.DataProxyConfigResponse;
-import org.apache.inlong.commons.pojo.dataproxy.ProxyPulsarDTO;
-import org.apache.inlong.commons.pojo.dataproxy.PulsarClusterInfo;
+import org.apache.inlong.common.pojo.dataproxy.DataProxyConfig;
+import org.apache.inlong.common.pojo.dataproxy.DataProxyConfigResponse;
+import org.apache.inlong.common.pojo.dataproxy.ProxyPulsarDTO;
+import org.apache.inlong.common.pojo.dataproxy.PulsarClusterInfo;
import org.apache.inlong.manager.common.beans.ClusterBean;
import org.apache.inlong.manager.common.enums.Constant;
import org.apache.inlong.manager.common.enums.EntityStatus;
diff --git a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/repository/DataProxyConfigRepository.java b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/repository/DataProxyConfigRepository.java
index 2bab168..215d4d2 100644
--- a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/repository/DataProxyConfigRepository.java
+++ b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/repository/DataProxyConfigRepository.java
@@ -19,28 +19,19 @@ package org.apache.inlong.manager.service.repository;
import com.google.common.base.Splitter;
import com.google.gson.Gson;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Set;
-import java.util.Timer;
-import java.util.TimerTask;
-import javax.annotation.PostConstruct;
import org.apache.commons.codec.digest.DigestUtils;
-import org.apache.inlong.commons.pojo.dataproxy.CacheClusterObject;
-import org.apache.inlong.commons.pojo.dataproxy.CacheClusterSetObject;
-import org.apache.inlong.commons.pojo.dataproxy.CacheTopicObject;
-import org.apache.inlong.commons.pojo.dataproxy.DataProxyCluster;
-import org.apache.inlong.commons.pojo.dataproxy.DataProxyConfigResponse;
-import org.apache.inlong.commons.pojo.dataproxy.IRepository;
-import org.apache.inlong.commons.pojo.dataproxy.InLongIdObject;
-import org.apache.inlong.commons.pojo.dataproxy.ProxyChannel;
-import org.apache.inlong.commons.pojo.dataproxy.ProxyClusterObject;
-import org.apache.inlong.commons.pojo.dataproxy.ProxySink;
-import org.apache.inlong.commons.pojo.dataproxy.ProxySource;
-import org.apache.inlong.commons.pojo.dataproxy.RepositoryTimerTask;
+import org.apache.inlong.common.pojo.dataproxy.CacheClusterObject;
+import org.apache.inlong.common.pojo.dataproxy.CacheClusterSetObject;
+import org.apache.inlong.common.pojo.dataproxy.CacheTopicObject;
+import org.apache.inlong.common.pojo.dataproxy.DataProxyCluster;
+import org.apache.inlong.common.pojo.dataproxy.DataProxyConfigResponse;
+import org.apache.inlong.common.pojo.dataproxy.IRepository;
+import org.apache.inlong.common.pojo.dataproxy.InLongIdObject;
+import org.apache.inlong.common.pojo.dataproxy.ProxyChannel;
+import org.apache.inlong.common.pojo.dataproxy.ProxyClusterObject;
+import org.apache.inlong.common.pojo.dataproxy.ProxySink;
+import org.apache.inlong.common.pojo.dataproxy.ProxySource;
+import org.apache.inlong.common.pojo.dataproxy.RepositoryTimerTask;
import org.apache.inlong.manager.common.pojo.dataproxy.DataProxyClusterSet;
import org.apache.inlong.manager.dao.entity.CacheCluster;
import org.apache.inlong.manager.dao.entity.CacheClusterExt;
@@ -62,6 +53,16 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Repository;
import org.springframework.transaction.annotation.Transactional;
+import javax.annotation.PostConstruct;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+import java.util.Timer;
+import java.util.TimerTask;
+
/**
* DataProxyConfigRepository
*/
diff --git a/inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/controller/openapi/DataProxyController.java b/inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/controller/openapi/DataProxyController.java
index 0ce767c..f31d4a4 100644
--- a/inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/controller/openapi/DataProxyController.java
+++ b/inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/controller/openapi/DataProxyController.java
@@ -19,11 +19,11 @@ package org.apache.inlong.manager.web.controller.openapi;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
-import org.apache.inlong.commons.pojo.dataproxy.ProxyPulsarDTO;
+import org.apache.inlong.common.pojo.dataproxy.DataProxyConfig;
+import org.apache.inlong.common.pojo.dataproxy.ProxyPulsarDTO;
import org.apache.inlong.manager.common.beans.Response;
import org.apache.inlong.manager.common.pojo.dataproxy.DataProxyIpRequest;
import org.apache.inlong.manager.common.pojo.dataproxy.DataProxyIpResponse;
-import org.apache.inlong.commons.pojo.dataproxy.DataProxyConfig;
import org.apache.inlong.manager.service.core.DataProxyClusterService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
@@ -70,7 +70,7 @@ public class DataProxyController {
@GetMapping("/getAllConfig")
@ApiOperation(value = "get data proxy config")
public String getAllConfig(@RequestParam("clusterName") String clusterName, @RequestParam("setName") String setName,
- @RequestParam("md5") String md5) {
+ @RequestParam("md5") String md5) {
return dataProxyClusterService.getAllConfig(clusterName, setName, md5);
}
}
diff --git a/inlong-sdk/sort-sdk/src/main/java/org/apache/inlong/sdk/sort/metrics/SortSdkMetricItem.java b/inlong-sdk/sort-sdk/src/main/java/org/apache/inlong/sdk/sort/metrics/SortSdkMetricItem.java
index c5a0b10..8181ada 100644
--- a/inlong-sdk/sort-sdk/src/main/java/org/apache/inlong/sdk/sort/metrics/SortSdkMetricItem.java
+++ b/inlong-sdk/sort-sdk/src/main/java/org/apache/inlong/sdk/sort/metrics/SortSdkMetricItem.java
@@ -18,10 +18,10 @@
package org.apache.inlong.sdk.sort.metrics;
import java.util.concurrent.atomic.AtomicLong;
-import org.apache.inlong.commons.metrics.metric.CountMetric;
-import org.apache.inlong.commons.metrics.metric.Dimension;
-import org.apache.inlong.commons.metrics.metric.MetricDomain;
-import org.apache.inlong.commons.metrics.metric.MetricItem;
+import org.apache.inlong.common.metric.CountMetric;
+import org.apache.inlong.common.metric.Dimension;
+import org.apache.inlong.common.metric.MetricDomain;
+import org.apache.inlong.common.metric.MetricItem;
@MetricDomain(name = "SortSdk")
public class SortSdkMetricItem extends MetricItem {
diff --git a/inlong-sdk/sort-sdk/src/main/java/org/apache/inlong/sdk/sort/metrics/SortSdkPrometheusMetricListener.java b/inlong-sdk/sort-sdk/src/main/java/org/apache/inlong/sdk/sort/metrics/SortSdkPrometheusMetricListener.java
index ed72a43..de44207 100644
--- a/inlong-sdk/sort-sdk/src/main/java/org/apache/inlong/sdk/sort/metrics/SortSdkPrometheusMetricListener.java
+++ b/inlong-sdk/sort-sdk/src/main/java/org/apache/inlong/sdk/sort/metrics/SortSdkPrometheusMetricListener.java
@@ -17,8 +17,8 @@
package org.apache.inlong.sdk.sort.metrics;
-import static org.apache.inlong.commons.metrics.metric.MetricItemMBean.DOMAIN_SEPARATOR;
-import static org.apache.inlong.commons.metrics.metric.MetricRegister.JMX_DOMAIN;
+import static org.apache.inlong.common.metric.MetricItemMBean.DOMAIN_SEPARATOR;
+import static org.apache.inlong.common.metric.MetricRegister.JMX_DOMAIN;
import java.lang.management.ManagementFactory;
import java.util.Map;
diff --git a/inlong-sort-standalone/sort-standalone-common/src/main/java/org/apache/inlong/sort/standalone/metrics/MetricItemValue.java b/inlong-sort-standalone/sort-standalone-common/src/main/java/org/apache/inlong/sort/standalone/metrics/MetricItemValue.java
index 59779c5..6b7b947 100644
--- a/inlong-sort-standalone/sort-standalone-common/src/main/java/org/apache/inlong/sort/standalone/metrics/MetricItemValue.java
+++ b/inlong-sort-standalone/sort-standalone-common/src/main/java/org/apache/inlong/sort/standalone/metrics/MetricItemValue.java
@@ -19,7 +19,7 @@ package org.apache.inlong.sort.standalone.metrics;
import java.util.Map;
-import org.apache.inlong.commons.metrics.metric.MetricValue;
+import org.apache.inlong.common.metric.MetricValue;
/**
*
diff --git a/inlong-sort-standalone/sort-standalone-common/src/main/java/org/apache/inlong/sort/standalone/metrics/MetricListenerRunnable.java b/inlong-sort-standalone/sort-standalone-common/src/main/java/org/apache/inlong/sort/standalone/metrics/MetricListenerRunnable.java
index 5b506e6..743a141 100644
--- a/inlong-sort-standalone/sort-standalone-common/src/main/java/org/apache/inlong/sort/standalone/metrics/MetricListenerRunnable.java
+++ b/inlong-sort-standalone/sort-standalone-common/src/main/java/org/apache/inlong/sort/standalone/metrics/MetricListenerRunnable.java
@@ -33,12 +33,12 @@ import javax.management.ObjectName;
import javax.management.ReflectionException;
import org.apache.commons.lang.ClassUtils;
-import org.apache.inlong.commons.metrics.metric.MetricItem;
-import org.apache.inlong.commons.metrics.metric.MetricItemMBean;
-import org.apache.inlong.commons.metrics.metric.MetricItemSetMBean;
-import org.apache.inlong.commons.metrics.metric.MetricRegister;
-import org.apache.inlong.commons.metrics.metric.MetricUtils;
-import org.apache.inlong.commons.metrics.metric.MetricValue;
+import org.apache.inlong.common.metric.MetricItem;
+import org.apache.inlong.common.metric.MetricItemMBean;
+import org.apache.inlong.common.metric.MetricItemSetMBean;
+import org.apache.inlong.common.metric.MetricRegister;
+import org.apache.inlong.common.metric.MetricUtils;
+import org.apache.inlong.common.metric.MetricValue;
import org.apache.inlong.sort.standalone.utils.InlongLoggerFactory;
import org.slf4j.Logger;
diff --git a/inlong-sort-standalone/sort-standalone-common/src/main/java/org/apache/inlong/sort/standalone/metrics/SortMetricItem.java b/inlong-sort-standalone/sort-standalone-common/src/main/java/org/apache/inlong/sort/standalone/metrics/SortMetricItem.java
index 4483963..565202f 100644
--- a/inlong-sort-standalone/sort-standalone-common/src/main/java/org/apache/inlong/sort/standalone/metrics/SortMetricItem.java
+++ b/inlong-sort-standalone/sort-standalone-common/src/main/java/org/apache/inlong/sort/standalone/metrics/SortMetricItem.java
@@ -19,11 +19,11 @@ package org.apache.inlong.sort.standalone.metrics;
import org.apache.commons.lang.math.NumberUtils;
import org.apache.flume.Event;
-import org.apache.inlong.commons.metrics.metric.CountMetric;
-import org.apache.inlong.commons.metrics.metric.Dimension;
-import org.apache.inlong.commons.metrics.metric.MetricDomain;
-import org.apache.inlong.commons.metrics.metric.MetricItem;
-import org.apache.inlong.commons.msg.AttributeConstants;
+import org.apache.inlong.common.metric.CountMetric;
+import org.apache.inlong.common.metric.Dimension;
+import org.apache.inlong.common.metric.MetricDomain;
+import org.apache.inlong.common.metric.MetricItem;
+import org.apache.inlong.common.msg.AttributeConstants;
import org.apache.inlong.sort.standalone.config.holder.CommonPropertiesHolder;
import org.apache.inlong.sort.standalone.utils.Constants;
diff --git a/inlong-sort-standalone/sort-standalone-common/src/main/java/org/apache/inlong/sort/standalone/metrics/SortMetricItemSet.java b/inlong-sort-standalone/sort-standalone-common/src/main/java/org/apache/inlong/sort/standalone/metrics/SortMetricItemSet.java
index 7c953a3..f9085e0 100644
--- a/inlong-sort-standalone/sort-standalone-common/src/main/java/org/apache/inlong/sort/standalone/metrics/SortMetricItemSet.java
+++ b/inlong-sort-standalone/sort-standalone-common/src/main/java/org/apache/inlong/sort/standalone/metrics/SortMetricItemSet.java
@@ -20,9 +20,9 @@ package org.apache.inlong.sort.standalone.metrics;
import java.util.List;
import java.util.Map;
-import org.apache.inlong.commons.metrics.metric.MetricDomain;
-import org.apache.inlong.commons.metrics.metric.MetricItem;
-import org.apache.inlong.commons.metrics.metric.MetricItemSet;
+import org.apache.inlong.common.metric.MetricDomain;
+import org.apache.inlong.common.metric.MetricItem;
+import org.apache.inlong.common.metric.MetricItemSet;
import org.apache.inlong.sort.standalone.utils.InlongLoggerFactory;
import org.slf4j.Logger;
diff --git a/inlong-sort-standalone/sort-standalone-common/src/test/java/org/apache/inlong/sort/standalone/metrics/TestMetricListenerRunnable.java b/inlong-sort-standalone/sort-standalone-common/src/test/java/org/apache/inlong/sort/standalone/metrics/TestMetricListenerRunnable.java
index c8eab96..0ed78b5 100644
--- a/inlong-sort-standalone/sort-standalone-common/src/test/java/org/apache/inlong/sort/standalone/metrics/TestMetricListenerRunnable.java
+++ b/inlong-sort-standalone/sort-standalone-common/src/test/java/org/apache/inlong/sort/standalone/metrics/TestMetricListenerRunnable.java
@@ -23,9 +23,9 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Map;
-import org.apache.inlong.commons.metrics.metric.MetricRegister;
-import org.apache.inlong.commons.metrics.metric.MetricUtils;
-import org.apache.inlong.commons.metrics.metric.MetricValue;
+import org.apache.inlong.common.metric.MetricRegister;
+import org.apache.inlong.common.metric.MetricUtils;
+import org.apache.inlong.common.metric.MetricValue;
import org.junit.BeforeClass;
import org.junit.Test;
diff --git a/inlong-sort-standalone/sort-standalone-common/src/test/java/org/apache/inlong/sort/standalone/metrics/TestSortMetricItemSet.java b/inlong-sort-standalone/sort-standalone-common/src/test/java/org/apache/inlong/sort/standalone/metrics/TestSortMetricItemSet.java
index 0a2e145..7e66c16 100644
--- a/inlong-sort-standalone/sort-standalone-common/src/test/java/org/apache/inlong/sort/standalone/metrics/TestSortMetricItemSet.java
+++ b/inlong-sort-standalone/sort-standalone-common/src/test/java/org/apache/inlong/sort/standalone/metrics/TestSortMetricItemSet.java
@@ -28,12 +28,12 @@ import javax.management.MBeanServer;
import javax.management.ObjectInstance;
import javax.management.ObjectName;
-import org.apache.inlong.commons.metrics.metric.MetricItem;
-import org.apache.inlong.commons.metrics.metric.MetricItemMBean;
-import org.apache.inlong.commons.metrics.metric.MetricItemSetMBean;
-import org.apache.inlong.commons.metrics.metric.MetricRegister;
-import org.apache.inlong.commons.metrics.metric.MetricUtils;
-import org.apache.inlong.commons.metrics.metric.MetricValue;
+import org.apache.inlong.common.metric.MetricItem;
+import org.apache.inlong.common.metric.MetricItemMBean;
+import org.apache.inlong.common.metric.MetricItemSetMBean;
+import org.apache.inlong.common.metric.MetricRegister;
+import org.apache.inlong.common.metric.MetricUtils;
+import org.apache.inlong.common.metric.MetricValue;
import org.junit.BeforeClass;
import org.junit.Test;
diff --git a/inlong-sort-standalone/sort-standalone-source/src/main/java/org/apache/inlong/sort/standalone/metrics/prometheus/PrometheusMetricListener.java b/inlong-sort-standalone/sort-standalone-source/src/main/java/org/apache/inlong/sort/standalone/metrics/prometheus/PrometheusMetricListener.java
index f927006..a1d9506 100644
--- a/inlong-sort-standalone/sort-standalone-source/src/main/java/org/apache/inlong/sort/standalone/metrics/prometheus/PrometheusMetricListener.java
+++ b/inlong-sort-standalone/sort-standalone-source/src/main/java/org/apache/inlong/sort/standalone/metrics/prometheus/PrometheusMetricListener.java
@@ -17,8 +17,8 @@
package org.apache.inlong.sort.standalone.metrics.prometheus;
-import static org.apache.inlong.commons.metrics.metric.MetricItemMBean.DOMAIN_SEPARATOR;
-import static org.apache.inlong.commons.metrics.metric.MetricRegister.JMX_DOMAIN;
+import static org.apache.inlong.common.metric.MetricItemMBean.DOMAIN_SEPARATOR;
+import static org.apache.inlong.common.metric.MetricRegister.JMX_DOMAIN;
import static org.apache.inlong.sort.standalone.config.holder.CommonPropertiesHolder.KEY_CLUSTER_ID;
import static org.apache.inlong.sort.standalone.metrics.SortMetricItem.M_NODE_DURATION;
import static org.apache.inlong.sort.standalone.metrics.SortMetricItem.M_READ_FAIL_COUNT;
@@ -47,7 +47,7 @@ import java.util.concurrent.atomic.AtomicLong;
import javax.management.MBeanServer;
import javax.management.ObjectName;
-import org.apache.inlong.commons.metrics.metric.MetricValue;
+import org.apache.inlong.common.metric.MetricValue;
import org.apache.inlong.sort.standalone.config.holder.CommonPropertiesHolder;
import org.apache.inlong.sort.standalone.metrics.MetricItemValue;
import org.apache.inlong.sort.standalone.metrics.MetricListener;
diff --git a/inlong-sort-standalone/sort-standalone-source/src/main/java/org/apache/inlong/sort/standalone/sink/SinkContext.java b/inlong-sort-standalone/sort-standalone-source/src/main/java/org/apache/inlong/sort/standalone/sink/SinkContext.java
index ed796cd..c377978 100644
--- a/inlong-sort-standalone/sort-standalone-source/src/main/java/org/apache/inlong/sort/standalone/sink/SinkContext.java
+++ b/inlong-sort-standalone/sort-standalone-source/src/main/java/org/apache/inlong/sort/standalone/sink/SinkContext.java
@@ -23,7 +23,7 @@ import java.util.TimerTask;
import org.apache.flume.Channel;
import org.apache.flume.Context;
-import org.apache.inlong.commons.metrics.metric.MetricRegister;
+import org.apache.inlong.common.metric.MetricRegister;
import org.apache.inlong.sort.standalone.config.holder.CommonPropertiesHolder;
import org.apache.inlong.sort.standalone.config.holder.SortClusterConfigHolder;
import org.apache.inlong.sort.standalone.config.pojo.SortTaskConfig;
diff --git a/inlong-sort-standalone/sort-standalone-source/src/main/java/org/apache/inlong/sort/standalone/source/SourceContext.java b/inlong-sort-standalone/sort-standalone-source/src/main/java/org/apache/inlong/sort/standalone/source/SourceContext.java
index a8afc5e..c55955a 100644
--- a/inlong-sort-standalone/sort-standalone-source/src/main/java/org/apache/inlong/sort/standalone/source/SourceContext.java
+++ b/inlong-sort-standalone/sort-standalone-source/src/main/java/org/apache/inlong/sort/standalone/source/SourceContext.java
@@ -18,6 +18,7 @@
package org.apache.inlong.sort.standalone.source;
import org.apache.flume.Context;
+import org.apache.inlong.common.metric.MetricItem;
import org.apache.inlong.sort.standalone.config.holder.CommonPropertiesHolder;
import javax.validation.constraints.NotBlank;
@@ -25,7 +26,7 @@ import javax.validation.constraints.NotNull;
/**
* Base source context <b>WITHOUT</b> metric reporter.
- * The derived classes of SourceContext may implement {@link org.apache.inlong.commons.metrics.metric.MetricItem} and
+ * The derived classes of SourceContext may implement {@link MetricItem} and
* realize methods to report customized metrics.
*/
public class SourceContext {
diff --git a/inlong-sort-standalone/sort-standalone-source/src/main/java/org/apache/inlong/sort/standalone/source/sortsdk/SortSdkSourceContext.java b/inlong-sort-standalone/sort-standalone-source/src/main/java/org/apache/inlong/sort/standalone/source/sortsdk/SortSdkSourceContext.java
index 447fd23..363e3b8 100644
--- a/inlong-sort-standalone/sort-standalone-source/src/main/java/org/apache/inlong/sort/standalone/source/sortsdk/SortSdkSourceContext.java
+++ b/inlong-sort-standalone/sort-standalone-source/src/main/java/org/apache/inlong/sort/standalone/source/sortsdk/SortSdkSourceContext.java
@@ -18,7 +18,7 @@
package org.apache.inlong.sort.standalone.source.sortsdk;
import org.apache.flume.Context;
-import org.apache.inlong.commons.metrics.metric.MetricRegister;
+import org.apache.inlong.common.metric.MetricRegister;
import org.apache.inlong.sort.standalone.channel.ProfileEvent;
import org.apache.inlong.sort.standalone.metrics.SortMetricItem;
import org.apache.inlong.sort.standalone.metrics.SortMetricItemSet;
diff --git a/inlong-sort-standalone/sort-standalone-source/src/test/java/org/apache/inlong/sort/standalone/sink/elasticsearch/TestDefaultEvent2IndexRequestHandler.java b/inlong-sort-standalone/sort-standalone-source/src/test/java/org/apache/inlong/sort/standalone/sink/elasticsearch/TestDefaultEvent2IndexRequestHandler.java
index c9fda79..f492e40 100644
--- a/inlong-sort-standalone/sort-standalone-source/src/test/java/org/apache/inlong/sort/standalone/sink/elasticsearch/TestDefaultEvent2IndexRequestHandler.java
+++ b/inlong-sort-standalone/sort-standalone-source/src/test/java/org/apache/inlong/sort/standalone/sink/elasticsearch/TestDefaultEvent2IndexRequestHandler.java
@@ -21,7 +21,7 @@ import static org.junit.Assert.assertEquals;
import java.util.concurrent.LinkedBlockingQueue;
-import org.apache.inlong.commons.metrics.metric.MetricRegister;
+import org.apache.inlong.common.metric.MetricRegister;
import org.apache.inlong.sort.standalone.channel.ProfileEvent;
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/inlong-sort-standalone/sort-standalone-source/src/test/java/org/apache/inlong/sort/standalone/sink/elasticsearch/TestEsCallbackListener.java b/inlong-sort-standalone/sort-standalone-source/src/test/java/org/apache/inlong/sort/standalone/sink/elasticsearch/TestEsCallbackListener.java
index fad674e..7799af1 100644
--- a/inlong-sort-standalone/sort-standalone-source/src/test/java/org/apache/inlong/sort/standalone/sink/elasticsearch/TestEsCallbackListener.java
+++ b/inlong-sort-standalone/sort-standalone-source/src/test/java/org/apache/inlong/sort/standalone/sink/elasticsearch/TestEsCallbackListener.java
@@ -19,7 +19,7 @@ package org.apache.inlong.sort.standalone.sink.elasticsearch;
import java.util.concurrent.LinkedBlockingQueue;
-import org.apache.inlong.commons.metrics.metric.MetricRegister;
+import org.apache.inlong.common.metric.MetricRegister;
import org.apache.inlong.sort.standalone.channel.ProfileEvent;
import org.elasticsearch.action.DocWriteRequest.OpType;
import org.elasticsearch.action.bulk.BulkItemResponse;
diff --git a/inlong-sort-standalone/sort-standalone-source/src/test/java/org/apache/inlong/sort/standalone/sink/elasticsearch/TestEsChannelWorker.java b/inlong-sort-standalone/sort-standalone-source/src/test/java/org/apache/inlong/sort/standalone/sink/elasticsearch/TestEsChannelWorker.java
index 2ed8466..5140337 100644
--- a/inlong-sort-standalone/sort-standalone-source/src/test/java/org/apache/inlong/sort/standalone/sink/elasticsearch/TestEsChannelWorker.java
+++ b/inlong-sort-standalone/sort-standalone-source/src/test/java/org/apache/inlong/sort/standalone/sink/elasticsearch/TestEsChannelWorker.java
@@ -20,7 +20,7 @@ package org.apache.inlong.sort.standalone.sink.elasticsearch;
import java.util.concurrent.LinkedBlockingQueue;
import org.apache.flume.Transaction;
-import org.apache.inlong.commons.metrics.metric.MetricRegister;
+import org.apache.inlong.common.metric.MetricRegister;
import org.apache.inlong.sort.standalone.channel.ProfileEvent;
import org.junit.Before;
import org.junit.Test;
diff --git a/inlong-sort-standalone/sort-standalone-source/src/test/java/org/apache/inlong/sort/standalone/sink/elasticsearch/TestEsOutputChannel.java b/inlong-sort-standalone/sort-standalone-source/src/test/java/org/apache/inlong/sort/standalone/sink/elasticsearch/TestEsOutputChannel.java
index f6c5f7a..cf21494 100644
--- a/inlong-sort-standalone/sort-standalone-source/src/test/java/org/apache/inlong/sort/standalone/sink/elasticsearch/TestEsOutputChannel.java
+++ b/inlong-sort-standalone/sort-standalone-source/src/test/java/org/apache/inlong/sort/standalone/sink/elasticsearch/TestEsOutputChannel.java
@@ -21,7 +21,7 @@ import static org.mockito.ArgumentMatchers.any;
import java.util.concurrent.LinkedBlockingQueue;
-import org.apache.inlong.commons.metrics.metric.MetricRegister;
+import org.apache.inlong.common.metric.MetricRegister;
import org.apache.inlong.sort.standalone.channel.ProfileEvent;
import org.elasticsearch.action.ActionListener;
import org.elasticsearch.action.admin.cluster.settings.ClusterUpdateSettingsRequest;
diff --git a/inlong-sort-standalone/sort-standalone-source/src/test/java/org/apache/inlong/sort/standalone/sink/elasticsearch/TestEsSinkContext.java b/inlong-sort-standalone/sort-standalone-source/src/test/java/org/apache/inlong/sort/standalone/sink/elasticsearch/TestEsSinkContext.java
index 69cd551..4f7cd3f 100644
--- a/inlong-sort-standalone/sort-standalone-source/src/test/java/org/apache/inlong/sort/standalone/sink/elasticsearch/TestEsSinkContext.java
+++ b/inlong-sort-standalone/sort-standalone-source/src/test/java/org/apache/inlong/sort/standalone/sink/elasticsearch/TestEsSinkContext.java
@@ -27,7 +27,7 @@ import java.util.concurrent.LinkedBlockingQueue;
import org.apache.flume.Channel;
import org.apache.flume.Context;
-import org.apache.inlong.commons.metrics.metric.MetricRegister;
+import org.apache.inlong.common.metric.MetricRegister;
import org.apache.inlong.sort.standalone.channel.BufferQueueChannel;
import org.apache.inlong.sort.standalone.channel.ProfileEvent;
import org.apache.inlong.sort.standalone.config.holder.CommonPropertiesHolder;
diff --git a/inlong-sort-standalone/sort-standalone-source/src/test/java/org/apache/inlong/sort/standalone/source/sortsdk/TestSortSdkSource.java b/inlong-sort-standalone/sort-standalone-source/src/test/java/org/apache/inlong/sort/standalone/source/sortsdk/TestSortSdkSource.java
index 836fdbf..7aee6b1 100644
--- a/inlong-sort-standalone/sort-standalone-source/src/test/java/org/apache/inlong/sort/standalone/source/sortsdk/TestSortSdkSource.java
+++ b/inlong-sort-standalone/sort-standalone-source/src/test/java/org/apache/inlong/sort/standalone/source/sortsdk/TestSortSdkSource.java
@@ -18,7 +18,7 @@
package org.apache.inlong.sort.standalone.source.sortsdk;
import org.apache.flume.Context;
-import org.apache.inlong.commons.metrics.metric.MetricRegister;
+import org.apache.inlong.common.metric.MetricRegister;
import org.apache.inlong.sort.standalone.config.holder.SortClusterConfigHolder;
import org.apache.inlong.sort.standalone.config.pojo.SortClusterConfig;
import org.apache.inlong.sort.standalone.config.pojo.SortTaskConfig;
diff --git a/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/flink/deserialization/MultiTenancyInLongMsgMixedDeserializerTest.java b/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/flink/deserialization/MultiTenancyInLongMsgMixedDeserializerTest.java
index 1f65a9e..18a2ab0 100644
--- a/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/flink/deserialization/MultiTenancyInLongMsgMixedDeserializerTest.java
+++ b/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/flink/deserialization/MultiTenancyInLongMsgMixedDeserializerTest.java
@@ -25,7 +25,7 @@ import java.sql.Timestamp;
import java.text.SimpleDateFormat;
import java.util.HashMap;
import java.util.Map;
-import org.apache.inlong.commons.msg.InLongMsg;
+import org.apache.inlong.common.msg.InLongMsg;
import org.apache.inlong.sort.flink.Record;
import org.apache.inlong.sort.flink.InLongMsgMixedSerializedRecord;
import org.apache.inlong.sort.formats.common.LongFormatInfo;
diff --git a/inlong-sort/sort-formats/format-inlongmsg-base/src/main/java/org/apache/inlong/sort/formats/inlongmsg/AbstractInLongMsgFormatDeserializer.java b/inlong-sort/sort-formats/format-inlongmsg-base/src/main/java/org/apache/inlong/sort/formats/inlongmsg/AbstractInLongMsgFormatDeserializer.java
index fddcd88..af19ed1 100644
--- a/inlong-sort/sort-formats/format-inlongmsg-base/src/main/java/org/apache/inlong/sort/formats/inlongmsg/AbstractInLongMsgFormatDeserializer.java
+++ b/inlong-sort/sort-formats/format-inlongmsg-base/src/main/java/org/apache/inlong/sort/formats/inlongmsg/AbstractInLongMsgFormatDeserializer.java
@@ -24,7 +24,7 @@ import java.util.Objects;
import javax.annotation.Nonnull;
import org.apache.flink.types.Row;
import org.apache.flink.util.Collector;
-import org.apache.inlong.commons.msg.InLongMsg;
+import org.apache.inlong.common.msg.InLongMsg;
import org.apache.inlong.sort.formats.base.TableFormatDeserializer;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/inlong-sort/sort-formats/format-inlongmsg-base/src/main/java/org/apache/inlong/sort/formats/inlongmsg/InLongMsgBody.java b/inlong-sort/sort-formats/format-inlongmsg-base/src/main/java/org/apache/inlong/sort/formats/inlongmsg/InLongMsgBody.java
index bb00c35..980d5cd 100644
--- a/inlong-sort/sort-formats/format-inlongmsg-base/src/main/java/org/apache/inlong/sort/formats/inlongmsg/InLongMsgBody.java
+++ b/inlong-sort/sort-formats/format-inlongmsg-base/src/main/java/org/apache/inlong/sort/formats/inlongmsg/InLongMsgBody.java
@@ -22,7 +22,7 @@ import java.io.Serializable;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
-import org.apache.inlong.commons.msg.InLongMsg;
+import org.apache.inlong.common.msg.InLongMsg;
/**
* The body deserialized from {@link InLongMsg}.
diff --git a/inlong-sort/sort-formats/format-inlongmsg-base/src/main/java/org/apache/inlong/sort/formats/inlongmsg/InLongMsgHead.java b/inlong-sort/sort-formats/format-inlongmsg-base/src/main/java/org/apache/inlong/sort/formats/inlongmsg/InLongMsgHead.java
index a753457..19b9161 100644
--- a/inlong-sort/sort-formats/format-inlongmsg-base/src/main/java/org/apache/inlong/sort/formats/inlongmsg/InLongMsgHead.java
+++ b/inlong-sort/sort-formats/format-inlongmsg-base/src/main/java/org/apache/inlong/sort/formats/inlongmsg/InLongMsgHead.java
@@ -24,7 +24,7 @@ import java.util.List;
import java.util.Map;
import java.util.Objects;
-import org.apache.inlong.commons.msg.InLongMsg;
+import org.apache.inlong.common.msg.InLongMsg;
/**
* The head deserialized from {@link InLongMsg}.
diff --git a/inlong-sort/sort-formats/format-inlongmsg-base/src/main/java/org/apache/inlong/sort/formats/inlongmsg/InLongMsgUtils.java b/inlong-sort/sort-formats/format-inlongmsg-base/src/main/java/org/apache/inlong/sort/formats/inlongmsg/InLongMsgUtils.java
index e2b8e8f..e3569a4 100644
--- a/inlong-sort/sort-formats/format-inlongmsg-base/src/main/java/org/apache/inlong/sort/formats/inlongmsg/InLongMsgUtils.java
+++ b/inlong-sort/sort-formats/format-inlongmsg-base/src/main/java/org/apache/inlong/sort/formats/inlongmsg/InLongMsgUtils.java
@@ -36,7 +36,7 @@ import org.apache.flink.table.api.ValidationException;
import org.apache.flink.table.descriptors.DescriptorProperties;
import org.apache.flink.table.types.DataType;
import org.apache.flink.types.Row;
-import org.apache.inlong.commons.msg.InLongMsg;
+import org.apache.inlong.common.msg.InLongMsg;
import org.apache.inlong.sort.formats.base.TableFormatConstants;
import org.apache.inlong.sort.formats.base.TableFormatUtils;
import org.apache.inlong.sort.formats.common.FormatInfo;
diff --git a/inlong-sort/sort-formats/format-inlongmsg-csv/src/test/java/org/apache/inlong/sort/formats/inlongmsgcsv/InLongMsgCsvFormatDeserializerTest.java b/inlong-sort/sort-formats/format-inlongmsg-csv/src/test/java/org/apache/inlong/sort/formats/inlongmsgcsv/InLongMsgCsvFormatDeserializerTest.java
index 9c93c14..0d6492b 100644
--- a/inlong-sort/sort-formats/format-inlongmsg-csv/src/test/java/org/apache/inlong/sort/formats/inlongmsgcsv/InLongMsgCsvFormatDeserializerTest.java
+++ b/inlong-sort/sort-formats/format-inlongmsg-csv/src/test/java/org/apache/inlong/sort/formats/inlongmsgcsv/InLongMsgCsvFormatDeserializerTest.java
@@ -36,7 +36,7 @@ import org.apache.flink.api.common.typeinfo.TypeInformation;
import org.apache.flink.api.common.typeinfo.Types;
import org.apache.flink.types.Row;
import org.apache.flink.util.Collector;
-import org.apache.inlong.commons.msg.InLongMsg;
+import org.apache.inlong.common.msg.InLongMsg;
import org.apache.inlong.sort.formats.base.TableFormatConstants;
import org.apache.inlong.sort.formats.common.FormatInfo;
import org.apache.inlong.sort.formats.common.IntFormatInfo;
diff --git a/inlong-sort/sort-single-tenant/src/main/java/org/apache/inlong/sort/singletenant/flink/deserialization/DeserializationFunction.java b/inlong-sort/sort-single-tenant/src/main/java/org/apache/inlong/sort/singletenant/flink/deserialization/DeserializationFunction.java
index e8bfe2f..cdc0430 100644
--- a/inlong-sort/sort-single-tenant/src/main/java/org/apache/inlong/sort/singletenant/flink/deserialization/DeserializationFunction.java
+++ b/inlong-sort/sort-single-tenant/src/main/java/org/apache/inlong/sort/singletenant/flink/deserialization/DeserializationFunction.java
@@ -21,7 +21,7 @@ import org.apache.flink.api.common.serialization.DeserializationSchema;
import org.apache.flink.streaming.api.functions.ProcessFunction;
import org.apache.flink.types.Row;
import org.apache.flink.util.Collector;
-import org.apache.inlong.commons.msg.InLongMsg;
+import org.apache.inlong.common.msg.InLongMsg;
import org.apache.inlong.sort.singletenant.flink.SerializedRecord;
import java.util.Iterator;
diff --git a/inlong-sort/sort-single-tenant/src/test/java/org/apache/inlong/sort/singletenant/flink/deserialization/DeserializationFunctionTest.java b/inlong-sort/sort-single-tenant/src/test/java/org/apache/inlong/sort/singletenant/flink/deserialization/DeserializationFunctionTest.java
index 0f88049..b991f47 100644
--- a/inlong-sort/sort-single-tenant/src/test/java/org/apache/inlong/sort/singletenant/flink/deserialization/DeserializationFunctionTest.java
+++ b/inlong-sort/sort-single-tenant/src/test/java/org/apache/inlong/sort/singletenant/flink/deserialization/DeserializationFunctionTest.java
@@ -18,7 +18,7 @@
package org.apache.inlong.sort.singletenant.flink.deserialization;
import org.apache.flink.types.Row;
-import org.apache.inlong.commons.msg.InLongMsg;
+import org.apache.inlong.common.msg.InLongMsg;
import org.apache.inlong.sort.formats.common.StringFormatInfo;
import org.apache.inlong.sort.protocol.FieldInfo;
import org.apache.inlong.sort.singletenant.flink.SerializedRecord;
diff --git a/pom.xml b/pom.xml
index d895699..8367448 100644
--- a/pom.xml
+++ b/pom.xml
@@ -111,14 +111,27 @@
<plugin.compile.version>3.8.1</plugin.compile.version>
<dockerfile-maven.version>1.4.13</dockerfile-maven.version>
<docker.organization>inlong</docker.organization>
+ <gson.version>2.8.5</gson.version>
+ <guava.version>31.0.1-jre</guava.version>
<lombok.version>1.18.22</lombok.version>
<logback.version>1.2.10</logback.version>
+ <junit.version>4.13.2</junit.version>
<je.version>7.3.7</je.version>
</properties>
<dependencyManagement>
<dependencies>
<dependency>
+ <groupId>com.google.code.gson</groupId>
+ <artifactId>gson</artifactId>
+ <version>${gson.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ <version>${guava.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>${lombok.version}</version>
@@ -138,6 +151,12 @@
<artifactId>je</artifactId>
<version>${je.version}</version>
</dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>${junit.version}</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</dependencyManagement>