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/08/10 06:15:41 UTC
[inlong] branch master updated (29f5c6585 -> e62e5ad42)
This is an automated email from the ASF dual-hosted git repository.
dockerzhang pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/inlong.git
from 29f5c6585 [INLONG-5406][Dashboard] No restrictions are added to the input of port numbers, such as dataproxy node (#5444)
add e62e5ad42 [INLONG-5428][Agent] Abstract metrics interface to be easier to extend (#5430)
No new revisions were added by this update.
Summary of changes:
.../inlong/agent/conf/AbstractConfiguration.java | 12 ++
.../inlong/agent/constant/AgentConstants.java | 4 -
.../inlong/agent/metrics/AgentDynamicMBean.java | 128 -------------
.../agent/metrics/AgentJmxMetricListener.java | 44 -----
.../agent/metrics/AgentMetricBaseListener.java | 47 -----
.../inlong/agent/metrics/AgentMetricItem.java | 94 +++++++++
.../metrics/{Tag.java => AgentMetricItemSet.java} | 23 ++-
.../inlong/agent/metrics/AgentMetricSingleton.java | 67 -------
.../metrics/AgentPrometheusMetricListener.java | 212 ++++++++++++++++++---
.../org/apache/inlong/agent/metrics/Metric.java | 63 ------
.../inlong/agent/metrics/MetricException.java | 32 ----
.../inlong/agent/metrics/MetricSnapshot.java | 25 ---
.../org/apache/inlong/agent/metrics/Metrics.java | 46 -----
.../inlong/agent/metrics/MetricsRegister.java | 150 ---------------
.../apache/inlong/agent/metrics/MutableMetric.java | 25 ---
.../inlong/agent/metrics/counter/Counter.java | 39 ----
.../inlong/agent/metrics/counter/CounterInt.java | 44 -----
.../inlong/agent/metrics/counter/CounterLong.java | 44 -----
.../apache/inlong/agent/metrics/gauge/Gauge.java | 55 ------
.../inlong/agent/metrics/gauge/GaugeInt.java | 60 ------
.../inlong/agent/metrics/gauge/GaugeLong.java | 60 ------
.../inlong/agent/metrics/global/GlobalMetrics.java | 153 ---------------
.../agent/metrics/global/JmxGlobalMetrics.java | 43 -----
.../metrics/global/PrometheusGlobalMetrics.java | 43 -----
.../inlong/agent/metrics/job/JobJmxMetrics.java | 75 --------
.../inlong/agent/metrics/job/JobMetrics.java | 39 ----
.../agent/metrics/job/JobPrometheusMetrics.java | 60 ------
.../inlong/agent/metrics/meta/MetricMeta.java | 87 ---------
.../inlong/agent/metrics/meta/MetricsMeta.java | 65 -------
.../agent/metrics/plugin/PluginJmxMetric.java | 131 -------------
.../inlong/agent/metrics/plugin/PluginMetric.java | 94 ---------
.../metrics/plugin/PluginPrometheusMetric.java | 142 --------------
.../inlong/agent/metrics/sink/SinkJmxMetric.java | 71 -------
.../inlong/agent/metrics/sink/SinkMetric.java | 49 -----
.../agent/metrics/sink/SinkPrometheusMetric.java | 73 -------
.../agent/metrics/source/SourceJmxMetric.java | 71 -------
.../inlong/agent/metrics/source/SourceMetric.java | 49 -----
.../metrics/source/SourcePrometheusMetric.java | 71 -------
.../inlong/agent/metrics/task/TaskJmxMetrics.java | 90 ---------
.../inlong/agent/metrics/task/TaskMetrics.java | 49 -----
.../agent/metrics/task/TaskPrometheusMetrics.java | 76 --------
.../inlong/agent/metrics/TestAgentMetrics.java | 113 +++++++++++
.../apache/inlong/agent/metrics/TestMetrics.java | 113 -----------
.../src/test/resources/agent.properties | 9 +-
.../org/apache/inlong/agent/core/AgentMain.java | 10 +-
.../apache/inlong/agent/core/job/JobManager.java | 30 ++-
.../apache/inlong/agent/core/task/TaskManager.java | 31 ++-
.../apache/inlong/agent/core/task/TaskWrapper.java | 2 +-
.../inlong/agent/core/TestTaskJmxMetrics.java | 42 ----
.../inlong/agent/plugin/channel/MemoryChannel.java | 48 +++--
.../inlong/agent/plugin/sinks/AbstractSink.java | 27 ++-
.../inlong/agent/plugin/sinks/ConsoleSink.java | 9 +-
.../inlong/agent/plugin/sinks/ProxySink.java | 7 +-
.../inlong/agent/plugin/sinks/SenderManager.java | 34 +++-
.../agent/plugin/sources/AbstractSource.java | 63 ++++++
.../inlong/agent/plugin/sources/BinlogSource.java | 16 +-
.../agent/plugin/sources/DatabaseSqlSource.java | 17 +-
.../inlong/agent/plugin/sources/KafkaSource.java | 17 +-
.../agent/plugin/sources/TextFileSource.java | 16 +-
.../plugin/sources/reader/AbstractReader.java | 27 ++-
.../agent/plugin/sources/reader/BinlogReader.java | 5 +-
.../agent/plugin/sources/reader/KafkaReader.java | 4 +-
.../agent/plugin/sources/reader/SqlReader.java | 6 +-
.../sources/reader/file/FileReaderOperator.java | 10 +-
.../agent/plugin/metrics/GlobalMetricsTest.java | 71 -------
.../apache/inlong/agent/plugin/sinks/MockSink.java | 8 +-
inlong-agent/conf/agent.properties | 9 +-
67 files changed, 683 insertions(+), 2866 deletions(-)
delete mode 100644 inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/metrics/AgentDynamicMBean.java
delete mode 100644 inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/metrics/AgentJmxMetricListener.java
delete mode 100644 inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/metrics/AgentMetricBaseListener.java
create mode 100644 inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/metrics/AgentMetricItem.java
rename inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/metrics/{Tag.java => AgentMetricItemSet.java} (68%)
mode change 100755 => 100644
delete mode 100644 inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/metrics/AgentMetricSingleton.java
delete mode 100644 inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/metrics/Metric.java
delete mode 100644 inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/metrics/MetricException.java
delete mode 100644 inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/metrics/MetricSnapshot.java
delete mode 100644 inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/metrics/Metrics.java
delete mode 100644 inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/metrics/MetricsRegister.java
delete mode 100644 inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/metrics/MutableMetric.java
delete mode 100644 inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/metrics/counter/Counter.java
delete mode 100644 inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/metrics/counter/CounterInt.java
delete mode 100644 inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/metrics/counter/CounterLong.java
delete mode 100644 inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/metrics/gauge/Gauge.java
delete mode 100644 inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/metrics/gauge/GaugeInt.java
delete mode 100644 inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/metrics/gauge/GaugeLong.java
delete mode 100644 inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/metrics/global/GlobalMetrics.java
delete mode 100644 inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/metrics/global/JmxGlobalMetrics.java
delete mode 100644 inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/metrics/global/PrometheusGlobalMetrics.java
delete mode 100644 inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/metrics/job/JobJmxMetrics.java
delete mode 100644 inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/metrics/job/JobMetrics.java
delete mode 100644 inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/metrics/job/JobPrometheusMetrics.java
delete mode 100644 inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/metrics/meta/MetricMeta.java
delete mode 100644 inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/metrics/meta/MetricsMeta.java
delete mode 100644 inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/metrics/plugin/PluginJmxMetric.java
delete mode 100644 inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/metrics/plugin/PluginMetric.java
delete mode 100644 inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/metrics/plugin/PluginPrometheusMetric.java
delete mode 100644 inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/metrics/sink/SinkJmxMetric.java
delete mode 100644 inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/metrics/sink/SinkMetric.java
delete mode 100644 inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/metrics/sink/SinkPrometheusMetric.java
delete mode 100644 inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/metrics/source/SourceJmxMetric.java
delete mode 100644 inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/metrics/source/SourceMetric.java
delete mode 100644 inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/metrics/source/SourcePrometheusMetric.java
delete mode 100644 inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/metrics/task/TaskJmxMetrics.java
delete mode 100644 inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/metrics/task/TaskMetrics.java
delete mode 100644 inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/metrics/task/TaskPrometheusMetrics.java
create mode 100755 inlong-agent/agent-common/src/test/java/org/apache/inlong/agent/metrics/TestAgentMetrics.java
delete mode 100755 inlong-agent/agent-common/src/test/java/org/apache/inlong/agent/metrics/TestMetrics.java
delete mode 100644 inlong-agent/agent-core/src/test/java/org/apache/inlong/agent/core/TestTaskJmxMetrics.java
create mode 100644 inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/sources/AbstractSource.java
delete mode 100644 inlong-agent/agent-plugins/src/test/java/org/apache/inlong/agent/plugin/metrics/GlobalMetricsTest.java