From 882668da66c9607b93bc8fec8faf69cc17a68b76 Mon Sep 17 00:00:00 2001 From: "william.liangf" Date: Fri, 11 May 2012 03:04:36 +0000 Subject: [PATCH] =?UTF-8?q?DUBBO-379=20=E5=B0=86count=E6=94=B9=E4=B8=BA?= =?UTF-8?q?=E4=BA=86collect=EF=BC=8C=E5=B9=B6=E9=80=9A=E8=BF=87=E5=8F=82?= =?UTF-8?q?=E6=95=B0URL=E7=9A=84=E5=8D=8F=E8=AE=AE=E5=8C=BA=E5=88=86?= =?UTF-8?q?=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: http://code.alibabatech.com/svn/dubbo/trunk@1725 1a56cb94-b969-4eaa-88fa-be21384802f2 --- .../main/java/com/alibaba/dubbo/monitor/MonitorService.java | 4 ++-- .../com/alibaba/dubbo/monitor/support/MonitorFilter.java | 2 +- .../alibaba/dubbo/monitor/support/MonitorFilterTest.java | 2 +- .../java/com/alibaba/dubbo/monitor/dubbo/DubboMonitor.java | 4 ++-- .../com/alibaba/dubbo/monitor/dubbo/DubboMonitorTest.java | 6 +++--- .../com/alibaba/dubbo/monitor/dubbo/MockMonitorService.java | 2 +- .../alibaba/dubbo/monitor/simple/SimpleMonitorService.java | 4 ++++ .../dubbo/monitor/simple/SimpleMonitorServiceTest.java | 2 +- 8 files changed, 15 insertions(+), 11 deletions(-) diff --git a/dubbo-monitor/dubbo-monitor-api/src/main/java/com/alibaba/dubbo/monitor/MonitorService.java b/dubbo-monitor/dubbo-monitor-api/src/main/java/com/alibaba/dubbo/monitor/MonitorService.java index 7d2cd5261..be2b7c400 100644 --- a/dubbo-monitor/dubbo-monitor-api/src/main/java/com/alibaba/dubbo/monitor/MonitorService.java +++ b/dubbo-monitor/dubbo-monitor-api/src/main/java/com/alibaba/dubbo/monitor/MonitorService.java @@ -61,10 +61,10 @@ public interface MonitorService { String MAX_CONCURRENT = "max.concurrent"; /** - * count. + * collect. * * @param statistics */ - void count(URL statistics); + void collect(URL statistics); } \ No newline at end of file diff --git a/dubbo-monitor/dubbo-monitor-api/src/main/java/com/alibaba/dubbo/monitor/support/MonitorFilter.java b/dubbo-monitor/dubbo-monitor-api/src/main/java/com/alibaba/dubbo/monitor/support/MonitorFilter.java index 9692a9b11..238d9e98a 100644 --- a/dubbo-monitor/dubbo-monitor-api/src/main/java/com/alibaba/dubbo/monitor/support/MonitorFilter.java +++ b/dubbo-monitor/dubbo-monitor-api/src/main/java/com/alibaba/dubbo/monitor/support/MonitorFilter.java @@ -100,7 +100,7 @@ public class MonitorFilter implements Filter { remoteKey = MonitorService.CONSUMER; remoteValue = context.getRemoteHost(); } - monitor.count(new URL(Constants.COUNT_PROTOCOL, + monitor.collect(new URL(Constants.COUNT_PROTOCOL, NetUtils.getLocalHost(), localPort, service + "/" + method, MonitorService.APPLICATION, application, diff --git a/dubbo-monitor/dubbo-monitor-api/src/test/java/com/alibaba/dubbo/monitor/support/MonitorFilterTest.java b/dubbo-monitor/dubbo-monitor-api/src/test/java/com/alibaba/dubbo/monitor/support/MonitorFilterTest.java index 24733071c..1d0cb4c7b 100644 --- a/dubbo-monitor/dubbo-monitor-api/src/test/java/com/alibaba/dubbo/monitor/support/MonitorFilterTest.java +++ b/dubbo-monitor/dubbo-monitor-api/src/test/java/com/alibaba/dubbo/monitor/support/MonitorFilterTest.java @@ -80,7 +80,7 @@ public class MonitorFilterTest { } public void destroy() { } - public void count(URL statistics) { + public void collect(URL statistics) { MonitorFilterTest.this.lastStatistics = statistics; } }; diff --git a/dubbo-monitor/dubbo-monitor-default/src/main/java/com/alibaba/dubbo/monitor/dubbo/DubboMonitor.java b/dubbo-monitor/dubbo-monitor-default/src/main/java/com/alibaba/dubbo/monitor/dubbo/DubboMonitor.java index 6be72b26a..cb0a445a2 100644 --- a/dubbo-monitor/dubbo-monitor-default/src/main/java/com/alibaba/dubbo/monitor/dubbo/DubboMonitor.java +++ b/dubbo-monitor/dubbo-monitor-default/src/main/java/com/alibaba/dubbo/monitor/dubbo/DubboMonitor.java @@ -109,7 +109,7 @@ public class DubboMonitor implements Monitor { MonitorService.MAX_ELAPSED, String.valueOf(maxElapsed), MonitorService.MAX_CONCURRENT, String.valueOf(maxConcurrent) ); - monitorService.count(url); + monitorService.collect(url); // 减掉已统计数据 long[] current; @@ -135,7 +135,7 @@ public class DubboMonitor implements Monitor { } } - public void count(URL url) { + public void collect(URL url) { // 读写统计变量 int success = url.getParameter(MonitorService.SUCCESS, 0); int failure = url.getParameter(MonitorService.FAILURE, 0); diff --git a/dubbo-monitor/dubbo-monitor-default/src/test/java/com/alibaba/dubbo/monitor/dubbo/DubboMonitorTest.java b/dubbo-monitor/dubbo-monitor-default/src/test/java/com/alibaba/dubbo/monitor/dubbo/DubboMonitorTest.java index 8f81003af..cfb7a87f3 100644 --- a/dubbo-monitor/dubbo-monitor-default/src/test/java/com/alibaba/dubbo/monitor/dubbo/DubboMonitorTest.java +++ b/dubbo-monitor/dubbo-monitor-default/src/test/java/com/alibaba/dubbo/monitor/dubbo/DubboMonitorTest.java @@ -60,7 +60,7 @@ public class DubboMonitorTest { private final MonitorService monitorService = new MonitorService() { - public void count(URL statistics) { + public void collect(URL statistics) { DubboMonitorTest.this.lastStatistics = statistics; } @@ -80,7 +80,7 @@ public class DubboMonitorTest { .addParameter(MonitorService.MAX_ELAPSED, 3) .addParameter(MonitorService.CONCURRENT, 1) .addParameter(MonitorService.MAX_CONCURRENT, 1); - monitor.count(statistics); + monitor.collect(statistics); while (lastStatistics == null) { Thread.sleep(10); } @@ -123,7 +123,7 @@ public class DubboMonitorTest { try { Monitor monitor = monitorFactory.getMonitor(URL.valueOf("dubbo://127.0.0.1:17979?interval=10")); try { - monitor.count(statistics); + monitor.collect(statistics); int i = 0; while(monitorService.getStatistics() == null && i < 200) { i ++; diff --git a/dubbo-monitor/dubbo-monitor-default/src/test/java/com/alibaba/dubbo/monitor/dubbo/MockMonitorService.java b/dubbo-monitor/dubbo-monitor-default/src/test/java/com/alibaba/dubbo/monitor/dubbo/MockMonitorService.java index b705bc2e0..102ea5a4c 100644 --- a/dubbo-monitor/dubbo-monitor-default/src/test/java/com/alibaba/dubbo/monitor/dubbo/MockMonitorService.java +++ b/dubbo-monitor/dubbo-monitor-default/src/test/java/com/alibaba/dubbo/monitor/dubbo/MockMonitorService.java @@ -27,7 +27,7 @@ public class MockMonitorService implements MonitorService { private URL statistics; - public void count(URL statistics) { + public void collect(URL statistics) { this.statistics = statistics; } diff --git a/dubbo-simple/dubbo-monitor-simple/src/main/java/com/alibaba/dubbo/monitor/simple/SimpleMonitorService.java b/dubbo-simple/dubbo-monitor-simple/src/main/java/com/alibaba/dubbo/monitor/simple/SimpleMonitorService.java index b68377f5d..ba3d0f063 100644 --- a/dubbo-simple/dubbo-monitor-simple/src/main/java/com/alibaba/dubbo/monitor/simple/SimpleMonitorService.java +++ b/dubbo-simple/dubbo-monitor-simple/src/main/java/com/alibaba/dubbo/monitor/simple/SimpleMonitorService.java @@ -416,6 +416,10 @@ public class SimpleMonitorService implements MonitorService { } public void count(URL statistics) { + collect(statistics); + } + + public void collect(URL statistics) { queue.offer(statistics); if (logger.isInfoEnabled()) { logger.info("collect statistics: " + statistics); diff --git a/dubbo-simple/dubbo-monitor-simple/src/test/java/com/alibaba/dubbo/monitor/simple/SimpleMonitorServiceTest.java b/dubbo-simple/dubbo-monitor-simple/src/test/java/com/alibaba/dubbo/monitor/simple/SimpleMonitorServiceTest.java index 5fdd141e2..04d0c12de 100644 --- a/dubbo-simple/dubbo-monitor-simple/src/test/java/com/alibaba/dubbo/monitor/simple/SimpleMonitorServiceTest.java +++ b/dubbo-simple/dubbo-monitor-simple/src/test/java/com/alibaba/dubbo/monitor/simple/SimpleMonitorServiceTest.java @@ -29,7 +29,7 @@ public class SimpleMonitorServiceTest { @Test public void testMonitor() { - new SimpleMonitorService().count(new URL("dubbo", NetUtils.getLocalHost(), 0)); + new SimpleMonitorService().collect(new URL("dubbo", NetUtils.getLocalHost(), 0)); } } \ No newline at end of file -- GitLab