kazusa
/
skywalking-java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修复Dubbo的viewpoint

This commit is contained in:
ascrutae 2016-08-17 22:21:38 +08:00
parent e57540b862
commit ddc9885103
3 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
skywalking-analysis/src/main/java/com/a/eye/skywalking/analysis/config/HBaseTableMetaData.java
View File

@ -7,7 +7,7 @@ public class HBaseTableMetaData {
* @author wusheng
*/
public final static class TABLE_CALL_CHAIN {
public static final String TABLE_NAME = "sw-call-chain";
public static final String TABLE_NAME = "trace-data";
public static final String FAMILY_NAME = "call-chain";
}

24
skywalking-collector/skywalking-sdk-plugin/dubbo-plugin/src/main/java/com/a/eye/skywalking/plugin/dubbo/MonitorFilterInterceptor.java
View File

@ -33,8 +33,8 @@ public class MonitorFilterInterceptor implements InstanceMethodsAroundIntercepto
boolean isConsumer = rpcContext.isConsumerSide();
context.set("isConsumer", isConsumer);
if (isConsumer) {
ContextData
contextData = new RPCClientInvokeMonitor().beforeInvoke(createIdentification(invoker, invocation));
ContextData contextData =
new RPCClientInvokeMonitor().beforeInvoke(createIdentification(invoker, invocation, true));
String contextDataStr = contextData.toString();
//追加参数
@ -72,7 +72,7 @@ public class MonitorFilterInterceptor implements InstanceMethodsAroundIntercepto
contextData = new ContextData(contextDataStr);
}
new RPCServerInvokeMonitor().beforeInvoke(contextData, createIdentification(invoker, invocation));
new RPCServerInvokeMonitor().beforeInvoke(contextData, createIdentification(invoker, invocation, false));
}
}
@ -85,9 +85,9 @@ public class MonitorFilterInterceptor implements InstanceMethodsAroundIntercepto
dealException(result.getException(), context);
}
if (isConsumer(context)){
if (isConsumer(context)) {
new RPCClientInvokeMonitor().afterInvoke();
}else{
} else {
new RPCServerInvokeMonitor().afterInvoke();
}
@ -95,25 +95,31 @@ public class MonitorFilterInterceptor implements InstanceMethodsAroundIntercepto
}
@Override
public void handleMethodException(Throwable t, EnhancedClassInstanceContext context, InstanceMethodInvokeContext interceptorContext) {
public void handleMethodException(Throwable t, EnhancedClassInstanceContext context,
InstanceMethodInvokeContext interceptorContext) {
dealException(t, context);
}
private boolean isConsumer(EnhancedClassInstanceContext context){
private boolean isConsumer(EnhancedClassInstanceContext context) {
return (boolean) context.get("isConsumer");
}
private void dealException(Throwable t, EnhancedClassInstanceContext context) {
if (isConsumer(context)) {
new RPCClientInvokeMonitor().occurException(t);
new RPCClientInvokeMonitor().occurException(t);
} else {
new RPCServerInvokeMonitor().occurException(t);
}
}
private static Identification createIdentification(Invoker<?> invoker, Invocation invocation) {
private static Identification createIdentification(Invoker<?> invoker, Invocation invocation, boolean isConsumer) {
StringBuilder viewPoint = new StringBuilder();
if (isConsumer) {
viewPoint.append("comsumer:");
} else {
viewPoint.append("provider:");
}
viewPoint.append(invoker.getUrl().getProtocol() + "://");
viewPoint.append(invoker.getUrl().getHost());
viewPoint.append(":" + invoker.getUrl().getPort());

4
skywalking-webui/src/main/resources/spring/springmvc-servlet.xml
View File

@ -12,7 +12,7 @@
<!-- 添加注解驱动 -->
<mvc:annotation-driven/>
<!-- 默认扫描的包路径 -->
<context:component-scan base-package="com.ai.cloud.skywalking.web"/>
<context:component-scan base-package="com.a.eye.skywalking.web"/>
<mvc:resources mapping="/bower_components/**" location="/bower_components/"/>
@ -59,4 +59,4 @@
<!-- 数据库、事务配置 -->
<import resource="application-jdbc.xml"/>
</beans>
</beans>