This is an automated email from the ASF dual-hosted git repository.
liubao pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/servicecomb-java-chassis.git
from d5f5714d1 fix: fix loaded variable not assigned (#4065)
new 7bc6d7f84 [SCB-2838]using micrometer to replace spectator part1:
MetricsInitializer
new a16d5bd40 [SCB-2838]using micrometer to replace spectator part2:
InvocationMeter
new 611517baf [SCB-2838]using micrometer to replace spectator part3:
EndpointMeter
new 07e85f0ac [SCB-2838]using micrometer to replace spectator part3:
OsMeter
new 1ac6afbfe [SCB-2838]using micrometer to replace spectator part3:
ThreadPool
new 82d443243 [SCB-2838]using micrometer to replace spectator part4:
remove spectator and fix UT
new 3b349b3ef [SCB-2838]using micrometer to replace spectator part5:
configure meter registry
new 26b990fd5 [SCB-2838]using micrometer to replace spectator part6:
thread pool and endpoint improvement
new a88817437 [SCB-2838]using micrometer to replace spectator part7: use
step histogram
new f9b3c9f16 [SCB-2838]fix test case in linux not mock
new 32397b91e [SCB-2838]fix checkstyle
The 11 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
dependencies/default/pom.xml | 7 -
foundations/foundation-metrics/pom.xml | 4 +-
.../com/netflix/spectator/api/SpectatorUtils.java | 39 --
.../foundation/metrics/MetricsBootstrap.java | 38 +-
.../foundation/metrics/MetricsInitializer.java | 9 +-
.../foundation/metrics/PolledEvent.java | 17 +-
.../metrics/meter/AbstractPeriodMeter.java | 42 --
.../metrics/meter/LatencyDistributionConfig.java | 4 +-
.../metrics/meter/LatencyDistributionMeter.java | 60 ---
.../metrics/meter/LatencyScopeMeter.java | 12 +-
.../foundation/metrics/meter/PeriodMeter.java | 11 +-
.../foundation/metrics/meter/SimpleTimer.java | 93 -----
.../publish/{spectator => }/DefaultTagFinder.java | 7 +-
.../{spectator => }/MeasurementGroupConfig.java | 2 +-
.../publish/{spectator => }/MeasurementNode.java | 27 +-
.../publish/{spectator => }/MeasurementTree.java | 49 ++-
.../metrics/publish/{spectator => }/TagFinder.java | 4 +-
.../metrics/registry/GlobalRegistry.java | 114 ------
.../foundation/metrics/TestMetricsBootstrap.java | 20 +-
.../meter/TestLatencyDistributionMeter.java | 47 ---
.../foundation/metrics/meter/TestSimpleTimer.java | 40 --
.../publish/spectator/TestDefaultTagFinder.java | 12 +-
.../spectator/TestMeasurementGroupConfig.java | 2 +
.../publish/spectator/TestMeasurementNode.java | 29 +-
.../publish/spectator/TestMeasurementTree.java | 39 +-
.../metrics/publish/spectator/TestTagFinder.java | 2 +
foundations/foundation-test-scaffolding/pom.xml | 4 +-
.../metric/DefaultClientEndpointMetricManager.java | 5 +-
.../monitor/MetricsMonitorDataProvider.java | 29 +-
.../ThreadPoolMonitorPublishModelFactory.java | 84 ----
.../metrics/core/DefaultRegistryInitializer.java | 63 ---
.../metrics/core/InvocationMetersInitializer.java | 14 +-
.../metrics/core/MetricsBootListener.java | 11 +-
.../metrics/core/MetricsCoreConfiguration.java | 37 +-
.../metrics/core/OsMetersInitializer.java | 21 +-
.../metrics/core/SimpleMeterRegistryExt.java | 63 +++
.../metrics/core/StepDistributionSummaryExt.java} | 20 +-
.../metrics/core/ThreadPoolMetersInitializer.java | 43 +--
.../metrics/core/VertxMetersInitializer.java | 41 +-
.../metrics/core/meter/ConsumerMeters.java | 6 +-
.../servicecomb/metrics/core/meter/EdgeMeters.java | 6 +-
.../metrics/core/meter/ProducerMeters.java | 6 +-
.../ThreadPoolMonitorPublishModelFactory.java | 71 ++++
.../meter/invocation/AbstractInvocationMeter.java | 111 +++---
.../meter/invocation/AbstractInvocationMeters.java | 30 +-
.../meter/invocation/ConsumerInvocationMeter.java | 66 ++--
.../meter/invocation/ConsumerInvocationMeters.java | 12 +-
.../core/meter/invocation/EdgeInvocationMeter.java | 54 +--
.../meter/invocation/EdgeInvocationMeters.java | 12 +-
.../meter/invocation/MeterInvocationConst.java | 6 +-
.../meter/invocation/ProducerInvocationMeter.java | 69 ++--
.../meter/invocation/ProducerInvocationMeters.java | 12 +-
.../metrics/core/meter/os/CpuMeter.java | 41 +-
.../metrics/core/meter/os/NetMeter.java | 60 ++-
.../servicecomb/metrics/core/meter/os/OsMeter.java | 32 +-
.../core/meter/os/cpu/AbstractCpuUsage.java | 12 -
.../metrics/core/meter/os/cpu/OsCpuUsage.java | 5 +-
.../metrics/core/meter/os/cpu/ProcessCpuUsage.java | 5 +-
.../metrics/core/meter/os/net/InterfaceUsage.java | 74 ++--
.../metrics/core/meter/os/net/NetStat.java | 10 +-
.../metrics/core/meter/pool/ThreadPoolMeter.java | 102 +++++
.../metrics/core/meter/vertx/EndpointMeter.java | 141 ++++---
.../core/meter/vertx/HttpClientEndpointMeter.java | 25 +-
.../core/meter/vertx/HttpClientEndpointsMeter.java | 15 +-
.../core/meter/vertx/ServerEndpointMeter.java | 31 +-
.../core/meter/vertx/ServerEndpointsMeter.java | 12 +-
.../core/meter/vertx/VertxEndpointsMeter.java | 61 ++-
.../AbstractMeasurementNodeLogPublisher.java | 4 +-
.../core/publish/ClientEndpointsLogPublisher.java | 4 +-
.../metrics/core/publish/DefaultLogPublisher.java | 77 ++--
.../metrics/core/publish/PublishModelFactory.java | 30 +-
.../metrics/core/publish/PublishUtils.java | 18 +-
.../core/publish/ServerEndpointsLogPublisher.java | 4 +-
.../core/publish/model/invocation/PerfInfo.java | 16 +-
.../servicecomb/metrics/core/AssertUtil.java | 12 +-
.../core/TestDefaultRegistryInitializer.java | 73 ----
.../core/TestInvocationMetersInitializer.java | 430 +++++++++++++--------
.../metrics/core/TestOsMeterInitializer.java | 48 ++-
.../core/TestThreadPoolMetersInitializer.java | 58 ++-
.../metrics/core/TestVertxMetersInitializer.java | 42 +-
.../metrics/core/meter/os/TestCpuMeter.java | 42 +-
.../metrics/core/meter/os/TestNetMeter.java | 214 +++++-----
.../metrics/core/meter/os/TestOsMeter.java | 38 +-
.../core/publish/TestDefaultLogPublisher.java | 65 ++--
.../publish/TestInvocationPublishModelFactory.java | 239 ++++++------
.../metrics/core/publish/TestPublishUtils.java | 19 +-
.../publish/TestThreadPoolPublishModelFactory.java | 35 +-
.../model/invocation/TestOperationPerf.java | 4 +-
.../model/invocation/TestOperationPerfGroup.java | 4 +-
.../publish/model/invocation/TestPerfInfo.java | 16 +-
.../core/publish/model/invocation/Utils.java | 45 +--
.../metrics/prometheus/PrometheusPublisher.java | 43 +--
.../prometheus/TestPrometheusPublisher.java | 23 +-
.../basic/integration/MetricsEndpointImpl.java | 47 +--
.../basic/integration/TestMetricsEndpointImpl.java | 49 +--
95 files changed, 1844 insertions(+), 2107 deletions(-)
delete mode 100644
foundations/foundation-metrics/src/main/java/com/netflix/spectator/api/SpectatorUtils.java
delete mode 100644
foundations/foundation-metrics/src/main/java/org/apache/servicecomb/foundation/metrics/meter/AbstractPeriodMeter.java
delete mode 100644
foundations/foundation-metrics/src/main/java/org/apache/servicecomb/foundation/metrics/meter/LatencyDistributionMeter.java
delete mode 100644
foundations/foundation-metrics/src/main/java/org/apache/servicecomb/foundation/metrics/meter/SimpleTimer.java
rename
foundations/foundation-metrics/src/main/java/org/apache/servicecomb/foundation/metrics/publish/{spectator
=> }/DefaultTagFinder.java (90%)
rename
foundations/foundation-metrics/src/main/java/org/apache/servicecomb/foundation/metrics/publish/{spectator
=> }/MeasurementGroupConfig.java (95%)
rename
foundations/foundation-metrics/src/main/java/org/apache/servicecomb/foundation/metrics/publish/{spectator
=> }/MeasurementNode.java (79%)
rename
foundations/foundation-metrics/src/main/java/org/apache/servicecomb/foundation/metrics/publish/{spectator
=> }/MeasurementTree.java (52%)
rename
foundations/foundation-metrics/src/main/java/org/apache/servicecomb/foundation/metrics/publish/{spectator
=> }/TagFinder.java (92%)
delete mode 100644
foundations/foundation-metrics/src/main/java/org/apache/servicecomb/foundation/metrics/registry/GlobalRegistry.java
delete mode 100644
foundations/foundation-metrics/src/test/java/org/apache/servicecomb/foundation/metrics/meter/TestLatencyDistributionMeter.java
delete mode 100644
foundations/foundation-metrics/src/test/java/org/apache/servicecomb/foundation/metrics/meter/TestSimpleTimer.java
delete mode 100644
metrics/metrics-core/src/main/java/com/netflix/spectator/api/patterns/ThreadPoolMonitorPublishModelFactory.java
delete mode 100644
metrics/metrics-core/src/main/java/org/apache/servicecomb/metrics/core/DefaultRegistryInitializer.java
create mode 100644
metrics/metrics-core/src/main/java/org/apache/servicecomb/metrics/core/SimpleMeterRegistryExt.java
copy
metrics/metrics-core/src/{test/java/org/apache/servicecomb/metrics/core/AssertUtil.java
=>
main/java/org/apache/servicecomb/metrics/core/StepDistributionSummaryExt.java}
(59%)
create mode 100644
metrics/metrics-core/src/main/java/org/apache/servicecomb/metrics/core/meter/ThreadPoolMonitorPublishModelFactory.java
create mode 100644
metrics/metrics-core/src/main/java/org/apache/servicecomb/metrics/core/meter/pool/ThreadPoolMeter.java
delete mode 100644
metrics/metrics-core/src/test/java/org/apache/servicecomb/metrics/core/TestDefaultRegistryInitializer.java
