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 02:28:14 UTC
[incubator-inlong] branch master updated (4e89a84 -> b8c144d)
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/incubator-inlong.git.
from 4e89a84 [INLONG-2572] fix sort-sdk UT bug (#2672)
add b8c144d [INLONG-2607][Dataproxy] Metric public capabilities are extracted to common and pulsar sink metric is added (#2608)
No new revisions were added by this update.
Summary of changes:
.../inlong/agent/core/job/JobJmxMetrics.java | 12 +-
.../inlong/agent/core/task/TaskJmxMetrics.java | 12 +-
.../agent/plugin/metrics/PluginJmxMetric.java | 8 +-
.../inlong/agent/plugin/metrics/SinkJmxMetric.java | 8 +-
.../agent/plugin/metrics/SourceJmxMetric.java | 8 +-
inlong-common/pom.xml | 53 +++++++-
.../inlong/commons/metrics/ChannelMetric.java | 58 ---------
.../commons/metrics/ChannelMetricResult.java | 72 ----------
.../commons/metrics/DataProxyDynamicMBean.java | 130 ------------------
.../org/apache/inlong/commons/metrics/Metric.java | 57 --------
.../inlong/commons/metrics/MetricException.java | 30 -----
.../inlong/commons}/metrics/MetricItemValue.java | 6 +-
.../inlong/commons}/metrics/MetricListener.java | 2 +-
.../commons}/metrics/MetricListenerRunnable.java | 44 ++++---
.../inlong/commons}/metrics/MetricObserver.java | 63 ++++++---
.../inlong/commons/metrics/MetricSnapshot.java | 23 ----
.../org/apache/inlong/commons/metrics/Metrics.java | 43 ------
.../inlong/commons/metrics/MetricsRegister.java | 145 ---------------------
.../inlong/commons/metrics/MutableMetric.java | 26 ----
.../inlong/commons/metrics/ResourceUsage.java | 66 ----------
.../org/apache/inlong/commons/metrics/Tag.java | 42 ------
.../inlong/commons/metrics/WaterMarkMetric.java | 52 --------
.../inlong/commons/metrics/counter/Counter.java | 35 -----
.../inlong/commons/metrics/counter/CounterInt.java | 42 ------
.../commons/metrics/counter/CounterLong.java | 42 ------
.../apache/inlong/commons/metrics/gauge/Gauge.java | 49 -------
.../inlong/commons/metrics/gauge/GaugeInt.java | 58 ---------
.../inlong/commons/metrics/gauge/GaugeLong.java | 57 --------
.../inlong/commons/metrics/meta/MetricMeta.java | 93 -------------
.../inlong/commons/metrics/meta/MetricsMeta.java | 60 ---------
.../metrics => metrics/metric}/CountMetric.java | 2 +-
.../metrics => metrics/metric}/Dimension.java | 2 +-
.../metrics => metrics/metric}/GaugeMetric.java | 2 +-
.../metrics => metrics/metric}/MetricDomain.java | 2 +-
.../metrics => metrics/metric}/MetricItem.java | 2 +-
.../metric}/MetricItemMBean.java | 2 +-
.../metrics => metrics/metric}/MetricItemSet.java | 4 +-
.../metric}/MetricItemSetMBean.java | 2 +-
.../metrics => metrics/metric}/MetricRegister.java | 2 +-
.../metrics => metrics/metric}/MetricUtils.java | 2 +-
.../metrics => metrics/metric}/MetricValue.java | 2 +-
.../org/apache/inlong/commons/util/MetricUtil.java | 92 -------------
.../metric}/item/AgentMetricItem.java | 12 +-
.../metric}/item/TestMetricItemMBean.java | 10 +-
.../metric}/set/DataProxyMetricItem.java | 10 +-
.../metric}/set/DataProxyMetricItemSet.java | 4 +-
.../metric}/set/TestMetricItemSetMBean.java | 14 +-
.../inlong/dataproxy/http/SimpleHttpSource.java | 3 -
.../dataproxy/metrics/DataProxyMetricItem.java | 8 +-
.../dataproxy/metrics/DataProxyMetricItemSet.java | 4 +-
.../inlong/dataproxy/metrics/WaterMarkServlet.java | 111 ----------------
.../prometheus/PrometheusMetricListener.java | 10 +-
.../apache/inlong/dataproxy/node/Application.java | 2 +-
.../org/apache/inlong/dataproxy/sink/MetaSink.java | 30 +++--
.../apache/inlong/dataproxy/sink/PulsarSink.java | 82 ++++++++++--
.../dataproxy/sink/SimpleMessageTubeSink.java | 2 +-
.../apache/inlong/dataproxy/sink/SinkContext.java | 2 +-
.../federation/PulsarFederationSinkContext.java | 2 +-
.../inlong/dataproxy/source/SimpleTcpSource.java | 2 +-
.../inlong/dataproxy/source/SourceContext.java | 2 +-
.../TestClassResourceCommonPropertiesLoader.java | 2 +-
.../metrics/TestDataProxyMetricItemSet.java | 12 +-
.../metrics/TestMetricListenerRunnable.java | 22 +++-
.../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 | 8 +-
.../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 | 2 +-
.../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 +-
81 files changed, 361 insertions(+), 1579 deletions(-)
delete mode 100644 inlong-common/src/main/java/org/apache/inlong/commons/metrics/ChannelMetric.java
delete mode 100644 inlong-common/src/main/java/org/apache/inlong/commons/metrics/ChannelMetricResult.java
delete mode 100644 inlong-common/src/main/java/org/apache/inlong/commons/metrics/DataProxyDynamicMBean.java
delete mode 100644 inlong-common/src/main/java/org/apache/inlong/commons/metrics/Metric.java
delete mode 100644 inlong-common/src/main/java/org/apache/inlong/commons/metrics/MetricException.java
rename {inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy => inlong-common/src/main/java/org/apache/inlong/commons}/metrics/MetricItemValue.java (92%)
rename {inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy => inlong-common/src/main/java/org/apache/inlong/commons}/metrics/MetricListener.java (96%)
rename {inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy => inlong-common/src/main/java/org/apache/inlong/commons}/metrics/MetricListenerRunnable.java (78%)
rename {inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy => inlong-common/src/main/java/org/apache/inlong/commons}/metrics/MetricObserver.java (65%)
delete mode 100644 inlong-common/src/main/java/org/apache/inlong/commons/metrics/MetricSnapshot.java
delete mode 100644 inlong-common/src/main/java/org/apache/inlong/commons/metrics/Metrics.java
delete mode 100644 inlong-common/src/main/java/org/apache/inlong/commons/metrics/MetricsRegister.java
delete mode 100644 inlong-common/src/main/java/org/apache/inlong/commons/metrics/MutableMetric.java
delete mode 100644 inlong-common/src/main/java/org/apache/inlong/commons/metrics/ResourceUsage.java
delete mode 100755 inlong-common/src/main/java/org/apache/inlong/commons/metrics/Tag.java
delete mode 100644 inlong-common/src/main/java/org/apache/inlong/commons/metrics/WaterMarkMetric.java
delete mode 100644 inlong-common/src/main/java/org/apache/inlong/commons/metrics/counter/Counter.java
delete mode 100644 inlong-common/src/main/java/org/apache/inlong/commons/metrics/counter/CounterInt.java
delete mode 100644 inlong-common/src/main/java/org/apache/inlong/commons/metrics/counter/CounterLong.java
delete mode 100644 inlong-common/src/main/java/org/apache/inlong/commons/metrics/gauge/Gauge.java
delete mode 100644 inlong-common/src/main/java/org/apache/inlong/commons/metrics/gauge/GaugeInt.java
delete mode 100644 inlong-common/src/main/java/org/apache/inlong/commons/metrics/gauge/GaugeLong.java
delete mode 100644 inlong-common/src/main/java/org/apache/inlong/commons/metrics/meta/MetricMeta.java
delete mode 100644 inlong-common/src/main/java/org/apache/inlong/commons/metrics/meta/MetricsMeta.java
rename inlong-common/src/main/java/org/apache/inlong/commons/{config/metrics => metrics/metric}/CountMetric.java (96%)
rename inlong-common/src/main/java/org/apache/inlong/commons/{config/metrics => metrics/metric}/Dimension.java (96%)
rename inlong-common/src/main/java/org/apache/inlong/commons/{config/metrics => metrics/metric}/GaugeMetric.java (96%)
rename inlong-common/src/main/java/org/apache/inlong/commons/{config/metrics => metrics/metric}/MetricDomain.java (96%)
rename inlong-common/src/main/java/org/apache/inlong/commons/{config/metrics => metrics/metric}/MetricItem.java (99%)
rename inlong-common/src/main/java/org/apache/inlong/commons/{config/metrics => metrics/metric}/MetricItemMBean.java (97%)
rename inlong-common/src/main/java/org/apache/inlong/commons/{config/metrics => metrics/metric}/MetricItemSet.java (96%)
rename inlong-common/src/main/java/org/apache/inlong/commons/{config/metrics => metrics/metric}/MetricItemSetMBean.java (96%)
rename inlong-common/src/main/java/org/apache/inlong/commons/{config/metrics => metrics/metric}/MetricRegister.java (98%)
rename inlong-common/src/main/java/org/apache/inlong/commons/{config/metrics => metrics/metric}/MetricUtils.java (98%)
rename inlong-common/src/main/java/org/apache/inlong/commons/{config/metrics => metrics/metric}/MetricValue.java (96%)
delete mode 100644 inlong-common/src/main/java/org/apache/inlong/commons/util/MetricUtil.java
rename inlong-common/src/test/java/org/apache/inlong/commons/{config/metrics => metrics/metric}/item/AgentMetricItem.java (81%)
rename inlong-common/src/test/java/org/apache/inlong/commons/{config/metrics => metrics/metric}/item/TestMetricItemMBean.java (93%)
rename inlong-common/src/test/java/org/apache/inlong/commons/{config/metrics => metrics/metric}/set/DataProxyMetricItem.java (89%)
rename inlong-common/src/test/java/org/apache/inlong/commons/{config/metrics => metrics/metric}/set/DataProxyMetricItemSet.java (93%)
rename inlong-common/src/test/java/org/apache/inlong/commons/{config/metrics => metrics/metric}/set/TestMetricItemSetMBean.java (94%)
delete mode 100644 inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/metrics/WaterMarkServlet.java