From 7eb05ac8cd9dace046185d77c40403748eb6fd92 Mon Sep 17 00:00:00 2001 From: ascrutae Date: Thu, 28 Jan 2016 11:19:08 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B0=86BuriedPointType=E5=AE=9E=E7=8E=B0?= =?UTF-8?q?=E7=A7=BB=E5=88=B0=E5=AF=B9=E5=BA=94=E7=9A=84=E5=AE=9E=E7=8E=B0?= =?UTF-8?q?=E5=B7=A5=E7=A8=8B=E4=B8=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cloud/skywalking/plugin/dubbo}/DubboBuriedPointType.java | 2 +- .../cloud/skywalking/plugin/dubbo/SWDubboEnhanceFilter.java | 1 - .../ai/cloud/skywalking/plugin/jdbc}/JDBCBuriedPointType.java | 2 +- .../plugin/jdbc/tracing/CallableStatementTracing.java | 2 +- .../skywalking/plugin/jdbc/tracing/ConnectionTracing.java | 2 +- .../plugin/jdbc/tracing/PreparedStatementTracing.java | 2 +- .../skywalking/plugin/jdbc/tracing/StatementTracing.java | 2 +- .../skywalking/plugin/spring}/SpringBuriedPointType.java | 2 +- .../com/ai/cloud/skywalking/plugin/spring/TracingAspect.java | 4 ---- .../com/ai/cloud/skywalking/plugin/web/SkyWalkingFilter.java | 1 - .../ai/cloud/skywalking/plugin/web}/WEBBuriedPointType.java | 2 +- 11 files changed, 8 insertions(+), 14 deletions(-) rename {skywalking-api/src/main/java/com/ai/cloud/skywalking/buriedpoint/type => skywalking-sdk-plugin/dubbo-plugin/src/main/java/com/ai/cloud/skywalking/plugin/dubbo}/DubboBuriedPointType.java (93%) rename {skywalking-api/src/main/java/com/ai/cloud/skywalking/buriedpoint/type => skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/ai/cloud/skywalking/plugin/jdbc}/JDBCBuriedPointType.java (92%) rename {skywalking-api/src/main/java/com/ai/cloud/skywalking/buriedpoint/type => skywalking-sdk-plugin/spring-plugin/src/main/java/com/ai/cloud/skywalking/plugin/spring}/SpringBuriedPointType.java (93%) rename {skywalking-api/src/main/java/com/ai/cloud/skywalking/buriedpoint/type => skywalking-sdk-plugin/web-plugin/src/main/java/com/ai/cloud/skywalking/plugin/web}/WEBBuriedPointType.java (92%) diff --git a/skywalking-api/src/main/java/com/ai/cloud/skywalking/buriedpoint/type/DubboBuriedPointType.java b/skywalking-sdk-plugin/dubbo-plugin/src/main/java/com/ai/cloud/skywalking/plugin/dubbo/DubboBuriedPointType.java similarity index 93% rename from skywalking-api/src/main/java/com/ai/cloud/skywalking/buriedpoint/type/DubboBuriedPointType.java rename to skywalking-sdk-plugin/dubbo-plugin/src/main/java/com/ai/cloud/skywalking/plugin/dubbo/DubboBuriedPointType.java index b35263304..248ff04f8 100644 --- a/skywalking-api/src/main/java/com/ai/cloud/skywalking/buriedpoint/type/DubboBuriedPointType.java +++ b/skywalking-sdk-plugin/dubbo-plugin/src/main/java/com/ai/cloud/skywalking/plugin/dubbo/DubboBuriedPointType.java @@ -1,4 +1,4 @@ -package com.ai.cloud.skywalking.buriedpoint.type; +package com.ai.cloud.skywalking.plugin.dubbo; import com.ai.cloud.skywalking.api.IBuriedPointType; import com.ai.cloud.skywalking.protocol.CallType; diff --git a/skywalking-sdk-plugin/dubbo-plugin/src/main/java/com/ai/cloud/skywalking/plugin/dubbo/SWDubboEnhanceFilter.java b/skywalking-sdk-plugin/dubbo-plugin/src/main/java/com/ai/cloud/skywalking/plugin/dubbo/SWDubboEnhanceFilter.java index 17ce708ff..145534e84 100644 --- a/skywalking-sdk-plugin/dubbo-plugin/src/main/java/com/ai/cloud/skywalking/plugin/dubbo/SWDubboEnhanceFilter.java +++ b/skywalking-sdk-plugin/dubbo-plugin/src/main/java/com/ai/cloud/skywalking/plugin/dubbo/SWDubboEnhanceFilter.java @@ -2,7 +2,6 @@ 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.buriedpoint.type.DubboBuriedPointType; import com.ai.cloud.skywalking.conf.AuthDesc; import com.ai.cloud.skywalking.model.ContextData; import com.ai.cloud.skywalking.model.Identification; diff --git a/skywalking-api/src/main/java/com/ai/cloud/skywalking/buriedpoint/type/JDBCBuriedPointType.java b/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/ai/cloud/skywalking/plugin/jdbc/JDBCBuriedPointType.java similarity index 92% rename from skywalking-api/src/main/java/com/ai/cloud/skywalking/buriedpoint/type/JDBCBuriedPointType.java rename to skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/ai/cloud/skywalking/plugin/jdbc/JDBCBuriedPointType.java index 36c9b8f61..bacb6a948 100644 --- a/skywalking-api/src/main/java/com/ai/cloud/skywalking/buriedpoint/type/JDBCBuriedPointType.java +++ b/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/ai/cloud/skywalking/plugin/jdbc/JDBCBuriedPointType.java @@ -1,4 +1,4 @@ -package com.ai.cloud.skywalking.buriedpoint.type; +package com.ai.cloud.skywalking.plugin.jdbc; import com.ai.cloud.skywalking.api.IBuriedPointType; import com.ai.cloud.skywalking.protocol.CallType; diff --git a/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/ai/cloud/skywalking/plugin/jdbc/tracing/CallableStatementTracing.java b/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/ai/cloud/skywalking/plugin/jdbc/tracing/CallableStatementTracing.java index 4bee296cc..759c55dd1 100644 --- a/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/ai/cloud/skywalking/plugin/jdbc/tracing/CallableStatementTracing.java +++ b/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/ai/cloud/skywalking/plugin/jdbc/tracing/CallableStatementTracing.java @@ -3,7 +3,7 @@ package com.ai.cloud.skywalking.plugin.jdbc.tracing; import java.sql.SQLException; import com.ai.cloud.skywalking.buriedpoint.RPCBuriedPointSender; -import com.ai.cloud.skywalking.buriedpoint.type.JDBCBuriedPointType; +import com.ai.cloud.skywalking.plugin.jdbc.JDBCBuriedPointType; import com.ai.cloud.skywalking.model.Identification; /** diff --git a/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/ai/cloud/skywalking/plugin/jdbc/tracing/ConnectionTracing.java b/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/ai/cloud/skywalking/plugin/jdbc/tracing/ConnectionTracing.java index 73f4090d5..d2d76a589 100644 --- a/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/ai/cloud/skywalking/plugin/jdbc/tracing/ConnectionTracing.java +++ b/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/ai/cloud/skywalking/plugin/jdbc/tracing/ConnectionTracing.java @@ -3,7 +3,7 @@ package com.ai.cloud.skywalking.plugin.jdbc.tracing; import java.sql.SQLException; import com.ai.cloud.skywalking.buriedpoint.RPCBuriedPointSender; -import com.ai.cloud.skywalking.buriedpoint.type.JDBCBuriedPointType; +import com.ai.cloud.skywalking.plugin.jdbc.JDBCBuriedPointType; import com.ai.cloud.skywalking.model.Identification; /** diff --git a/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/ai/cloud/skywalking/plugin/jdbc/tracing/PreparedStatementTracing.java b/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/ai/cloud/skywalking/plugin/jdbc/tracing/PreparedStatementTracing.java index 100e9d6e8..d3535e386 100644 --- a/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/ai/cloud/skywalking/plugin/jdbc/tracing/PreparedStatementTracing.java +++ b/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/ai/cloud/skywalking/plugin/jdbc/tracing/PreparedStatementTracing.java @@ -3,7 +3,7 @@ package com.ai.cloud.skywalking.plugin.jdbc.tracing; import java.sql.SQLException; import com.ai.cloud.skywalking.buriedpoint.RPCBuriedPointSender; -import com.ai.cloud.skywalking.buriedpoint.type.JDBCBuriedPointType; +import com.ai.cloud.skywalking.plugin.jdbc.JDBCBuriedPointType; import com.ai.cloud.skywalking.model.Identification; /** diff --git a/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/ai/cloud/skywalking/plugin/jdbc/tracing/StatementTracing.java b/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/ai/cloud/skywalking/plugin/jdbc/tracing/StatementTracing.java index 0e6052db7..d1dd7d3e4 100644 --- a/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/ai/cloud/skywalking/plugin/jdbc/tracing/StatementTracing.java +++ b/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/ai/cloud/skywalking/plugin/jdbc/tracing/StatementTracing.java @@ -1,7 +1,7 @@ package com.ai.cloud.skywalking.plugin.jdbc.tracing; import com.ai.cloud.skywalking.buriedpoint.RPCBuriedPointSender; -import com.ai.cloud.skywalking.buriedpoint.type.JDBCBuriedPointType; +import com.ai.cloud.skywalking.plugin.jdbc.JDBCBuriedPointType; import com.ai.cloud.skywalking.model.Identification; import java.sql.SQLException; diff --git a/skywalking-api/src/main/java/com/ai/cloud/skywalking/buriedpoint/type/SpringBuriedPointType.java b/skywalking-sdk-plugin/spring-plugin/src/main/java/com/ai/cloud/skywalking/plugin/spring/SpringBuriedPointType.java similarity index 93% rename from skywalking-api/src/main/java/com/ai/cloud/skywalking/buriedpoint/type/SpringBuriedPointType.java rename to skywalking-sdk-plugin/spring-plugin/src/main/java/com/ai/cloud/skywalking/plugin/spring/SpringBuriedPointType.java index 50ecd32bc..16d0e2be3 100644 --- a/skywalking-api/src/main/java/com/ai/cloud/skywalking/buriedpoint/type/SpringBuriedPointType.java +++ b/skywalking-sdk-plugin/spring-plugin/src/main/java/com/ai/cloud/skywalking/plugin/spring/SpringBuriedPointType.java @@ -1,4 +1,4 @@ -package com.ai.cloud.skywalking.buriedpoint.type; +package com.ai.cloud.skywalking.plugin.spring; import com.ai.cloud.skywalking.api.IBuriedPointType; import com.ai.cloud.skywalking.protocol.CallType; diff --git a/skywalking-sdk-plugin/spring-plugin/src/main/java/com/ai/cloud/skywalking/plugin/spring/TracingAspect.java b/skywalking-sdk-plugin/spring-plugin/src/main/java/com/ai/cloud/skywalking/plugin/spring/TracingAspect.java index 90834d181..f03af1193 100644 --- a/skywalking-sdk-plugin/spring-plugin/src/main/java/com/ai/cloud/skywalking/plugin/spring/TracingAspect.java +++ b/skywalking-sdk-plugin/spring-plugin/src/main/java/com/ai/cloud/skywalking/plugin/spring/TracingAspect.java @@ -1,13 +1,9 @@ package com.ai.cloud.skywalking.plugin.spring; import com.ai.cloud.skywalking.buriedpoint.LocalBuriedPointSender; -import com.ai.cloud.skywalking.buriedpoint.type.SpringBuriedPointType; import com.ai.cloud.skywalking.model.Identification; import org.aspectj.lang.ProceedingJoinPoint; -import java.text.SimpleDateFormat; -import java.util.Date; - public class TracingAspect { public Object doTracing(ProceedingJoinPoint proceedingJoinPoint) throws Throwable { diff --git a/skywalking-sdk-plugin/web-plugin/src/main/java/com/ai/cloud/skywalking/plugin/web/SkyWalkingFilter.java b/skywalking-sdk-plugin/web-plugin/src/main/java/com/ai/cloud/skywalking/plugin/web/SkyWalkingFilter.java index 71420fc18..0bb232738 100644 --- a/skywalking-sdk-plugin/web-plugin/src/main/java/com/ai/cloud/skywalking/plugin/web/SkyWalkingFilter.java +++ b/skywalking-sdk-plugin/web-plugin/src/main/java/com/ai/cloud/skywalking/plugin/web/SkyWalkingFilter.java @@ -3,7 +3,6 @@ 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.buriedpoint.type.WEBBuriedPointType; import com.ai.cloud.skywalking.conf.AuthDesc; import com.ai.cloud.skywalking.model.ContextData; import com.ai.cloud.skywalking.model.Identification; diff --git a/skywalking-api/src/main/java/com/ai/cloud/skywalking/buriedpoint/type/WEBBuriedPointType.java b/skywalking-sdk-plugin/web-plugin/src/main/java/com/ai/cloud/skywalking/plugin/web/WEBBuriedPointType.java similarity index 92% rename from skywalking-api/src/main/java/com/ai/cloud/skywalking/buriedpoint/type/WEBBuriedPointType.java rename to skywalking-sdk-plugin/web-plugin/src/main/java/com/ai/cloud/skywalking/plugin/web/WEBBuriedPointType.java index de2ca006d..c9ff0a2b9 100644 --- a/skywalking-api/src/main/java/com/ai/cloud/skywalking/buriedpoint/type/WEBBuriedPointType.java +++ b/skywalking-sdk-plugin/web-plugin/src/main/java/com/ai/cloud/skywalking/plugin/web/WEBBuriedPointType.java @@ -1,4 +1,4 @@ -package com.ai.cloud.skywalking.buriedpoint.type; +package com.ai.cloud.skywalking.plugin.web; import com.ai.cloud.skywalking.api.IBuriedPointType; import com.ai.cloud.skywalking.protocol.CallType;