This is an automated email from the ASF dual-hosted git repository.
ningjiang pushed a change to branch master
in repository
https://gitbox.apache.org/repos/asf/incubator-servicecomb-java-chassis.git.
from b0f8224 Only deploy the snapshot for push request
new 0983559 SCB-327 adjust metrics publish format to spring cloud netflix
style
new 928108a SCB-327 adjust health check package
new aef846b SCB-327 remove spring dependency and use SPI mechanism
new c205240 SCB-327 refactor metrics simplify monitors in order to
improve implement
new 33d4c10 SCB-327 fix pr comment
new f9ca59a SCB-327 minor refactor and improve performance
new f55177e SCB-327 improve test case and fix pr comment
The 7 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:
.../common/rest/AbstractRestInvocation.java | 8 +-
.../org/apache/servicecomb/core/Invocation.java | 26 +-
.../core/metrics/InvocationFinishedEvent.java | 27 +-
.../metrics/InvocationStartExecutionEvent.java | 13 +-
.../metrics/InvocationStartProcessingEvent.java | 48 ---
.../core/metrics/InvocationStartedEvent.java | 3 +-
.../core/provider/consumer/InvokerUtils.java | 16 +-
demo/demo-springmvc/springmvc-client/pom.xml | 6 -
.../demo/springmvc/client/SpringmvcClient.java | 35 +--
.../META-INF/spring/springmvc.client.bean.xml | 16 +-
.../src/main/resources/microservice.yaml | 4 +
.../org/apache/servicecomb/demo/perf/PerfMain.java | 6 +-
.../demo/perf/PerfMetricsFilePublisher.java | 132 ++++-----
.../servicecomb/foundation/common/event/Event.java | 22 --
.../foundation/common/event/EventBus.java | 35 ++-
.../foundation/common/event/EventListener.java | 8 +-
.../foundation/common/utils/EventUtils.java | 38 ---
.../foundation/common/event/TestEventBus.java | 47 ++-
.../foundation/metrics}/MetricsConst.java | 26 +-
.../metrics/health}/HealthCheckResult.java | 2 +-
.../foundation/metrics/health}/HealthChecker.java | 2 +-
.../metrics/health/HealthCheckerManager.java | 44 ++-
.../foundation/metrics/publish/Metric.java | 81 ++++++
.../foundation/metrics/publish/MetricNode.java | 145 +++++++++
.../foundation/metrics/publish/MetricsLoader.java | 62 ++++
.../metrics/health/TestHealthCheckerManager.java | 95 ++++++
.../foundation/metrics/publish/TestMetricNode.java | 90 ++++++
.../metrics/publish/TestMetricsLoader.java | 41 +--
metrics/metrics-common/pom.xml | 39 ---
.../servicecomb/metrics/common/CallMetric.java | 92 ------
.../metrics/common/ConsumerInvocationMetric.java | 59 ----
.../common/DefaultHealthCheckExtraData.java | 69 -----
.../metrics/common/DoubleMetricValue.java | 56 ----
.../metrics/common/HealthCheckerPublisher.java | 26 --
.../servicecomb/metrics/common/InstanceMetric.java | 59 ----
.../metrics/common/LongMetricValue.java | 56 ----
.../servicecomb/metrics/common/MetricValue.java | 70 -----
.../metrics/common/MetricsDimension.java | 46 ---
.../metrics/common/MetricsPublisher.java | 59 ----
.../metrics/common/ProducerInvocationMetric.java | 89 ------
.../servicecomb/metrics/common/RegistryMetric.java | 91 ------
.../servicecomb/metrics/common/SystemMetric.java | 119 --------
.../servicecomb/metrics/common/TimerMetric.java | 99 -------
metrics/metrics-core/pom.xml | 2 +-
.../metrics/core/AbstractInvocationMetrics.java | 73 +++++
...sConfig.java => ConsumerInvocationMetrics.java} | 15 +-
.../metrics/core/InvocationMetricsManager.java | 85 ++++++
.../servicecomb/metrics/core/MetricsConfig.java | 4 +-
.../servicecomb/metrics/core/MonitorManager.java | 185 ++++++++++++
.../metrics/core/ProducerInvocationMetrics.java | 23 +-
...efaultSystemMonitor.java => SystemMetrics.java} | 29 +-
.../core/event/DefaultEventListenerManager.java | 53 ----
.../event/InvocationFinishedEventListener.java | 37 +--
... => InvocationStartExecutionEventListener.java} | 14 +-
.../InvocationStartProcessingEventListener.java | 49 ----
.../core/event/InvocationStartedEventListener.java | 29 +-
.../event/dimension/CodeGroupStatusConvertor.java | 45 ---
.../core/event/dimension/CodeStatusConvertor.java | 25 --
.../core/event/dimension/StatusConvertor.java | 22 --
.../event/dimension/StatusConvertorFactory.java | 53 ----
.../dimension/SuccessFailedStatusConvertor.java | 28 --
.../health/DefaultMicroserviceHealthChecker.java | 66 -----
.../metrics/core/monitor/CallMonitor.java | 95 ------
.../core/monitor/ConsumerInvocationMonitor.java | 47 ---
.../metrics/core/monitor/InvocationMonitor.java | 37 ---
.../core/monitor/ProducerInvocationMonitor.java | 74 -----
.../metrics/core/monitor/RegistryMonitor.java | 66 -----
.../metrics/core/monitor/SystemMonitor.java | 44 ---
.../metrics/core/monitor/TimerMonitor.java | 66 -----
.../metrics/core/publish/DataSource.java | 62 ----
.../metrics/core/publish/DefaultDataSource.java | 98 -------
.../core/publish/DefaultMetricsPublisher.java | 66 -----
.../metrics/core/publish/HealthCheckerManager.java | 31 --
...rPublisher.java => HealthCheckerPublisher.java} | 38 +--
...CheckerPublisher.java => MetricsPublisher.java} | 31 +-
.../metrics/core/utils/MonitorUtils.java | 70 -----
...rvicecomb.foundation.common.event.EventListener | 37 +++
.../metrics/core/TestEventAndRunner.java | 323 ---------------------
.../metrics/core/TestHealthCheckerManager.java | 104 -------
.../metrics/core/TestHealthCheckerPublisher.java | 65 +++--
.../metrics/core/TestMetricsPublisher.java | 21 +-
.../metrics/core/TestMonitorManager.java | 265 +++++++++++++++++
.../servicecomb/metrics/core/TestPublisher.java | 56 ----
.../metrics/core/TestStatusDimension.java | 159 ----------
.../metrics/prometheus/MetricsCollector.java | 108 ++-----
...icsPublisher.java => MetricsHttpPublisher.java} | 14 +-
metrics/pom.xml | 2 +-
...kerAnnotation.java => CustomHealthChecker.java} | 10 +-
.../extendhealthcheck/MySqlHealthChecker.java | 5 +-
.../SomeServiceWithHealthCheckerManager.java | 35 ---
...icecomb.foundation.metrics.health.HealthChecker | 3 +-
.../samples/mwf/FileContentConvertor.java | 4 +-
.../samples/mwf/SimpleFileContentConvertor.java | 33 ++-
.../samples/mwf/WriteFileInitializer.java | 21 +-
.../servicecomb/samples/mwf/TestWriteFile.java | 174 -----------
tracing/tracing-zipkin/pom.xml | 1 +
.../transport/highway/HighwayServerInvoke.java | 8 +-
97 files changed, 1590 insertions(+), 3627 deletions(-)
rename
metrics/metrics-common/src/main/java/org/apache/servicecomb/metrics/common/InvocationMetric.java
=>
core/src/main/java/org/apache/servicecomb/core/metrics/InvocationStartExecutionEvent.java
(78%)
delete mode 100644
core/src/main/java/org/apache/servicecomb/core/metrics/InvocationStartProcessingEvent.java
delete mode 100644
foundations/foundation-common/src/main/java/org/apache/servicecomb/foundation/common/event/Event.java
delete mode 100644
foundations/foundation-common/src/main/java/org/apache/servicecomb/foundation/common/utils/EventUtils.java
rename
{metrics/metrics-common/src/main/java/org/apache/servicecomb/metrics/common =>
foundations/foundation-metrics/src/main/java/org/apache/servicecomb/foundation/metrics}/MetricsConst.java
(54%)
rename
{metrics/metrics-common/src/main/java/org/apache/servicecomb/metrics/common =>
foundations/foundation-metrics/src/main/java/org/apache/servicecomb/foundation/metrics/health}/HealthCheckResult.java
(96%)
rename
{metrics/metrics-common/src/main/java/org/apache/servicecomb/metrics/common =>
foundations/foundation-metrics/src/main/java/org/apache/servicecomb/foundation/metrics/health}/HealthChecker.java
(93%)
rename
metrics/metrics-core/src/main/java/org/apache/servicecomb/metrics/core/publish/DefaultHealthCheckerManager.java
=>
foundations/foundation-metrics/src/main/java/org/apache/servicecomb/foundation/metrics/health/HealthCheckerManager.java
(54%)
create mode 100644
foundations/foundation-metrics/src/main/java/org/apache/servicecomb/foundation/metrics/publish/Metric.java
create mode 100644
foundations/foundation-metrics/src/main/java/org/apache/servicecomb/foundation/metrics/publish/MetricNode.java
create mode 100644
foundations/foundation-metrics/src/main/java/org/apache/servicecomb/foundation/metrics/publish/MetricsLoader.java
create mode 100644
foundations/foundation-metrics/src/test/java/org/apache/servicecomb/foundation/metrics/health/TestHealthCheckerManager.java
create mode 100644
foundations/foundation-metrics/src/test/java/org/apache/servicecomb/foundation/metrics/publish/TestMetricNode.java
copy
swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/response/consumer/TestDefaultConsumerResponseMapperFactory.java
=>
foundations/foundation-metrics/src/test/java/org/apache/servicecomb/foundation/metrics/publish/TestMetricsLoader.java
(50%)
delete mode 100644 metrics/metrics-common/pom.xml
delete mode 100644
metrics/metrics-common/src/main/java/org/apache/servicecomb/metrics/common/CallMetric.java
delete mode 100644
metrics/metrics-common/src/main/java/org/apache/servicecomb/metrics/common/ConsumerInvocationMetric.java
delete mode 100644
metrics/metrics-common/src/main/java/org/apache/servicecomb/metrics/common/DefaultHealthCheckExtraData.java
delete mode 100644
metrics/metrics-common/src/main/java/org/apache/servicecomb/metrics/common/DoubleMetricValue.java
delete mode 100644
metrics/metrics-common/src/main/java/org/apache/servicecomb/metrics/common/HealthCheckerPublisher.java
delete mode 100644
metrics/metrics-common/src/main/java/org/apache/servicecomb/metrics/common/InstanceMetric.java
delete mode 100644
metrics/metrics-common/src/main/java/org/apache/servicecomb/metrics/common/LongMetricValue.java
delete mode 100644
metrics/metrics-common/src/main/java/org/apache/servicecomb/metrics/common/MetricValue.java
delete mode 100644
metrics/metrics-common/src/main/java/org/apache/servicecomb/metrics/common/MetricsDimension.java
delete mode 100644
metrics/metrics-common/src/main/java/org/apache/servicecomb/metrics/common/MetricsPublisher.java
delete mode 100644
metrics/metrics-common/src/main/java/org/apache/servicecomb/metrics/common/ProducerInvocationMetric.java
delete mode 100644
metrics/metrics-common/src/main/java/org/apache/servicecomb/metrics/common/RegistryMetric.java
delete mode 100644
metrics/metrics-common/src/main/java/org/apache/servicecomb/metrics/common/SystemMetric.java
delete mode 100644
metrics/metrics-common/src/main/java/org/apache/servicecomb/metrics/common/TimerMetric.java
create mode 100644
metrics/metrics-core/src/main/java/org/apache/servicecomb/metrics/core/AbstractInvocationMetrics.java
copy
metrics/metrics-core/src/main/java/org/apache/servicecomb/metrics/core/{MetricsConfig.java
=> ConsumerInvocationMetrics.java} (65%)
create mode 100644
metrics/metrics-core/src/main/java/org/apache/servicecomb/metrics/core/InvocationMetricsManager.java
create mode 100644
metrics/metrics-core/src/main/java/org/apache/servicecomb/metrics/core/MonitorManager.java
copy
foundations/foundation-vertx/src/main/java/org/apache/servicecomb/foundation/vertx/client/tcp/TcpClientConnectionPool.java
=>
metrics/metrics-core/src/main/java/org/apache/servicecomb/metrics/core/ProducerInvocationMetrics.java
(51%)
rename
metrics/metrics-core/src/main/java/org/apache/servicecomb/metrics/core/{monitor/DefaultSystemMonitor.java
=> SystemMetrics.java} (76%)
delete mode 100644
metrics/metrics-core/src/main/java/org/apache/servicecomb/metrics/core/event/DefaultEventListenerManager.java
rename
metrics/metrics-core/src/main/java/org/apache/servicecomb/metrics/core/event/{EventListenerManager.java
=> InvocationStartExecutionEventListener.java} (62%)
delete mode 100644
metrics/metrics-core/src/main/java/org/apache/servicecomb/metrics/core/event/InvocationStartProcessingEventListener.java
delete mode 100644
metrics/metrics-core/src/main/java/org/apache/servicecomb/metrics/core/event/dimension/CodeGroupStatusConvertor.java
delete mode 100644
metrics/metrics-core/src/main/java/org/apache/servicecomb/metrics/core/event/dimension/CodeStatusConvertor.java
delete mode 100644
metrics/metrics-core/src/main/java/org/apache/servicecomb/metrics/core/event/dimension/StatusConvertor.java
delete mode 100644
metrics/metrics-core/src/main/java/org/apache/servicecomb/metrics/core/event/dimension/StatusConvertorFactory.java
delete mode 100644
metrics/metrics-core/src/main/java/org/apache/servicecomb/metrics/core/event/dimension/SuccessFailedStatusConvertor.java
delete mode 100644
metrics/metrics-core/src/main/java/org/apache/servicecomb/metrics/core/health/DefaultMicroserviceHealthChecker.java
delete mode 100644
metrics/metrics-core/src/main/java/org/apache/servicecomb/metrics/core/monitor/CallMonitor.java
delete mode 100644
metrics/metrics-core/src/main/java/org/apache/servicecomb/metrics/core/monitor/ConsumerInvocationMonitor.java
delete mode 100644
metrics/metrics-core/src/main/java/org/apache/servicecomb/metrics/core/monitor/InvocationMonitor.java
delete mode 100644
metrics/metrics-core/src/main/java/org/apache/servicecomb/metrics/core/monitor/ProducerInvocationMonitor.java
delete mode 100644
metrics/metrics-core/src/main/java/org/apache/servicecomb/metrics/core/monitor/RegistryMonitor.java
delete mode 100644
metrics/metrics-core/src/main/java/org/apache/servicecomb/metrics/core/monitor/SystemMonitor.java
delete mode 100644
metrics/metrics-core/src/main/java/org/apache/servicecomb/metrics/core/monitor/TimerMonitor.java
delete mode 100644
metrics/metrics-core/src/main/java/org/apache/servicecomb/metrics/core/publish/DataSource.java
delete mode 100644
metrics/metrics-core/src/main/java/org/apache/servicecomb/metrics/core/publish/DefaultDataSource.java
delete mode 100644
metrics/metrics-core/src/main/java/org/apache/servicecomb/metrics/core/publish/DefaultMetricsPublisher.java
delete mode 100644
metrics/metrics-core/src/main/java/org/apache/servicecomb/metrics/core/publish/HealthCheckerManager.java
copy
metrics/metrics-core/src/main/java/org/apache/servicecomb/metrics/core/publish/{DefaultHealthCheckerPublisher.java
=> HealthCheckerPublisher.java} (58%)
rename
metrics/metrics-core/src/main/java/org/apache/servicecomb/metrics/core/publish/{DefaultHealthCheckerPublisher.java
=> MetricsPublisher.java} (63%)
delete mode 100644
metrics/metrics-core/src/main/java/org/apache/servicecomb/metrics/core/utils/MonitorUtils.java
create mode 100644
metrics/metrics-core/src/main/resources/META-INF/services/org.apache.servicecomb.foundation.common.event.EventListener
delete mode 100644
metrics/metrics-core/src/test/java/org/apache/servicecomb/metrics/core/TestEventAndRunner.java
delete mode 100644
metrics/metrics-core/src/test/java/org/apache/servicecomb/metrics/core/TestHealthCheckerManager.java
copy
service-registry/src/test/java/org/apache/servicecomb/serviceregistry/api/request/TestUpdatePropertiesRequest.java
=>
metrics/metrics-core/src/test/java/org/apache/servicecomb/metrics/core/TestMetricsPublisher.java
(65%)
create mode 100644
metrics/metrics-core/src/test/java/org/apache/servicecomb/metrics/core/TestMonitorManager.java
delete mode 100644
metrics/metrics-core/src/test/java/org/apache/servicecomb/metrics/core/TestPublisher.java
delete mode 100644
metrics/metrics-core/src/test/java/org/apache/servicecomb/metrics/core/TestStatusDimension.java
rename
metrics/metrics-integration/metrics-prometheus/src/main/java/org/apache/servicecomb/metrics/prometheus/{MetricsPublisher.java
=> MetricsHttpPublisher.java} (86%)
rename
samples/metrics-extend-healthcheck/src/main/java/org/apache/servicecomb/samples/metrics/extendhealthcheck/{CustomHealthCheckerAnnotation.java
=> CustomHealthChecker.java} (76%)
delete mode 100644
samples/metrics-extend-healthcheck/src/main/java/org/apache/servicecomb/samples/metrics/extendhealthcheck/SomeServiceWithHealthCheckerManager.java
copy
demo/demo-edge/edge-service/src/main/resources/META-INF/services/org.apache.servicecomb.transport.rest.vertx.VertxHttpDispatcher
=>
samples/metrics-extend-healthcheck/src/main/resources/META-INF/services/org.apache.servicecomb.foundation.metrics.health.HealthChecker
(83%)
delete mode 100644
samples/metrics-write-file-sample/metrics-write-file/src/test/java/org/apache/servicecomb/samples/mwf/TestWriteFile.java
--
To stop receiving notification emails like this one, please contact
[email protected].
