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

Merge remote-tracking branch 'origin/master'

This commit is contained in:
zhangxin10 2015-12-23 17:25:18 +08:00
parent f1f20b1c45 643aa626cb
commit 320e8ac718
5 changed files with 32 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
skywalking-sdk-plugin/dubbo-plugin/src/main/java/com/ai/cloud/skywalking/plugin/dubbo/SWDubboEnhanceFilter.java
View File

@ -2,6 +2,7 @@ package com.ai.cloud.skywalking.plugin.dubbo;
import com.ai.cloud.skywalking.buriedpoint.RPCBuriedPointReceiver;
import com.ai.cloud.skywalking.buriedpoint.RPCBuriedPointSender;
import com.ai.cloud.skywalking.conf.AuthDesc;
import com.ai.cloud.skywalking.model.ContextData;
import com.ai.cloud.skywalking.model.Identification;
import com.ai.cloud.skywalking.plugin.dubbox.bugfix.below283.BugFixAcitve;
@ -13,6 +14,10 @@ import com.alibaba.dubbo.rpc.*;
public class SWDubboEnhanceFilter implements Filter {
public Result invoke(Invoker<?> invoker, Invocation invocation) throws RpcException {
if(!AuthDesc.isAuth()){
return invoker.invoke(invocation);
}
RpcContext context = RpcContext.getContext();
boolean isConsumer = context.isConsumerSide();
Result result = null;

6
skywalking-sdk-plugin/httpclient-plugin/src/main/java/com/ai/cloud/skywalking/plugin/httpclient/trace/HttpClientTracing.java
View File

@ -1,7 +1,9 @@
package com.ai.cloud.skywalking.plugin.httpclient.trace;
import com.ai.cloud.skywalking.buriedpoint.RPCBuriedPointSender;
import com.ai.cloud.skywalking.conf.AuthDesc;
import com.ai.cloud.skywalking.model.Identification;
import org.apache.http.HttpRequest;
import java.io.IOException;
@ -11,6 +13,10 @@ public class HttpClientTracing {
private static RPCBuriedPointSender sender = new RPCBuriedPointSender();
public static <R> R execute(String url, String traceHearName, HttpRequest httpRequest, Executor<R> executor) throws IOException {
if(!AuthDesc.isAuth()){
return executor.execute();
}
try {
httpRequest.setHeader(traceHearName,
"ContextData=" + sender.beforeSend(Identification.newBuilder()

8
skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/ai/cloud/skywalking/plugin/jdbc/TracingDriver.java
View File

@ -7,6 +7,8 @@ import java.sql.SQLFeatureNotSupportedException;
import java.util.Properties;
import java.util.logging.Logger;
import com.ai.cloud.skywalking.conf.AuthDesc;
public abstract class TracingDriver implements Driver {
private static final String TRACING_SIGN = "tracing:";
@ -20,7 +22,11 @@ public abstract class TracingDriver implements Driver {
public java.sql.Connection connect(String url, Properties info) throws SQLException {
java.sql.Connection conn = this.realDriver.connect(this.getRealUrl(url), info);
return new SWConnection(url, info, conn);
if(!AuthDesc.isAuth()){
return conn;
}else{
return new SWConnection(url, info, conn);
}
}
public boolean acceptsURL(String url) throws SQLException {

7
skywalking-sdk-plugin/spring-plugin/src/main/java/com/ai/cloud/skywalking/plugin/spring/TracingEnhanceProcessor.java
View File

@ -1,12 +1,15 @@
package com.ai.cloud.skywalking.plugin.spring;
import com.ai.cloud.skywalking.buriedpoint.LocalBuriedPointSender;
import com.ai.cloud.skywalking.conf.AuthDesc;
import com.ai.cloud.skywalking.model.Identification;
import com.ai.cloud.skywalking.plugin.spring.util.ConcurrentHashSet;
import javassist.*;
import javassist.Modifier;
import javassist.bytecode.AnnotationsAttribute;
import javassist.bytecode.ConstPool;
import org.springframework.beans.BeansException;
import org.springframework.beans.factory.DisposableBean;
import org.springframework.beans.factory.config.BeanFactoryPostProcessor;
@ -77,6 +80,10 @@ public class TracingEnhanceProcessor implements DisposableBean,
@Override
public Object postProcessAfterInitialization(Object bean, String beanName)
throws BeansException {
if(!AuthDesc.isAuth()){
return bean;
}
String packageName;
if (bean.getClass().getPackage() == null) {
packageName = "";

7
skywalking-sdk-plugin/web-plugin/src/main/java/com/ai/cloud/skywalking/plugin/web/SkyWalkingFilter.java
View File

@ -3,12 +3,14 @@ package com.ai.cloud.skywalking.plugin.web;
import com.ai.cloud.skywalking.api.Tracing;
import com.ai.cloud.skywalking.buriedpoint.RPCBuriedPointReceiver;
import com.ai.cloud.skywalking.conf.AuthDesc;
import com.ai.cloud.skywalking.model.ContextData;
import com.ai.cloud.skywalking.model.Identification;
import javax.servlet.*;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
public class SkyWalkingFilter implements Filter {
@ -26,6 +28,11 @@ public class SkyWalkingFilter implements Filter {
}
public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse, FilterChain filterChain) throws IOException, ServletException {
if(!AuthDesc.isAuth()){
filterChain.doFilter(servletRequest, servletResponse);
return;
}
RPCBuriedPointReceiver receiver = null;
try {
HttpServletRequest request = (HttpServletRequest) servletRequest;