This is an automated email from the ASF dual-hosted git repository.
zirui pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/inlong.git
from 6243a0577 [INLONG-7063][Dashboard] Optimize the topic name of the new
consumption page (#7084)
add 2ef7e0b25 [INLONG-6829][Agent] Support for the task delivery of
stream_source according to the tag granularity (#6902)
No new revisions were added by this update.
Summary of changes:
inlong-agent/agent-common/pom.xml | 5 +
.../inlong/agent/common/AgentThreadFactory.java | 15 +-
.../NamedRunnable.java} | 8 +-
.../inlong/agent/conf/AbstractConfiguration.java | 15 +-
.../inlong/agent/conf/AgentConfiguration.java | 13 +-
.../apache/inlong/agent/conf/TriggerProfile.java | 3 +-
.../inlong/agent/constant/AgentConstants.java | 3 +-
.../inlong/agent/constant/DataCollectType.java | 4 +-
.../inlong/agent/constant/FileCollectType.java | 28 --
.../inlong/agent/constant/FileTriggerType.java | 66 ++++
.../apache/inlong/agent/constant/JobConstants.java | 13 +-
.../inlong/agent/constant/KubernetesConstants.java | 11 +-
.../inlong/agent/constant/MetadataConstants.java | 16 +-
.../org/apache/inlong/agent/db/JobProfileDb.java | 32 +-
.../apache/inlong/agent/db/TriggerProfileDb.java | 2 +-
.../org/apache/inlong/agent/plugin/Trigger.java | 9 +-
.../java/org/apache/inlong/agent/pojo/FileJob.java | 6 +-
.../apache/inlong/agent/pojo/JobProfileDto.java | 3 +-
.../inlong/agent/state/AbstractStateWrapper.java | 1 -
.../org/apache/inlong/agent/utils/AgentUtils.java | 66 +---
.../org/apache/inlong/agent/utils/HttpManager.java | 3 +-
.../org/apache/inlong/agent/utils/PathUtils.java | 138 ++++++++
.../apache/inlong/agent/utils/TestPathUtils.java | 25 +-
.../org/apache/inlong/agent/core/AgentManager.java | 38 +-
.../apache/inlong/agent/core/HeartbeatManager.java | 45 ++-
.../java/org/apache/inlong/agent/core/job/Job.java | 65 ----
.../apache/inlong/agent/core/job/JobManager.java | 2 +-
.../apache/inlong/agent/core/job/JobWrapper.java | 104 ++++--
.../org/apache/inlong/agent/core/task/Task.java | 4 +
.../apache/inlong/agent/core/task/TaskManager.java | 9 +-
.../apache/inlong/agent/core/task/TaskWrapper.java | 20 +-
.../inlong/agent/core/trigger/TriggerManager.java | 228 ++++--------
.../agent/plugin/fetcher/ManagerFetcher.java | 110 +++---
.../agent/plugin/filter/DateFormatRegex.java | 37 +-
.../agent/plugin/sources/TextFileSource.java | 12 +-
.../sources/reader/file/AbstractFileReader.java | 71 ----
.../sources/reader/file/FileReaderOperator.java | 241 +++++++++----
...Reader.java => KubernetesMetadataProvider.java} | 36 +-
.../sources/reader/file/MonitorTextFile.java | 54 +--
.../plugin/sources/reader/file/TextFileReader.java | 103 ------
.../reader/file/TriggerFileReader.java} | 64 ++--
.../inlong/agent/plugin/trigger/CronTrigger.java | 5 +-
.../agent/plugin/trigger/DirectoryTrigger.java | 387 +++++++++++----------
.../inlong/agent/plugin/trigger/PathPattern.java | 170 +++++----
.../inlong/agent/plugin/utils/FileDataUtils.java | 2 +-
.../inlong/agent/plugin/utils/PluginUtils.java | 46 +--
.../inlong/agent/plugin/utils/RocksDBUtils.java | 57 +++
.../org/apache/inlong/agent/plugin/MiniAgent.java | 47 ++-
.../apache/inlong/agent/plugin/TestFileAgent.java | 89 +++--
.../agent/plugin/filter/TestDateFormatRegex.java | 21 +-
.../apache/inlong/agent/plugin/sinks/MockSink.java | 11 +-
.../agent/plugin/sources/TestTextFileReader.java | 47 ++-
.../inlong/agent/plugin/task/TestTextFileTask.java | 298 ++++++++++++++++
.../agent/plugin/trigger/TestTriggerManager.java | 174 +++++++++
.../agent/plugin/trigger/TestWatchDirTrigger.java | 155 +++++++--
.../inlong/agent/plugin/utils/TestUtils.java | 18 +-
.../src/test/resources/agent.properties | 1 +
inlong-agent/bin/agent.sh | 15 +-
inlong-agent/conf/agent.properties | 3 +-
inlong-agent/conf/log4j2.xml | 2 +-
.../apache/inlong/common/enums/NodeSrvStatus.java | 2 +
.../inlong/common/heartbeat/HeartbeatMsg.java | 5 +
.../inlong/manager/client/api/InlongClient.java | 9 +
.../manager/client/api/impl/InlongClientImpl.java | 6 +
.../api/inner/client/InlongClusterClient.java | 13 +
.../client/api/service/InlongClusterApi.java | 4 +
.../dao/entity/InlongClusterNodeEntity.java | 1 +
.../manager/dao/entity/StreamSourceEntity.java | 1 +
.../dao/mapper/StreamSourceEntityMapper.java | 8 +-
.../src/main/resources/generatorConfig.xml | 14 +-
.../mappers/InlongClusterNodeEntityMapper.xml | 15 +-
.../resources/mappers/StreamSourceEntityMapper.xml | 45 ++-
...Request.java => ClusterNodeBindTagRequest.java} | 27 +-
.../manager/pojo/cluster/ClusterNodeResponse.java | 3 +
.../inlong/manager/pojo/source/SourceRequest.java | 3 +
.../inlong/manager/pojo/source/StreamSource.java | 3 +
.../manager/pojo/source/file/FileSource.java | 3 +
.../manager/pojo/source/file/FileSourceDTO.java | 4 +
.../pojo/source/file/FileSourceRequest.java | 3 +
.../service/cluster/InlongClusterService.java | 10 +
.../service/cluster/InlongClusterServiceImpl.java | 55 +++
.../service/core/impl/AgentServiceImpl.java | 290 +++++++++------
.../service/heartbeat/HeartbeatManager.java | 33 +-
.../service/source/AbstractSourceOperator.java | 3 +
.../service/source/StreamSourceServiceImpl.java | 10 +-
.../service/core/impl/AgentServiceTest.java | 284 ++++++++++++++-
.../inlong/manager/service/mocks/MockAgent.java | 111 ++++++
.../main/resources/h2/apache_inlong_manager.sql | 2 +
.../manager-web/sql/apache_inlong_manager.sql | 2 +
.../web/controller/InlongClusterController.java | 8 +
licenses/inlong-agent/LICENSE | 2 +-
licenses/inlong-agent/NOTICE | 21 ++
92 files changed, 2916 insertions(+), 1360 deletions(-)
copy
inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/{state/StateCallback.java
=> common/NamedRunnable.java} (84%)
mode change 100755 => 100644
delete mode 100644
inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/constant/FileCollectType.java
create mode 100644
inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/constant/FileTriggerType.java
create mode 100644
inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/utils/PathUtils.java
copy
inlong-sort/sort-connectors/base/src/test/java/org/apache/inlong/sort/base/util/LabelUtilsTest.java
=>
inlong-agent/agent-common/src/test/java/org/apache/inlong/agent/utils/TestPathUtils.java
(56%)
delete mode 100644
inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/sources/reader/file/AbstractFileReader.java
rename
inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/sources/reader/file/{KubernetesFileReader.java
=> KubernetesMetadataProvider.java} (77%)
delete mode 100644
inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/sources/reader/file/TextFileReader.java
copy
inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/{sinks/ConsoleSink.java
=> sources/reader/file/TriggerFileReader.java} (50%)
create mode 100644
inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/utils/RocksDBUtils.java
create mode 100644
inlong-agent/agent-plugins/src/test/java/org/apache/inlong/agent/plugin/task/TestTextFileTask.java
create mode 100644
inlong-agent/agent-plugins/src/test/java/org/apache/inlong/agent/plugin/trigger/TestTriggerManager.java
copy
inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/cluster/{BindTagRequest.java
=> ClusterNodeBindTagRequest.java} (55%)
create mode 100644
inlong-manager/manager-service/src/test/java/org/apache/inlong/manager/service/mocks/MockAgent.java
