You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicecomb.apache.org by ni...@apache.org on 2017/12/27 01:26:19 UTC
[incubator-servicecomb-java-chassis] 05/12: JAV-539 & SCB-9 direct
return servo monitor collect data (not cache anymore)
This is an automated email from the ASF dual-hosted git repository.
ningjiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-servicecomb-java-chassis.git
commit b8970835af714e6530483a38cd05f69b1f9b2aa4
Author: zhengyangyong <ya...@huawei.com>
AuthorDate: Sat Dec 23 09:27:52 2017 +0800
JAV-539 & SCB-9 direct return servo monitor collect data (not cache anymore)
Signed-off-by: zhengyangyong <ya...@huawei.com>
---
.../metrics/core/metric/RegistryMetric.java | 2 +-
.../DataSource.java => monitor/BasicMonitor.java} | 21 ++++++-----
.../metrics/core/monitor/CallMonitor.java | 8 ++--
.../metrics/core/monitor/InvocationMonitor.java | 16 ++++----
.../metrics/core/monitor/RegistryMonitor.java | 6 +--
.../metrics/core/monitor/TimerMonitor.java | 11 ++++--
.../metrics/core/publish/DataSource.java | 6 +--
.../metrics/core/publish/DefaultDataSource.java | 44 ++++------------------
.../metrics/core/TestEventAndRunner.java | 23 +++++------
9 files changed, 58 insertions(+), 79 deletions(-)
diff --git a/metrics/metrics-core/src/main/java/io/servicecomb/metrics/core/metric/RegistryMetric.java b/metrics/metrics-core/src/main/java/io/servicecomb/metrics/core/metric/RegistryMetric.java
index 7238f92..e7e1460 100644
--- a/metrics/metrics-core/src/main/java/io/servicecomb/metrics/core/metric/RegistryMetric.java
+++ b/metrics/metrics-core/src/main/java/io/servicecomb/metrics/core/metric/RegistryMetric.java
@@ -53,7 +53,7 @@ public class RegistryMetric {
consumerMetrics = new HashMap<>();
producerMetrics = new HashMap<>();
- //TODO:current java chassis unable know invocation type before starting process,ProducerInvocation + UnknownTypeInvocation
+ //TODO:current java chassis unable know invocation type before starting process,totalWaitInQueue = ProducerInvocation + UnknownTypeInvocation
long totalWaitInQueue = 0;
long producerWaitInQueue = 0;
TimerMetric lifeTimeInQueue = new TimerMetric(MetricsConst.INSTANCE_PRODUCER_PREFIX + ".lifeTimeInQueue");
diff --git a/metrics/metrics-core/src/main/java/io/servicecomb/metrics/core/publish/DataSource.java b/metrics/metrics-core/src/main/java/io/servicecomb/metrics/core/monitor/BasicMonitor.java
similarity index 64%
copy from metrics/metrics-core/src/main/java/io/servicecomb/metrics/core/publish/DataSource.java
copy to metrics/metrics-core/src/main/java/io/servicecomb/metrics/core/monitor/BasicMonitor.java
index de39777..69227ac 100644
--- a/metrics/metrics-core/src/main/java/io/servicecomb/metrics/core/publish/DataSource.java
+++ b/metrics/metrics-core/src/main/java/io/servicecomb/metrics/core/monitor/BasicMonitor.java
@@ -15,16 +15,19 @@
* limitations under the License.
*/
-package io.servicecomb.metrics.core.publish;
+package io.servicecomb.metrics.core.monitor;
-import java.util.List;
+public class BasicMonitor {
-import io.servicecomb.metrics.core.metric.RegistryMetric;
+ //for time-related monitor type, if stop poll value over one window time,
+ //the value may return -1 because servo can't known precise value of previous step
+ //so must change to return 0
+ public double adjustValue(double value) {
+ return value < 0 ? 0 : value;
+ }
-public interface DataSource {
-
- //为上层提供Metric信息
- RegistryMetric getRegistryMetric(int pollerIndex);
-
- List<Long> getAppliedPollingIntervals();
+ //same as above
+ public long adjustValue(long value) {
+ return value < 0 ? 0 : value;
+ }
}
diff --git a/metrics/metrics-core/src/main/java/io/servicecomb/metrics/core/monitor/CallMonitor.java b/metrics/metrics-core/src/main/java/io/servicecomb/metrics/core/monitor/CallMonitor.java
index 259a604..ee62a54 100644
--- a/metrics/metrics-core/src/main/java/io/servicecomb/metrics/core/monitor/CallMonitor.java
+++ b/metrics/metrics-core/src/main/java/io/servicecomb/metrics/core/monitor/CallMonitor.java
@@ -23,7 +23,7 @@ import com.netflix.servo.monitor.StepCounter;
import io.servicecomb.metrics.core.metric.CallMetric;
-public class CallMonitor {
+public class CallMonitor extends BasicMonitor {
private final String prefix;
private final BasicCounter total;
@@ -41,8 +41,8 @@ public class CallMonitor {
tps.increment();
}
- public CallMetric toCallMetric(int pollerIndex) {
- return new CallMetric(this.prefix, total.getValue(pollerIndex).longValue(),
- tps.getValue(pollerIndex).doubleValue());
+ public CallMetric toCallMetric(int windowTimeIndex) {
+ return new CallMetric(this.prefix, total.getValue(windowTimeIndex).longValue(),
+ this.adjustValue(tps.getValue(windowTimeIndex).doubleValue()));
}
}
diff --git a/metrics/metrics-core/src/main/java/io/servicecomb/metrics/core/monitor/InvocationMonitor.java b/metrics/metrics-core/src/main/java/io/servicecomb/metrics/core/monitor/InvocationMonitor.java
index e11ee89..f5430f7 100644
--- a/metrics/metrics-core/src/main/java/io/servicecomb/metrics/core/monitor/InvocationMonitor.java
+++ b/metrics/metrics-core/src/main/java/io/servicecomb/metrics/core/monitor/InvocationMonitor.java
@@ -26,7 +26,7 @@ import io.servicecomb.metrics.core.metric.InvocationMetric;
import io.servicecomb.metrics.core.metric.ProducerInvocationMetric;
import io.servicecomb.swagger.invocation.InvocationType;
-public class InvocationMonitor {
+public class InvocationMonitor extends BasicMonitor {
private final String operationName;
private final String consumerPrefix;
@@ -104,18 +104,18 @@ public class InvocationMonitor {
this.producerCall = new CallMonitor(producerPrefix + ".producerCall");
}
- public InvocationMetric toInvocationMetric(int pollerIndex) {
+ public InvocationMetric toInvocationMetric(int windowTimeIndex) {
InvocationMetric metric;
- long queueCount = waitInQueue.getValue(pollerIndex).longValue();
+ long queueCount = waitInQueue.getValue(windowTimeIndex).longValue();
if (invocationMonitorType.equals(InvocationMonitorType.PRODUCER)) {
metric = new ProducerInvocationMetric(operationName, producerPrefix, queueCount,
- lifeTimeInQueue.toTimerMetric(pollerIndex),
- executionTime.toTimerMetric(pollerIndex),
- producerLatency.toTimerMetric(pollerIndex),
- producerCall.toCallMetric(pollerIndex));
+ lifeTimeInQueue.toTimerMetric(windowTimeIndex),
+ executionTime.toTimerMetric(windowTimeIndex),
+ producerLatency.toTimerMetric(windowTimeIndex),
+ producerCall.toCallMetric(windowTimeIndex));
} else if (invocationMonitorType.equals(InvocationMonitorType.CONSUMER)) {
metric = new ConsumerInvocationMetric(operationName, consumerPrefix, queueCount,
- consumerLatency.toTimerMetric(pollerIndex), consumerCall.toCallMetric(pollerIndex));
+ consumerLatency.toTimerMetric(windowTimeIndex), consumerCall.toCallMetric(windowTimeIndex));
} else {
metric = new InvocationMetric(operationName, consumerPrefix, queueCount);
}
diff --git a/metrics/metrics-core/src/main/java/io/servicecomb/metrics/core/monitor/RegistryMonitor.java b/metrics/metrics-core/src/main/java/io/servicecomb/metrics/core/monitor/RegistryMonitor.java
index fd2fc53..0f592d2 100644
--- a/metrics/metrics-core/src/main/java/io/servicecomb/metrics/core/monitor/RegistryMonitor.java
+++ b/metrics/metrics-core/src/main/java/io/servicecomb/metrics/core/monitor/RegistryMonitor.java
@@ -27,7 +27,7 @@ import io.servicecomb.metrics.core.metric.InvocationMetric;
import io.servicecomb.metrics.core.metric.RegistryMetric;
@Component
-public class RegistryMonitor {
+public class RegistryMonitor extends BasicMonitor {
private final Map<String, InvocationMonitor> invocationMonitors;
@@ -39,10 +39,10 @@ public class RegistryMonitor {
return invocationMonitors.computeIfAbsent(operationName, i -> new InvocationMonitor(operationName));
}
- public RegistryMetric toRegistryMetric(int pollerIndex) {
+ public RegistryMetric toRegistryMetric(int windowTimeIndex) {
Map<String, InvocationMetric> invocationMetrics = new HashMap<>();
for (InvocationMonitor monitor : invocationMonitors.values()) {
- invocationMetrics.put(monitor.getOperationName(), monitor.toInvocationMetric(pollerIndex));
+ invocationMetrics.put(monitor.getOperationName(), monitor.toInvocationMetric(windowTimeIndex));
}
return new RegistryMetric(invocationMetrics);
}
diff --git a/metrics/metrics-core/src/main/java/io/servicecomb/metrics/core/monitor/TimerMonitor.java b/metrics/metrics-core/src/main/java/io/servicecomb/metrics/core/monitor/TimerMonitor.java
index a2120e3..a1aec71 100644
--- a/metrics/metrics-core/src/main/java/io/servicecomb/metrics/core/monitor/TimerMonitor.java
+++ b/metrics/metrics-core/src/main/java/io/servicecomb/metrics/core/monitor/TimerMonitor.java
@@ -24,7 +24,7 @@ import com.netflix.servo.monitor.StepCounter;
import io.servicecomb.metrics.core.metric.TimerMetric;
-public class TimerMonitor {
+public class TimerMonitor extends BasicMonitor {
private final String prefix;
private final StepCounter total;
@@ -52,8 +52,11 @@ public class TimerMonitor {
max = new MaxGauge(MonitorConfig.builder(prefix + ".max").build());
}
- public TimerMetric toTimerMetric(int pollerIndex) {
- return new TimerMetric(this.prefix, total.getCount(pollerIndex), count.getCount(pollerIndex),
- min.getValue(pollerIndex), max.getValue(pollerIndex));
+ public TimerMetric toTimerMetric(int windowTimeIndex) {
+ return new TimerMetric(this.prefix,
+ this.adjustValue(total.getCount(windowTimeIndex)),
+ this.adjustValue(count.getCount(windowTimeIndex)),
+ this.adjustValue(min.getValue(windowTimeIndex)),
+ this.adjustValue(max.getValue(windowTimeIndex)));
}
}
diff --git a/metrics/metrics-core/src/main/java/io/servicecomb/metrics/core/publish/DataSource.java b/metrics/metrics-core/src/main/java/io/servicecomb/metrics/core/publish/DataSource.java
index de39777..fbd47d4 100644
--- a/metrics/metrics-core/src/main/java/io/servicecomb/metrics/core/publish/DataSource.java
+++ b/metrics/metrics-core/src/main/java/io/servicecomb/metrics/core/publish/DataSource.java
@@ -22,9 +22,9 @@ import java.util.List;
import io.servicecomb.metrics.core.metric.RegistryMetric;
public interface DataSource {
+ RegistryMetric getRegistryMetric();
- //为上层提供Metric信息
- RegistryMetric getRegistryMetric(int pollerIndex);
+ RegistryMetric getRegistryMetric(int windowTimeIndex);
- List<Long> getAppliedPollingIntervals();
+ List<Long> getAppliedWindowTime();
}
diff --git a/metrics/metrics-core/src/main/java/io/servicecomb/metrics/core/publish/DefaultDataSource.java b/metrics/metrics-core/src/main/java/io/servicecomb/metrics/core/publish/DefaultDataSource.java
index 6aa0420..59a9d91 100644
--- a/metrics/metrics-core/src/main/java/io/servicecomb/metrics/core/publish/DefaultDataSource.java
+++ b/metrics/metrics-core/src/main/java/io/servicecomb/metrics/core/publish/DefaultDataSource.java
@@ -17,13 +17,7 @@
package io.servicecomb.metrics.core.publish;
-import static java.util.concurrent.TimeUnit.MILLISECONDS;
-
-import java.util.ArrayList;
import java.util.List;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.Executors;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@@ -38,52 +32,30 @@ import io.servicecomb.metrics.core.monitor.RegistryMonitor;
public class DefaultDataSource implements DataSource {
private static final String METRICS_POLLING_TIME = "servicecomb.metrics.polling.time";
- private static final String METRICS_POLLING_MIN = "servicecomb.metrics.polling.min";
-
- private final List<Long> appliedPollingIntervals;
-
private final RegistryMonitor registryMonitor;
- private final Map<Integer, RegistryMetric> registryMetrics;
-
@Autowired
public DefaultDataSource(RegistryMonitor registryMonitor) {
- this(registryMonitor, DynamicPropertyFactory.getInstance().getStringProperty(METRICS_POLLING_TIME, "10000").get());
+ this(registryMonitor, DynamicPropertyFactory.getInstance().getStringProperty(METRICS_POLLING_TIME, "5000").get());
}
public DefaultDataSource(RegistryMonitor registryMonitor, String pollingSettings) {
- this.registryMetrics = new ConcurrentHashMap<>();
this.registryMonitor = registryMonitor;
- //需要限制一下Polling的最小时间间隔, Servo推荐是10000(10秒),默认最低限制为100毫秒
- long minPollingTime = DynamicPropertyFactory.getInstance().getLongProperty(METRICS_POLLING_MIN, 100).get();
System.getProperties().setProperty("servo.pollers", pollingSettings);
-
- List<Long> intervals = Pollers.getPollingIntervals();
- List<Long> appliedIntervals = new ArrayList<>();
- for (int index = 0; index < intervals.size(); index++) {
- int finalIndex = index;
- long finalInterval = intervals.get(finalIndex) < minPollingTime ? minPollingTime : intervals.get(finalIndex);
- long pollerInterval = (long) (finalInterval * 0.5);
- final Runnable poller = () -> reloadRegistryMetric(finalIndex);
- Executors.newScheduledThreadPool(1)
- //for step counter correct work we need poll in time ,otherwise current step will return Datapoint.UNKNOWN (missing last sample)
- .scheduleWithFixedDelay(poller, pollerInterval, pollerInterval, MILLISECONDS);
- appliedIntervals.add(finalInterval);
- }
- this.appliedPollingIntervals = appliedIntervals;
}
@Override
- public RegistryMetric getRegistryMetric(int pollerIndex) {
- return registryMetrics.getOrDefault(pollerIndex, new RegistryMetric());
+ public RegistryMetric getRegistryMetric() {
+ return getRegistryMetric(0);
}
@Override
- public List<Long> getAppliedPollingIntervals() {
- return appliedPollingIntervals;
+ public RegistryMetric getRegistryMetric(int windowTimeIndex) {
+ return registryMonitor.toRegistryMetric(windowTimeIndex);
}
- private void reloadRegistryMetric(Integer pollerIndex) {
- registryMetrics.put(pollerIndex, registryMonitor.toRegistryMetric(pollerIndex));
+ @Override
+ public List<Long> getAppliedWindowTime() {
+ return Pollers.getPollingIntervals();
}
}
diff --git a/metrics/metrics-core/src/test/java/io/servicecomb/metrics/core/TestEventAndRunner.java b/metrics/metrics-core/src/test/java/io/servicecomb/metrics/core/TestEventAndRunner.java
index 06d2b77..9b3a194 100644
--- a/metrics/metrics-core/src/test/java/io/servicecomb/metrics/core/TestEventAndRunner.java
+++ b/metrics/metrics-core/src/test/java/io/servicecomb/metrics/core/TestEventAndRunner.java
@@ -39,13 +39,13 @@ public class TestEventAndRunner {
@Test
public void test() throws InterruptedException {
RegistryMonitor monitor = new RegistryMonitor();
- DefaultDataSource dataSource = new DefaultDataSource(monitor, "2000");
+ DefaultDataSource dataSource = new DefaultDataSource(monitor, "1000");
- List<Long> intervals = dataSource.getAppliedPollingIntervals();
+ List<Long> intervals = dataSource.getAppliedWindowTime();
Assert.assertEquals(intervals.size(), 1);
- Assert.assertEquals(intervals.get(0).intValue(), 2000);
+ Assert.assertEquals(intervals.get(0).intValue(), 1000);
- DefaultEventListenerManager manager = new DefaultEventListenerManager(monitor);
+ new DefaultEventListenerManager(monitor);
//fun1 is a PRODUCER invocation call twice and all is completed
EventUtils.triggerEvent(new InvocationStartedEvent("fun1", System.nanoTime()));
@@ -82,9 +82,10 @@ public class TestEventAndRunner {
//fun4 is a invocation call only started and no processing start and finished
EventUtils.triggerEvent(new InvocationStartedEvent("fun4", System.nanoTime()));
- Thread.sleep(2000);
+ //sim lease one window time
+ Thread.sleep(1000);
- RegistryMetric model = dataSource.getRegistryMetric(0);
+ RegistryMetric model = dataSource.getRegistryMetric();
//check InstanceMetric
Assert.assertEquals(model.getInstanceMetric().getWaitInQueue(), 1);
@@ -119,7 +120,7 @@ public class TestEventAndRunner {
Assert.assertEquals(model.getInstanceMetric().getProducerMetric().getProducerLatency().getMin(),
TimeUnit.MILLISECONDS.toNanos(300));
- Assert.assertEquals(model.getInstanceMetric().getProducerMetric().getProducerCall().getTps(), 1.5, 0);
+ Assert.assertEquals(model.getInstanceMetric().getProducerMetric().getProducerCall().getTps(), 3, 0);
Assert.assertEquals(model.getInstanceMetric().getProducerMetric().getProducerCall().getTotal(), 3);
Assert.assertEquals(model.getInstanceMetric().getConsumerMetric().getConsumerLatency().getCount(), 1);
@@ -132,7 +133,7 @@ public class TestEventAndRunner {
Assert.assertEquals(model.getInstanceMetric().getConsumerMetric().getConsumerLatency().getMin(),
TimeUnit.MILLISECONDS.toNanos(300));
- Assert.assertEquals(model.getInstanceMetric().getConsumerMetric().getConsumerCall().getTps(), 0.5, 0);
+ Assert.assertEquals(model.getInstanceMetric().getConsumerMetric().getConsumerCall().getTps(), 1, 0);
Assert.assertEquals(model.getInstanceMetric().getConsumerMetric().getConsumerCall().getTotal(), 1);
//check ProducerMetrics
@@ -167,7 +168,7 @@ public class TestEventAndRunner {
Assert.assertEquals(model.getProducerMetrics().get("fun1").getProducerLatency().getMin(),
TimeUnit.MILLISECONDS.toNanos(300));
- Assert.assertEquals(model.getProducerMetrics().get("fun1").getProducerCall().getTps(), 1, 0);
+ Assert.assertEquals(model.getProducerMetrics().get("fun1").getProducerCall().getTps(), 2, 0);
Assert.assertEquals(model.getProducerMetrics().get("fun1").getProducerCall().getTotal(), 2);
//fun3
@@ -202,7 +203,7 @@ public class TestEventAndRunner {
Assert.assertEquals(model.getProducerMetrics().get("fun3").getProducerLatency().getMin(),
TimeUnit.MILLISECONDS.toNanos(0));
- Assert.assertEquals(model.getProducerMetrics().get("fun3").getProducerCall().getTps(), 0.5, 0);
+ Assert.assertEquals(model.getProducerMetrics().get("fun3").getProducerCall().getTps(), 1, 0);
Assert.assertEquals(model.getProducerMetrics().get("fun3").getProducerCall().getTotal(), 1);
//check ConsumerMetrics
@@ -218,7 +219,7 @@ public class TestEventAndRunner {
Assert.assertEquals(model.getConsumerMetrics().get("fun2").getConsumerLatency().getMin(),
TimeUnit.MILLISECONDS.toNanos(300));
- Assert.assertEquals(model.getConsumerMetrics().get("fun2").getConsumerCall().getTps(), 0.5, 0);
+ Assert.assertEquals(model.getConsumerMetrics().get("fun2").getConsumerCall().getTps(), 1, 0);
Assert.assertEquals(model.getConsumerMetrics().get("fun2").getConsumerCall().getTotal(), 1);
Map<String, Number> metrics = model.toMap();
--
To stop receiving notification emails like this one, please contact
"commits@servicecomb.apache.org" <co...@servicecomb.apache.org>.