You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dubbo.apache.org by il...@apache.org on 2018/04/10 02:37:36 UTC
[incubator-dubbo] branch master updated: 1. dubbo monitor
parameters add group and version (#1407)
This is an automated email from the ASF dual-hosted git repository.
iluo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-dubbo.git
The following commit(s) were added to refs/heads/master by this push:
new 2e84f07 1. dubbo monitor parameters add group and version (#1407)
2e84f07 is described below
commit 2e84f07203cc1955b1822e0821fa908ea77a20d0
Author: Young Hu <hu...@163.com>
AuthorDate: Tue Apr 10 10:37:25 2018 +0800
1. dubbo monitor parameters add group and version (#1407)
2. monitor interval can be override by outside setting
---
.../src/main/java/com/alibaba/dubbo/config/MonitorConfig.java | 10 ++++++++++
.../dubbo-config-spring/src/main/resources/META-INF/dubbo.xsd | 5 +++++
.../java/com/alibaba/dubbo/monitor/support/MonitorFilter.java | 6 +++++-
.../java/com/alibaba/dubbo/monitor/dubbo/DubboMonitor.java | 5 ++++-
4 files changed, 24 insertions(+), 2 deletions(-)
diff --git a/dubbo-config/dubbo-config-api/src/main/java/com/alibaba/dubbo/config/MonitorConfig.java b/dubbo-config/dubbo-config-api/src/main/java/com/alibaba/dubbo/config/MonitorConfig.java
index 9d51517..835daed 100644
--- a/dubbo-config/dubbo-config-api/src/main/java/com/alibaba/dubbo/config/MonitorConfig.java
+++ b/dubbo-config/dubbo-config-api/src/main/java/com/alibaba/dubbo/config/MonitorConfig.java
@@ -41,6 +41,8 @@ public class MonitorConfig extends AbstractConfig {
private String version;
+ private String interval;
+
// customized parameters
private Map<String, String> parameters;
@@ -123,4 +125,12 @@ public class MonitorConfig extends AbstractConfig {
this.isDefault = isDefault;
}
+ public void setInterval(String interval){
+ this.interval = interval;
+ }
+
+ public String getInterval(){
+ return interval;
+ }
+
}
\ No newline at end of file
diff --git a/dubbo-config/dubbo-config-spring/src/main/resources/META-INF/dubbo.xsd b/dubbo-config/dubbo-config-spring/src/main/resources/META-INF/dubbo.xsd
index 1ae252a..e21b1a5 100644
--- a/dubbo-config/dubbo-config-spring/src/main/resources/META-INF/dubbo.xsd
+++ b/dubbo-config/dubbo-config-spring/src/main/resources/META-INF/dubbo.xsd
@@ -574,6 +574,11 @@
<xsd:documentation><![CDATA[ The monitor version. ]]></xsd:documentation>
</xsd:annotation>
</xsd:attribute>
+ <xsd:attribute name="interval" type="xsd:string" use="optional">
+ <xsd:annotation>
+ <xsd:documentation><![CDATA[ The monitor interval. ]]></xsd:documentation>
+ </xsd:annotation>
+ </xsd:attribute>
<xsd:attribute name="default" type="xsd:string" use="optional">
<xsd:annotation>
<xsd:documentation><![CDATA[ Is default. ]]></xsd:documentation>
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 ebeb4ee..679b25c 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
@@ -84,6 +84,8 @@ public class MonitorFilter implements Filter {
String application = invoker.getUrl().getParameter(Constants.APPLICATION_KEY);
String service = invoker.getInterface().getName(); // service name
String method = RpcUtils.getMethodName(invocation); // method name
+ String group = invoker.getUrl().getParameter(Constants.GROUP_KEY);
+ String version = invoker.getUrl().getParameter(Constants.VERSION_KEY);
URL url = invoker.getUrl().getUrlParameter(Constants.MONITOR_KEY);
Monitor monitor = monitorFactory.getMonitor(url);
if (monitor == null) {
@@ -121,7 +123,9 @@ public class MonitorFilter implements Filter {
MonitorService.ELAPSED, String.valueOf(elapsed),
MonitorService.CONCURRENT, String.valueOf(concurrent),
Constants.INPUT_KEY, input,
- Constants.OUTPUT_KEY, output));
+ Constants.OUTPUT_KEY, output,
+ Constants.GROUP_KEY, group,
+ Constants.VERSION_KEY, version));
} catch (Throwable t) {
logger.error("Failed to monitor count service " + invoker.getUrl() + ", cause: " + t.getMessage(), t);
}
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 7393afe..b320492 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
@@ -16,6 +16,7 @@
*/
package com.alibaba.dubbo.monitor.dubbo;
+import com.alibaba.dubbo.common.Constants;
import com.alibaba.dubbo.common.URL;
import com.alibaba.dubbo.common.logger.Logger;
import com.alibaba.dubbo.common.logger.LoggerFactory;
@@ -92,6 +93,7 @@ public class DubboMonitor implements Monitor {
long maxOutput = numbers[7];
long maxElapsed = numbers[8];
long maxConcurrent = numbers[9];
+ String version = getUrl().getParameter(Constants.DEFAULT_PROTOCOL);
// send statistics data
URL url = statistics.getUrl()
@@ -105,7 +107,8 @@ public class DubboMonitor implements Monitor {
MonitorService.MAX_INPUT, String.valueOf(maxInput),
MonitorService.MAX_OUTPUT, String.valueOf(maxOutput),
MonitorService.MAX_ELAPSED, String.valueOf(maxElapsed),
- MonitorService.MAX_CONCURRENT, String.valueOf(maxConcurrent)
+ MonitorService.MAX_CONCURRENT, String.valueOf(maxConcurrent),
+ Constants.DEFAULT_PROTOCOL, version
);
monitorService.collect(url);
--
To stop receiving notification emails like this one, please contact
iluo@apache.org.