You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by pa...@apache.org on 2021/08/02 09:50:25 UTC
[shardingsphere] branch master updated (384242d -> fcad18c)
This is an automated email from the ASF dual-hosted git repository.
panjuan pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git.
from 384242d Fix start error with autoTables rule configuration. (#11597)
add fcad18c Refactor the metrics module in agent plugin and add transfer bytes metrics (#11585)
No new revisions were added by this update.
Summary of changes:
.../agent/core/entity/InterceptorConvertTest.java | 2 +-
.../shardingsphere-agent-metrics-api/pom.xml | 6 +
.../agent/metrics/api/MetricsPool.java | 60 ++++++
.../agent/metrics/api/MetricsRegister.java | 100 ---------
.../agent/metrics/api/MetricsWrapper.java | 111 ++++++++++
.../MetricType.java => MetricsWrapperFactory.java} | 28 +--
.../metrics/api/advice/ChannelHandlerAdvice.java | 37 ++--
.../api/advice/CommandExecutorTaskAdvice.java | 22 +-
.../agent/metrics/api/advice/DataSourceAdvice.java | 9 +-
...ansactionAdvice.java => PacketCodecAdvice.java} | 39 ++--
.../metrics/api/advice/SQLRouteEngineAdvice.java | 49 ++---
.../metrics/api/advice/TransactionAdvice.java | 25 +--
.../agent/metrics/api/constant/MetricIds.java | 51 +++++
.../definition/MetricsPluginDefinitionService.java | 4 +-
.../metrics/api/reporter/MetricsReporter.java | 232 ---------------------
.../src/main/resources/interceptors.yaml | 7 +
...icsAdviceBaseTest.java => MetricsPoolTest.java} | 26 +--
.../agent/metrics/api/MetricsWrapperTest.java | 53 +++++
.../api/advice/ChannelHandlerAdviceTest.java | 29 ++-
.../api/advice/CommandExecutorTaskAdviceTest.java | 32 +--
.../metrics/api/advice/DataSourceAdviceTest.java | 49 +++++
.../metrics/api/advice/MetricsAdviceBaseTest.java | 10 +-
.../metrics/api/advice/PacketCodecAdviceTest.java | 71 +++++++
.../api/advice/SQLRouteEngineAdviceTest.java | 90 ++++++++
.../metrics/api/advice/TransactionAdviceTest.java | 26 ++-
.../agent/metrics/api/constant/MetricIdsTest.java} | 29 +--
.../MetricsPluginDefinitionServiceTest.java | 2 +-
.../api/fixture/FixtureMetricsRegister.java | 93 ---------
.../agent/metrics/api/fixture/FixtureWrapper.java | 85 ++++++++
.../api/fixture/FixtureWrapperFactory.java} | 32 +--
.../handler/PrometheusMetricsHandler.java | 44 ++++
.../prometheus/hikari/HikariSimpleMetrics.java | 24 +--
.../register/PrometheusMetricsRegister.java | 146 -------------
.../service/PrometheusPluginBootService.java | 6 +-
.../prometheus/wrapper/CounterWrapper.java} | 31 ++-
.../prometheus/wrapper/DelegateWrapper.java} | 28 +--
.../metrics/prometheus/wrapper/GaugeWrapper.java} | 31 ++-
.../prometheus/wrapper/HistogramWrapper.java} | 28 +--
.../wrapper/PrometheusWrapperFactory.java | 172 +++++++++++++++
.../prometheus/wrapper/SummaryWrapper.java} | 23 +-
.../src/main/resources/metrics.yaml | 100 +++++++++
.../collector/ProxyInfoCollectorTest.java} | 30 ++-
.../handler/PrometheusMetricsHandlerTest.java} | 31 ++-
.../hikari/HikariMetricsTrackerFactoryTest.java | 61 ++++++
.../hikari/HikariMetricsTrackerTest.java | 60 ++++++
.../hikari/HikariPoolStatCollectorTest.java | 56 +++++
.../prometheus/hikari/HikariSimpleMetricsTest.java | 44 ++++
.../register/PrometheusMetricsRegisterTest.java | 101 ---------
.../metrics/prometheus/util/ReflectiveUtil.java | 20 ++
.../prometheus/wrapper/CounterWrapperTest.java} | 28 +--
.../prometheus/wrapper/DelegateWrapperTest.java} | 35 ++--
.../prometheus/wrapper/GaugeWrapperTest.java} | 26 +--
.../prometheus/wrapper/HistogramWrapperTest.java} | 26 +--
.../wrapper/PrometheusWrapperFactoryTest.java | 45 ++++
.../prometheus/wrapper/SummaryWrapperTest.java} | 26 +--
.../src/test/resources/metrics.yaml | 62 ++++++
.../agent/test/metrics/MetricsPluginIT.java | 51 +++--
57 files changed, 1630 insertions(+), 1114 deletions(-)
create mode 100644 shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-metrics/shardingsphere-agent-metrics-api/src/main/java/org/apache/shardingsphere/agent/metrics/api/MetricsPool.java
delete mode 100644 shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-metrics/shardingsphere-agent-metrics-api/src/main/java/org/apache/shardingsphere/agent/metrics/api/MetricsRegister.java
create mode 100644 shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-metrics/shardingsphere-agent-metrics-api/src/main/java/org/apache/shardingsphere/agent/metrics/api/MetricsWrapper.java
copy shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-metrics/shardingsphere-agent-metrics-api/src/main/java/org/apache/shardingsphere/agent/metrics/api/{enums/MetricType.java => MetricsWrapperFactory.java} (70%)
copy shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-metrics/shardingsphere-agent-metrics-api/src/main/java/org/apache/shardingsphere/agent/metrics/api/advice/{TransactionAdvice.java => PacketCodecAdvice.java} (55%)
create mode 100644 shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-metrics/shardingsphere-agent-metrics-api/src/main/java/org/apache/shardingsphere/agent/metrics/api/constant/MetricIds.java
delete mode 100644 shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-metrics/shardingsphere-agent-metrics-api/src/main/java/org/apache/shardingsphere/agent/metrics/api/reporter/MetricsReporter.java
copy shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-metrics/shardingsphere-agent-metrics-api/src/test/java/org/apache/shardingsphere/agent/metrics/api/{advice/MetricsAdviceBaseTest.java => MetricsPoolTest.java} (64%)
create mode 100644 shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-metrics/shardingsphere-agent-metrics-api/src/test/java/org/apache/shardingsphere/agent/metrics/api/MetricsWrapperTest.java
create mode 100644 shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-metrics/shardingsphere-agent-metrics-api/src/test/java/org/apache/shardingsphere/agent/metrics/api/advice/DataSourceAdviceTest.java
create mode 100644 shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-metrics/shardingsphere-agent-metrics-api/src/test/java/org/apache/shardingsphere/agent/metrics/api/advice/PacketCodecAdviceTest.java
create mode 100644 shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-metrics/shardingsphere-agent-metrics-api/src/test/java/org/apache/shardingsphere/agent/metrics/api/advice/SQLRouteEngineAdviceTest.java
rename shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-metrics/shardingsphere-agent-metrics-api/src/{main/java/org/apache/shardingsphere/agent/metrics/api/constant/MethodNameConstant.java => test/java/org/apache/shardingsphere/agent/metrics/api/constant/MetricIdsTest.java} (57%)
delete mode 100644 shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-metrics/shardingsphere-agent-metrics-api/src/test/java/org/apache/shardingsphere/agent/metrics/api/fixture/FixtureMetricsRegister.java
create mode 100644 shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-metrics/shardingsphere-agent-metrics-api/src/test/java/org/apache/shardingsphere/agent/metrics/api/fixture/FixtureWrapper.java
copy shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-metrics/shardingsphere-agent-metrics-api/src/{main/java/org/apache/shardingsphere/agent/metrics/api/enums/MetricType.java => test/java/org/apache/shardingsphere/agent/metrics/api/fixture/FixtureWrapperFactory.java} (63%)
create mode 100644 shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-metrics/shardingsphere-agent-metrics-prometheus/src/main/java/org/apache/shardingsphere/agent/metrics/prometheus/handler/PrometheusMetricsHandler.java
delete mode 100644 shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-metrics/shardingsphere-agent-metrics-prometheus/src/main/java/org/apache/shardingsphere/agent/metrics/prometheus/register/PrometheusMetricsRegister.java
copy shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-metrics/{shardingsphere-agent-metrics-api/src/main/java/org/apache/shardingsphere/agent/metrics/api/enums/MetricType.java => shardingsphere-agent-metrics-prometheus/src/main/java/org/apache/shardingsphere/agent/metrics/prometheus/wrapper/CounterWrapper.java} (62%)
copy shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-metrics/{shardingsphere-agent-metrics-api/src/main/java/org/apache/shardingsphere/agent/metrics/api/enums/MetricType.java => shardingsphere-agent-metrics-prometheus/src/main/java/org/apache/shardingsphere/agent/metrics/prometheus/wrapper/DelegateWrapper.java} (65%)
copy shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-metrics/{shardingsphere-agent-metrics-api/src/main/java/org/apache/shardingsphere/agent/metrics/api/enums/MetricType.java => shardingsphere-agent-metrics-prometheus/src/main/java/org/apache/shardingsphere/agent/metrics/prometheus/wrapper/GaugeWrapper.java} (64%)
copy shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-metrics/{shardingsphere-agent-metrics-api/src/main/java/org/apache/shardingsphere/agent/metrics/api/enums/MetricType.java => shardingsphere-agent-metrics-prometheus/src/main/java/org/apache/shardingsphere/agent/metrics/prometheus/wrapper/HistogramWrapper.java} (67%)
create mode 100644 shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-metrics/shardingsphere-agent-metrics-prometheus/src/main/java/org/apache/shardingsphere/agent/metrics/prometheus/wrapper/PrometheusWrapperFactory.java
copy shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-metrics/{shardingsphere-agent-metrics-api/src/main/java/org/apache/shardingsphere/agent/metrics/api/entity/Metric.java => shardingsphere-agent-metrics-prometheus/src/main/java/org/apache/shardingsphere/agent/metrics/prometheus/wrapper/SummaryWrapper.java} (68%)
create mode 100644 shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-metrics/shardingsphere-agent-metrics-prometheus/src/main/resources/metrics.yaml
rename shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-metrics/{shardingsphere-agent-metrics-api/src/main/java/org/apache/shardingsphere/agent/metrics/api/entity/Metric.java => shardingsphere-agent-metrics-prometheus/src/test/java/org/apache/shardingsphere/agent/metrics/prometheus/collector/ProxyInfoCollectorTest.java} (62%)
copy shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-metrics/{shardingsphere-agent-metrics-api/src/test/java/org/apache/shardingsphere/agent/metrics/api/definition/MetricsPluginDefinitionServiceTest.java => shardingsphere-agent-metrics-prometheus/src/test/java/org/apache/shardingsphere/agent/metrics/prometheus/handler/PrometheusMetricsHandlerTest.java} (50%)
create mode 100644 shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-metrics/shardingsphere-agent-metrics-prometheus/src/test/java/org/apache/shardingsphere/agent/metrics/prometheus/hikari/HikariMetricsTrackerFactoryTest.java
create mode 100644 shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-metrics/shardingsphere-agent-metrics-prometheus/src/test/java/org/apache/shardingsphere/agent/metrics/prometheus/hikari/HikariMetricsTrackerTest.java
create mode 100644 shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-metrics/shardingsphere-agent-metrics-prometheus/src/test/java/org/apache/shardingsphere/agent/metrics/prometheus/hikari/HikariPoolStatCollectorTest.java
create mode 100644 shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-metrics/shardingsphere-agent-metrics-prometheus/src/test/java/org/apache/shardingsphere/agent/metrics/prometheus/hikari/HikariSimpleMetricsTest.java
delete mode 100644 shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-metrics/shardingsphere-agent-metrics-prometheus/src/test/java/org/apache/shardingsphere/agent/metrics/prometheus/register/PrometheusMetricsRegisterTest.java
copy shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-metrics/{shardingsphere-agent-metrics-api/src/test/java/org/apache/shardingsphere/agent/metrics/api/advice/MetricsAdviceBaseTest.java => shardingsphere-agent-metrics-prometheus/src/test/java/org/apache/shardingsphere/agent/metrics/prometheus/wrapper/CounterWrapperTest.java} (53%)
rename shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-metrics/{shardingsphere-agent-metrics-api/src/main/java/org/apache/shardingsphere/agent/metrics/api/enums/MetricType.java => shardingsphere-agent-metrics-prometheus/src/test/java/org/apache/shardingsphere/agent/metrics/prometheus/wrapper/DelegateWrapperTest.java} (66%)
copy shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-metrics/{shardingsphere-agent-metrics-api/src/test/java/org/apache/shardingsphere/agent/metrics/api/advice/MetricsAdviceBaseTest.java => shardingsphere-agent-metrics-prometheus/src/test/java/org/apache/shardingsphere/agent/metrics/prometheus/wrapper/GaugeWrapperTest.java} (55%)
copy shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-metrics/{shardingsphere-agent-metrics-api/src/test/java/org/apache/shardingsphere/agent/metrics/api/advice/MetricsAdviceBaseTest.java => shardingsphere-agent-metrics-prometheus/src/test/java/org/apache/shardingsphere/agent/metrics/prometheus/wrapper/HistogramWrapperTest.java} (54%)
create mode 100644 shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-metrics/shardingsphere-agent-metrics-prometheus/src/test/java/org/apache/shardingsphere/agent/metrics/prometheus/wrapper/PrometheusWrapperFactoryTest.java
copy shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-metrics/{shardingsphere-agent-metrics-api/src/test/java/org/apache/shardingsphere/agent/metrics/api/advice/MetricsAdviceBaseTest.java => shardingsphere-agent-metrics-prometheus/src/test/java/org/apache/shardingsphere/agent/metrics/prometheus/wrapper/SummaryWrapperTest.java} (55%)
create mode 100644 shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-metrics/shardingsphere-agent-metrics-prometheus/src/test/resources/metrics.yaml