From 8a8d6e6bc7f564209708f2160ae0bd279d89e8f5 Mon Sep 17 00:00:00 2001 From: zhangxin Date: Sun, 19 Feb 2017 14:50:05 +0800 Subject: [PATCH 01/11] add delegate method --- .../a/eye/skywalking/context/ContextManager.java | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/context/ContextManager.java b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/context/ContextManager.java index 7c89f0cae..49fa84965 100644 --- a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/context/ContextManager.java +++ b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/context/ContextManager.java @@ -39,6 +39,20 @@ public enum ContextManager implements TracerContextListener { return segment; } + /** + * @see {@link TracerContext#inject(ContextCarrier)} + */ + public void inject(ContextCarrier carrier) { + get().inject(carrier); + } + + /** + *@see {@link TracerContext#extract(ContextCarrier)} + */ + public void extract(ContextCarrier carrier) { + get().extract(carrier); + } + public Span createSpan(String operationName) { return get().createSpan(operationName); } From ebd745c728c786cdfafc86849e11219f4b5fae8b Mon Sep 17 00:00:00 2001 From: wusheng Date: Sun, 19 Feb 2017 17:47:25 +0800 Subject: [PATCH 02/11] Refactor code. --- .../com/a/eye/skywalking/trace/tag/Tags.java | 41 +++++++++++-------- .../a/eye/skywalking/trace/SpanTestCase.java | 9 ++-- .../context/ContextManagerTestCase.java | 6 +++ .../plugin/jdbc/PreparedStatementTracing.java | 2 +- 4 files changed, 34 insertions(+), 24 deletions(-) diff --git a/skywalking-commons/skywalking-trace/src/main/java/com/a/eye/skywalking/trace/tag/Tags.java b/skywalking-commons/skywalking-trace/src/main/java/com/a/eye/skywalking/trace/tag/Tags.java index d0881dc1b..9d7cab61d 100644 --- a/skywalking-commons/skywalking-trace/src/main/java/com/a/eye/skywalking/trace/tag/Tags.java +++ b/skywalking-commons/skywalking-trace/src/main/java/com/a/eye/skywalking/trace/tag/Tags.java @@ -23,51 +23,56 @@ public final class Tags { public static final IntTag HTTP_STATUS = new IntTag("http.status_code"); /** - * SPAN_KIND represents the kind of span. + * + */ + public static final StringTag SPAN_KIND = new StringTag("span.kind"); + + /** + * SPAN_LAYER represents the kind of span. * e.g. db=database, rpc=Remote Procedure Call, nosql=something like redis/memcache */ - public static final class SPAN_KIND{ - private static StringTag SPAN_KIND_TAG = new StringTag("span.kind"); + public static final class SPAN_LAYER { + private static StringTag SPAN_LAYER_TAG = new StringTag("span.layer"); - private static final String DB_KIND = "db"; - private static final String RPC_KIND = "rpc"; - private static final String NOSQL_KIND = "nosql"; - private static final String HTTP_KIND = "http"; + private static final String DB_LAYER = "db"; + private static final String RPC_LAYER = "rpc"; + private static final String NOSQL_LAYER = "nosql"; + private static final String HTTP_LAYER = "http"; public static void asDBAccess(Span span){ - SPAN_KIND_TAG.set(span, DB_KIND); + SPAN_LAYER_TAG.set(span, DB_LAYER); } public static void asRPC(Span span){ - SPAN_KIND_TAG.set(span, RPC_KIND); + SPAN_LAYER_TAG.set(span, RPC_LAYER); } public static void asNoSQL(Span span){ - SPAN_KIND_TAG.set(span, NOSQL_KIND); + SPAN_LAYER_TAG.set(span, NOSQL_LAYER); } public static void asHttp(Span span){ - SPAN_KIND_TAG.set(span, HTTP_KIND); + SPAN_LAYER_TAG.set(span, HTTP_LAYER); } public static String get(Span span){ - return SPAN_KIND_TAG.get(span); + return SPAN_LAYER_TAG.get(span); } public static boolean isDBAccess(Span span){ - return DB_KIND.equals(get(span)); + return DB_LAYER.equals(get(span)); } public static boolean isRPC(Span span){ - return RPC_KIND.equals(get(span)); + return RPC_LAYER.equals(get(span)); } public static boolean isNoSQL(Span span){ - return NOSQL_KIND.equals(get(span)); + return NOSQL_LAYER.equals(get(span)); } public static boolean isHttp(Span span){ - return HTTP_KIND.equals(get(span)); + return HTTP_LAYER.equals(get(span)); } } @@ -83,9 +88,9 @@ public final class Tags { public static final BooleanTag ERROR = new BooleanTag("error"); /** - * PEER_HOST_IPV4 records IPv4 host address of the peer. + * PEER_HOST records host address of the peer, maybe IPV4, IPV6 or hostname. */ - public static final IntTag PEER_HOST_IPV4 = new IntTag("peer.ipv4"); + public static final StringTag PEER_HOST = new StringTag("peer.host"); /** * DB_URL records the url of the database access. diff --git a/skywalking-commons/skywalking-trace/src/test/java/com/a/eye/skywalking/trace/SpanTestCase.java b/skywalking-commons/skywalking-trace/src/test/java/com/a/eye/skywalking/trace/SpanTestCase.java index f26b22f23..e297e58d6 100644 --- a/skywalking-commons/skywalking-trace/src/test/java/com/a/eye/skywalking/trace/SpanTestCase.java +++ b/skywalking-commons/skywalking-trace/src/test/java/com/a/eye/skywalking/trace/SpanTestCase.java @@ -1,7 +1,6 @@ package com.a.eye.skywalking.trace; import com.a.eye.skywalking.trace.tag.Tags; -import java.util.Collections; import java.util.List; import java.util.Map; import org.junit.Assert; @@ -38,9 +37,9 @@ public class SpanTestCase { @Test public void testSetTag() { Span span1 = new Span(0, "serviceA"); - Tags.SPAN_KIND.asHttp(span1); + Tags.SPAN_LAYER.asHttp(span1); Tags.COMPONENT.set(span1, "Spring"); - Tags.PEER_HOST_IPV4.set(span1, ipToInt("127.0.0.1")); + Tags.PEER_HOST.set(span1, ipToInt("127.0.0.1")); Tags.ERROR.set(span1, true); Tags.HTTP_STATUS.set(span1, 302); Tags.HTTP_URL.set(span1, "http://127.0.0.1/serviceA"); @@ -49,8 +48,8 @@ public class SpanTestCase { Map tags = span1.getTags(); Assert.assertEquals(8, tags.size()); - Assert.assertTrue(Tags.SPAN_KIND.isHttp(span1)); - Assert.assertEquals("127.0.0.1", intToIp(Tags.PEER_HOST_IPV4.get(span1))); + Assert.assertTrue(Tags.SPAN_LAYER.isHttp(span1)); + Assert.assertEquals("127.0.0.1", intToIp(Tags.PEER_HOST.get(span1))); Assert.assertTrue(Tags.ERROR.get(span1)); } diff --git a/skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/context/ContextManagerTestCase.java b/skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/context/ContextManagerTestCase.java index 80ee01c42..fe9c2ba9a 100644 --- a/skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/context/ContextManagerTestCase.java +++ b/skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/context/ContextManagerTestCase.java @@ -3,6 +3,7 @@ package com.a.eye.skywalking.context; import com.a.eye.skywalking.trace.Span; import com.a.eye.skywalking.trace.TraceSegment; import com.a.eye.skywalking.trace.tag.Tags; +import org.junit.After; import org.junit.Assert; import org.junit.Test; @@ -24,4 +25,9 @@ public class ContextManagerTestCase { Assert.assertEquals(span, segment.getSpans().get(0)); } + + @After + public void reset(){ + TracerContext.ListenerManager.remove(TestTracerContextListener.INSTANCE); + } } diff --git a/skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/plugin/jdbc/PreparedStatementTracing.java b/skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/plugin/jdbc/PreparedStatementTracing.java index 464ea055d..85d1557aa 100644 --- a/skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/plugin/jdbc/PreparedStatementTracing.java +++ b/skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/plugin/jdbc/PreparedStatementTracing.java @@ -17,7 +17,7 @@ public class PreparedStatementTracing { throws SQLException { Span span = ContextManager.INSTANCE.createSpan("JDBC/PreparedStatement/" + method); try { - Tags.SPAN_KIND.asDBAccess(span); + Tags.SPAN_LAYER.asDBAccess(span); Tags.DB_URL.set(span, connectInfo); Tags.DB_SQL.set(span, sql); return exec.exe(realStatement, sql); From fc19ce851850660b29618c14f80dcc9ed850e5a2 Mon Sep 17 00:00:00 2001 From: wusheng Date: Sun, 19 Feb 2017 18:15:43 +0800 Subject: [PATCH 03/11] =?UTF-8?q?Take=20Adrian=20Cole=20=E2=80=99s=20advic?= =?UTF-8?q?e,=20remove=20http=20prefix=20of=20tag.=20Maybe=20still=20need?= =?UTF-8?q?=20some=20improvements.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/a/eye/skywalking/trace/tag/Tags.java | 42 ++++++++++++------- .../a/eye/skywalking/trace/SpanTestCase.java | 6 +-- .../plugin/jdbc/PreparedStatementTracing.java | 2 +- 3 files changed, 30 insertions(+), 20 deletions(-) diff --git a/skywalking-commons/skywalking-trace/src/main/java/com/a/eye/skywalking/trace/tag/Tags.java b/skywalking-commons/skywalking-trace/src/main/java/com/a/eye/skywalking/trace/tag/Tags.java index 9d7cab61d..d1f51cdb2 100644 --- a/skywalking-commons/skywalking-trace/src/main/java/com/a/eye/skywalking/trace/tag/Tags.java +++ b/skywalking-commons/skywalking-trace/src/main/java/com/a/eye/skywalking/trace/tag/Tags.java @@ -13,38 +13,48 @@ public final class Tags { } /** - * HTTP_URL records the url of the incoming request. + * URL records the url of the incoming request. */ - public static final StringTag HTTP_URL = new StringTag("http.url"); + public static final StringTag URL = new StringTag("url"); /** - * HTTP_STATUS records the http status code of the response. + * STATUS_CODE records the http status code of the response. */ - public static final IntTag HTTP_STATUS = new IntTag("http.status_code"); + public static final IntTag STATUS_CODE = new IntTag("status_code"); /** - * + * SPAN_KIND hints at the relationship between spans, e.g. client/server. */ public static final StringTag SPAN_KIND = new StringTag("span.kind"); + /** + * A constant for setting the span kind to indicate that it represents a server span. + */ + public static final String SPAN_KIND_SERVER = "server"; + + /** + * A constant for setting the span kind to indicate that it represents a client span. + */ + public static final String SPAN_KIND_CLIENT = "client"; + /** * SPAN_LAYER represents the kind of span. - * e.g. db=database, rpc=Remote Procedure Call, nosql=something like redis/memcache + * e.g. db=database; rpc=Remote Procedure Call Framework, like motan, thift; nosql=something like redis/memcache */ public static final class SPAN_LAYER { private static StringTag SPAN_LAYER_TAG = new StringTag("span.layer"); - private static final String DB_LAYER = "db"; - private static final String RPC_LAYER = "rpc"; + private static final String RDB_LAYER = "rda"; + private static final String RPC_FRAMEWORK_LAYER = "rpc"; private static final String NOSQL_LAYER = "nosql"; private static final String HTTP_LAYER = "http"; public static void asDBAccess(Span span){ - SPAN_LAYER_TAG.set(span, DB_LAYER); + SPAN_LAYER_TAG.set(span, RDB_LAYER); } - public static void asRPC(Span span){ - SPAN_LAYER_TAG.set(span, RPC_LAYER); + public static void asRPCFramework(Span span){ + SPAN_LAYER_TAG.set(span, RPC_FRAMEWORK_LAYER); } public static void asNoSQL(Span span){ @@ -60,11 +70,11 @@ public final class Tags { } public static boolean isDBAccess(Span span){ - return DB_LAYER.equals(get(span)); + return RDB_LAYER.equals(get(span)); } - public static boolean isRPC(Span span){ - return RPC_LAYER.equals(get(span)); + public static boolean isRPCFramework(Span span){ + return RPC_FRAMEWORK_LAYER.equals(get(span)); } public static boolean isNoSQL(Span span){ @@ -98,7 +108,7 @@ public final class Tags { public static final StringTag DB_URL = new StringTag("db.url"); /** - * DB_SQL records the sql statement of the database access. + * DB_STATEMENT records the sql statement of the database access. */ - public static final StringTag DB_SQL = new StringTag("db.statement"); + public static final StringTag DB_STATEMENT = new StringTag("db.statement"); } diff --git a/skywalking-commons/skywalking-trace/src/test/java/com/a/eye/skywalking/trace/SpanTestCase.java b/skywalking-commons/skywalking-trace/src/test/java/com/a/eye/skywalking/trace/SpanTestCase.java index e297e58d6..27209fc92 100644 --- a/skywalking-commons/skywalking-trace/src/test/java/com/a/eye/skywalking/trace/SpanTestCase.java +++ b/skywalking-commons/skywalking-trace/src/test/java/com/a/eye/skywalking/trace/SpanTestCase.java @@ -41,10 +41,10 @@ public class SpanTestCase { Tags.COMPONENT.set(span1, "Spring"); Tags.PEER_HOST.set(span1, ipToInt("127.0.0.1")); Tags.ERROR.set(span1, true); - Tags.HTTP_STATUS.set(span1, 302); - Tags.HTTP_URL.set(span1, "http://127.0.0.1/serviceA"); + Tags.STATUS_CODE.set(span1, 302); + Tags.URL.set(span1, "http://127.0.0.1/serviceA"); Tags.DB_URL.set(span1, "jdbc:127.0.0.1:user"); - Tags.DB_SQL.set(span1, "select * from users"); + Tags.DB_STATEMENT.set(span1, "select * from users"); Map tags = span1.getTags(); Assert.assertEquals(8, tags.size()); diff --git a/skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/plugin/jdbc/PreparedStatementTracing.java b/skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/plugin/jdbc/PreparedStatementTracing.java index 85d1557aa..115afe1b7 100644 --- a/skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/plugin/jdbc/PreparedStatementTracing.java +++ b/skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/plugin/jdbc/PreparedStatementTracing.java @@ -19,7 +19,7 @@ public class PreparedStatementTracing { try { Tags.SPAN_LAYER.asDBAccess(span); Tags.DB_URL.set(span, connectInfo); - Tags.DB_SQL.set(span, sql); + Tags.DB_STATEMENT.set(span, sql); return exec.exe(realStatement, sql); } catch (SQLException e) { span.log(e); From 9a9014174d4d04d29f96aa9c534881dcf5fd09dc Mon Sep 17 00:00:00 2001 From: wusheng Date: Sun, 19 Feb 2017 19:13:41 +0800 Subject: [PATCH 04/11] Refactor tags. --- .../com/a/eye/skywalking/trace/tag/Tags.java | 46 ++++++++++--------- .../plugin/jdbc/PreparedStatementTracing.java | 2 +- 2 files changed, 26 insertions(+), 22 deletions(-) diff --git a/skywalking-commons/skywalking-trace/src/main/java/com/a/eye/skywalking/trace/tag/Tags.java b/skywalking-commons/skywalking-trace/src/main/java/com/a/eye/skywalking/trace/tag/Tags.java index d1f51cdb2..d66701961 100644 --- a/skywalking-commons/skywalking-trace/src/main/java/com/a/eye/skywalking/trace/tag/Tags.java +++ b/skywalking-commons/skywalking-trace/src/main/java/com/a/eye/skywalking/trace/tag/Tags.java @@ -13,17 +13,17 @@ public final class Tags { } /** - * URL records the url of the incoming request. + * URL records the url of the incoming request. */ public static final StringTag URL = new StringTag("url"); /** - * STATUS_CODE records the http status code of the response. + * STATUS_CODE records the http status code of the response. */ public static final IntTag STATUS_CODE = new IntTag("status_code"); /** - * SPAN_KIND hints at the relationship between spans, e.g. client/server. + * SPAN_KIND hints at the relationship between spans, e.g. client/server. */ public static final StringTag SPAN_KIND = new StringTag("span.kind"); @@ -38,59 +38,63 @@ public final class Tags { public static final String SPAN_KIND_CLIENT = "client"; /** - * SPAN_LAYER represents the kind of span. - * e.g. db=database; rpc=Remote Procedure Call Framework, like motan, thift; nosql=something like redis/memcache + * SPAN_LAYER represents the kind of span. + * + * e.g. + * db=database; + * rpc=Remote Procedure Call Framework, like motan, thift; + * nosql=something like redis/memcache */ public static final class SPAN_LAYER { private static StringTag SPAN_LAYER_TAG = new StringTag("span.layer"); - private static final String RDB_LAYER = "rda"; + private static final String RDB_LAYER = "rdb"; private static final String RPC_FRAMEWORK_LAYER = "rpc"; private static final String NOSQL_LAYER = "nosql"; private static final String HTTP_LAYER = "http"; - public static void asDBAccess(Span span){ + public static void asRDB(Span span) { SPAN_LAYER_TAG.set(span, RDB_LAYER); } - public static void asRPCFramework(Span span){ + public static void asRPCFramework(Span span) { SPAN_LAYER_TAG.set(span, RPC_FRAMEWORK_LAYER); } - public static void asNoSQL(Span span){ + public static void asNoSQL(Span span) { SPAN_LAYER_TAG.set(span, NOSQL_LAYER); } - public static void asHttp(Span span){ + public static void asHttp(Span span) { SPAN_LAYER_TAG.set(span, HTTP_LAYER); } - public static String get(Span span){ + public static String get(Span span) { return SPAN_LAYER_TAG.get(span); } - public static boolean isDBAccess(Span span){ + public static boolean isRDB(Span span) { return RDB_LAYER.equals(get(span)); } - public static boolean isRPCFramework(Span span){ + public static boolean isRPCFramework(Span span) { return RPC_FRAMEWORK_LAYER.equals(get(span)); } - public static boolean isNoSQL(Span span){ + public static boolean isNoSQL(Span span) { return NOSQL_LAYER.equals(get(span)); } - public static boolean isHttp(Span span){ + public static boolean isHttp(Span span) { return HTTP_LAYER.equals(get(span)); } } /** - * COMPONENT is a low-cardinality identifier of the module, library, or package that is instrumented. - * Like dubbo/dubbox/motan + * COMPONENT is a low-cardinality identifier of the module, library, or package that is instrumented. + * Like dubbo/dubbox/motan */ - public static final StringTag COMPONENT = new StringTag("component"); + public static final StringTag COMPONENT = new StringTag("component"); /** * ERROR indicates whether a Span ended in an error state. @@ -98,17 +102,17 @@ public final class Tags { public static final BooleanTag ERROR = new BooleanTag("error"); /** - * PEER_HOST records host address of the peer, maybe IPV4, IPV6 or hostname. + * PEER_HOST records host address of the peer, maybe IPV4, IPV6 or hostname. */ public static final StringTag PEER_HOST = new StringTag("peer.host"); /** - * DB_URL records the url of the database access. + * DB_URL records the url of the database access. */ public static final StringTag DB_URL = new StringTag("db.url"); /** - * DB_STATEMENT records the sql statement of the database access. + * DB_STATEMENT records the sql statement of the database access. */ public static final StringTag DB_STATEMENT = new StringTag("db.statement"); } diff --git a/skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/plugin/jdbc/PreparedStatementTracing.java b/skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/plugin/jdbc/PreparedStatementTracing.java index 115afe1b7..2790e0979 100644 --- a/skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/plugin/jdbc/PreparedStatementTracing.java +++ b/skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/plugin/jdbc/PreparedStatementTracing.java @@ -17,7 +17,7 @@ public class PreparedStatementTracing { throws SQLException { Span span = ContextManager.INSTANCE.createSpan("JDBC/PreparedStatement/" + method); try { - Tags.SPAN_LAYER.asDBAccess(span); + Tags.SPAN_LAYER.asRDB(span); Tags.DB_URL.set(span, connectInfo); Tags.DB_STATEMENT.set(span, sql); return exec.exe(realStatement, sql); From 22dba10bdebe7ee2a2c3828f65d3cb0be72252dc Mon Sep 17 00:00:00 2001 From: wusheng Date: Sun, 19 Feb 2017 21:09:25 +0800 Subject: [PATCH 05/11] remove blank line. --- .../src/main/java/com/a/eye/skywalking/trace/tag/Tags.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/skywalking-commons/skywalking-trace/src/main/java/com/a/eye/skywalking/trace/tag/Tags.java b/skywalking-commons/skywalking-trace/src/main/java/com/a/eye/skywalking/trace/tag/Tags.java index d66701961..e706e975d 100644 --- a/skywalking-commons/skywalking-trace/src/main/java/com/a/eye/skywalking/trace/tag/Tags.java +++ b/skywalking-commons/skywalking-trace/src/main/java/com/a/eye/skywalking/trace/tag/Tags.java @@ -39,7 +39,7 @@ public final class Tags { /** * SPAN_LAYER represents the kind of span. - * + * * e.g. * db=database; * rpc=Remote Procedure Call Framework, like motan, thift; From 75d8aba0f42377a9ac2f04fc56b8572605557ad9 Mon Sep 17 00:00:00 2001 From: wusheng Date: Mon, 20 Feb 2017 21:54:08 +0800 Subject: [PATCH 06/11] Big refactor. Rename the api-module root package name . --- .../skywalking/health/report/HealthCollector.java | 4 ++-- .../a/eye/skywalking/{ => api}/logging/api/ILog.java | 2 +- .../skywalking/{ => api}/logging/api/LogManager.java | 2 +- .../{ => api}/logging/api/LogResolver.java | 2 +- .../skywalking/{ => api}/logging/api/NoopLogger.java | 2 +- .../{ => api}/logging/impl/log4j2/Log4j2Logger.java | 4 ++-- .../logging/impl/log4j2/Log4j2Resolver.java | 6 +++--- .../skywalking/{ => api}/util/ConfigInitializer.java | 2 +- .../a/eye/skywalking/{ => api}/util/StringUtil.java | 2 +- .../com/a/eye/skywalking/agent/SkyWalkingAgent.java | 12 ++++++------ .../agent/junction/SkyWalkingEnhanceMatcher.java | 2 +- .../com/a/eye/skywalking/{ => api}/conf/Config.java | 2 +- .../a/eye/skywalking/{ => api}/conf/Constants.java | 4 ++-- .../{ => api}/conf/SnifferConfigInitializer.java | 10 +++++----- .../skywalking/{ => api}/context/ContextCarrier.java | 4 ++-- .../skywalking/{ => api}/context/ContextManager.java | 4 ++-- .../skywalking/{ => api}/context/TracerContext.java | 6 ++---- .../{ => api}/context/TracerContextListener.java | 2 +- .../{ => api}/logging/EasyLogResolver.java | 6 +++--- .../eye/skywalking/{ => api}/logging/EasyLogger.java | 5 +++-- .../a/eye/skywalking/{ => api}/logging/IWriter.java | 2 +- .../a/eye/skywalking/{ => api}/logging/LogLevel.java | 2 +- .../skywalking/{ => api}/logging/STDOutWriter.java | 2 +- .../skywalking/{ => api}/logging/SyncFileWriter.java | 2 +- .../skywalking/{ => api}/logging/WriterFactory.java | 2 +- .../plugin/AbstractClassEnhancePluginDefine.java | 11 ++++++----- .../skywalking/{ => api}/plugin/PluginBootstrap.java | 6 +++--- .../a/eye/skywalking/{ => api}/plugin/PluginCfg.java | 4 ++-- .../{ => api}/plugin/PluginDefineCategory.java | 2 +- .../skywalking/{ => api}/plugin/PluginException.java | 2 +- .../{ => api}/plugin/PluginResourcesResolver.java | 6 +++--- .../{ => api}/plugin/TracingBootstrap.java | 6 +++--- .../bytebuddy/AllObjectDefaultMethodsMatch.java | 2 +- .../plugin/bytebuddy/ArgumentTypeNameMatch.java | 2 +- .../interceptor/ConstructorInterceptPoint.java | 2 +- .../plugin/interceptor/EnhanceException.java | 2 +- .../interceptor/EnhancedClassInstanceContext.java | 10 ++++++---- .../interceptor/InstanceMethodsInterceptPoint.java | 2 +- .../plugin/interceptor/InterceptorException.java | 2 +- .../interceptor/StaticMethodsInterceptPoint.java | 2 +- .../interceptor/assist/NoCocurrencyAceessObject.java | 6 +++--- .../enhance/ClassConstructorInterceptor.java | 10 +++++----- .../enhance/ClassEnhancePluginDefine.java | 11 +++++------ .../ClassInstanceMethodsEnhancePluginDefine.java | 3 ++- .../enhance/ClassInstanceMethodsInterceptor.java | 10 +++++----- .../ClassStaticMethodsEnhancePluginDefine.java | 4 ++-- .../enhance/ClassStaticMethodsInterceptor.java | 8 ++++---- .../enhance/ConstructorInvokeContext.java | 2 +- .../enhance/DefaultClassConstructorInterceptor.java | 8 ++++---- .../api/plugin/interceptor/enhance/FieldGetter.java | 5 +++++ .../plugin/interceptor/enhance/FieldSetter.java | 2 +- .../enhance/InstanceConstructorInterceptor.java | 4 ++-- .../enhance/InstanceMethodInvokeContext.java | 2 +- .../enhance/InstanceMethodsAroundInterceptor.java | 4 ++-- .../interceptor/enhance/MethodInterceptResult.java | 4 ++-- .../interceptor/enhance/MethodInvokeContext.java | 2 +- .../enhance/StaticMethodInvokeContext.java | 2 +- .../enhance/StaticMethodsAroundInterceptor.java | 2 +- .../loader/InterceptorInstanceLoader.java | 6 +++--- .../{ => api}/queue/TraceSegmentHolder.java | 2 +- .../{ => api}/queue/TraceSegmentProcessQueue.java | 4 ++-- .../a/eye/skywalking/{ => api}/util/LoggingUtil.java | 2 +- .../a/eye/skywalking/{ => api}/util/MachineInfo.java | 2 +- .../{ => api}/util/RoutingKeyGenerator.java | 2 +- .../skywalking/{ => api}/util/TraceIdGenerator.java | 2 +- .../plugin/interceptor/enhance/FieldGetter.java | 5 ----- .../{ => api}/context/ContextCarrierTestCase.java | 2 +- .../{ => api}/context/ContextManagerTestCase.java | 2 +- .../{ => api}/context/TestTracerContextListener.java | 2 +- .../{ => api}/context/TracerContextTestCase.java | 2 +- .../{ => api}/plugin/BeInterceptedClass.java | 2 +- .../skywalking/{ => api}/plugin/PluginMainTest.java | 2 +- .../{ => api}/plugin/PluginResourceResoverTest.java | 4 +--- .../{ => api}/plugin/TestAroundInterceptor.java | 8 ++++---- .../{ => api}/plugin/TestInterceptorDefine.java | 8 +++++--- .../plugin/TestStaticAroundInterceptor.java | 8 ++++---- .../{ => api}/plugin/dubbo/DubboBuriedPointType.java | 2 +- .../{ => api}/plugin/dubbo/DubboPluginDefine.java | 4 ++-- .../plugin/dubbo/MonitorFilterInterceptor.java | 12 ++++++------ .../plugin/dubbox/bugfix/below283/BugFixAcitve.java | 2 +- .../plugin/dubbox/bugfix/below283/SWBaseBean.java | 2 +- .../httpClient/v4/HttpClientExecuteInterceptor.java | 8 ++++---- .../plugin/httpClient/v4/WebBuriedPointType.java | 2 +- .../v4/define/AbstractHttpClientPluginDefine.java | 4 ++-- .../define/DefaultRequestDirectorPluginDefine.java | 4 ++-- .../httpClient/v4/define/HttpClientPluginDefine.java | 2 +- .../v4/define/InternalHttpClientPluginDefine.java | 4 ++-- .../v4/define/MinimalHttpClientPluginDefine.java | 4 ++-- .../plugin/jdbc/CallableStatementTracing.java | 4 ++-- .../{ => api}/plugin/jdbc/ConnectionTracing.java | 4 ++-- .../plugin/jdbc/PreparedStatementTracing.java | 4 ++-- .../{ => api}/plugin/jdbc/SWCallableStatement.java | 2 +- .../{ => api}/plugin/jdbc/SWConnection.java | 2 +- .../{ => api}/plugin/jdbc/SWPreparedStatement.java | 2 +- .../{ => api}/plugin/jdbc/SWStatement.java | 2 +- .../{ => api}/plugin/jdbc/StatementTracing.java | 4 ++-- .../jdbc/define/AbstractDatabasePluginDefine.java | 5 +++-- .../{ => api}/plugin/jdbc/define/H2PluginDefine.java | 2 +- .../plugin/jdbc/define/JDBCBuriedPointType.java | 2 +- .../plugin/jdbc/define/JDBCDriverInterceptor.java | 10 +++++----- .../plugin/jdbc/define/MysqlPluginDefine.java | 2 +- .../plugin/jdbc/define/OraclePluginDefine.java | 2 +- ...ClusterConstructorInterceptor4HostAndPortArg.java | 10 ++++------ .../JedisClusterConstructorInterceptor4SetArg.java | 8 ++++---- .../v2/JedisConstructorInterceptor4ShardInfoArg.java | 10 ++++------ .../v2/JedisConstructorInterceptor4StringArg.java | 11 ++++------- .../jedis/v2/JedisConstructorInterceptor4UriArg.java | 8 ++++---- .../plugin/jedis/v2/JedisMethodInterceptor.java | 6 +++--- .../plugin/jedis/v2/RedisBuriedPointType.java | 2 +- .../jedis/v2/define/JedisClusterPluginDefine.java | 4 ++-- .../plugin/jedis/v2/define/JedisPluginDefine.java | 5 +++-- .../{ => api}/plugin/motan/MotanBuriedPointType.java | 2 +- .../plugin/motan/MotanClientCallInterceptor.java | 9 ++++----- .../motan/MotanClientFetchCallURLInterceptor.java | 8 ++++---- .../plugin/motan/MotanServerInterceptor.java | 10 +++++----- .../plugin/motan/define/MotanClientDefine.java | 4 ++-- .../plugin/motan/define/MotanServerDefine.java | 5 +++-- .../plugin/tomcat78x/TomcatPluginInterceptor.java | 8 ++++---- .../plugin/tomcat78x/WebBuriedPointType.java | 2 +- .../plugin/tomcat78x/define/TomcatPluginDefine.java | 4 ++-- .../log/log4j/v1/x/PrintTraceIdInterceptor.java | 6 +++--- .../v1/x/TraceIdPatternConverterActivation.java | 2 +- .../log/log4j/v2/x/PrintTraceIdInterceptor.java | 2 -- .../v1/x/LogbackPatternConverterActivation.java | 2 +- .../log/logback/v1/x/PrintTraceIdInterceptor.java | 6 +++--- .../opentracing/span/SkyWalkingSpanActivation.java | 2 +- .../span/interceptor/SpanFinishInterceptor.java | 6 +++--- .../span/interceptor/SpanNewInstanceInterceptor.java | 4 ++-- .../interceptor/SpanSetOperationNameInterceptor.java | 6 +++--- .../span/interceptor/SpanSetTagInterceptor.java | 6 +++--- .../spanbuilder/SkyWalkingSpanBuilderActivation.java | 2 +- .../SpanBuilderNewInstanceInterceptor.java | 4 ++-- .../interceptor/SpanBuilderStartInterceptor.java | 6 +++--- .../SpanBuilderWithStartTimeInterceptor.java | 6 +++--- .../interceptor/SpanBuilderWithTagInterceptor.java | 6 +++--- .../tracer/SkyWalkingTracerActivation.java | 2 +- ...ractCrossProcessByteBufferContextInterceptor.java | 6 +++--- ...ExtractCrossProcessTextMapContextInterceptor.java | 6 +++--- .../TracerFormatCrossProcessContextInterceptor.java | 7 +++---- .../activation/trace/TraceContextInterceptor.java | 10 +++++----- 140 files changed, 306 insertions(+), 312 deletions(-) rename skywalking-commons/skywalking-logging/skywalking-logging-api/src/main/java/com/a/eye/skywalking/{ => api}/logging/api/ILog.java (94%) rename skywalking-commons/skywalking-logging/skywalking-logging-api/src/main/java/com/a/eye/skywalking/{ => api}/logging/api/LogManager.java (95%) rename skywalking-commons/skywalking-logging/skywalking-logging-api/src/main/java/com/a/eye/skywalking/{ => api}/logging/api/LogResolver.java (87%) rename skywalking-commons/skywalking-logging/skywalking-logging-api/src/main/java/com/a/eye/skywalking/{ => api}/logging/api/NoopLogger.java (96%) rename skywalking-commons/skywalking-logging/skywalking-logging-impl-log4j2/src/main/java/com/a/eye/skywalking/{ => api}/logging/impl/log4j2/Log4j2Logger.java (94%) rename skywalking-commons/skywalking-logging/skywalking-logging-impl-log4j2/src/main/java/com/a/eye/skywalking/{ => api}/logging/impl/log4j2/Log4j2Resolver.java (62%) rename skywalking-commons/skywalking-util/src/main/java/com/a/eye/skywalking/{ => api}/util/ConfigInitializer.java (98%) rename skywalking-commons/skywalking-util/src/main/java/com/a/eye/skywalking/{ => api}/util/StringUtil.java (95%) rename skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/{ => api}/conf/Config.java (95%) rename skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/{ => api}/conf/Constants.java (67%) rename skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/{ => api}/conf/SnifferConfigInitializer.java (89%) rename skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/{ => api}/context/ContextCarrier.java (94%) rename skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/{ => api}/context/ContextManager.java (95%) rename skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/{ => api}/context/TracerContext.java (97%) rename skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/{ => api}/context/TracerContextListener.java (93%) rename skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/{ => api}/logging/EasyLogResolver.java (57%) rename skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/{ => api}/logging/EasyLogger.java (96%) rename skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/{ => api}/logging/IWriter.java (70%) rename skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/{ => api}/logging/LogLevel.java (69%) rename skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/{ => api}/logging/STDOutWriter.java (85%) rename skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/{ => api}/logging/SyncFileWriter.java (98%) rename skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/{ => api}/logging/WriterFactory.java (88%) rename skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/{ => api}/plugin/AbstractClassEnhancePluginDefine.java (91%) rename skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/{ => api}/plugin/PluginBootstrap.java (93%) rename skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/{ => api}/plugin/PluginCfg.java (90%) rename skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/{ => api}/plugin/PluginDefineCategory.java (97%) rename skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/{ => api}/plugin/PluginException.java (88%) rename skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/{ => api}/plugin/PluginResourcesResolver.java (92%) rename skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/{ => api}/plugin/TracingBootstrap.java (94%) rename skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/{ => api}/plugin/bytebuddy/AllObjectDefaultMethodsMatch.java (98%) rename skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/{ => api}/plugin/bytebuddy/ArgumentTypeNameMatch.java (97%) rename skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/{ => api}/plugin/interceptor/ConstructorInterceptPoint.java (94%) rename skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/{ => api}/plugin/interceptor/EnhanceException.java (87%) rename skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/{ => api}/plugin/interceptor/EnhancedClassInstanceContext.java (72%) rename skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/{ => api}/plugin/interceptor/InstanceMethodsInterceptPoint.java (94%) rename skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/{ => api}/plugin/interceptor/InterceptorException.java (85%) rename skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/{ => api}/plugin/interceptor/StaticMethodsInterceptPoint.java (94%) rename skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/{ => api}/plugin/interceptor/assist/NoCocurrencyAceessObject.java (86%) rename skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/{ => api}/plugin/interceptor/enhance/ClassConstructorInterceptor.java (87%) rename skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/{ => api}/plugin/interceptor/enhance/ClassEnhancePluginDefine.java (96%) rename skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/{ => api}/plugin/interceptor/enhance/ClassInstanceMethodsEnhancePluginDefine.java (84%) rename skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/{ => api}/plugin/interceptor/enhance/ClassInstanceMethodsInterceptor.java (91%) rename skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/{ => api}/plugin/interceptor/enhance/ClassStaticMethodsEnhancePluginDefine.java (87%) rename skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/{ => api}/plugin/interceptor/enhance/ClassStaticMethodsInterceptor.java (93%) rename skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/{ => api}/plugin/interceptor/enhance/ConstructorInvokeContext.java (89%) rename skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/{ => api}/plugin/interceptor/enhance/DefaultClassConstructorInterceptor.java (78%) create mode 100644 skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/enhance/FieldGetter.java rename skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/{ => api}/plugin/interceptor/enhance/FieldSetter.java (51%) rename skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/{ => api}/plugin/interceptor/enhance/InstanceConstructorInterceptor.java (79%) rename skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/{ => api}/plugin/interceptor/enhance/InstanceMethodInvokeContext.java (90%) rename skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/{ => api}/plugin/interceptor/enhance/InstanceMethodsAroundInterceptor.java (92%) rename skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/{ => api}/plugin/interceptor/enhance/MethodInterceptResult.java (89%) rename skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/{ => api}/plugin/interceptor/enhance/MethodInvokeContext.java (93%) rename skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/{ => api}/plugin/interceptor/enhance/StaticMethodInvokeContext.java (90%) rename skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/{ => api}/plugin/interceptor/enhance/StaticMethodsAroundInterceptor.java (95%) rename skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/{ => api}/plugin/interceptor/loader/InterceptorInstanceLoader.java (97%) rename skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/{ => api}/queue/TraceSegmentHolder.java (93%) rename skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/{ => api}/queue/TraceSegmentProcessQueue.java (94%) rename skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/{ => api}/util/LoggingUtil.java (93%) rename skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/{ => api}/util/MachineInfo.java (97%) rename skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/{ => api}/util/RoutingKeyGenerator.java (91%) rename skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/{ => api}/util/TraceIdGenerator.java (97%) delete mode 100644 skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/plugin/interceptor/enhance/FieldGetter.java rename skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/{ => api}/context/ContextCarrierTestCase.java (97%) rename skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/{ => api}/context/ContextManagerTestCase.java (95%) rename skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/{ => api}/context/TestTracerContextListener.java (89%) rename skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/{ => api}/context/TracerContextTestCase.java (98%) rename skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/{ => api}/plugin/BeInterceptedClass.java (86%) rename skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/{ => api}/plugin/PluginMainTest.java (95%) rename skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/{ => api}/plugin/PluginResourceResoverTest.java (70%) rename skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/{ => api}/plugin/TestAroundInterceptor.java (75%) rename skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/{ => api}/plugin/TestInterceptorDefine.java (82%) rename skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/{ => api}/plugin/TestStaticAroundInterceptor.java (68%) rename skywalking-sniffer/skywalking-sdk-plugin/dubbo-plugin/src/main/java/com/a/eye/skywalking/{ => api}/plugin/dubbo/DubboBuriedPointType.java (86%) rename skywalking-sniffer/skywalking-sdk-plugin/dubbo-plugin/src/main/java/com/a/eye/skywalking/{ => api}/plugin/dubbo/DubboPluginDefine.java (90%) rename skywalking-sniffer/skywalking-sdk-plugin/dubbo-plugin/src/main/java/com/a/eye/skywalking/{ => api}/plugin/dubbo/MonitorFilterInterceptor.java (93%) rename skywalking-sniffer/skywalking-sdk-plugin/dubbo-plugin/src/main/java/com/a/eye/skywalking/{ => api}/plugin/dubbox/bugfix/below283/BugFixAcitve.java (68%) rename skywalking-sniffer/skywalking-sdk-plugin/dubbo-plugin/src/main/java/com/a/eye/skywalking/{ => api}/plugin/dubbox/bugfix/below283/SWBaseBean.java (81%) rename skywalking-sniffer/skywalking-sdk-plugin/httpClient-4.x-plugin/src/main/java/com/a/eye/skywalking/{ => api}/plugin/httpClient/v4/HttpClientExecuteInterceptor.java (87%) rename skywalking-sniffer/skywalking-sdk-plugin/httpClient-4.x-plugin/src/main/java/com/a/eye/skywalking/{ => api}/plugin/httpClient/v4/WebBuriedPointType.java (84%) rename skywalking-sniffer/skywalking-sdk-plugin/httpClient-4.x-plugin/src/main/java/com/a/eye/skywalking/{ => api}/plugin/httpClient/v4/define/AbstractHttpClientPluginDefine.java (86%) rename skywalking-sniffer/skywalking-sdk-plugin/httpClient-4.x-plugin/src/main/java/com/a/eye/skywalking/{ => api}/plugin/httpClient/v4/define/DefaultRequestDirectorPluginDefine.java (87%) rename skywalking-sniffer/skywalking-sdk-plugin/httpClient-4.x-plugin/src/main/java/com/a/eye/skywalking/{ => api}/plugin/httpClient/v4/define/HttpClientPluginDefine.java (89%) rename skywalking-sniffer/skywalking-sdk-plugin/httpClient-4.x-plugin/src/main/java/com/a/eye/skywalking/{ => api}/plugin/httpClient/v4/define/InternalHttpClientPluginDefine.java (85%) rename skywalking-sniffer/skywalking-sdk-plugin/httpClient-4.x-plugin/src/main/java/com/a/eye/skywalking/{ => api}/plugin/httpClient/v4/define/MinimalHttpClientPluginDefine.java (85%) rename skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/{ => api}/plugin/jdbc/CallableStatementTracing.java (92%) rename skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/{ => api}/plugin/jdbc/ConnectionTracing.java (92%) rename skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/{ => api}/plugin/jdbc/PreparedStatementTracing.java (91%) rename skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/{ => api}/plugin/jdbc/SWCallableStatement.java (99%) rename skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/{ => api}/plugin/jdbc/SWConnection.java (99%) rename skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/{ => api}/plugin/jdbc/SWPreparedStatement.java (99%) rename skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/{ => api}/plugin/jdbc/SWStatement.java (99%) rename skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/{ => api}/plugin/jdbc/StatementTracing.java (92%) rename skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/{ => api}/plugin/jdbc/define/AbstractDatabasePluginDefine.java (84%) rename skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/{ => api}/plugin/jdbc/define/H2PluginDefine.java (75%) rename skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/{ => api}/plugin/jdbc/define/JDBCBuriedPointType.java (84%) rename skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/{ => api}/plugin/jdbc/define/JDBCDriverInterceptor.java (72%) rename skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/{ => api}/plugin/jdbc/define/MysqlPluginDefine.java (80%) rename skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/{ => api}/plugin/jdbc/define/OraclePluginDefine.java (80%) rename skywalking-sniffer/skywalking-sdk-plugin/jedis-2.x-plugin/src/main/java/com/a/eye/skywalking/{ => api}/plugin/jedis/v2/JedisClusterConstructorInterceptor4HostAndPortArg.java (67%) rename skywalking-sniffer/skywalking-sdk-plugin/jedis-2.x-plugin/src/main/java/com/a/eye/skywalking/{ => api}/plugin/jedis/v2/JedisClusterConstructorInterceptor4SetArg.java (70%) rename skywalking-sniffer/skywalking-sdk-plugin/jedis-2.x-plugin/src/main/java/com/a/eye/skywalking/{ => api}/plugin/jedis/v2/JedisConstructorInterceptor4ShardInfoArg.java (66%) rename skywalking-sniffer/skywalking-sdk-plugin/jedis-2.x-plugin/src/main/java/com/a/eye/skywalking/{ => api}/plugin/jedis/v2/JedisConstructorInterceptor4StringArg.java (62%) rename skywalking-sniffer/skywalking-sdk-plugin/jedis-2.x-plugin/src/main/java/com/a/eye/skywalking/{ => api}/plugin/jedis/v2/JedisConstructorInterceptor4UriArg.java (64%) rename skywalking-sniffer/skywalking-sdk-plugin/jedis-2.x-plugin/src/main/java/com/a/eye/skywalking/{ => api}/plugin/jedis/v2/JedisMethodInterceptor.java (90%) rename skywalking-sniffer/skywalking-sdk-plugin/jedis-2.x-plugin/src/main/java/com/a/eye/skywalking/{ => api}/plugin/jedis/v2/RedisBuriedPointType.java (84%) rename skywalking-sniffer/skywalking-sdk-plugin/jedis-2.x-plugin/src/main/java/com/a/eye/skywalking/{ => api}/plugin/jedis/v2/define/JedisClusterPluginDefine.java (94%) rename skywalking-sniffer/skywalking-sdk-plugin/jedis-2.x-plugin/src/main/java/com/a/eye/skywalking/{ => api}/plugin/jedis/v2/define/JedisPluginDefine.java (93%) rename skywalking-sniffer/skywalking-sdk-plugin/motan-plugin/src/main/java/com/a/eye/skywalking/{ => api}/plugin/motan/MotanBuriedPointType.java (86%) rename skywalking-sniffer/skywalking-sdk-plugin/motan-plugin/src/main/java/com/a/eye/skywalking/{ => api}/plugin/motan/MotanClientCallInterceptor.java (86%) rename skywalking-sniffer/skywalking-sdk-plugin/motan-plugin/src/main/java/com/a/eye/skywalking/{ => api}/plugin/motan/MotanClientFetchCallURLInterceptor.java (73%) rename skywalking-sniffer/skywalking-sdk-plugin/motan-plugin/src/main/java/com/a/eye/skywalking/{ => api}/plugin/motan/MotanServerInterceptor.java (86%) rename skywalking-sniffer/skywalking-sdk-plugin/motan-plugin/src/main/java/com/a/eye/skywalking/{ => api}/plugin/motan/define/MotanClientDefine.java (92%) rename skywalking-sniffer/skywalking-sdk-plugin/motan-plugin/src/main/java/com/a/eye/skywalking/{ => api}/plugin/motan/define/MotanServerDefine.java (89%) rename skywalking-sniffer/skywalking-sdk-plugin/tomcat-7.x-8.x-plugin/src/main/java/com/a/eye/skywalking/{ => api}/plugin/tomcat78x/TomcatPluginInterceptor.java (90%) rename skywalking-sniffer/skywalking-sdk-plugin/tomcat-7.x-8.x-plugin/src/main/java/com/a/eye/skywalking/{ => api}/plugin/tomcat78x/WebBuriedPointType.java (85%) rename skywalking-sniffer/skywalking-sdk-plugin/tomcat-7.x-8.x-plugin/src/main/java/com/a/eye/skywalking/{ => api}/plugin/tomcat78x/define/TomcatPluginDefine.java (89%) diff --git a/skywalking-commons/skywalking-health-report/src/main/java/com/a/eye/skywalking/health/report/HealthCollector.java b/skywalking-commons/skywalking-health-report/src/main/java/com/a/eye/skywalking/health/report/HealthCollector.java index d081acb47..601bab84c 100644 --- a/skywalking-commons/skywalking-health-report/src/main/java/com/a/eye/skywalking/health/report/HealthCollector.java +++ b/skywalking-commons/skywalking-health-report/src/main/java/com/a/eye/skywalking/health/report/HealthCollector.java @@ -1,8 +1,8 @@ package com.a.eye.skywalking.health.report; -import com.a.eye.skywalking.logging.api.ILog; -import com.a.eye.skywalking.logging.api.LogManager; +import com.a.eye.skywalking.api.logging.api.ILog; +import com.a.eye.skywalking.api.logging.api.LogManager; import java.util.Arrays; import java.util.Map; diff --git a/skywalking-commons/skywalking-logging/skywalking-logging-api/src/main/java/com/a/eye/skywalking/logging/api/ILog.java b/skywalking-commons/skywalking-logging/skywalking-logging-api/src/main/java/com/a/eye/skywalking/api/logging/api/ILog.java similarity index 94% rename from skywalking-commons/skywalking-logging/skywalking-logging-api/src/main/java/com/a/eye/skywalking/logging/api/ILog.java rename to skywalking-commons/skywalking-logging/skywalking-logging-api/src/main/java/com/a/eye/skywalking/api/logging/api/ILog.java index dfe6a4067..449b87d2d 100644 --- a/skywalking-commons/skywalking-logging/skywalking-logging-api/src/main/java/com/a/eye/skywalking/logging/api/ILog.java +++ b/skywalking-commons/skywalking-logging/skywalking-logging-api/src/main/java/com/a/eye/skywalking/api/logging/api/ILog.java @@ -1,4 +1,4 @@ -package com.a.eye.skywalking.logging.api; +package com.a.eye.skywalking.api.logging.api; /** * The Log interface. diff --git a/skywalking-commons/skywalking-logging/skywalking-logging-api/src/main/java/com/a/eye/skywalking/logging/api/LogManager.java b/skywalking-commons/skywalking-logging/skywalking-logging-api/src/main/java/com/a/eye/skywalking/api/logging/api/LogManager.java similarity index 95% rename from skywalking-commons/skywalking-logging/skywalking-logging-api/src/main/java/com/a/eye/skywalking/logging/api/LogManager.java rename to skywalking-commons/skywalking-logging/skywalking-logging-api/src/main/java/com/a/eye/skywalking/api/logging/api/LogManager.java index 19497e286..ade1abca8 100644 --- a/skywalking-commons/skywalking-logging/skywalking-logging-api/src/main/java/com/a/eye/skywalking/logging/api/LogManager.java +++ b/skywalking-commons/skywalking-logging/skywalking-logging-api/src/main/java/com/a/eye/skywalking/api/logging/api/LogManager.java @@ -1,4 +1,4 @@ -package com.a.eye.skywalking.logging.api; +package com.a.eye.skywalking.api.logging.api; /** * LogManager is the {@link LogResolver} implementation manager. diff --git a/skywalking-commons/skywalking-logging/skywalking-logging-api/src/main/java/com/a/eye/skywalking/logging/api/LogResolver.java b/skywalking-commons/skywalking-logging/skywalking-logging-api/src/main/java/com/a/eye/skywalking/api/logging/api/LogResolver.java similarity index 87% rename from skywalking-commons/skywalking-logging/skywalking-logging-api/src/main/java/com/a/eye/skywalking/logging/api/LogResolver.java rename to skywalking-commons/skywalking-logging/skywalking-logging-api/src/main/java/com/a/eye/skywalking/api/logging/api/LogResolver.java index 0a50cef91..c311e3354 100644 --- a/skywalking-commons/skywalking-logging/skywalking-logging-api/src/main/java/com/a/eye/skywalking/logging/api/LogResolver.java +++ b/skywalking-commons/skywalking-logging/skywalking-logging-api/src/main/java/com/a/eye/skywalking/api/logging/api/LogResolver.java @@ -1,4 +1,4 @@ -package com.a.eye.skywalking.logging.api; +package com.a.eye.skywalking.api.logging.api; /** * {@link LogResolver} just do only one thing: return the {@link ILog} implementation. diff --git a/skywalking-commons/skywalking-logging/skywalking-logging-api/src/main/java/com/a/eye/skywalking/logging/api/NoopLogger.java b/skywalking-commons/skywalking-logging/skywalking-logging-api/src/main/java/com/a/eye/skywalking/api/logging/api/NoopLogger.java similarity index 96% rename from skywalking-commons/skywalking-logging/skywalking-logging-api/src/main/java/com/a/eye/skywalking/logging/api/NoopLogger.java rename to skywalking-commons/skywalking-logging/skywalking-logging-api/src/main/java/com/a/eye/skywalking/api/logging/api/NoopLogger.java index 936c13bb5..8088322e1 100644 --- a/skywalking-commons/skywalking-logging/skywalking-logging-api/src/main/java/com/a/eye/skywalking/logging/api/NoopLogger.java +++ b/skywalking-commons/skywalking-logging/skywalking-logging-api/src/main/java/com/a/eye/skywalking/api/logging/api/NoopLogger.java @@ -1,4 +1,4 @@ -package com.a.eye.skywalking.logging.api; +package com.a.eye.skywalking.api.logging.api; /** diff --git a/skywalking-commons/skywalking-logging/skywalking-logging-impl-log4j2/src/main/java/com/a/eye/skywalking/logging/impl/log4j2/Log4j2Logger.java b/skywalking-commons/skywalking-logging/skywalking-logging-impl-log4j2/src/main/java/com/a/eye/skywalking/api/logging/impl/log4j2/Log4j2Logger.java similarity index 94% rename from skywalking-commons/skywalking-logging/skywalking-logging-impl-log4j2/src/main/java/com/a/eye/skywalking/logging/impl/log4j2/Log4j2Logger.java rename to skywalking-commons/skywalking-logging/skywalking-logging-impl-log4j2/src/main/java/com/a/eye/skywalking/api/logging/impl/log4j2/Log4j2Logger.java index ca8e2ec81..2fb1f5d37 100644 --- a/skywalking-commons/skywalking-logging/skywalking-logging-impl-log4j2/src/main/java/com/a/eye/skywalking/logging/impl/log4j2/Log4j2Logger.java +++ b/skywalking-commons/skywalking-logging/skywalking-logging-impl-log4j2/src/main/java/com/a/eye/skywalking/api/logging/impl/log4j2/Log4j2Logger.java @@ -1,6 +1,6 @@ -package com.a.eye.skywalking.logging.impl.log4j2; +package com.a.eye.skywalking.api.logging.impl.log4j2; -import com.a.eye.skywalking.logging.api.ILog; +import com.a.eye.skywalking.api.logging.api.ILog; import org.apache.logging.log4j.Logger; /** diff --git a/skywalking-commons/skywalking-logging/skywalking-logging-impl-log4j2/src/main/java/com/a/eye/skywalking/logging/impl/log4j2/Log4j2Resolver.java b/skywalking-commons/skywalking-logging/skywalking-logging-impl-log4j2/src/main/java/com/a/eye/skywalking/api/logging/impl/log4j2/Log4j2Resolver.java similarity index 62% rename from skywalking-commons/skywalking-logging/skywalking-logging-impl-log4j2/src/main/java/com/a/eye/skywalking/logging/impl/log4j2/Log4j2Resolver.java rename to skywalking-commons/skywalking-logging/skywalking-logging-impl-log4j2/src/main/java/com/a/eye/skywalking/api/logging/impl/log4j2/Log4j2Resolver.java index de0d9ca20..a2fb23d78 100644 --- a/skywalking-commons/skywalking-logging/skywalking-logging-impl-log4j2/src/main/java/com/a/eye/skywalking/logging/impl/log4j2/Log4j2Resolver.java +++ b/skywalking-commons/skywalking-logging/skywalking-logging-impl-log4j2/src/main/java/com/a/eye/skywalking/api/logging/impl/log4j2/Log4j2Resolver.java @@ -1,7 +1,7 @@ -package com.a.eye.skywalking.logging.impl.log4j2; +package com.a.eye.skywalking.api.logging.impl.log4j2; -import com.a.eye.skywalking.logging.api.ILog; -import com.a.eye.skywalking.logging.api.LogResolver; +import com.a.eye.skywalking.api.logging.api.ILog; +import com.a.eye.skywalking.api.logging.api.LogResolver; import org.apache.logging.log4j.LogManager; /** diff --git a/skywalking-commons/skywalking-util/src/main/java/com/a/eye/skywalking/util/ConfigInitializer.java b/skywalking-commons/skywalking-util/src/main/java/com/a/eye/skywalking/api/util/ConfigInitializer.java similarity index 98% rename from skywalking-commons/skywalking-util/src/main/java/com/a/eye/skywalking/util/ConfigInitializer.java rename to skywalking-commons/skywalking-util/src/main/java/com/a/eye/skywalking/api/util/ConfigInitializer.java index b43907e62..7a079b81d 100644 --- a/skywalking-commons/skywalking-util/src/main/java/com/a/eye/skywalking/util/ConfigInitializer.java +++ b/skywalking-commons/skywalking-util/src/main/java/com/a/eye/skywalking/api/util/ConfigInitializer.java @@ -1,4 +1,4 @@ -package com.a.eye.skywalking.util; +package com.a.eye.skywalking.api.util; import java.lang.reflect.Field; import java.lang.reflect.Modifier; diff --git a/skywalking-commons/skywalking-util/src/main/java/com/a/eye/skywalking/util/StringUtil.java b/skywalking-commons/skywalking-util/src/main/java/com/a/eye/skywalking/api/util/StringUtil.java similarity index 95% rename from skywalking-commons/skywalking-util/src/main/java/com/a/eye/skywalking/util/StringUtil.java rename to skywalking-commons/skywalking-util/src/main/java/com/a/eye/skywalking/api/util/StringUtil.java index aee0e9096..d448a3802 100644 --- a/skywalking-commons/skywalking-util/src/main/java/com/a/eye/skywalking/util/StringUtil.java +++ b/skywalking-commons/skywalking-util/src/main/java/com/a/eye/skywalking/api/util/StringUtil.java @@ -1,4 +1,4 @@ -package com.a.eye.skywalking.util; +package com.a.eye.skywalking.api.util; public final class StringUtil { public static boolean isEmpty(String str) { diff --git a/skywalking-sniffer/skywalking-agent/src/main/java/com/a/eye/skywalking/agent/SkyWalkingAgent.java b/skywalking-sniffer/skywalking-agent/src/main/java/com/a/eye/skywalking/agent/SkyWalkingAgent.java index df3cf091e..21868ecc7 100644 --- a/skywalking-sniffer/skywalking-agent/src/main/java/com/a/eye/skywalking/agent/SkyWalkingAgent.java +++ b/skywalking-sniffer/skywalking-agent/src/main/java/com/a/eye/skywalking/agent/SkyWalkingAgent.java @@ -2,13 +2,13 @@ package com.a.eye.skywalking.agent; import com.a.eye.skywalking.agent.junction.SkyWalkingEnhanceMatcher; import com.a.eye.skywalking.conf.Config; -import com.a.eye.skywalking.conf.SnifferConfigInitializer; +import com.a.eye.skywalking.api.conf.SnifferConfigInitializer; import com.a.eye.skywalking.logging.EasyLogResolver; -import com.a.eye.skywalking.logging.api.ILog; -import com.a.eye.skywalking.logging.api.LogManager; -import com.a.eye.skywalking.plugin.AbstractClassEnhancePluginDefine; -import com.a.eye.skywalking.plugin.PluginBootstrap; -import com.a.eye.skywalking.plugin.PluginDefineCategory; +import com.a.eye.skywalking.api.logging.api.ILog; +import com.a.eye.skywalking.api.logging.api.LogManager; +import com.a.eye.skywalking.api.plugin.AbstractClassEnhancePluginDefine; +import com.a.eye.skywalking.api.plugin.PluginBootstrap; +import com.a.eye.skywalking.api.plugin.PluginDefineCategory; import com.a.eye.skywalking.plugin.PluginException; import net.bytebuddy.agent.builder.AgentBuilder; import net.bytebuddy.description.NamedElement; diff --git a/skywalking-sniffer/skywalking-agent/src/main/java/com/a/eye/skywalking/agent/junction/SkyWalkingEnhanceMatcher.java b/skywalking-sniffer/skywalking-agent/src/main/java/com/a/eye/skywalking/agent/junction/SkyWalkingEnhanceMatcher.java index 8dd4c9eae..340608860 100644 --- a/skywalking-sniffer/skywalking-agent/src/main/java/com/a/eye/skywalking/agent/junction/SkyWalkingEnhanceMatcher.java +++ b/skywalking-sniffer/skywalking-agent/src/main/java/com/a/eye/skywalking/agent/junction/SkyWalkingEnhanceMatcher.java @@ -1,6 +1,6 @@ package com.a.eye.skywalking.agent.junction; -import com.a.eye.skywalking.plugin.PluginDefineCategory; +import com.a.eye.skywalking.api.plugin.PluginDefineCategory; import net.bytebuddy.description.NamedElement; /** diff --git a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/conf/Config.java b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/conf/Config.java similarity index 95% rename from skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/conf/Config.java rename to skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/conf/Config.java index 85032931d..6ed63537e 100644 --- a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/conf/Config.java +++ b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/conf/Config.java @@ -1,4 +1,4 @@ -package com.a.eye.skywalking.conf; +package com.a.eye.skywalking.api.conf; public class Config { diff --git a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/conf/Constants.java b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/conf/Constants.java similarity index 67% rename from skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/conf/Constants.java rename to skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/conf/Constants.java index fa1ebc8ea..8751a1be4 100644 --- a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/conf/Constants.java +++ b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/conf/Constants.java @@ -1,6 +1,6 @@ -package com.a.eye.skywalking.conf; +package com.a.eye.skywalking.api.conf; -import com.a.eye.skywalking.util.TraceIdGenerator; +import com.a.eye.skywalking.api.util.TraceIdGenerator; public class Constants { /** diff --git a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/conf/SnifferConfigInitializer.java b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/conf/SnifferConfigInitializer.java similarity index 89% rename from skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/conf/SnifferConfigInitializer.java rename to skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/conf/SnifferConfigInitializer.java index 1a04b78bf..4faa1b64e 100644 --- a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/conf/SnifferConfigInitializer.java +++ b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/conf/SnifferConfigInitializer.java @@ -1,9 +1,9 @@ -package com.a.eye.skywalking.conf; +package com.a.eye.skywalking.api.conf; -import com.a.eye.skywalking.logging.api.ILog; -import com.a.eye.skywalking.logging.api.LogManager; -import com.a.eye.skywalking.util.ConfigInitializer; -import com.a.eye.skywalking.util.StringUtil; +import com.a.eye.skywalking.api.logging.api.ILog; +import com.a.eye.skywalking.api.logging.api.LogManager; +import com.a.eye.skywalking.api.util.ConfigInitializer; +import com.a.eye.skywalking.api.util.StringUtil; import java.io.File; import java.io.FileInputStream; diff --git a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/context/ContextCarrier.java b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/context/ContextCarrier.java similarity index 94% rename from skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/context/ContextCarrier.java rename to skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/context/ContextCarrier.java index a4bb855ff..30d880d09 100644 --- a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/context/ContextCarrier.java +++ b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/context/ContextCarrier.java @@ -1,7 +1,7 @@ -package com.a.eye.skywalking.context; +package com.a.eye.skywalking.api.context; import com.a.eye.skywalking.trace.TraceSegmentRef; -import com.a.eye.skywalking.util.StringUtil; +import com.a.eye.skywalking.api.util.StringUtil; import java.io.Serializable; /** diff --git a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/context/ContextManager.java b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/context/ContextManager.java similarity index 95% rename from skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/context/ContextManager.java rename to skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/context/ContextManager.java index 49fa84965..2ff330509 100644 --- a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/context/ContextManager.java +++ b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/context/ContextManager.java @@ -1,6 +1,6 @@ -package com.a.eye.skywalking.context; +package com.a.eye.skywalking.api.context; -import com.a.eye.skywalking.queue.TraceSegmentProcessQueue; +import com.a.eye.skywalking.api.queue.TraceSegmentProcessQueue; import com.a.eye.skywalking.trace.Span; import com.a.eye.skywalking.trace.TraceSegment; diff --git a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/context/TracerContext.java b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/context/TracerContext.java similarity index 97% rename from skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/context/TracerContext.java rename to skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/context/TracerContext.java index a60911c27..ea8faf001 100644 --- a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/context/TracerContext.java +++ b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/context/TracerContext.java @@ -1,11 +1,9 @@ -package com.a.eye.skywalking.context; +package com.a.eye.skywalking.api.context; import com.a.eye.skywalking.trace.Span; import com.a.eye.skywalking.trace.TraceSegment; -import com.a.eye.skywalking.util.TraceIdGenerator; -import java.lang.reflect.Executable; +import com.a.eye.skywalking.api.util.TraceIdGenerator; import java.util.ArrayList; -import java.util.Iterator; import java.util.LinkedList; import java.util.List; diff --git a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/context/TracerContextListener.java b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/context/TracerContextListener.java similarity index 93% rename from skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/context/TracerContextListener.java rename to skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/context/TracerContextListener.java index d1753cb2d..b343492e1 100644 --- a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/context/TracerContextListener.java +++ b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/context/TracerContextListener.java @@ -1,4 +1,4 @@ -package com.a.eye.skywalking.context; +package com.a.eye.skywalking.api.context; import com.a.eye.skywalking.trace.TraceSegment; diff --git a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/logging/EasyLogResolver.java b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/logging/EasyLogResolver.java similarity index 57% rename from skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/logging/EasyLogResolver.java rename to skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/logging/EasyLogResolver.java index dc1f578ed..3f9103b72 100644 --- a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/logging/EasyLogResolver.java +++ b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/logging/EasyLogResolver.java @@ -1,7 +1,7 @@ -package com.a.eye.skywalking.logging; +package com.a.eye.skywalking.api.logging; -import com.a.eye.skywalking.logging.api.ILog; -import com.a.eye.skywalking.logging.api.LogResolver; +import com.a.eye.skywalking.api.logging.api.ILog; +import com.a.eye.skywalking.api.logging.api.LogResolver; /** * Created by wusheng on 2016/11/26. diff --git a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/logging/EasyLogger.java b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/logging/EasyLogger.java similarity index 96% rename from skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/logging/EasyLogger.java rename to skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/logging/EasyLogger.java index 1c71dcd81..d5e9dfa12 100644 --- a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/logging/EasyLogger.java +++ b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/logging/EasyLogger.java @@ -1,6 +1,7 @@ -package com.a.eye.skywalking.logging; +package com.a.eye.skywalking.api.logging; +import com.a.eye.skywalking.api.logging.api.ILog; import com.a.eye.skywalking.util.LoggingUtil; import java.net.URLEncoder; @@ -12,7 +13,7 @@ import static com.a.eye.skywalking.logging.LogLevel.*; /** * Created by xin on 16-6-23. */ -public class EasyLogger implements com.a.eye.skywalking.logging.api.ILog { +public class EasyLogger implements ILog { private Class toBeLoggerClass; diff --git a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/logging/IWriter.java b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/logging/IWriter.java similarity index 70% rename from skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/logging/IWriter.java rename to skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/logging/IWriter.java index 36a3945a2..4bbf17116 100644 --- a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/logging/IWriter.java +++ b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/logging/IWriter.java @@ -1,4 +1,4 @@ -package com.a.eye.skywalking.logging; +package com.a.eye.skywalking.api.logging; public interface IWriter { void write(String message); diff --git a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/logging/LogLevel.java b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/logging/LogLevel.java similarity index 69% rename from skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/logging/LogLevel.java rename to skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/logging/LogLevel.java index 61a84a5fb..feb602e31 100644 --- a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/logging/LogLevel.java +++ b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/logging/LogLevel.java @@ -1,4 +1,4 @@ -package com.a.eye.skywalking.logging; +package com.a.eye.skywalking.api.logging; /** * Created by xin on 2016/12/7. diff --git a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/logging/STDOutWriter.java b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/logging/STDOutWriter.java similarity index 85% rename from skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/logging/STDOutWriter.java rename to skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/logging/STDOutWriter.java index 77a29d63a..58fbeaef0 100644 --- a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/logging/STDOutWriter.java +++ b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/logging/STDOutWriter.java @@ -1,4 +1,4 @@ -package com.a.eye.skywalking.logging; +package com.a.eye.skywalking.api.logging; public class STDOutWriter implements IWriter { diff --git a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/logging/SyncFileWriter.java b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/logging/SyncFileWriter.java similarity index 98% rename from skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/logging/SyncFileWriter.java rename to skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/logging/SyncFileWriter.java index bd09c64aa..21cfd4872 100644 --- a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/logging/SyncFileWriter.java +++ b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/logging/SyncFileWriter.java @@ -1,4 +1,4 @@ -package com.a.eye.skywalking.logging; +package com.a.eye.skywalking.api.logging; import com.a.eye.skywalking.conf.Config; diff --git a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/logging/WriterFactory.java b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/logging/WriterFactory.java similarity index 88% rename from skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/logging/WriterFactory.java rename to skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/logging/WriterFactory.java index 0f62810d0..1e290aa26 100644 --- a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/logging/WriterFactory.java +++ b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/logging/WriterFactory.java @@ -1,4 +1,4 @@ -package com.a.eye.skywalking.logging; +package com.a.eye.skywalking.api.logging; import com.a.eye.skywalking.conf.Config; diff --git a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/plugin/AbstractClassEnhancePluginDefine.java b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/AbstractClassEnhancePluginDefine.java similarity index 91% rename from skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/plugin/AbstractClassEnhancePluginDefine.java rename to skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/AbstractClassEnhancePluginDefine.java index ccf1c3b99..7d6de38fe 100644 --- a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/plugin/AbstractClassEnhancePluginDefine.java +++ b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/AbstractClassEnhancePluginDefine.java @@ -1,8 +1,9 @@ -package com.a.eye.skywalking.plugin; +package com.a.eye.skywalking.api.plugin; -import com.a.eye.skywalking.logging.api.ILog; -import com.a.eye.skywalking.logging.api.LogManager; -import com.a.eye.skywalking.util.StringUtil; +import com.a.eye.skywalking.api.logging.api.ILog; +import com.a.eye.skywalking.api.logging.api.LogManager; +import com.a.eye.skywalking.api.plugin.interceptor.enhance.ClassEnhancePluginDefine; +import com.a.eye.skywalking.api.util.StringUtil; import net.bytebuddy.dynamic.DynamicType; import net.bytebuddy.pool.TypePool.Resolution; @@ -10,7 +11,7 @@ import net.bytebuddy.pool.TypePool.Resolution; * Basic abstract class of all sky-walking auto-instrumentation plugins. *

* It provides the outline of enhancing the target class. - * If you want to know more about enhancing, you should go to see {@link com.a.eye.skywalking.plugin.interceptor.enhance.ClassEnhancePluginDefine} + * If you want to know more about enhancing, you should go to see {@link ClassEnhancePluginDefine} */ public abstract class AbstractClassEnhancePluginDefine { private static ILog logger = LogManager.getLogger(AbstractClassEnhancePluginDefine.class); diff --git a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/plugin/PluginBootstrap.java b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/PluginBootstrap.java similarity index 93% rename from skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/plugin/PluginBootstrap.java rename to skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/PluginBootstrap.java index f799eb865..c5349b3d6 100644 --- a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/plugin/PluginBootstrap.java +++ b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/PluginBootstrap.java @@ -1,7 +1,7 @@ -package com.a.eye.skywalking.plugin; +package com.a.eye.skywalking.api.plugin; -import com.a.eye.skywalking.logging.api.ILog; -import com.a.eye.skywalking.logging.api.LogManager; +import com.a.eye.skywalking.api.logging.api.ILog; +import com.a.eye.skywalking.api.logging.api.LogManager; import net.bytebuddy.pool.TypePool; import java.net.URL; diff --git a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/plugin/PluginCfg.java b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/PluginCfg.java similarity index 90% rename from skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/plugin/PluginCfg.java rename to skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/PluginCfg.java index 9822136eb..2c31816b1 100644 --- a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/plugin/PluginCfg.java +++ b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/PluginCfg.java @@ -1,6 +1,6 @@ -package com.a.eye.skywalking.plugin; +package com.a.eye.skywalking.api.plugin; -import com.a.eye.skywalking.util.StringUtil; +import com.a.eye.skywalking.api.util.StringUtil; import java.io.BufferedReader; import java.io.IOException; diff --git a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/plugin/PluginDefineCategory.java b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/PluginDefineCategory.java similarity index 97% rename from skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/plugin/PluginDefineCategory.java rename to skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/PluginDefineCategory.java index 8c690d62d..75f45d81b 100644 --- a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/plugin/PluginDefineCategory.java +++ b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/PluginDefineCategory.java @@ -1,4 +1,4 @@ -package com.a.eye.skywalking.plugin; +package com.a.eye.skywalking.api.plugin; import java.util.HashMap; import java.util.List; diff --git a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/plugin/PluginException.java b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/PluginException.java similarity index 88% rename from skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/plugin/PluginException.java rename to skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/PluginException.java index 7b8170fbf..4cab724e9 100644 --- a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/plugin/PluginException.java +++ b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/PluginException.java @@ -1,4 +1,4 @@ -package com.a.eye.skywalking.plugin; +package com.a.eye.skywalking.api.plugin; public class PluginException extends RuntimeException { private static final long serialVersionUID = -6020188711867490724L; diff --git a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/plugin/PluginResourcesResolver.java b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/PluginResourcesResolver.java similarity index 92% rename from skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/plugin/PluginResourcesResolver.java rename to skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/PluginResourcesResolver.java index 52ad8a026..415014db2 100644 --- a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/plugin/PluginResourcesResolver.java +++ b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/PluginResourcesResolver.java @@ -1,7 +1,7 @@ -package com.a.eye.skywalking.plugin; +package com.a.eye.skywalking.api.plugin; -import com.a.eye.skywalking.logging.api.ILog; -import com.a.eye.skywalking.logging.api.LogManager; +import com.a.eye.skywalking.api.logging.api.ILog; +import com.a.eye.skywalking.api.logging.api.LogManager; import java.io.IOException; import java.net.URL; diff --git a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/plugin/TracingBootstrap.java b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/TracingBootstrap.java similarity index 94% rename from skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/plugin/TracingBootstrap.java rename to skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/TracingBootstrap.java index d4a9c14bb..0aebaa931 100644 --- a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/plugin/TracingBootstrap.java +++ b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/TracingBootstrap.java @@ -1,7 +1,7 @@ -package com.a.eye.skywalking.plugin; +package com.a.eye.skywalking.api.plugin; -import com.a.eye.skywalking.logging.api.ILog; -import com.a.eye.skywalking.logging.api.LogManager; +import com.a.eye.skywalking.api.logging.api.ILog; +import com.a.eye.skywalking.api.logging.api.LogManager; import net.bytebuddy.ByteBuddy; import net.bytebuddy.dynamic.ClassFileLocator; import net.bytebuddy.dynamic.DynamicType; diff --git a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/plugin/bytebuddy/AllObjectDefaultMethodsMatch.java b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/bytebuddy/AllObjectDefaultMethodsMatch.java similarity index 98% rename from skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/plugin/bytebuddy/AllObjectDefaultMethodsMatch.java rename to skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/bytebuddy/AllObjectDefaultMethodsMatch.java index 833e3d0eb..84858e831 100644 --- a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/plugin/bytebuddy/AllObjectDefaultMethodsMatch.java +++ b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/bytebuddy/AllObjectDefaultMethodsMatch.java @@ -1,4 +1,4 @@ -package com.a.eye.skywalking.plugin.bytebuddy; +package com.a.eye.skywalking.api.plugin.bytebuddy; import net.bytebuddy.description.method.MethodDescription; import net.bytebuddy.matcher.ElementMatcher; diff --git a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/plugin/bytebuddy/ArgumentTypeNameMatch.java b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/bytebuddy/ArgumentTypeNameMatch.java similarity index 97% rename from skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/plugin/bytebuddy/ArgumentTypeNameMatch.java rename to skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/bytebuddy/ArgumentTypeNameMatch.java index 6efebf36f..6d8c8c6af 100644 --- a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/plugin/bytebuddy/ArgumentTypeNameMatch.java +++ b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/bytebuddy/ArgumentTypeNameMatch.java @@ -1,4 +1,4 @@ -package com.a.eye.skywalking.plugin.bytebuddy; +package com.a.eye.skywalking.api.plugin.bytebuddy; import net.bytebuddy.description.method.MethodDescription; import net.bytebuddy.matcher.ElementMatcher; diff --git a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/plugin/interceptor/ConstructorInterceptPoint.java b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/ConstructorInterceptPoint.java similarity index 94% rename from skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/plugin/interceptor/ConstructorInterceptPoint.java rename to skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/ConstructorInterceptPoint.java index a68a0e1d3..401f5196e 100644 --- a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/plugin/interceptor/ConstructorInterceptPoint.java +++ b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/ConstructorInterceptPoint.java @@ -1,4 +1,4 @@ -package com.a.eye.skywalking.plugin.interceptor; +package com.a.eye.skywalking.api.plugin.interceptor; import net.bytebuddy.description.method.MethodDescription; import net.bytebuddy.matcher.ElementMatcher; diff --git a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/plugin/interceptor/EnhanceException.java b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/EnhanceException.java similarity index 87% rename from skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/plugin/interceptor/EnhanceException.java rename to skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/EnhanceException.java index 2663964f1..adf1fae5c 100644 --- a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/plugin/interceptor/EnhanceException.java +++ b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/EnhanceException.java @@ -1,4 +1,4 @@ -package com.a.eye.skywalking.plugin.interceptor; +package com.a.eye.skywalking.api.plugin.interceptor; import com.a.eye.skywalking.plugin.PluginException; diff --git a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/plugin/interceptor/EnhancedClassInstanceContext.java b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/EnhancedClassInstanceContext.java similarity index 72% rename from skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/plugin/interceptor/EnhancedClassInstanceContext.java rename to skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/EnhancedClassInstanceContext.java index 0e4310576..34736fd77 100644 --- a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/plugin/interceptor/EnhancedClassInstanceContext.java +++ b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/EnhancedClassInstanceContext.java @@ -1,15 +1,17 @@ -package com.a.eye.skywalking.plugin.interceptor; +package com.a.eye.skywalking.api.plugin.interceptor; +import com.a.eye.skywalking.api.plugin.AbstractClassEnhancePluginDefine; +import com.a.eye.skywalking.api.plugin.interceptor.enhance.ClassEnhancePluginDefine; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; /** * Enhanced instance field type. * - * Any plugins({@link com.a.eye.skywalking.plugin.AbstractClassEnhancePluginDefine}'s subclass) override - * {@link com.a.eye.skywalking.plugin.interceptor.enhance.ClassEnhancePluginDefine#getConstructorsInterceptPoints} + * Any plugins({@link AbstractClassEnhancePluginDefine}'s subclass) override + * {@link ClassEnhancePluginDefine#getConstructorsInterceptPoints} * or - * {@link com.a.eye.skywalking.plugin.interceptor.enhance.ClassEnhancePluginDefine#getInstanceMethodsInterceptPoints} + * {@link ClassEnhancePluginDefine#getInstanceMethodsInterceptPoints} * will add a field with this type. * * @author wusheng diff --git a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/plugin/interceptor/InstanceMethodsInterceptPoint.java b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/InstanceMethodsInterceptPoint.java similarity index 94% rename from skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/plugin/interceptor/InstanceMethodsInterceptPoint.java rename to skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/InstanceMethodsInterceptPoint.java index 0a21a58e6..76587e356 100644 --- a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/plugin/interceptor/InstanceMethodsInterceptPoint.java +++ b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/InstanceMethodsInterceptPoint.java @@ -1,4 +1,4 @@ -package com.a.eye.skywalking.plugin.interceptor; +package com.a.eye.skywalking.api.plugin.interceptor; import net.bytebuddy.description.method.MethodDescription; import net.bytebuddy.matcher.ElementMatcher; diff --git a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/plugin/interceptor/InterceptorException.java b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/InterceptorException.java similarity index 85% rename from skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/plugin/interceptor/InterceptorException.java rename to skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/InterceptorException.java index b1a10e983..43e6072a5 100644 --- a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/plugin/interceptor/InterceptorException.java +++ b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/InterceptorException.java @@ -1,4 +1,4 @@ -package com.a.eye.skywalking.plugin.interceptor; +package com.a.eye.skywalking.api.plugin.interceptor; public class InterceptorException extends RuntimeException { private static final long serialVersionUID = 7846035239994885019L; diff --git a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/plugin/interceptor/StaticMethodsInterceptPoint.java b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/StaticMethodsInterceptPoint.java similarity index 94% rename from skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/plugin/interceptor/StaticMethodsInterceptPoint.java rename to skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/StaticMethodsInterceptPoint.java index f8d726631..a06c38217 100644 --- a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/plugin/interceptor/StaticMethodsInterceptPoint.java +++ b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/StaticMethodsInterceptPoint.java @@ -1,4 +1,4 @@ -package com.a.eye.skywalking.plugin.interceptor; +package com.a.eye.skywalking.api.plugin.interceptor; import net.bytebuddy.description.method.MethodDescription; import net.bytebuddy.matcher.ElementMatcher; diff --git a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/plugin/interceptor/assist/NoCocurrencyAceessObject.java b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/assist/NoCocurrencyAceessObject.java similarity index 86% rename from skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/plugin/interceptor/assist/NoCocurrencyAceessObject.java rename to skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/assist/NoCocurrencyAceessObject.java index bfaedb993..eaa0ffadb 100644 --- a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/plugin/interceptor/assist/NoCocurrencyAceessObject.java +++ b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/assist/NoCocurrencyAceessObject.java @@ -1,8 +1,8 @@ -package com.a.eye.skywalking.plugin.interceptor.assist; +package com.a.eye.skywalking.api.plugin.interceptor.assist; -import com.a.eye.skywalking.plugin.interceptor.EnhancedClassInstanceContext; +import com.a.eye.skywalking.api.plugin.interceptor.EnhancedClassInstanceContext; import com.a.eye.skywalking.plugin.interceptor.InterceptorException; -import com.a.eye.skywalking.plugin.interceptor.enhance.InstanceMethodsAroundInterceptor; +import com.a.eye.skywalking.api.plugin.interceptor.enhance.InstanceMethodsAroundInterceptor; /** * {@link NoCocurrencyAceessObject} is an abstract class, diff --git a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/plugin/interceptor/enhance/ClassConstructorInterceptor.java b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/enhance/ClassConstructorInterceptor.java similarity index 87% rename from skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/plugin/interceptor/enhance/ClassConstructorInterceptor.java rename to skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/enhance/ClassConstructorInterceptor.java index c6bc9c73b..0c4473851 100644 --- a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/plugin/interceptor/enhance/ClassConstructorInterceptor.java +++ b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/enhance/ClassConstructorInterceptor.java @@ -1,9 +1,9 @@ -package com.a.eye.skywalking.plugin.interceptor.enhance; +package com.a.eye.skywalking.api.plugin.interceptor.enhance; -import com.a.eye.skywalking.logging.api.ILog; -import com.a.eye.skywalking.logging.api.LogManager; -import com.a.eye.skywalking.plugin.interceptor.EnhancedClassInstanceContext; -import com.a.eye.skywalking.plugin.interceptor.loader.InterceptorInstanceLoader; +import com.a.eye.skywalking.api.logging.api.ILog; +import com.a.eye.skywalking.api.logging.api.LogManager; +import com.a.eye.skywalking.api.plugin.interceptor.loader.InterceptorInstanceLoader; +import com.a.eye.skywalking.api.plugin.interceptor.EnhancedClassInstanceContext; import net.bytebuddy.implementation.bind.annotation.AllArguments; import net.bytebuddy.implementation.bind.annotation.FieldProxy; import net.bytebuddy.implementation.bind.annotation.RuntimeType; diff --git a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/plugin/interceptor/enhance/ClassEnhancePluginDefine.java b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/enhance/ClassEnhancePluginDefine.java similarity index 96% rename from skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/plugin/interceptor/enhance/ClassEnhancePluginDefine.java rename to skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/enhance/ClassEnhancePluginDefine.java index 02621024f..dbb2d3c3e 100644 --- a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/plugin/interceptor/enhance/ClassEnhancePluginDefine.java +++ b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/enhance/ClassEnhancePluginDefine.java @@ -1,11 +1,10 @@ -package com.a.eye.skywalking.plugin.interceptor.enhance; +package com.a.eye.skywalking.api.plugin.interceptor.enhance; -import com.a.eye.skywalking.logging.api.ILog; -import com.a.eye.skywalking.logging.api.LogManager; -import com.a.eye.skywalking.plugin.AbstractClassEnhancePluginDefine; +import com.a.eye.skywalking.api.logging.api.ILog; +import com.a.eye.skywalking.api.logging.api.LogManager; +import com.a.eye.skywalking.api.plugin.AbstractClassEnhancePluginDefine; import com.a.eye.skywalking.plugin.PluginException; -import com.a.eye.skywalking.plugin.interceptor.*; -import com.a.eye.skywalking.util.StringUtil; +import com.a.eye.skywalking.api.util.StringUtil; import net.bytebuddy.description.method.MethodDescription; import net.bytebuddy.dynamic.DynamicType; import net.bytebuddy.implementation.MethodDelegation; diff --git a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/plugin/interceptor/enhance/ClassInstanceMethodsEnhancePluginDefine.java b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/enhance/ClassInstanceMethodsEnhancePluginDefine.java similarity index 84% rename from skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/plugin/interceptor/enhance/ClassInstanceMethodsEnhancePluginDefine.java rename to skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/enhance/ClassInstanceMethodsEnhancePluginDefine.java index 1fcd98439..97571d4dc 100644 --- a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/plugin/interceptor/enhance/ClassInstanceMethodsEnhancePluginDefine.java +++ b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/enhance/ClassInstanceMethodsEnhancePluginDefine.java @@ -1,5 +1,6 @@ -package com.a.eye.skywalking.plugin.interceptor.enhance; +package com.a.eye.skywalking.api.plugin.interceptor.enhance; +import com.a.eye.skywalking.api.plugin.interceptor.StaticMethodsInterceptPoint; import com.a.eye.skywalking.plugin.interceptor.StaticMethodsInterceptPoint; /** diff --git a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/plugin/interceptor/enhance/ClassInstanceMethodsInterceptor.java b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/enhance/ClassInstanceMethodsInterceptor.java similarity index 91% rename from skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/plugin/interceptor/enhance/ClassInstanceMethodsInterceptor.java rename to skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/enhance/ClassInstanceMethodsInterceptor.java index 664d7dd60..0def0d564 100644 --- a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/plugin/interceptor/enhance/ClassInstanceMethodsInterceptor.java +++ b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/enhance/ClassInstanceMethodsInterceptor.java @@ -1,9 +1,9 @@ -package com.a.eye.skywalking.plugin.interceptor.enhance; +package com.a.eye.skywalking.api.plugin.interceptor.enhance; -import com.a.eye.skywalking.logging.api.ILog; -import com.a.eye.skywalking.logging.api.LogManager; -import com.a.eye.skywalking.plugin.interceptor.EnhancedClassInstanceContext; -import com.a.eye.skywalking.plugin.interceptor.loader.InterceptorInstanceLoader; +import com.a.eye.skywalking.api.logging.api.ILog; +import com.a.eye.skywalking.api.logging.api.LogManager; +import com.a.eye.skywalking.api.plugin.interceptor.loader.InterceptorInstanceLoader; +import com.a.eye.skywalking.api.plugin.interceptor.EnhancedClassInstanceContext; import net.bytebuddy.implementation.bind.annotation.*; import java.lang.reflect.Method; diff --git a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/plugin/interceptor/enhance/ClassStaticMethodsEnhancePluginDefine.java b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/enhance/ClassStaticMethodsEnhancePluginDefine.java similarity index 87% rename from skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/plugin/interceptor/enhance/ClassStaticMethodsEnhancePluginDefine.java rename to skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/enhance/ClassStaticMethodsEnhancePluginDefine.java index 6b5a468ea..37b38c077 100644 --- a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/plugin/interceptor/enhance/ClassStaticMethodsEnhancePluginDefine.java +++ b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/enhance/ClassStaticMethodsEnhancePluginDefine.java @@ -1,7 +1,7 @@ -package com.a.eye.skywalking.plugin.interceptor.enhance; +package com.a.eye.skywalking.api.plugin.interceptor.enhance; +import com.a.eye.skywalking.api.plugin.interceptor.InstanceMethodsInterceptPoint; import com.a.eye.skywalking.plugin.interceptor.ConstructorInterceptPoint; -import com.a.eye.skywalking.plugin.interceptor.InstanceMethodsInterceptPoint; /** * Plugins, which only need enhance class static methods. diff --git a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/plugin/interceptor/enhance/ClassStaticMethodsInterceptor.java b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/enhance/ClassStaticMethodsInterceptor.java similarity index 93% rename from skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/plugin/interceptor/enhance/ClassStaticMethodsInterceptor.java rename to skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/enhance/ClassStaticMethodsInterceptor.java index c9623040c..86b472308 100644 --- a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/plugin/interceptor/enhance/ClassStaticMethodsInterceptor.java +++ b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/enhance/ClassStaticMethodsInterceptor.java @@ -1,8 +1,8 @@ -package com.a.eye.skywalking.plugin.interceptor.enhance; +package com.a.eye.skywalking.api.plugin.interceptor.enhance; -import com.a.eye.skywalking.logging.api.ILog; -import com.a.eye.skywalking.logging.api.LogManager; -import com.a.eye.skywalking.plugin.interceptor.loader.InterceptorInstanceLoader; +import com.a.eye.skywalking.api.logging.api.ILog; +import com.a.eye.skywalking.api.logging.api.LogManager; +import com.a.eye.skywalking.api.plugin.interceptor.loader.InterceptorInstanceLoader; import net.bytebuddy.implementation.bind.annotation.AllArguments; import net.bytebuddy.implementation.bind.annotation.Origin; import net.bytebuddy.implementation.bind.annotation.RuntimeType; diff --git a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/plugin/interceptor/enhance/ConstructorInvokeContext.java b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/enhance/ConstructorInvokeContext.java similarity index 89% rename from skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/plugin/interceptor/enhance/ConstructorInvokeContext.java rename to skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/enhance/ConstructorInvokeContext.java index cf866ccd5..e5aefd6f8 100644 --- a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/plugin/interceptor/enhance/ConstructorInvokeContext.java +++ b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/enhance/ConstructorInvokeContext.java @@ -1,4 +1,4 @@ -package com.a.eye.skywalking.plugin.interceptor.enhance; +package com.a.eye.skywalking.api.plugin.interceptor.enhance; /** * Constructor context. diff --git a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/plugin/interceptor/enhance/DefaultClassConstructorInterceptor.java b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/enhance/DefaultClassConstructorInterceptor.java similarity index 78% rename from skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/plugin/interceptor/enhance/DefaultClassConstructorInterceptor.java rename to skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/enhance/DefaultClassConstructorInterceptor.java index 5f7d91673..5de84f0d2 100644 --- a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/plugin/interceptor/enhance/DefaultClassConstructorInterceptor.java +++ b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/enhance/DefaultClassConstructorInterceptor.java @@ -1,8 +1,8 @@ -package com.a.eye.skywalking.plugin.interceptor.enhance; +package com.a.eye.skywalking.api.plugin.interceptor.enhance; -import com.a.eye.skywalking.logging.api.ILog; -import com.a.eye.skywalking.logging.api.LogManager; -import com.a.eye.skywalking.plugin.interceptor.EnhancedClassInstanceContext; +import com.a.eye.skywalking.api.logging.api.ILog; +import com.a.eye.skywalking.api.logging.api.LogManager; +import com.a.eye.skywalking.api.plugin.interceptor.EnhancedClassInstanceContext; import net.bytebuddy.implementation.bind.annotation.AllArguments; import net.bytebuddy.implementation.bind.annotation.FieldProxy; import net.bytebuddy.implementation.bind.annotation.RuntimeType; diff --git a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/enhance/FieldGetter.java b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/enhance/FieldGetter.java new file mode 100644 index 000000000..aa8570fe5 --- /dev/null +++ b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/enhance/FieldGetter.java @@ -0,0 +1,5 @@ +package com.a.eye.skywalking.api.plugin.interceptor.enhance; + +public interface FieldGetter { + Object getValue(); +} diff --git a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/plugin/interceptor/enhance/FieldSetter.java b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/enhance/FieldSetter.java similarity index 51% rename from skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/plugin/interceptor/enhance/FieldSetter.java rename to skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/enhance/FieldSetter.java index 56989715e..94a7a7ccd 100644 --- a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/plugin/interceptor/enhance/FieldSetter.java +++ b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/enhance/FieldSetter.java @@ -1,4 +1,4 @@ -package com.a.eye.skywalking.plugin.interceptor.enhance; +package com.a.eye.skywalking.api.plugin.interceptor.enhance; public interface FieldSetter { void setValue(Object value); diff --git a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/plugin/interceptor/enhance/InstanceConstructorInterceptor.java b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/enhance/InstanceConstructorInterceptor.java similarity index 79% rename from skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/plugin/interceptor/enhance/InstanceConstructorInterceptor.java rename to skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/enhance/InstanceConstructorInterceptor.java index eead68ef0..2cdf2f349 100644 --- a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/plugin/interceptor/enhance/InstanceConstructorInterceptor.java +++ b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/enhance/InstanceConstructorInterceptor.java @@ -1,6 +1,6 @@ -package com.a.eye.skywalking.plugin.interceptor.enhance; +package com.a.eye.skywalking.api.plugin.interceptor.enhance; -import com.a.eye.skywalking.plugin.interceptor.EnhancedClassInstanceContext; +import com.a.eye.skywalking.api.plugin.interceptor.EnhancedClassInstanceContext; /** * The instance constructor's interceptor interface. diff --git a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/plugin/interceptor/enhance/InstanceMethodInvokeContext.java b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/enhance/InstanceMethodInvokeContext.java similarity index 90% rename from skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/plugin/interceptor/enhance/InstanceMethodInvokeContext.java rename to skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/enhance/InstanceMethodInvokeContext.java index ef1a4afd3..0c27f7b5c 100644 --- a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/plugin/interceptor/enhance/InstanceMethodInvokeContext.java +++ b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/enhance/InstanceMethodInvokeContext.java @@ -1,4 +1,4 @@ -package com.a.eye.skywalking.plugin.interceptor.enhance; +package com.a.eye.skywalking.api.plugin.interceptor.enhance; /** * Instance method invoke context. diff --git a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/plugin/interceptor/enhance/InstanceMethodsAroundInterceptor.java b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/enhance/InstanceMethodsAroundInterceptor.java similarity index 92% rename from skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/plugin/interceptor/enhance/InstanceMethodsAroundInterceptor.java rename to skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/enhance/InstanceMethodsAroundInterceptor.java index 9e0dc9d8e..86ee5709b 100644 --- a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/plugin/interceptor/enhance/InstanceMethodsAroundInterceptor.java +++ b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/enhance/InstanceMethodsAroundInterceptor.java @@ -1,6 +1,6 @@ -package com.a.eye.skywalking.plugin.interceptor.enhance; +package com.a.eye.skywalking.api.plugin.interceptor.enhance; -import com.a.eye.skywalking.plugin.interceptor.EnhancedClassInstanceContext; +import com.a.eye.skywalking.api.plugin.interceptor.EnhancedClassInstanceContext; /** * A interceptor, which intercept method's invocation. diff --git a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/plugin/interceptor/enhance/MethodInterceptResult.java b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/enhance/MethodInterceptResult.java similarity index 89% rename from skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/plugin/interceptor/enhance/MethodInterceptResult.java rename to skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/enhance/MethodInterceptResult.java index db59b96ea..a81edf10a 100644 --- a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/plugin/interceptor/enhance/MethodInterceptResult.java +++ b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/enhance/MethodInterceptResult.java @@ -1,6 +1,6 @@ -package com.a.eye.skywalking.plugin.interceptor.enhance; +package com.a.eye.skywalking.api.plugin.interceptor.enhance; -import com.a.eye.skywalking.plugin.interceptor.EnhancedClassInstanceContext; +import com.a.eye.skywalking.api.plugin.interceptor.EnhancedClassInstanceContext; /** * This is a method return value manipulator. diff --git a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/plugin/interceptor/enhance/MethodInvokeContext.java b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/enhance/MethodInvokeContext.java similarity index 93% rename from skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/plugin/interceptor/enhance/MethodInvokeContext.java rename to skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/enhance/MethodInvokeContext.java index 440ab6e82..5f4339e5d 100644 --- a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/plugin/interceptor/enhance/MethodInvokeContext.java +++ b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/enhance/MethodInvokeContext.java @@ -1,4 +1,4 @@ -package com.a.eye.skywalking.plugin.interceptor.enhance; +package com.a.eye.skywalking.api.plugin.interceptor.enhance; /** * Method invoke context. diff --git a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/plugin/interceptor/enhance/StaticMethodInvokeContext.java b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/enhance/StaticMethodInvokeContext.java similarity index 90% rename from skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/plugin/interceptor/enhance/StaticMethodInvokeContext.java rename to skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/enhance/StaticMethodInvokeContext.java index de046c9ce..78086bb46 100644 --- a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/plugin/interceptor/enhance/StaticMethodInvokeContext.java +++ b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/enhance/StaticMethodInvokeContext.java @@ -1,4 +1,4 @@ -package com.a.eye.skywalking.plugin.interceptor.enhance; +package com.a.eye.skywalking.api.plugin.interceptor.enhance; /** * Static method invoke context. diff --git a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/plugin/interceptor/enhance/StaticMethodsAroundInterceptor.java b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/enhance/StaticMethodsAroundInterceptor.java similarity index 95% rename from skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/plugin/interceptor/enhance/StaticMethodsAroundInterceptor.java rename to skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/enhance/StaticMethodsAroundInterceptor.java index 238237b71..7966c9fc1 100644 --- a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/plugin/interceptor/enhance/StaticMethodsAroundInterceptor.java +++ b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/enhance/StaticMethodsAroundInterceptor.java @@ -1,4 +1,4 @@ -package com.a.eye.skywalking.plugin.interceptor.enhance; +package com.a.eye.skywalking.api.plugin.interceptor.enhance; /** diff --git a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/plugin/interceptor/loader/InterceptorInstanceLoader.java b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/loader/InterceptorInstanceLoader.java similarity index 97% rename from skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/plugin/interceptor/loader/InterceptorInstanceLoader.java rename to skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/loader/InterceptorInstanceLoader.java index e977a1425..26bedd0b2 100644 --- a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/plugin/interceptor/loader/InterceptorInstanceLoader.java +++ b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/loader/InterceptorInstanceLoader.java @@ -1,7 +1,7 @@ -package com.a.eye.skywalking.plugin.interceptor.loader; +package com.a.eye.skywalking.api.plugin.interceptor.loader; -import com.a.eye.skywalking.logging.api.ILog; -import com.a.eye.skywalking.logging.api.LogManager; +import com.a.eye.skywalking.api.logging.api.ILog; +import com.a.eye.skywalking.api.logging.api.LogManager; import java.io.BufferedInputStream; import java.io.ByteArrayOutputStream; diff --git a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/queue/TraceSegmentHolder.java b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/queue/TraceSegmentHolder.java similarity index 93% rename from skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/queue/TraceSegmentHolder.java rename to skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/queue/TraceSegmentHolder.java index c653e794b..309bc1e53 100644 --- a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/queue/TraceSegmentHolder.java +++ b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/queue/TraceSegmentHolder.java @@ -1,4 +1,4 @@ -package com.a.eye.skywalking.queue; +package com.a.eye.skywalking.api.queue; import com.a.eye.skywalking.trace.TraceSegment; import com.lmax.disruptor.EventFactory; diff --git a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/queue/TraceSegmentProcessQueue.java b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/queue/TraceSegmentProcessQueue.java similarity index 94% rename from skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/queue/TraceSegmentProcessQueue.java rename to skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/queue/TraceSegmentProcessQueue.java index 1d3223909..10b2420f8 100644 --- a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/queue/TraceSegmentProcessQueue.java +++ b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/queue/TraceSegmentProcessQueue.java @@ -1,7 +1,7 @@ -package com.a.eye.skywalking.queue; +package com.a.eye.skywalking.api.queue; import com.a.eye.skywalking.conf.Config; -import com.a.eye.skywalking.context.TracerContext; +import com.a.eye.skywalking.api.context.TracerContext; import com.a.eye.skywalking.context.TracerContextListener; import com.a.eye.skywalking.health.report.HealthCollector; import com.a.eye.skywalking.health.report.HeathReading; diff --git a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/util/LoggingUtil.java b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/util/LoggingUtil.java similarity index 93% rename from skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/util/LoggingUtil.java rename to skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/util/LoggingUtil.java index b9f7b407c..dbfc3102c 100644 --- a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/util/LoggingUtil.java +++ b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/util/LoggingUtil.java @@ -1,4 +1,4 @@ -package com.a.eye.skywalking.util; +package com.a.eye.skywalking.api.util; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/util/MachineInfo.java b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/util/MachineInfo.java similarity index 97% rename from skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/util/MachineInfo.java rename to skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/util/MachineInfo.java index 9cb10598c..6c43c14a9 100644 --- a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/util/MachineInfo.java +++ b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/util/MachineInfo.java @@ -1,4 +1,4 @@ -package com.a.eye.skywalking.util; +package com.a.eye.skywalking.api.util; import java.lang.management.ManagementFactory; import java.net.InetAddress; diff --git a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/util/RoutingKeyGenerator.java b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/util/RoutingKeyGenerator.java similarity index 91% rename from skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/util/RoutingKeyGenerator.java rename to skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/util/RoutingKeyGenerator.java index bf4605345..a335eaab8 100644 --- a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/util/RoutingKeyGenerator.java +++ b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/util/RoutingKeyGenerator.java @@ -1,4 +1,4 @@ -package com.a.eye.skywalking.util; +package com.a.eye.skywalking.api.util; /** * Created data xin on 2016/12/4. diff --git a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/util/TraceIdGenerator.java b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/util/TraceIdGenerator.java similarity index 97% rename from skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/util/TraceIdGenerator.java rename to skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/util/TraceIdGenerator.java index 6db0948a3..e68fe7c64 100644 --- a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/util/TraceIdGenerator.java +++ b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/util/TraceIdGenerator.java @@ -1,4 +1,4 @@ -package com.a.eye.skywalking.util; +package com.a.eye.skywalking.api.util; import com.a.eye.skywalking.conf.Constants; import java.util.UUID; diff --git a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/plugin/interceptor/enhance/FieldGetter.java b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/plugin/interceptor/enhance/FieldGetter.java deleted file mode 100644 index 63a56acfd..000000000 --- a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/plugin/interceptor/enhance/FieldGetter.java +++ /dev/null @@ -1,5 +0,0 @@ -package com.a.eye.skywalking.plugin.interceptor.enhance; - -public interface FieldGetter { - Object getValue(); -} diff --git a/skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/context/ContextCarrierTestCase.java b/skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/api/context/ContextCarrierTestCase.java similarity index 97% rename from skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/context/ContextCarrierTestCase.java rename to skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/api/context/ContextCarrierTestCase.java index 82660a7a1..805090e07 100644 --- a/skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/context/ContextCarrierTestCase.java +++ b/skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/api/context/ContextCarrierTestCase.java @@ -1,4 +1,4 @@ -package com.a.eye.skywalking.context; +package com.a.eye.skywalking.api.context; import org.junit.Assert; import org.junit.Test; diff --git a/skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/context/ContextManagerTestCase.java b/skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/api/context/ContextManagerTestCase.java similarity index 95% rename from skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/context/ContextManagerTestCase.java rename to skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/api/context/ContextManagerTestCase.java index fe9c2ba9a..017d70cac 100644 --- a/skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/context/ContextManagerTestCase.java +++ b/skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/api/context/ContextManagerTestCase.java @@ -1,4 +1,4 @@ -package com.a.eye.skywalking.context; +package com.a.eye.skywalking.api.context; import com.a.eye.skywalking.trace.Span; import com.a.eye.skywalking.trace.TraceSegment; diff --git a/skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/context/TestTracerContextListener.java b/skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/api/context/TestTracerContextListener.java similarity index 89% rename from skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/context/TestTracerContextListener.java rename to skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/api/context/TestTracerContextListener.java index 2b6c56eb0..f1147fd08 100644 --- a/skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/context/TestTracerContextListener.java +++ b/skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/api/context/TestTracerContextListener.java @@ -1,4 +1,4 @@ -package com.a.eye.skywalking.context; +package com.a.eye.skywalking.api.context; import com.a.eye.skywalking.trace.TraceSegment; diff --git a/skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/context/TracerContextTestCase.java b/skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/api/context/TracerContextTestCase.java similarity index 98% rename from skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/context/TracerContextTestCase.java rename to skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/api/context/TracerContextTestCase.java index 845251ad2..15389ff9b 100644 --- a/skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/context/TracerContextTestCase.java +++ b/skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/api/context/TracerContextTestCase.java @@ -1,4 +1,4 @@ -package com.a.eye.skywalking.context; +package com.a.eye.skywalking.api.context; import com.a.eye.skywalking.trace.Span; import com.a.eye.skywalking.trace.TraceSegment; diff --git a/skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/plugin/BeInterceptedClass.java b/skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/api/plugin/BeInterceptedClass.java similarity index 86% rename from skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/plugin/BeInterceptedClass.java rename to skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/api/plugin/BeInterceptedClass.java index b7067eb21..2f501a8d4 100644 --- a/skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/plugin/BeInterceptedClass.java +++ b/skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/api/plugin/BeInterceptedClass.java @@ -1,4 +1,4 @@ -package com.a.eye.skywalking.plugin; +package com.a.eye.skywalking.api.plugin; public class BeInterceptedClass { public BeInterceptedClass(){ diff --git a/skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/plugin/PluginMainTest.java b/skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/api/plugin/PluginMainTest.java similarity index 95% rename from skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/plugin/PluginMainTest.java rename to skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/api/plugin/PluginMainTest.java index 678938728..df0fe92f6 100644 --- a/skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/plugin/PluginMainTest.java +++ b/skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/api/plugin/PluginMainTest.java @@ -1,4 +1,4 @@ -package com.a.eye.skywalking.plugin; +package com.a.eye.skywalking.api.plugin; import org.junit.Test; diff --git a/skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/plugin/PluginResourceResoverTest.java b/skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/api/plugin/PluginResourceResoverTest.java similarity index 70% rename from skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/plugin/PluginResourceResoverTest.java rename to skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/api/plugin/PluginResourceResoverTest.java index 06d8285c2..d7b1f9828 100644 --- a/skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/plugin/PluginResourceResoverTest.java +++ b/skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/api/plugin/PluginResourceResoverTest.java @@ -1,9 +1,7 @@ -package com.a.eye.skywalking.plugin; +package com.a.eye.skywalking.api.plugin; import java.io.IOException; -import com.a.eye.skywalking.plugin.PluginResourcesResolver; - public class PluginResourceResoverTest { public static void main(String[] args) throws IOException { diff --git a/skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/plugin/TestAroundInterceptor.java b/skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/api/plugin/TestAroundInterceptor.java similarity index 75% rename from skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/plugin/TestAroundInterceptor.java rename to skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/api/plugin/TestAroundInterceptor.java index 0b1108589..a640985e9 100644 --- a/skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/plugin/TestAroundInterceptor.java +++ b/skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/api/plugin/TestAroundInterceptor.java @@ -1,10 +1,10 @@ -package com.a.eye.skywalking.plugin; +package com.a.eye.skywalking.api.plugin; -import com.a.eye.skywalking.plugin.interceptor.EnhancedClassInstanceContext; +import com.a.eye.skywalking.api.plugin.interceptor.EnhancedClassInstanceContext; import com.a.eye.skywalking.plugin.interceptor.enhance.ConstructorInvokeContext; import com.a.eye.skywalking.plugin.interceptor.enhance.InstanceMethodInvokeContext; -import com.a.eye.skywalking.plugin.interceptor.enhance.InstanceMethodsAroundInterceptor; -import com.a.eye.skywalking.plugin.interceptor.enhance.MethodInterceptResult; +import com.a.eye.skywalking.api.plugin.interceptor.enhance.InstanceMethodsAroundInterceptor; +import com.a.eye.skywalking.api.plugin.interceptor.enhance.MethodInterceptResult; public class TestAroundInterceptor implements InstanceMethodsAroundInterceptor { diff --git a/skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/plugin/TestInterceptorDefine.java b/skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/api/plugin/TestInterceptorDefine.java similarity index 82% rename from skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/plugin/TestInterceptorDefine.java rename to skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/api/plugin/TestInterceptorDefine.java index 47980584d..6e4c492a2 100644 --- a/skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/plugin/TestInterceptorDefine.java +++ b/skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/api/plugin/TestInterceptorDefine.java @@ -1,9 +1,11 @@ -package com.a.eye.skywalking.plugin; +package com.a.eye.skywalking.api.plugin; +import com.a.eye.skywalking.api.plugin.interceptor.ConstructorInterceptPoint; +import com.a.eye.skywalking.api.plugin.interceptor.InstanceMethodsInterceptPoint; +import com.a.eye.skywalking.api.plugin.interceptor.StaticMethodsInterceptPoint; +import com.a.eye.skywalking.api.plugin.interceptor.enhance.ClassEnhancePluginDefine; import com.a.eye.skywalking.plugin.interceptor.ConstructorInterceptPoint; -import com.a.eye.skywalking.plugin.interceptor.InstanceMethodsInterceptPoint; import com.a.eye.skywalking.plugin.interceptor.StaticMethodsInterceptPoint; -import com.a.eye.skywalking.plugin.interceptor.enhance.ClassEnhancePluginDefine; import net.bytebuddy.description.method.MethodDescription; import net.bytebuddy.matcher.ElementMatcher; diff --git a/skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/plugin/TestStaticAroundInterceptor.java b/skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/api/plugin/TestStaticAroundInterceptor.java similarity index 68% rename from skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/plugin/TestStaticAroundInterceptor.java rename to skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/api/plugin/TestStaticAroundInterceptor.java index 338459561..cfe346d88 100644 --- a/skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/plugin/TestStaticAroundInterceptor.java +++ b/skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/api/plugin/TestStaticAroundInterceptor.java @@ -1,9 +1,9 @@ -package com.a.eye.skywalking.plugin; +package com.a.eye.skywalking.api.plugin; -import com.a.eye.skywalking.plugin.interceptor.enhance.MethodInterceptResult; +import com.a.eye.skywalking.api.plugin.interceptor.enhance.MethodInterceptResult; import com.a.eye.skywalking.plugin.interceptor.enhance.MethodInvokeContext; -import com.a.eye.skywalking.plugin.interceptor.enhance.StaticMethodInvokeContext; -import com.a.eye.skywalking.plugin.interceptor.enhance.StaticMethodsAroundInterceptor; +import com.a.eye.skywalking.api.plugin.interceptor.enhance.StaticMethodInvokeContext; +import com.a.eye.skywalking.api.plugin.interceptor.enhance.StaticMethodsAroundInterceptor; public class TestStaticAroundInterceptor implements StaticMethodsAroundInterceptor { diff --git a/skywalking-sniffer/skywalking-sdk-plugin/dubbo-plugin/src/main/java/com/a/eye/skywalking/plugin/dubbo/DubboBuriedPointType.java b/skywalking-sniffer/skywalking-sdk-plugin/dubbo-plugin/src/main/java/com/a/eye/skywalking/api/plugin/dubbo/DubboBuriedPointType.java similarity index 86% rename from skywalking-sniffer/skywalking-sdk-plugin/dubbo-plugin/src/main/java/com/a/eye/skywalking/plugin/dubbo/DubboBuriedPointType.java rename to skywalking-sniffer/skywalking-sdk-plugin/dubbo-plugin/src/main/java/com/a/eye/skywalking/api/plugin/dubbo/DubboBuriedPointType.java index 53264dd9e..d165ae736 100644 --- a/skywalking-sniffer/skywalking-sdk-plugin/dubbo-plugin/src/main/java/com/a/eye/skywalking/plugin/dubbo/DubboBuriedPointType.java +++ b/skywalking-sniffer/skywalking-sdk-plugin/dubbo-plugin/src/main/java/com/a/eye/skywalking/api/plugin/dubbo/DubboBuriedPointType.java @@ -1,4 +1,4 @@ -package com.a.eye.skywalking.plugin.dubbo; +package com.a.eye.skywalking.api.plugin.dubbo; import com.a.eye.skywalking.api.IBuriedPointType; diff --git a/skywalking-sniffer/skywalking-sdk-plugin/dubbo-plugin/src/main/java/com/a/eye/skywalking/plugin/dubbo/DubboPluginDefine.java b/skywalking-sniffer/skywalking-sdk-plugin/dubbo-plugin/src/main/java/com/a/eye/skywalking/api/plugin/dubbo/DubboPluginDefine.java similarity index 90% rename from skywalking-sniffer/skywalking-sdk-plugin/dubbo-plugin/src/main/java/com/a/eye/skywalking/plugin/dubbo/DubboPluginDefine.java rename to skywalking-sniffer/skywalking-sdk-plugin/dubbo-plugin/src/main/java/com/a/eye/skywalking/api/plugin/dubbo/DubboPluginDefine.java index 5d04f87c5..90a1eaf95 100644 --- a/skywalking-sniffer/skywalking-sdk-plugin/dubbo-plugin/src/main/java/com/a/eye/skywalking/plugin/dubbo/DubboPluginDefine.java +++ b/skywalking-sniffer/skywalking-sdk-plugin/dubbo-plugin/src/main/java/com/a/eye/skywalking/api/plugin/dubbo/DubboPluginDefine.java @@ -1,7 +1,7 @@ -package com.a.eye.skywalking.plugin.dubbo; +package com.a.eye.skywalking.api.plugin.dubbo; +import com.a.eye.skywalking.api.plugin.interceptor.InstanceMethodsInterceptPoint; import com.a.eye.skywalking.plugin.interceptor.ConstructorInterceptPoint; -import com.a.eye.skywalking.plugin.interceptor.InstanceMethodsInterceptPoint; import com.a.eye.skywalking.plugin.interceptor.enhance.ClassInstanceMethodsEnhancePluginDefine; import net.bytebuddy.description.method.MethodDescription; import net.bytebuddy.matcher.ElementMatcher; diff --git a/skywalking-sniffer/skywalking-sdk-plugin/dubbo-plugin/src/main/java/com/a/eye/skywalking/plugin/dubbo/MonitorFilterInterceptor.java b/skywalking-sniffer/skywalking-sdk-plugin/dubbo-plugin/src/main/java/com/a/eye/skywalking/api/plugin/dubbo/MonitorFilterInterceptor.java similarity index 93% rename from skywalking-sniffer/skywalking-sdk-plugin/dubbo-plugin/src/main/java/com/a/eye/skywalking/plugin/dubbo/MonitorFilterInterceptor.java rename to skywalking-sniffer/skywalking-sdk-plugin/dubbo-plugin/src/main/java/com/a/eye/skywalking/api/plugin/dubbo/MonitorFilterInterceptor.java index 6ef3b40fa..22e01ebf6 100644 --- a/skywalking-sniffer/skywalking-sdk-plugin/dubbo-plugin/src/main/java/com/a/eye/skywalking/plugin/dubbo/MonitorFilterInterceptor.java +++ b/skywalking-sniffer/skywalking-sdk-plugin/dubbo-plugin/src/main/java/com/a/eye/skywalking/api/plugin/dubbo/MonitorFilterInterceptor.java @@ -1,15 +1,15 @@ -package com.a.eye.skywalking.plugin.dubbo; +package com.a.eye.skywalking.api.plugin.dubbo; +import com.a.eye.skywalking.api.plugin.dubbox.bugfix.below283.BugFixAcitve; +import com.a.eye.skywalking.api.plugin.dubbox.bugfix.below283.SWBaseBean; import com.a.eye.skywalking.invoke.monitor.RPCClientInvokeMonitor; import com.a.eye.skywalking.invoke.monitor.RPCServerInvokeMonitor; import com.a.eye.skywalking.model.ContextData; import com.a.eye.skywalking.model.Identification; -import com.a.eye.skywalking.plugin.dubbox.bugfix.below283.BugFixAcitve; -import com.a.eye.skywalking.plugin.dubbox.bugfix.below283.SWBaseBean; -import com.a.eye.skywalking.plugin.interceptor.EnhancedClassInstanceContext; +import com.a.eye.skywalking.api.plugin.interceptor.EnhancedClassInstanceContext; import com.a.eye.skywalking.plugin.interceptor.enhance.InstanceMethodInvokeContext; -import com.a.eye.skywalking.plugin.interceptor.enhance.InstanceMethodsAroundInterceptor; -import com.a.eye.skywalking.plugin.interceptor.enhance.MethodInterceptResult; +import com.a.eye.skywalking.api.plugin.interceptor.enhance.InstanceMethodsAroundInterceptor; +import com.a.eye.skywalking.api.plugin.interceptor.enhance.MethodInterceptResult; import com.alibaba.dubbo.rpc.Invocation; import com.alibaba.dubbo.rpc.Invoker; import com.alibaba.dubbo.rpc.Result; diff --git a/skywalking-sniffer/skywalking-sdk-plugin/dubbo-plugin/src/main/java/com/a/eye/skywalking/plugin/dubbox/bugfix/below283/BugFixAcitve.java b/skywalking-sniffer/skywalking-sdk-plugin/dubbo-plugin/src/main/java/com/a/eye/skywalking/api/plugin/dubbox/bugfix/below283/BugFixAcitve.java similarity index 68% rename from skywalking-sniffer/skywalking-sdk-plugin/dubbo-plugin/src/main/java/com/a/eye/skywalking/plugin/dubbox/bugfix/below283/BugFixAcitve.java rename to skywalking-sniffer/skywalking-sdk-plugin/dubbo-plugin/src/main/java/com/a/eye/skywalking/api/plugin/dubbox/bugfix/below283/BugFixAcitve.java index 8d56f83b8..735c6868e 100644 --- a/skywalking-sniffer/skywalking-sdk-plugin/dubbo-plugin/src/main/java/com/a/eye/skywalking/plugin/dubbox/bugfix/below283/BugFixAcitve.java +++ b/skywalking-sniffer/skywalking-sdk-plugin/dubbo-plugin/src/main/java/com/a/eye/skywalking/api/plugin/dubbox/bugfix/below283/BugFixAcitve.java @@ -1,4 +1,4 @@ -package com.a.eye.skywalking.plugin.dubbox.bugfix.below283; +package com.a.eye.skywalking.api.plugin.dubbox.bugfix.below283; public final class BugFixAcitve { public static boolean isActive = false; diff --git a/skywalking-sniffer/skywalking-sdk-plugin/dubbo-plugin/src/main/java/com/a/eye/skywalking/plugin/dubbox/bugfix/below283/SWBaseBean.java b/skywalking-sniffer/skywalking-sdk-plugin/dubbo-plugin/src/main/java/com/a/eye/skywalking/api/plugin/dubbox/bugfix/below283/SWBaseBean.java similarity index 81% rename from skywalking-sniffer/skywalking-sdk-plugin/dubbo-plugin/src/main/java/com/a/eye/skywalking/plugin/dubbox/bugfix/below283/SWBaseBean.java rename to skywalking-sniffer/skywalking-sdk-plugin/dubbo-plugin/src/main/java/com/a/eye/skywalking/api/plugin/dubbox/bugfix/below283/SWBaseBean.java index 1a343d5f6..42dca3074 100644 --- a/skywalking-sniffer/skywalking-sdk-plugin/dubbo-plugin/src/main/java/com/a/eye/skywalking/plugin/dubbox/bugfix/below283/SWBaseBean.java +++ b/skywalking-sniffer/skywalking-sdk-plugin/dubbo-plugin/src/main/java/com/a/eye/skywalking/api/plugin/dubbox/bugfix/below283/SWBaseBean.java @@ -1,4 +1,4 @@ -package com.a.eye.skywalking.plugin.dubbox.bugfix.below283; +package com.a.eye.skywalking.api.plugin.dubbox.bugfix.below283; import java.io.Serializable; diff --git a/skywalking-sniffer/skywalking-sdk-plugin/httpClient-4.x-plugin/src/main/java/com/a/eye/skywalking/plugin/httpClient/v4/HttpClientExecuteInterceptor.java b/skywalking-sniffer/skywalking-sdk-plugin/httpClient-4.x-plugin/src/main/java/com/a/eye/skywalking/api/plugin/httpClient/v4/HttpClientExecuteInterceptor.java similarity index 87% rename from skywalking-sniffer/skywalking-sdk-plugin/httpClient-4.x-plugin/src/main/java/com/a/eye/skywalking/plugin/httpClient/v4/HttpClientExecuteInterceptor.java rename to skywalking-sniffer/skywalking-sdk-plugin/httpClient-4.x-plugin/src/main/java/com/a/eye/skywalking/api/plugin/httpClient/v4/HttpClientExecuteInterceptor.java index 221a65c08..514dd6151 100644 --- a/skywalking-sniffer/skywalking-sdk-plugin/httpClient-4.x-plugin/src/main/java/com/a/eye/skywalking/plugin/httpClient/v4/HttpClientExecuteInterceptor.java +++ b/skywalking-sniffer/skywalking-sdk-plugin/httpClient-4.x-plugin/src/main/java/com/a/eye/skywalking/api/plugin/httpClient/v4/HttpClientExecuteInterceptor.java @@ -1,6 +1,6 @@ -package com.a.eye.skywalking.plugin.httpClient.v4; +package com.a.eye.skywalking.api.plugin.httpClient.v4; -import com.a.eye.skywalking.plugin.interceptor.EnhancedClassInstanceContext; +import com.a.eye.skywalking.api.plugin.interceptor.EnhancedClassInstanceContext; import com.a.eye.skywalking.plugin.interceptor.enhance.ConstructorInvokeContext; import org.apache.http.HttpHost; import org.apache.http.HttpRequest; @@ -8,8 +8,8 @@ import org.apache.http.HttpRequest; import com.a.eye.skywalking.invoke.monitor.RPCClientInvokeMonitor; import com.a.eye.skywalking.model.Identification; import com.a.eye.skywalking.plugin.interceptor.enhance.InstanceMethodInvokeContext; -import com.a.eye.skywalking.plugin.interceptor.enhance.InstanceMethodsAroundInterceptor; -import com.a.eye.skywalking.plugin.interceptor.enhance.MethodInterceptResult; +import com.a.eye.skywalking.api.plugin.interceptor.enhance.InstanceMethodsAroundInterceptor; +import com.a.eye.skywalking.api.plugin.interceptor.enhance.MethodInterceptResult; public class HttpClientExecuteInterceptor implements InstanceMethodsAroundInterceptor { /** diff --git a/skywalking-sniffer/skywalking-sdk-plugin/httpClient-4.x-plugin/src/main/java/com/a/eye/skywalking/plugin/httpClient/v4/WebBuriedPointType.java b/skywalking-sniffer/skywalking-sdk-plugin/httpClient-4.x-plugin/src/main/java/com/a/eye/skywalking/api/plugin/httpClient/v4/WebBuriedPointType.java similarity index 84% rename from skywalking-sniffer/skywalking-sdk-plugin/httpClient-4.x-plugin/src/main/java/com/a/eye/skywalking/plugin/httpClient/v4/WebBuriedPointType.java rename to skywalking-sniffer/skywalking-sdk-plugin/httpClient-4.x-plugin/src/main/java/com/a/eye/skywalking/api/plugin/httpClient/v4/WebBuriedPointType.java index 05b4ac70e..b4e60faa7 100644 --- a/skywalking-sniffer/skywalking-sdk-plugin/httpClient-4.x-plugin/src/main/java/com/a/eye/skywalking/plugin/httpClient/v4/WebBuriedPointType.java +++ b/skywalking-sniffer/skywalking-sdk-plugin/httpClient-4.x-plugin/src/main/java/com/a/eye/skywalking/api/plugin/httpClient/v4/WebBuriedPointType.java @@ -1,4 +1,4 @@ -package com.a.eye.skywalking.plugin.httpClient.v4; +package com.a.eye.skywalking.api.plugin.httpClient.v4; import com.a.eye.skywalking.api.IBuriedPointType; diff --git a/skywalking-sniffer/skywalking-sdk-plugin/httpClient-4.x-plugin/src/main/java/com/a/eye/skywalking/plugin/httpClient/v4/define/AbstractHttpClientPluginDefine.java b/skywalking-sniffer/skywalking-sdk-plugin/httpClient-4.x-plugin/src/main/java/com/a/eye/skywalking/api/plugin/httpClient/v4/define/AbstractHttpClientPluginDefine.java similarity index 86% rename from skywalking-sniffer/skywalking-sdk-plugin/httpClient-4.x-plugin/src/main/java/com/a/eye/skywalking/plugin/httpClient/v4/define/AbstractHttpClientPluginDefine.java rename to skywalking-sniffer/skywalking-sdk-plugin/httpClient-4.x-plugin/src/main/java/com/a/eye/skywalking/api/plugin/httpClient/v4/define/AbstractHttpClientPluginDefine.java index c507ab152..33f7505fe 100644 --- a/skywalking-sniffer/skywalking-sdk-plugin/httpClient-4.x-plugin/src/main/java/com/a/eye/skywalking/plugin/httpClient/v4/define/AbstractHttpClientPluginDefine.java +++ b/skywalking-sniffer/skywalking-sdk-plugin/httpClient-4.x-plugin/src/main/java/com/a/eye/skywalking/api/plugin/httpClient/v4/define/AbstractHttpClientPluginDefine.java @@ -1,6 +1,6 @@ -package com.a.eye.skywalking.plugin.httpClient.v4.define; +package com.a.eye.skywalking.api.plugin.httpClient.v4.define; -import com.a.eye.skywalking.plugin.interceptor.InstanceMethodsInterceptPoint; +import com.a.eye.skywalking.api.plugin.interceptor.InstanceMethodsInterceptPoint; import net.bytebuddy.description.method.MethodDescription; import net.bytebuddy.matcher.ElementMatcher; diff --git a/skywalking-sniffer/skywalking-sdk-plugin/httpClient-4.x-plugin/src/main/java/com/a/eye/skywalking/plugin/httpClient/v4/define/DefaultRequestDirectorPluginDefine.java b/skywalking-sniffer/skywalking-sdk-plugin/httpClient-4.x-plugin/src/main/java/com/a/eye/skywalking/api/plugin/httpClient/v4/define/DefaultRequestDirectorPluginDefine.java similarity index 87% rename from skywalking-sniffer/skywalking-sdk-plugin/httpClient-4.x-plugin/src/main/java/com/a/eye/skywalking/plugin/httpClient/v4/define/DefaultRequestDirectorPluginDefine.java rename to skywalking-sniffer/skywalking-sdk-plugin/httpClient-4.x-plugin/src/main/java/com/a/eye/skywalking/api/plugin/httpClient/v4/define/DefaultRequestDirectorPluginDefine.java index 5e2c6cca9..540b2fbbf 100644 --- a/skywalking-sniffer/skywalking-sdk-plugin/httpClient-4.x-plugin/src/main/java/com/a/eye/skywalking/plugin/httpClient/v4/define/DefaultRequestDirectorPluginDefine.java +++ b/skywalking-sniffer/skywalking-sdk-plugin/httpClient-4.x-plugin/src/main/java/com/a/eye/skywalking/api/plugin/httpClient/v4/define/DefaultRequestDirectorPluginDefine.java @@ -1,6 +1,6 @@ -package com.a.eye.skywalking.plugin.httpClient.v4.define; +package com.a.eye.skywalking.api.plugin.httpClient.v4.define; -import com.a.eye.skywalking.plugin.interceptor.InstanceMethodsInterceptPoint; +import com.a.eye.skywalking.api.plugin.interceptor.InstanceMethodsInterceptPoint; import net.bytebuddy.description.method.MethodDescription; import net.bytebuddy.matcher.ElementMatcher; diff --git a/skywalking-sniffer/skywalking-sdk-plugin/httpClient-4.x-plugin/src/main/java/com/a/eye/skywalking/plugin/httpClient/v4/define/HttpClientPluginDefine.java b/skywalking-sniffer/skywalking-sdk-plugin/httpClient-4.x-plugin/src/main/java/com/a/eye/skywalking/api/plugin/httpClient/v4/define/HttpClientPluginDefine.java similarity index 89% rename from skywalking-sniffer/skywalking-sdk-plugin/httpClient-4.x-plugin/src/main/java/com/a/eye/skywalking/plugin/httpClient/v4/define/HttpClientPluginDefine.java rename to skywalking-sniffer/skywalking-sdk-plugin/httpClient-4.x-plugin/src/main/java/com/a/eye/skywalking/api/plugin/httpClient/v4/define/HttpClientPluginDefine.java index b068b71ae..fd1616114 100644 --- a/skywalking-sniffer/skywalking-sdk-plugin/httpClient-4.x-plugin/src/main/java/com/a/eye/skywalking/plugin/httpClient/v4/define/HttpClientPluginDefine.java +++ b/skywalking-sniffer/skywalking-sdk-plugin/httpClient-4.x-plugin/src/main/java/com/a/eye/skywalking/api/plugin/httpClient/v4/define/HttpClientPluginDefine.java @@ -1,4 +1,4 @@ -package com.a.eye.skywalking.plugin.httpClient.v4.define; +package com.a.eye.skywalking.api.plugin.httpClient.v4.define; import com.a.eye.skywalking.plugin.interceptor.ConstructorInterceptPoint; import com.a.eye.skywalking.plugin.interceptor.enhance.ClassInstanceMethodsEnhancePluginDefine; diff --git a/skywalking-sniffer/skywalking-sdk-plugin/httpClient-4.x-plugin/src/main/java/com/a/eye/skywalking/plugin/httpClient/v4/define/InternalHttpClientPluginDefine.java b/skywalking-sniffer/skywalking-sdk-plugin/httpClient-4.x-plugin/src/main/java/com/a/eye/skywalking/api/plugin/httpClient/v4/define/InternalHttpClientPluginDefine.java similarity index 85% rename from skywalking-sniffer/skywalking-sdk-plugin/httpClient-4.x-plugin/src/main/java/com/a/eye/skywalking/plugin/httpClient/v4/define/InternalHttpClientPluginDefine.java rename to skywalking-sniffer/skywalking-sdk-plugin/httpClient-4.x-plugin/src/main/java/com/a/eye/skywalking/api/plugin/httpClient/v4/define/InternalHttpClientPluginDefine.java index 28e510372..832c3390d 100644 --- a/skywalking-sniffer/skywalking-sdk-plugin/httpClient-4.x-plugin/src/main/java/com/a/eye/skywalking/plugin/httpClient/v4/define/InternalHttpClientPluginDefine.java +++ b/skywalking-sniffer/skywalking-sdk-plugin/httpClient-4.x-plugin/src/main/java/com/a/eye/skywalking/api/plugin/httpClient/v4/define/InternalHttpClientPluginDefine.java @@ -1,6 +1,6 @@ -package com.a.eye.skywalking.plugin.httpClient.v4.define; +package com.a.eye.skywalking.api.plugin.httpClient.v4.define; -import com.a.eye.skywalking.plugin.interceptor.InstanceMethodsInterceptPoint; +import com.a.eye.skywalking.api.plugin.interceptor.InstanceMethodsInterceptPoint; import net.bytebuddy.description.method.MethodDescription; import net.bytebuddy.matcher.ElementMatcher; diff --git a/skywalking-sniffer/skywalking-sdk-plugin/httpClient-4.x-plugin/src/main/java/com/a/eye/skywalking/plugin/httpClient/v4/define/MinimalHttpClientPluginDefine.java b/skywalking-sniffer/skywalking-sdk-plugin/httpClient-4.x-plugin/src/main/java/com/a/eye/skywalking/api/plugin/httpClient/v4/define/MinimalHttpClientPluginDefine.java similarity index 85% rename from skywalking-sniffer/skywalking-sdk-plugin/httpClient-4.x-plugin/src/main/java/com/a/eye/skywalking/plugin/httpClient/v4/define/MinimalHttpClientPluginDefine.java rename to skywalking-sniffer/skywalking-sdk-plugin/httpClient-4.x-plugin/src/main/java/com/a/eye/skywalking/api/plugin/httpClient/v4/define/MinimalHttpClientPluginDefine.java index 69213af59..100a8a37f 100644 --- a/skywalking-sniffer/skywalking-sdk-plugin/httpClient-4.x-plugin/src/main/java/com/a/eye/skywalking/plugin/httpClient/v4/define/MinimalHttpClientPluginDefine.java +++ b/skywalking-sniffer/skywalking-sdk-plugin/httpClient-4.x-plugin/src/main/java/com/a/eye/skywalking/api/plugin/httpClient/v4/define/MinimalHttpClientPluginDefine.java @@ -1,6 +1,6 @@ -package com.a.eye.skywalking.plugin.httpClient.v4.define; +package com.a.eye.skywalking.api.plugin.httpClient.v4.define; -import com.a.eye.skywalking.plugin.interceptor.InstanceMethodsInterceptPoint; +import com.a.eye.skywalking.api.plugin.interceptor.InstanceMethodsInterceptPoint; import net.bytebuddy.description.method.MethodDescription; import net.bytebuddy.matcher.ElementMatcher; diff --git a/skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/plugin/jdbc/CallableStatementTracing.java b/skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/api/plugin/jdbc/CallableStatementTracing.java similarity index 92% rename from skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/plugin/jdbc/CallableStatementTracing.java rename to skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/api/plugin/jdbc/CallableStatementTracing.java index 0dc792bed..48dc1b55e 100644 --- a/skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/plugin/jdbc/CallableStatementTracing.java +++ b/skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/api/plugin/jdbc/CallableStatementTracing.java @@ -1,8 +1,8 @@ -package com.a.eye.skywalking.plugin.jdbc; +package com.a.eye.skywalking.api.plugin.jdbc; +import com.a.eye.skywalking.api.plugin.jdbc.define.JDBCBuriedPointType; import com.a.eye.skywalking.invoke.monitor.RPCClientInvokeMonitor; import com.a.eye.skywalking.model.Identification; -import com.a.eye.skywalking.plugin.jdbc.define.JDBCBuriedPointType; import java.sql.SQLException; diff --git a/skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/plugin/jdbc/ConnectionTracing.java b/skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/api/plugin/jdbc/ConnectionTracing.java similarity index 92% rename from skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/plugin/jdbc/ConnectionTracing.java rename to skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/api/plugin/jdbc/ConnectionTracing.java index 613872bf0..d100efa44 100755 --- a/skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/plugin/jdbc/ConnectionTracing.java +++ b/skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/api/plugin/jdbc/ConnectionTracing.java @@ -1,8 +1,8 @@ -package com.a.eye.skywalking.plugin.jdbc; +package com.a.eye.skywalking.api.plugin.jdbc; +import com.a.eye.skywalking.api.plugin.jdbc.define.JDBCBuriedPointType; import com.a.eye.skywalking.model.Identification; import com.a.eye.skywalking.invoke.monitor.RPCClientInvokeMonitor; -import com.a.eye.skywalking.plugin.jdbc.define.JDBCBuriedPointType; import java.sql.SQLException; diff --git a/skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/plugin/jdbc/PreparedStatementTracing.java b/skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/api/plugin/jdbc/PreparedStatementTracing.java similarity index 91% rename from skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/plugin/jdbc/PreparedStatementTracing.java rename to skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/api/plugin/jdbc/PreparedStatementTracing.java index 2790e0979..d20d97106 100644 --- a/skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/plugin/jdbc/PreparedStatementTracing.java +++ b/skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/api/plugin/jdbc/PreparedStatementTracing.java @@ -1,6 +1,6 @@ -package com.a.eye.skywalking.plugin.jdbc; +package com.a.eye.skywalking.api.plugin.jdbc; -import com.a.eye.skywalking.context.ContextManager; +import com.a.eye.skywalking.api.context.ContextManager; import com.a.eye.skywalking.trace.Span; import com.a.eye.skywalking.trace.tag.Tags; import java.sql.SQLException; diff --git a/skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/plugin/jdbc/SWCallableStatement.java b/skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/api/plugin/jdbc/SWCallableStatement.java similarity index 99% rename from skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/plugin/jdbc/SWCallableStatement.java rename to skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/api/plugin/jdbc/SWCallableStatement.java index d0b903058..70141c53d 100644 --- a/skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/plugin/jdbc/SWCallableStatement.java +++ b/skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/api/plugin/jdbc/SWCallableStatement.java @@ -1,4 +1,4 @@ -package com.a.eye.skywalking.plugin.jdbc; +package com.a.eye.skywalking.api.plugin.jdbc; import java.io.InputStream; import java.io.Reader; diff --git a/skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/plugin/jdbc/SWConnection.java b/skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/api/plugin/jdbc/SWConnection.java similarity index 99% rename from skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/plugin/jdbc/SWConnection.java rename to skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/api/plugin/jdbc/SWConnection.java index b2a7efa2a..d95766a2d 100755 --- a/skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/plugin/jdbc/SWConnection.java +++ b/skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/api/plugin/jdbc/SWConnection.java @@ -1,4 +1,4 @@ -package com.a.eye.skywalking.plugin.jdbc; +package com.a.eye.skywalking.api.plugin.jdbc; import java.sql.*; import java.util.Map; diff --git a/skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/plugin/jdbc/SWPreparedStatement.java b/skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/api/plugin/jdbc/SWPreparedStatement.java similarity index 99% rename from skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/plugin/jdbc/SWPreparedStatement.java rename to skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/api/plugin/jdbc/SWPreparedStatement.java index 8cae0bcf3..12cec2459 100644 --- a/skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/plugin/jdbc/SWPreparedStatement.java +++ b/skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/api/plugin/jdbc/SWPreparedStatement.java @@ -1,4 +1,4 @@ -package com.a.eye.skywalking.plugin.jdbc; +package com.a.eye.skywalking.api.plugin.jdbc; import java.io.InputStream; import java.io.Reader; diff --git a/skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/plugin/jdbc/SWStatement.java b/skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/api/plugin/jdbc/SWStatement.java similarity index 99% rename from skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/plugin/jdbc/SWStatement.java rename to skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/api/plugin/jdbc/SWStatement.java index e7d9a8989..1a3cd2b49 100644 --- a/skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/plugin/jdbc/SWStatement.java +++ b/skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/api/plugin/jdbc/SWStatement.java @@ -1,4 +1,4 @@ -package com.a.eye.skywalking.plugin.jdbc; +package com.a.eye.skywalking.api.plugin.jdbc; import java.sql.Connection; import java.sql.ResultSet; diff --git a/skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/plugin/jdbc/StatementTracing.java b/skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/api/plugin/jdbc/StatementTracing.java similarity index 92% rename from skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/plugin/jdbc/StatementTracing.java rename to skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/api/plugin/jdbc/StatementTracing.java index 25ed23df9..1ee9749de 100644 --- a/skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/plugin/jdbc/StatementTracing.java +++ b/skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/api/plugin/jdbc/StatementTracing.java @@ -1,8 +1,8 @@ -package com.a.eye.skywalking.plugin.jdbc; +package com.a.eye.skywalking.api.plugin.jdbc; +import com.a.eye.skywalking.api.plugin.jdbc.define.JDBCBuriedPointType; import com.a.eye.skywalking.model.Identification; import com.a.eye.skywalking.invoke.monitor.RPCClientInvokeMonitor; -import com.a.eye.skywalking.plugin.jdbc.define.JDBCBuriedPointType; import java.sql.SQLException; diff --git a/skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/plugin/jdbc/define/AbstractDatabasePluginDefine.java b/skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/api/plugin/jdbc/define/AbstractDatabasePluginDefine.java similarity index 84% rename from skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/plugin/jdbc/define/AbstractDatabasePluginDefine.java rename to skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/api/plugin/jdbc/define/AbstractDatabasePluginDefine.java index db029464d..e0f452d45 100644 --- a/skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/plugin/jdbc/define/AbstractDatabasePluginDefine.java +++ b/skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/api/plugin/jdbc/define/AbstractDatabasePluginDefine.java @@ -1,7 +1,8 @@ -package com.a.eye.skywalking.plugin.jdbc.define; +package com.a.eye.skywalking.api.plugin.jdbc.define; +import com.a.eye.skywalking.api.plugin.interceptor.ConstructorInterceptPoint; +import com.a.eye.skywalking.api.plugin.interceptor.InstanceMethodsInterceptPoint; import com.a.eye.skywalking.plugin.interceptor.ConstructorInterceptPoint; -import com.a.eye.skywalking.plugin.interceptor.InstanceMethodsInterceptPoint; import com.a.eye.skywalking.plugin.interceptor.enhance.ClassInstanceMethodsEnhancePluginDefine; import net.bytebuddy.description.method.MethodDescription; import net.bytebuddy.matcher.ElementMatcher; diff --git a/skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/plugin/jdbc/define/H2PluginDefine.java b/skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/api/plugin/jdbc/define/H2PluginDefine.java similarity index 75% rename from skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/plugin/jdbc/define/H2PluginDefine.java rename to skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/api/plugin/jdbc/define/H2PluginDefine.java index 22a36b674..14c32bd17 100644 --- a/skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/plugin/jdbc/define/H2PluginDefine.java +++ b/skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/api/plugin/jdbc/define/H2PluginDefine.java @@ -1,4 +1,4 @@ -package com.a.eye.skywalking.plugin.jdbc.define; +package com.a.eye.skywalking.api.plugin.jdbc.define; public class H2PluginDefine extends AbstractDatabasePluginDefine { @Override diff --git a/skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/plugin/jdbc/define/JDBCBuriedPointType.java b/skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/api/plugin/jdbc/define/JDBCBuriedPointType.java similarity index 84% rename from skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/plugin/jdbc/define/JDBCBuriedPointType.java rename to skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/api/plugin/jdbc/define/JDBCBuriedPointType.java index e398a55b3..a1aa965d2 100644 --- a/skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/plugin/jdbc/define/JDBCBuriedPointType.java +++ b/skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/api/plugin/jdbc/define/JDBCBuriedPointType.java @@ -1,4 +1,4 @@ -package com.a.eye.skywalking.plugin.jdbc.define; +package com.a.eye.skywalking.api.plugin.jdbc.define; import com.a.eye.skywalking.api.IBuriedPointType; diff --git a/skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/plugin/jdbc/define/JDBCDriverInterceptor.java b/skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/api/plugin/jdbc/define/JDBCDriverInterceptor.java similarity index 72% rename from skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/plugin/jdbc/define/JDBCDriverInterceptor.java rename to skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/api/plugin/jdbc/define/JDBCDriverInterceptor.java index 6c38e2390..577e43622 100644 --- a/skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/plugin/jdbc/define/JDBCDriverInterceptor.java +++ b/skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/api/plugin/jdbc/define/JDBCDriverInterceptor.java @@ -1,11 +1,11 @@ -package com.a.eye.skywalking.plugin.jdbc.define; +package com.a.eye.skywalking.api.plugin.jdbc.define; -import com.a.eye.skywalking.plugin.interceptor.EnhancedClassInstanceContext; +import com.a.eye.skywalking.api.plugin.interceptor.EnhancedClassInstanceContext; import com.a.eye.skywalking.plugin.interceptor.enhance.ConstructorInvokeContext; -import com.a.eye.skywalking.plugin.interceptor.enhance.MethodInterceptResult; +import com.a.eye.skywalking.api.plugin.interceptor.enhance.MethodInterceptResult; import com.a.eye.skywalking.plugin.interceptor.enhance.InstanceMethodInvokeContext; -import com.a.eye.skywalking.plugin.interceptor.enhance.InstanceMethodsAroundInterceptor; -import com.a.eye.skywalking.plugin.jdbc.SWConnection; +import com.a.eye.skywalking.api.plugin.interceptor.enhance.InstanceMethodsAroundInterceptor; +import com.a.eye.skywalking.api.plugin.jdbc.SWConnection; import java.sql.Connection; import java.util.Properties; diff --git a/skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/plugin/jdbc/define/MysqlPluginDefine.java b/skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/api/plugin/jdbc/define/MysqlPluginDefine.java similarity index 80% rename from skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/plugin/jdbc/define/MysqlPluginDefine.java rename to skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/api/plugin/jdbc/define/MysqlPluginDefine.java index a1cecd2ad..c286ac49f 100644 --- a/skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/plugin/jdbc/define/MysqlPluginDefine.java +++ b/skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/api/plugin/jdbc/define/MysqlPluginDefine.java @@ -1,4 +1,4 @@ -package com.a.eye.skywalking.plugin.jdbc.define; +package com.a.eye.skywalking.api.plugin.jdbc.define; /** * Created by xin on 16/8/4. diff --git a/skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/plugin/jdbc/define/OraclePluginDefine.java b/skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/api/plugin/jdbc/define/OraclePluginDefine.java similarity index 80% rename from skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/plugin/jdbc/define/OraclePluginDefine.java rename to skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/api/plugin/jdbc/define/OraclePluginDefine.java index c028f0e90..05fb9e3c0 100644 --- a/skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/plugin/jdbc/define/OraclePluginDefine.java +++ b/skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/api/plugin/jdbc/define/OraclePluginDefine.java @@ -1,4 +1,4 @@ -package com.a.eye.skywalking.plugin.jdbc.define; +package com.a.eye.skywalking.api.plugin.jdbc.define; /** * Created by xin on 16/8/4. diff --git a/skywalking-sniffer/skywalking-sdk-plugin/jedis-2.x-plugin/src/main/java/com/a/eye/skywalking/plugin/jedis/v2/JedisClusterConstructorInterceptor4HostAndPortArg.java b/skywalking-sniffer/skywalking-sdk-plugin/jedis-2.x-plugin/src/main/java/com/a/eye/skywalking/api/plugin/jedis/v2/JedisClusterConstructorInterceptor4HostAndPortArg.java similarity index 67% rename from skywalking-sniffer/skywalking-sdk-plugin/jedis-2.x-plugin/src/main/java/com/a/eye/skywalking/plugin/jedis/v2/JedisClusterConstructorInterceptor4HostAndPortArg.java rename to skywalking-sniffer/skywalking-sdk-plugin/jedis-2.x-plugin/src/main/java/com/a/eye/skywalking/api/plugin/jedis/v2/JedisClusterConstructorInterceptor4HostAndPortArg.java index 26c4da2eb..021e2ac66 100644 --- a/skywalking-sniffer/skywalking-sdk-plugin/jedis-2.x-plugin/src/main/java/com/a/eye/skywalking/plugin/jedis/v2/JedisClusterConstructorInterceptor4HostAndPortArg.java +++ b/skywalking-sniffer/skywalking-sdk-plugin/jedis-2.x-plugin/src/main/java/com/a/eye/skywalking/api/plugin/jedis/v2/JedisClusterConstructorInterceptor4HostAndPortArg.java @@ -1,13 +1,11 @@ -package com.a.eye.skywalking.plugin.jedis.v2; +package com.a.eye.skywalking.api.plugin.jedis.v2; -import com.a.eye.skywalking.plugin.interceptor.EnhancedClassInstanceContext; +import com.a.eye.skywalking.api.plugin.interceptor.EnhancedClassInstanceContext; import com.a.eye.skywalking.plugin.interceptor.enhance.ConstructorInvokeContext; -import com.a.eye.skywalking.plugin.interceptor.enhance.InstanceConstructorInterceptor; +import com.a.eye.skywalking.api.plugin.interceptor.enhance.InstanceConstructorInterceptor; import redis.clients.jedis.HostAndPort; -import java.util.Set; - -import static com.a.eye.skywalking.plugin.jedis.v2.JedisMethodInterceptor.REDIS_CONN_INFO_KEY; +import static com.a.eye.skywalking.api.plugin.jedis.v2.JedisMethodInterceptor.REDIS_CONN_INFO_KEY; /** * Created by xin on 16-6-12. diff --git a/skywalking-sniffer/skywalking-sdk-plugin/jedis-2.x-plugin/src/main/java/com/a/eye/skywalking/plugin/jedis/v2/JedisClusterConstructorInterceptor4SetArg.java b/skywalking-sniffer/skywalking-sdk-plugin/jedis-2.x-plugin/src/main/java/com/a/eye/skywalking/api/plugin/jedis/v2/JedisClusterConstructorInterceptor4SetArg.java similarity index 70% rename from skywalking-sniffer/skywalking-sdk-plugin/jedis-2.x-plugin/src/main/java/com/a/eye/skywalking/plugin/jedis/v2/JedisClusterConstructorInterceptor4SetArg.java rename to skywalking-sniffer/skywalking-sdk-plugin/jedis-2.x-plugin/src/main/java/com/a/eye/skywalking/api/plugin/jedis/v2/JedisClusterConstructorInterceptor4SetArg.java index f630bb1c2..17a098eb7 100644 --- a/skywalking-sniffer/skywalking-sdk-plugin/jedis-2.x-plugin/src/main/java/com/a/eye/skywalking/plugin/jedis/v2/JedisClusterConstructorInterceptor4SetArg.java +++ b/skywalking-sniffer/skywalking-sdk-plugin/jedis-2.x-plugin/src/main/java/com/a/eye/skywalking/api/plugin/jedis/v2/JedisClusterConstructorInterceptor4SetArg.java @@ -1,14 +1,14 @@ -package com.a.eye.skywalking.plugin.jedis.v2; +package com.a.eye.skywalking.api.plugin.jedis.v2; -import com.a.eye.skywalking.plugin.interceptor.EnhancedClassInstanceContext; +import com.a.eye.skywalking.api.plugin.interceptor.EnhancedClassInstanceContext; import com.a.eye.skywalking.plugin.interceptor.enhance.ConstructorInvokeContext; -import com.a.eye.skywalking.plugin.interceptor.enhance.InstanceConstructorInterceptor; +import com.a.eye.skywalking.api.plugin.interceptor.enhance.InstanceConstructorInterceptor; import redis.clients.jedis.HostAndPort; import java.util.Set; -import static com.a.eye.skywalking.plugin.jedis.v2.JedisMethodInterceptor.REDIS_CONN_INFO_KEY; +import static com.a.eye.skywalking.api.plugin.jedis.v2.JedisMethodInterceptor.REDIS_CONN_INFO_KEY; /** * Created by xin on 16-6-12. diff --git a/skywalking-sniffer/skywalking-sdk-plugin/jedis-2.x-plugin/src/main/java/com/a/eye/skywalking/plugin/jedis/v2/JedisConstructorInterceptor4ShardInfoArg.java b/skywalking-sniffer/skywalking-sdk-plugin/jedis-2.x-plugin/src/main/java/com/a/eye/skywalking/api/plugin/jedis/v2/JedisConstructorInterceptor4ShardInfoArg.java similarity index 66% rename from skywalking-sniffer/skywalking-sdk-plugin/jedis-2.x-plugin/src/main/java/com/a/eye/skywalking/plugin/jedis/v2/JedisConstructorInterceptor4ShardInfoArg.java rename to skywalking-sniffer/skywalking-sdk-plugin/jedis-2.x-plugin/src/main/java/com/a/eye/skywalking/api/plugin/jedis/v2/JedisConstructorInterceptor4ShardInfoArg.java index dff6b2800..b0f3a1580 100644 --- a/skywalking-sniffer/skywalking-sdk-plugin/jedis-2.x-plugin/src/main/java/com/a/eye/skywalking/plugin/jedis/v2/JedisConstructorInterceptor4ShardInfoArg.java +++ b/skywalking-sniffer/skywalking-sdk-plugin/jedis-2.x-plugin/src/main/java/com/a/eye/skywalking/api/plugin/jedis/v2/JedisConstructorInterceptor4ShardInfoArg.java @@ -1,13 +1,11 @@ -package com.a.eye.skywalking.plugin.jedis.v2; +package com.a.eye.skywalking.api.plugin.jedis.v2; -import com.a.eye.skywalking.plugin.interceptor.EnhancedClassInstanceContext; +import com.a.eye.skywalking.api.plugin.interceptor.EnhancedClassInstanceContext; import com.a.eye.skywalking.plugin.interceptor.enhance.ConstructorInvokeContext; -import com.a.eye.skywalking.plugin.interceptor.enhance.InstanceConstructorInterceptor; +import com.a.eye.skywalking.api.plugin.interceptor.enhance.InstanceConstructorInterceptor; import redis.clients.jedis.JedisShardInfo; -import java.net.URI; - -import static com.a.eye.skywalking.plugin.jedis.v2.JedisMethodInterceptor.REDIS_CONN_INFO_KEY; +import static com.a.eye.skywalking.api.plugin.jedis.v2.JedisMethodInterceptor.REDIS_CONN_INFO_KEY; /** * Created by wusheng on 2016/12/1. diff --git a/skywalking-sniffer/skywalking-sdk-plugin/jedis-2.x-plugin/src/main/java/com/a/eye/skywalking/plugin/jedis/v2/JedisConstructorInterceptor4StringArg.java b/skywalking-sniffer/skywalking-sdk-plugin/jedis-2.x-plugin/src/main/java/com/a/eye/skywalking/api/plugin/jedis/v2/JedisConstructorInterceptor4StringArg.java similarity index 62% rename from skywalking-sniffer/skywalking-sdk-plugin/jedis-2.x-plugin/src/main/java/com/a/eye/skywalking/plugin/jedis/v2/JedisConstructorInterceptor4StringArg.java rename to skywalking-sniffer/skywalking-sdk-plugin/jedis-2.x-plugin/src/main/java/com/a/eye/skywalking/api/plugin/jedis/v2/JedisConstructorInterceptor4StringArg.java index 6b64925dc..9ead9a34a 100644 --- a/skywalking-sniffer/skywalking-sdk-plugin/jedis-2.x-plugin/src/main/java/com/a/eye/skywalking/plugin/jedis/v2/JedisConstructorInterceptor4StringArg.java +++ b/skywalking-sniffer/skywalking-sdk-plugin/jedis-2.x-plugin/src/main/java/com/a/eye/skywalking/api/plugin/jedis/v2/JedisConstructorInterceptor4StringArg.java @@ -1,13 +1,10 @@ -package com.a.eye.skywalking.plugin.jedis.v2; +package com.a.eye.skywalking.api.plugin.jedis.v2; -import com.a.eye.skywalking.plugin.interceptor.EnhancedClassInstanceContext; +import com.a.eye.skywalking.api.plugin.interceptor.EnhancedClassInstanceContext; import com.a.eye.skywalking.plugin.interceptor.enhance.ConstructorInvokeContext; -import com.a.eye.skywalking.plugin.interceptor.enhance.InstanceConstructorInterceptor; -import redis.clients.jedis.JedisShardInfo; +import com.a.eye.skywalking.api.plugin.interceptor.enhance.InstanceConstructorInterceptor; -import java.net.URI; - -import static com.a.eye.skywalking.plugin.jedis.v2.JedisMethodInterceptor.REDIS_CONN_INFO_KEY; +import static com.a.eye.skywalking.api.plugin.jedis.v2.JedisMethodInterceptor.REDIS_CONN_INFO_KEY; public class JedisConstructorInterceptor4StringArg implements InstanceConstructorInterceptor { diff --git a/skywalking-sniffer/skywalking-sdk-plugin/jedis-2.x-plugin/src/main/java/com/a/eye/skywalking/plugin/jedis/v2/JedisConstructorInterceptor4UriArg.java b/skywalking-sniffer/skywalking-sdk-plugin/jedis-2.x-plugin/src/main/java/com/a/eye/skywalking/api/plugin/jedis/v2/JedisConstructorInterceptor4UriArg.java similarity index 64% rename from skywalking-sniffer/skywalking-sdk-plugin/jedis-2.x-plugin/src/main/java/com/a/eye/skywalking/plugin/jedis/v2/JedisConstructorInterceptor4UriArg.java rename to skywalking-sniffer/skywalking-sdk-plugin/jedis-2.x-plugin/src/main/java/com/a/eye/skywalking/api/plugin/jedis/v2/JedisConstructorInterceptor4UriArg.java index d5fa5ad29..273d28075 100644 --- a/skywalking-sniffer/skywalking-sdk-plugin/jedis-2.x-plugin/src/main/java/com/a/eye/skywalking/plugin/jedis/v2/JedisConstructorInterceptor4UriArg.java +++ b/skywalking-sniffer/skywalking-sdk-plugin/jedis-2.x-plugin/src/main/java/com/a/eye/skywalking/api/plugin/jedis/v2/JedisConstructorInterceptor4UriArg.java @@ -1,12 +1,12 @@ -package com.a.eye.skywalking.plugin.jedis.v2; +package com.a.eye.skywalking.api.plugin.jedis.v2; -import com.a.eye.skywalking.plugin.interceptor.EnhancedClassInstanceContext; +import com.a.eye.skywalking.api.plugin.interceptor.EnhancedClassInstanceContext; import com.a.eye.skywalking.plugin.interceptor.enhance.ConstructorInvokeContext; -import com.a.eye.skywalking.plugin.interceptor.enhance.InstanceConstructorInterceptor; +import com.a.eye.skywalking.api.plugin.interceptor.enhance.InstanceConstructorInterceptor; import java.net.URI; -import static com.a.eye.skywalking.plugin.jedis.v2.JedisMethodInterceptor.REDIS_CONN_INFO_KEY; +import static com.a.eye.skywalking.api.plugin.jedis.v2.JedisMethodInterceptor.REDIS_CONN_INFO_KEY; /** * Created by wusheng on 2016/12/1. diff --git a/skywalking-sniffer/skywalking-sdk-plugin/jedis-2.x-plugin/src/main/java/com/a/eye/skywalking/plugin/jedis/v2/JedisMethodInterceptor.java b/skywalking-sniffer/skywalking-sdk-plugin/jedis-2.x-plugin/src/main/java/com/a/eye/skywalking/api/plugin/jedis/v2/JedisMethodInterceptor.java similarity index 90% rename from skywalking-sniffer/skywalking-sdk-plugin/jedis-2.x-plugin/src/main/java/com/a/eye/skywalking/plugin/jedis/v2/JedisMethodInterceptor.java rename to skywalking-sniffer/skywalking-sdk-plugin/jedis-2.x-plugin/src/main/java/com/a/eye/skywalking/api/plugin/jedis/v2/JedisMethodInterceptor.java index 518c9ada7..874d12a28 100644 --- a/skywalking-sniffer/skywalking-sdk-plugin/jedis-2.x-plugin/src/main/java/com/a/eye/skywalking/plugin/jedis/v2/JedisMethodInterceptor.java +++ b/skywalking-sniffer/skywalking-sdk-plugin/jedis-2.x-plugin/src/main/java/com/a/eye/skywalking/api/plugin/jedis/v2/JedisMethodInterceptor.java @@ -1,10 +1,10 @@ -package com.a.eye.skywalking.plugin.jedis.v2; +package com.a.eye.skywalking.api.plugin.jedis.v2; import com.a.eye.skywalking.model.Identification; -import com.a.eye.skywalking.plugin.interceptor.EnhancedClassInstanceContext; +import com.a.eye.skywalking.api.plugin.interceptor.EnhancedClassInstanceContext; import com.a.eye.skywalking.plugin.interceptor.assist.NoCocurrencyAceessObject; import com.a.eye.skywalking.plugin.interceptor.enhance.InstanceMethodInvokeContext; -import com.a.eye.skywalking.plugin.interceptor.enhance.MethodInterceptResult; +import com.a.eye.skywalking.api.plugin.interceptor.enhance.MethodInterceptResult; public class JedisMethodInterceptor extends NoCocurrencyAceessObject { protected static final String REDIS_CONN_INFO_KEY = "redisClusterConnInfo"; diff --git a/skywalking-sniffer/skywalking-sdk-plugin/jedis-2.x-plugin/src/main/java/com/a/eye/skywalking/plugin/jedis/v2/RedisBuriedPointType.java b/skywalking-sniffer/skywalking-sdk-plugin/jedis-2.x-plugin/src/main/java/com/a/eye/skywalking/api/plugin/jedis/v2/RedisBuriedPointType.java similarity index 84% rename from skywalking-sniffer/skywalking-sdk-plugin/jedis-2.x-plugin/src/main/java/com/a/eye/skywalking/plugin/jedis/v2/RedisBuriedPointType.java rename to skywalking-sniffer/skywalking-sdk-plugin/jedis-2.x-plugin/src/main/java/com/a/eye/skywalking/api/plugin/jedis/v2/RedisBuriedPointType.java index 4718186f6..3153d27e8 100644 --- a/skywalking-sniffer/skywalking-sdk-plugin/jedis-2.x-plugin/src/main/java/com/a/eye/skywalking/plugin/jedis/v2/RedisBuriedPointType.java +++ b/skywalking-sniffer/skywalking-sdk-plugin/jedis-2.x-plugin/src/main/java/com/a/eye/skywalking/api/plugin/jedis/v2/RedisBuriedPointType.java @@ -1,4 +1,4 @@ -package com.a.eye.skywalking.plugin.jedis.v2; +package com.a.eye.skywalking.api.plugin.jedis.v2; import com.a.eye.skywalking.api.IBuriedPointType; diff --git a/skywalking-sniffer/skywalking-sdk-plugin/jedis-2.x-plugin/src/main/java/com/a/eye/skywalking/plugin/jedis/v2/define/JedisClusterPluginDefine.java b/skywalking-sniffer/skywalking-sdk-plugin/jedis-2.x-plugin/src/main/java/com/a/eye/skywalking/api/plugin/jedis/v2/define/JedisClusterPluginDefine.java similarity index 94% rename from skywalking-sniffer/skywalking-sdk-plugin/jedis-2.x-plugin/src/main/java/com/a/eye/skywalking/plugin/jedis/v2/define/JedisClusterPluginDefine.java rename to skywalking-sniffer/skywalking-sdk-plugin/jedis-2.x-plugin/src/main/java/com/a/eye/skywalking/api/plugin/jedis/v2/define/JedisClusterPluginDefine.java index d55821875..cfebfb463 100644 --- a/skywalking-sniffer/skywalking-sdk-plugin/jedis-2.x-plugin/src/main/java/com/a/eye/skywalking/plugin/jedis/v2/define/JedisClusterPluginDefine.java +++ b/skywalking-sniffer/skywalking-sdk-plugin/jedis-2.x-plugin/src/main/java/com/a/eye/skywalking/api/plugin/jedis/v2/define/JedisClusterPluginDefine.java @@ -1,9 +1,9 @@ -package com.a.eye.skywalking.plugin.jedis.v2.define; +package com.a.eye.skywalking.api.plugin.jedis.v2.define; +import com.a.eye.skywalking.api.plugin.interceptor.InstanceMethodsInterceptPoint; import com.a.eye.skywalking.plugin.bytebuddy.AllObjectDefaultMethodsMatch; import com.a.eye.skywalking.plugin.bytebuddy.ArgumentTypeNameMatch; import com.a.eye.skywalking.plugin.interceptor.ConstructorInterceptPoint; -import com.a.eye.skywalking.plugin.interceptor.InstanceMethodsInterceptPoint; import com.a.eye.skywalking.plugin.interceptor.enhance.ClassInstanceMethodsEnhancePluginDefine; import net.bytebuddy.description.method.MethodDescription; import net.bytebuddy.matcher.ElementMatcher; diff --git a/skywalking-sniffer/skywalking-sdk-plugin/jedis-2.x-plugin/src/main/java/com/a/eye/skywalking/plugin/jedis/v2/define/JedisPluginDefine.java b/skywalking-sniffer/skywalking-sdk-plugin/jedis-2.x-plugin/src/main/java/com/a/eye/skywalking/api/plugin/jedis/v2/define/JedisPluginDefine.java similarity index 93% rename from skywalking-sniffer/skywalking-sdk-plugin/jedis-2.x-plugin/src/main/java/com/a/eye/skywalking/plugin/jedis/v2/define/JedisPluginDefine.java rename to skywalking-sniffer/skywalking-sdk-plugin/jedis-2.x-plugin/src/main/java/com/a/eye/skywalking/api/plugin/jedis/v2/define/JedisPluginDefine.java index 651eb0908..d4085b551 100644 --- a/skywalking-sniffer/skywalking-sdk-plugin/jedis-2.x-plugin/src/main/java/com/a/eye/skywalking/plugin/jedis/v2/define/JedisPluginDefine.java +++ b/skywalking-sniffer/skywalking-sdk-plugin/jedis-2.x-plugin/src/main/java/com/a/eye/skywalking/api/plugin/jedis/v2/define/JedisPluginDefine.java @@ -1,8 +1,9 @@ -package com.a.eye.skywalking.plugin.jedis.v2.define; +package com.a.eye.skywalking.api.plugin.jedis.v2.define; +import com.a.eye.skywalking.api.plugin.interceptor.ConstructorInterceptPoint; +import com.a.eye.skywalking.api.plugin.interceptor.InstanceMethodsInterceptPoint; import com.a.eye.skywalking.plugin.bytebuddy.AllObjectDefaultMethodsMatch; import com.a.eye.skywalking.plugin.interceptor.ConstructorInterceptPoint; -import com.a.eye.skywalking.plugin.interceptor.InstanceMethodsInterceptPoint; import com.a.eye.skywalking.plugin.interceptor.enhance.ClassInstanceMethodsEnhancePluginDefine; import net.bytebuddy.description.method.MethodDescription; import net.bytebuddy.matcher.ElementMatcher; diff --git a/skywalking-sniffer/skywalking-sdk-plugin/motan-plugin/src/main/java/com/a/eye/skywalking/plugin/motan/MotanBuriedPointType.java b/skywalking-sniffer/skywalking-sdk-plugin/motan-plugin/src/main/java/com/a/eye/skywalking/api/plugin/motan/MotanBuriedPointType.java similarity index 86% rename from skywalking-sniffer/skywalking-sdk-plugin/motan-plugin/src/main/java/com/a/eye/skywalking/plugin/motan/MotanBuriedPointType.java rename to skywalking-sniffer/skywalking-sdk-plugin/motan-plugin/src/main/java/com/a/eye/skywalking/api/plugin/motan/MotanBuriedPointType.java index 448a3e53d..766351815 100644 --- a/skywalking-sniffer/skywalking-sdk-plugin/motan-plugin/src/main/java/com/a/eye/skywalking/plugin/motan/MotanBuriedPointType.java +++ b/skywalking-sniffer/skywalking-sdk-plugin/motan-plugin/src/main/java/com/a/eye/skywalking/api/plugin/motan/MotanBuriedPointType.java @@ -1,4 +1,4 @@ -package com.a.eye.skywalking.plugin.motan; +package com.a.eye.skywalking.api.plugin.motan; import com.a.eye.skywalking.api.IBuriedPointType; diff --git a/skywalking-sniffer/skywalking-sdk-plugin/motan-plugin/src/main/java/com/a/eye/skywalking/plugin/motan/MotanClientCallInterceptor.java b/skywalking-sniffer/skywalking-sdk-plugin/motan-plugin/src/main/java/com/a/eye/skywalking/api/plugin/motan/MotanClientCallInterceptor.java similarity index 86% rename from skywalking-sniffer/skywalking-sdk-plugin/motan-plugin/src/main/java/com/a/eye/skywalking/plugin/motan/MotanClientCallInterceptor.java rename to skywalking-sniffer/skywalking-sdk-plugin/motan-plugin/src/main/java/com/a/eye/skywalking/api/plugin/motan/MotanClientCallInterceptor.java index 76590b8b3..c06cb9ba6 100644 --- a/skywalking-sniffer/skywalking-sdk-plugin/motan-plugin/src/main/java/com/a/eye/skywalking/plugin/motan/MotanClientCallInterceptor.java +++ b/skywalking-sniffer/skywalking-sdk-plugin/motan-plugin/src/main/java/com/a/eye/skywalking/api/plugin/motan/MotanClientCallInterceptor.java @@ -1,14 +1,13 @@ -package com.a.eye.skywalking.plugin.motan; +package com.a.eye.skywalking.api.plugin.motan; import com.a.eye.skywalking.invoke.monitor.RPCClientInvokeMonitor; import com.a.eye.skywalking.model.ContextData; import com.a.eye.skywalking.model.Identification; -import com.a.eye.skywalking.plugin.interceptor.EnhancedClassInstanceContext; +import com.a.eye.skywalking.api.plugin.interceptor.EnhancedClassInstanceContext; import com.a.eye.skywalking.plugin.interceptor.enhance.ConstructorInvokeContext; -import com.a.eye.skywalking.plugin.interceptor.enhance.InstanceConstructorInterceptor; import com.a.eye.skywalking.plugin.interceptor.enhance.InstanceMethodInvokeContext; -import com.a.eye.skywalking.plugin.interceptor.enhance.InstanceMethodsAroundInterceptor; -import com.a.eye.skywalking.plugin.interceptor.enhance.MethodInterceptResult; +import com.a.eye.skywalking.api.plugin.interceptor.enhance.InstanceMethodsAroundInterceptor; +import com.a.eye.skywalking.api.plugin.interceptor.enhance.MethodInterceptResult; import com.weibo.api.motan.rpc.Request; import com.weibo.api.motan.rpc.URL; diff --git a/skywalking-sniffer/skywalking-sdk-plugin/motan-plugin/src/main/java/com/a/eye/skywalking/plugin/motan/MotanClientFetchCallURLInterceptor.java b/skywalking-sniffer/skywalking-sdk-plugin/motan-plugin/src/main/java/com/a/eye/skywalking/api/plugin/motan/MotanClientFetchCallURLInterceptor.java similarity index 73% rename from skywalking-sniffer/skywalking-sdk-plugin/motan-plugin/src/main/java/com/a/eye/skywalking/plugin/motan/MotanClientFetchCallURLInterceptor.java rename to skywalking-sniffer/skywalking-sdk-plugin/motan-plugin/src/main/java/com/a/eye/skywalking/api/plugin/motan/MotanClientFetchCallURLInterceptor.java index 104eb206c..637a56116 100644 --- a/skywalking-sniffer/skywalking-sdk-plugin/motan-plugin/src/main/java/com/a/eye/skywalking/plugin/motan/MotanClientFetchCallURLInterceptor.java +++ b/skywalking-sniffer/skywalking-sdk-plugin/motan-plugin/src/main/java/com/a/eye/skywalking/api/plugin/motan/MotanClientFetchCallURLInterceptor.java @@ -1,9 +1,9 @@ -package com.a.eye.skywalking.plugin.motan; +package com.a.eye.skywalking.api.plugin.motan; -import com.a.eye.skywalking.plugin.interceptor.EnhancedClassInstanceContext; +import com.a.eye.skywalking.api.plugin.interceptor.EnhancedClassInstanceContext; import com.a.eye.skywalking.plugin.interceptor.enhance.InstanceMethodInvokeContext; -import com.a.eye.skywalking.plugin.interceptor.enhance.InstanceMethodsAroundInterceptor; -import com.a.eye.skywalking.plugin.interceptor.enhance.MethodInterceptResult; +import com.a.eye.skywalking.api.plugin.interceptor.enhance.InstanceMethodsAroundInterceptor; +import com.a.eye.skywalking.api.plugin.interceptor.enhance.MethodInterceptResult; /** * Created by xin on 2017/1/23. diff --git a/skywalking-sniffer/skywalking-sdk-plugin/motan-plugin/src/main/java/com/a/eye/skywalking/plugin/motan/MotanServerInterceptor.java b/skywalking-sniffer/skywalking-sdk-plugin/motan-plugin/src/main/java/com/a/eye/skywalking/api/plugin/motan/MotanServerInterceptor.java similarity index 86% rename from skywalking-sniffer/skywalking-sdk-plugin/motan-plugin/src/main/java/com/a/eye/skywalking/plugin/motan/MotanServerInterceptor.java rename to skywalking-sniffer/skywalking-sdk-plugin/motan-plugin/src/main/java/com/a/eye/skywalking/api/plugin/motan/MotanServerInterceptor.java index 89db91c74..9a1570aee 100644 --- a/skywalking-sniffer/skywalking-sdk-plugin/motan-plugin/src/main/java/com/a/eye/skywalking/plugin/motan/MotanServerInterceptor.java +++ b/skywalking-sniffer/skywalking-sdk-plugin/motan-plugin/src/main/java/com/a/eye/skywalking/api/plugin/motan/MotanServerInterceptor.java @@ -1,14 +1,14 @@ -package com.a.eye.skywalking.plugin.motan; +package com.a.eye.skywalking.api.plugin.motan; import com.a.eye.skywalking.invoke.monitor.RPCServerInvokeMonitor; import com.a.eye.skywalking.model.ContextData; import com.a.eye.skywalking.model.Identification; -import com.a.eye.skywalking.plugin.interceptor.EnhancedClassInstanceContext; +import com.a.eye.skywalking.api.plugin.interceptor.EnhancedClassInstanceContext; import com.a.eye.skywalking.plugin.interceptor.enhance.ConstructorInvokeContext; -import com.a.eye.skywalking.plugin.interceptor.enhance.InstanceConstructorInterceptor; +import com.a.eye.skywalking.api.plugin.interceptor.enhance.InstanceConstructorInterceptor; import com.a.eye.skywalking.plugin.interceptor.enhance.InstanceMethodInvokeContext; -import com.a.eye.skywalking.plugin.interceptor.enhance.InstanceMethodsAroundInterceptor; -import com.a.eye.skywalking.plugin.interceptor.enhance.MethodInterceptResult; +import com.a.eye.skywalking.api.plugin.interceptor.enhance.InstanceMethodsAroundInterceptor; +import com.a.eye.skywalking.api.plugin.interceptor.enhance.MethodInterceptResult; import com.weibo.api.motan.rpc.Request; import com.weibo.api.motan.rpc.URL; diff --git a/skywalking-sniffer/skywalking-sdk-plugin/motan-plugin/src/main/java/com/a/eye/skywalking/plugin/motan/define/MotanClientDefine.java b/skywalking-sniffer/skywalking-sdk-plugin/motan-plugin/src/main/java/com/a/eye/skywalking/api/plugin/motan/define/MotanClientDefine.java similarity index 92% rename from skywalking-sniffer/skywalking-sdk-plugin/motan-plugin/src/main/java/com/a/eye/skywalking/plugin/motan/define/MotanClientDefine.java rename to skywalking-sniffer/skywalking-sdk-plugin/motan-plugin/src/main/java/com/a/eye/skywalking/api/plugin/motan/define/MotanClientDefine.java index df9272193..e838dda1e 100644 --- a/skywalking-sniffer/skywalking-sdk-plugin/motan-plugin/src/main/java/com/a/eye/skywalking/plugin/motan/define/MotanClientDefine.java +++ b/skywalking-sniffer/skywalking-sdk-plugin/motan-plugin/src/main/java/com/a/eye/skywalking/api/plugin/motan/define/MotanClientDefine.java @@ -1,7 +1,7 @@ -package com.a.eye.skywalking.plugin.motan.define; +package com.a.eye.skywalking.api.plugin.motan.define; +import com.a.eye.skywalking.api.plugin.interceptor.InstanceMethodsInterceptPoint; import com.a.eye.skywalking.plugin.interceptor.ConstructorInterceptPoint; -import com.a.eye.skywalking.plugin.interceptor.InstanceMethodsInterceptPoint; import com.a.eye.skywalking.plugin.interceptor.enhance.ClassInstanceMethodsEnhancePluginDefine; import net.bytebuddy.description.method.MethodDescription; diff --git a/skywalking-sniffer/skywalking-sdk-plugin/motan-plugin/src/main/java/com/a/eye/skywalking/plugin/motan/define/MotanServerDefine.java b/skywalking-sniffer/skywalking-sdk-plugin/motan-plugin/src/main/java/com/a/eye/skywalking/api/plugin/motan/define/MotanServerDefine.java similarity index 89% rename from skywalking-sniffer/skywalking-sdk-plugin/motan-plugin/src/main/java/com/a/eye/skywalking/plugin/motan/define/MotanServerDefine.java rename to skywalking-sniffer/skywalking-sdk-plugin/motan-plugin/src/main/java/com/a/eye/skywalking/api/plugin/motan/define/MotanServerDefine.java index aec3aeca8..4649f3a40 100644 --- a/skywalking-sniffer/skywalking-sdk-plugin/motan-plugin/src/main/java/com/a/eye/skywalking/plugin/motan/define/MotanServerDefine.java +++ b/skywalking-sniffer/skywalking-sdk-plugin/motan-plugin/src/main/java/com/a/eye/skywalking/api/plugin/motan/define/MotanServerDefine.java @@ -1,7 +1,8 @@ -package com.a.eye.skywalking.plugin.motan.define; +package com.a.eye.skywalking.api.plugin.motan.define; +import com.a.eye.skywalking.api.plugin.interceptor.ConstructorInterceptPoint; +import com.a.eye.skywalking.api.plugin.interceptor.InstanceMethodsInterceptPoint; import com.a.eye.skywalking.plugin.interceptor.ConstructorInterceptPoint; -import com.a.eye.skywalking.plugin.interceptor.InstanceMethodsInterceptPoint; import com.a.eye.skywalking.plugin.interceptor.enhance.ClassInstanceMethodsEnhancePluginDefine; import net.bytebuddy.description.method.MethodDescription; import net.bytebuddy.matcher.ElementMatcher; diff --git a/skywalking-sniffer/skywalking-sdk-plugin/tomcat-7.x-8.x-plugin/src/main/java/com/a/eye/skywalking/plugin/tomcat78x/TomcatPluginInterceptor.java b/skywalking-sniffer/skywalking-sdk-plugin/tomcat-7.x-8.x-plugin/src/main/java/com/a/eye/skywalking/api/plugin/tomcat78x/TomcatPluginInterceptor.java similarity index 90% rename from skywalking-sniffer/skywalking-sdk-plugin/tomcat-7.x-8.x-plugin/src/main/java/com/a/eye/skywalking/plugin/tomcat78x/TomcatPluginInterceptor.java rename to skywalking-sniffer/skywalking-sdk-plugin/tomcat-7.x-8.x-plugin/src/main/java/com/a/eye/skywalking/api/plugin/tomcat78x/TomcatPluginInterceptor.java index 6a914e4a4..e46e1b6ab 100644 --- a/skywalking-sniffer/skywalking-sdk-plugin/tomcat-7.x-8.x-plugin/src/main/java/com/a/eye/skywalking/plugin/tomcat78x/TomcatPluginInterceptor.java +++ b/skywalking-sniffer/skywalking-sdk-plugin/tomcat-7.x-8.x-plugin/src/main/java/com/a/eye/skywalking/api/plugin/tomcat78x/TomcatPluginInterceptor.java @@ -1,14 +1,14 @@ -package com.a.eye.skywalking.plugin.tomcat78x; +package com.a.eye.skywalking.api.plugin.tomcat78x; import com.a.eye.skywalking.api.Tracing; import com.a.eye.skywalking.invoke.monitor.RPCServerInvokeMonitor; import com.a.eye.skywalking.model.ContextData; import com.a.eye.skywalking.model.Identification; -import com.a.eye.skywalking.plugin.interceptor.EnhancedClassInstanceContext; +import com.a.eye.skywalking.api.plugin.interceptor.EnhancedClassInstanceContext; import com.a.eye.skywalking.plugin.interceptor.enhance.ConstructorInvokeContext; import com.a.eye.skywalking.plugin.interceptor.enhance.InstanceMethodInvokeContext; -import com.a.eye.skywalking.plugin.interceptor.enhance.InstanceMethodsAroundInterceptor; -import com.a.eye.skywalking.plugin.interceptor.enhance.MethodInterceptResult; +import com.a.eye.skywalking.api.plugin.interceptor.enhance.InstanceMethodsAroundInterceptor; +import com.a.eye.skywalking.api.plugin.interceptor.enhance.MethodInterceptResult; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; diff --git a/skywalking-sniffer/skywalking-sdk-plugin/tomcat-7.x-8.x-plugin/src/main/java/com/a/eye/skywalking/plugin/tomcat78x/WebBuriedPointType.java b/skywalking-sniffer/skywalking-sdk-plugin/tomcat-7.x-8.x-plugin/src/main/java/com/a/eye/skywalking/api/plugin/tomcat78x/WebBuriedPointType.java similarity index 85% rename from skywalking-sniffer/skywalking-sdk-plugin/tomcat-7.x-8.x-plugin/src/main/java/com/a/eye/skywalking/plugin/tomcat78x/WebBuriedPointType.java rename to skywalking-sniffer/skywalking-sdk-plugin/tomcat-7.x-8.x-plugin/src/main/java/com/a/eye/skywalking/api/plugin/tomcat78x/WebBuriedPointType.java index 99f645805..d353c784a 100644 --- a/skywalking-sniffer/skywalking-sdk-plugin/tomcat-7.x-8.x-plugin/src/main/java/com/a/eye/skywalking/plugin/tomcat78x/WebBuriedPointType.java +++ b/skywalking-sniffer/skywalking-sdk-plugin/tomcat-7.x-8.x-plugin/src/main/java/com/a/eye/skywalking/api/plugin/tomcat78x/WebBuriedPointType.java @@ -1,4 +1,4 @@ -package com.a.eye.skywalking.plugin.tomcat78x; +package com.a.eye.skywalking.api.plugin.tomcat78x; import com.a.eye.skywalking.api.IBuriedPointType; diff --git a/skywalking-sniffer/skywalking-sdk-plugin/tomcat-7.x-8.x-plugin/src/main/java/com/a/eye/skywalking/plugin/tomcat78x/define/TomcatPluginDefine.java b/skywalking-sniffer/skywalking-sdk-plugin/tomcat-7.x-8.x-plugin/src/main/java/com/a/eye/skywalking/api/plugin/tomcat78x/define/TomcatPluginDefine.java similarity index 89% rename from skywalking-sniffer/skywalking-sdk-plugin/tomcat-7.x-8.x-plugin/src/main/java/com/a/eye/skywalking/plugin/tomcat78x/define/TomcatPluginDefine.java rename to skywalking-sniffer/skywalking-sdk-plugin/tomcat-7.x-8.x-plugin/src/main/java/com/a/eye/skywalking/api/plugin/tomcat78x/define/TomcatPluginDefine.java index 6e26528cd..d79b185c9 100644 --- a/skywalking-sniffer/skywalking-sdk-plugin/tomcat-7.x-8.x-plugin/src/main/java/com/a/eye/skywalking/plugin/tomcat78x/define/TomcatPluginDefine.java +++ b/skywalking-sniffer/skywalking-sdk-plugin/tomcat-7.x-8.x-plugin/src/main/java/com/a/eye/skywalking/api/plugin/tomcat78x/define/TomcatPluginDefine.java @@ -1,7 +1,7 @@ -package com.a.eye.skywalking.plugin.tomcat78x.define; +package com.a.eye.skywalking.api.plugin.tomcat78x.define; import com.a.eye.skywalking.plugin.interceptor.ConstructorInterceptPoint; -import com.a.eye.skywalking.plugin.interceptor.InstanceMethodsInterceptPoint; +import com.a.eye.skywalking.api.plugin.interceptor.InstanceMethodsInterceptPoint; import com.a.eye.skywalking.plugin.interceptor.enhance.ClassInstanceMethodsEnhancePluginDefine; import net.bytebuddy.description.method.MethodDescription; import net.bytebuddy.matcher.ElementMatcher; diff --git a/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-log4j-1.x-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/log/log4j/v1/x/PrintTraceIdInterceptor.java b/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-log4j-1.x-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/log/log4j/v1/x/PrintTraceIdInterceptor.java index bb2edba9f..b70b9173d 100644 --- a/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-log4j-1.x-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/log/log4j/v1/x/PrintTraceIdInterceptor.java +++ b/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-log4j-1.x-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/log/log4j/v1/x/PrintTraceIdInterceptor.java @@ -1,10 +1,10 @@ package com.a.eye.skywalking.toolkit.activation.log.log4j.v1.x; import com.a.eye.skywalking.api.Tracing; -import com.a.eye.skywalking.plugin.interceptor.EnhancedClassInstanceContext; +import com.a.eye.skywalking.api.plugin.interceptor.EnhancedClassInstanceContext; import com.a.eye.skywalking.plugin.interceptor.enhance.InstanceMethodInvokeContext; -import com.a.eye.skywalking.plugin.interceptor.enhance.InstanceMethodsAroundInterceptor; -import com.a.eye.skywalking.plugin.interceptor.enhance.MethodInterceptResult; +import com.a.eye.skywalking.api.plugin.interceptor.enhance.InstanceMethodsAroundInterceptor; +import com.a.eye.skywalking.api.plugin.interceptor.enhance.MethodInterceptResult; /** * Created by wusheng on 2016/12/7. diff --git a/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-log4j-1.x-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/log/log4j/v1/x/TraceIdPatternConverterActivation.java b/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-log4j-1.x-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/log/log4j/v1/x/TraceIdPatternConverterActivation.java index 865dd4463..1f06344d3 100644 --- a/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-log4j-1.x-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/log/log4j/v1/x/TraceIdPatternConverterActivation.java +++ b/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-log4j-1.x-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/log/log4j/v1/x/TraceIdPatternConverterActivation.java @@ -1,7 +1,7 @@ package com.a.eye.skywalking.toolkit.activation.log.log4j.v1.x; import com.a.eye.skywalking.plugin.interceptor.ConstructorInterceptPoint; -import com.a.eye.skywalking.plugin.interceptor.InstanceMethodsInterceptPoint; +import com.a.eye.skywalking.api.plugin.interceptor.InstanceMethodsInterceptPoint; import com.a.eye.skywalking.plugin.interceptor.StaticMethodsInterceptPoint; import com.a.eye.skywalking.plugin.interceptor.enhance.ClassInstanceMethodsEnhancePluginDefine; import net.bytebuddy.description.method.MethodDescription; diff --git a/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-log4j-2.x-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/log/log4j/v2/x/PrintTraceIdInterceptor.java b/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-log4j-2.x-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/log/log4j/v2/x/PrintTraceIdInterceptor.java index 1140baa5c..46840d3bf 100644 --- a/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-log4j-2.x-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/log/log4j/v2/x/PrintTraceIdInterceptor.java +++ b/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-log4j-2.x-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/log/log4j/v2/x/PrintTraceIdInterceptor.java @@ -1,8 +1,6 @@ package com.a.eye.skywalking.toolkit.activation.log.log4j.v2.x; import com.a.eye.skywalking.api.Tracing; -import com.a.eye.skywalking.plugin.interceptor.EnhancedClassInstanceContext; -import com.a.eye.skywalking.plugin.interceptor.enhance.*; /** * Created by wusheng on 2016/12/7. diff --git a/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-logback-1.x-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/log/logback/v1/x/LogbackPatternConverterActivation.java b/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-logback-1.x-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/log/logback/v1/x/LogbackPatternConverterActivation.java index 33160d00e..6379d9685 100644 --- a/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-logback-1.x-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/log/logback/v1/x/LogbackPatternConverterActivation.java +++ b/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-logback-1.x-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/log/logback/v1/x/LogbackPatternConverterActivation.java @@ -1,7 +1,7 @@ package com.a.eye.skywalking.toolkit.activation.log.logback.v1.x; import com.a.eye.skywalking.plugin.interceptor.ConstructorInterceptPoint; -import com.a.eye.skywalking.plugin.interceptor.InstanceMethodsInterceptPoint; +import com.a.eye.skywalking.api.plugin.interceptor.InstanceMethodsInterceptPoint; import com.a.eye.skywalking.plugin.interceptor.StaticMethodsInterceptPoint; import com.a.eye.skywalking.plugin.interceptor.enhance.ClassInstanceMethodsEnhancePluginDefine; import net.bytebuddy.description.method.MethodDescription; diff --git a/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-logback-1.x-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/log/logback/v1/x/PrintTraceIdInterceptor.java b/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-logback-1.x-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/log/logback/v1/x/PrintTraceIdInterceptor.java index d66ee862a..0677d4efa 100644 --- a/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-logback-1.x-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/log/logback/v1/x/PrintTraceIdInterceptor.java +++ b/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-logback-1.x-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/log/logback/v1/x/PrintTraceIdInterceptor.java @@ -1,10 +1,10 @@ package com.a.eye.skywalking.toolkit.activation.log.logback.v1.x; import com.a.eye.skywalking.api.Tracing; -import com.a.eye.skywalking.plugin.interceptor.EnhancedClassInstanceContext; +import com.a.eye.skywalking.api.plugin.interceptor.EnhancedClassInstanceContext; import com.a.eye.skywalking.plugin.interceptor.enhance.InstanceMethodInvokeContext; -import com.a.eye.skywalking.plugin.interceptor.enhance.InstanceMethodsAroundInterceptor; -import com.a.eye.skywalking.plugin.interceptor.enhance.MethodInterceptResult; +import com.a.eye.skywalking.api.plugin.interceptor.enhance.InstanceMethodsAroundInterceptor; +import com.a.eye.skywalking.api.plugin.interceptor.enhance.MethodInterceptResult; /** * Created by wusheng on 2016/12/7. diff --git a/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-opentracing-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/opentracing/span/SkyWalkingSpanActivation.java b/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-opentracing-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/opentracing/span/SkyWalkingSpanActivation.java index b93a5214f..8fd58f621 100644 --- a/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-opentracing-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/opentracing/span/SkyWalkingSpanActivation.java +++ b/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-opentracing-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/opentracing/span/SkyWalkingSpanActivation.java @@ -1,7 +1,7 @@ package com.a.eye.skywalking.toolkit.activation.opentracing.span; import com.a.eye.skywalking.plugin.interceptor.ConstructorInterceptPoint; -import com.a.eye.skywalking.plugin.interceptor.InstanceMethodsInterceptPoint; +import com.a.eye.skywalking.api.plugin.interceptor.InstanceMethodsInterceptPoint; import com.a.eye.skywalking.plugin.interceptor.enhance.ClassInstanceMethodsEnhancePluginDefine; import net.bytebuddy.description.method.MethodDescription; diff --git a/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-opentracing-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/opentracing/span/interceptor/SpanFinishInterceptor.java b/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-opentracing-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/opentracing/span/interceptor/SpanFinishInterceptor.java index a285b4da2..3af85ee90 100644 --- a/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-opentracing-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/opentracing/span/interceptor/SpanFinishInterceptor.java +++ b/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-opentracing-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/opentracing/span/interceptor/SpanFinishInterceptor.java @@ -3,10 +3,10 @@ package com.a.eye.skywalking.toolkit.activation.opentracing.span.interceptor; import com.a.eye.skywalking.api.Tracing; import com.a.eye.skywalking.invoke.monitor.LocalMethodInvokeMonitor; import com.a.eye.skywalking.model.Span; -import com.a.eye.skywalking.plugin.interceptor.EnhancedClassInstanceContext; +import com.a.eye.skywalking.api.plugin.interceptor.EnhancedClassInstanceContext; import com.a.eye.skywalking.plugin.interceptor.enhance.InstanceMethodInvokeContext; -import com.a.eye.skywalking.plugin.interceptor.enhance.InstanceMethodsAroundInterceptor; -import com.a.eye.skywalking.plugin.interceptor.enhance.MethodInterceptResult; +import com.a.eye.skywalking.api.plugin.interceptor.enhance.InstanceMethodsAroundInterceptor; +import com.a.eye.skywalking.api.plugin.interceptor.enhance.MethodInterceptResult; import java.util.Map; diff --git a/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-opentracing-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/opentracing/span/interceptor/SpanNewInstanceInterceptor.java b/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-opentracing-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/opentracing/span/interceptor/SpanNewInstanceInterceptor.java index 26b3805e5..d0821a41e 100644 --- a/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-opentracing-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/opentracing/span/interceptor/SpanNewInstanceInterceptor.java +++ b/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-opentracing-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/opentracing/span/interceptor/SpanNewInstanceInterceptor.java @@ -1,8 +1,8 @@ package com.a.eye.skywalking.toolkit.activation.opentracing.span.interceptor; -import com.a.eye.skywalking.plugin.interceptor.EnhancedClassInstanceContext; +import com.a.eye.skywalking.api.plugin.interceptor.EnhancedClassInstanceContext; import com.a.eye.skywalking.plugin.interceptor.enhance.ConstructorInvokeContext; -import com.a.eye.skywalking.plugin.interceptor.enhance.InstanceConstructorInterceptor; +import com.a.eye.skywalking.api.plugin.interceptor.enhance.InstanceConstructorInterceptor; /** * @author zhangxin diff --git a/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-opentracing-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/opentracing/span/interceptor/SpanSetOperationNameInterceptor.java b/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-opentracing-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/opentracing/span/interceptor/SpanSetOperationNameInterceptor.java index e7f6dc7a4..5eb368ff0 100644 --- a/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-opentracing-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/opentracing/span/interceptor/SpanSetOperationNameInterceptor.java +++ b/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-opentracing-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/opentracing/span/interceptor/SpanSetOperationNameInterceptor.java @@ -1,9 +1,9 @@ package com.a.eye.skywalking.toolkit.activation.opentracing.span.interceptor; -import com.a.eye.skywalking.plugin.interceptor.EnhancedClassInstanceContext; +import com.a.eye.skywalking.api.plugin.interceptor.EnhancedClassInstanceContext; import com.a.eye.skywalking.plugin.interceptor.enhance.InstanceMethodInvokeContext; -import com.a.eye.skywalking.plugin.interceptor.enhance.InstanceMethodsAroundInterceptor; -import com.a.eye.skywalking.plugin.interceptor.enhance.MethodInterceptResult; +import com.a.eye.skywalking.api.plugin.interceptor.enhance.InstanceMethodsAroundInterceptor; +import com.a.eye.skywalking.api.plugin.interceptor.enhance.MethodInterceptResult; /** * Created by xin on 2017/1/16. diff --git a/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-opentracing-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/opentracing/span/interceptor/SpanSetTagInterceptor.java b/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-opentracing-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/opentracing/span/interceptor/SpanSetTagInterceptor.java index 978d2e43b..f8ee21cc7 100644 --- a/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-opentracing-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/opentracing/span/interceptor/SpanSetTagInterceptor.java +++ b/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-opentracing-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/opentracing/span/interceptor/SpanSetTagInterceptor.java @@ -1,9 +1,9 @@ package com.a.eye.skywalking.toolkit.activation.opentracing.span.interceptor; -import com.a.eye.skywalking.plugin.interceptor.EnhancedClassInstanceContext; +import com.a.eye.skywalking.api.plugin.interceptor.EnhancedClassInstanceContext; import com.a.eye.skywalking.plugin.interceptor.enhance.InstanceMethodInvokeContext; -import com.a.eye.skywalking.plugin.interceptor.enhance.InstanceMethodsAroundInterceptor; -import com.a.eye.skywalking.plugin.interceptor.enhance.MethodInterceptResult; +import com.a.eye.skywalking.api.plugin.interceptor.enhance.InstanceMethodsAroundInterceptor; +import com.a.eye.skywalking.api.plugin.interceptor.enhance.MethodInterceptResult; import java.util.HashMap; import java.util.Map; diff --git a/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-opentracing-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/opentracing/spanbuilder/SkyWalkingSpanBuilderActivation.java b/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-opentracing-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/opentracing/spanbuilder/SkyWalkingSpanBuilderActivation.java index c575a20c7..7d79c3d1c 100644 --- a/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-opentracing-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/opentracing/spanbuilder/SkyWalkingSpanBuilderActivation.java +++ b/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-opentracing-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/opentracing/spanbuilder/SkyWalkingSpanBuilderActivation.java @@ -1,7 +1,7 @@ package com.a.eye.skywalking.toolkit.activation.opentracing.spanbuilder; import com.a.eye.skywalking.plugin.interceptor.ConstructorInterceptPoint; -import com.a.eye.skywalking.plugin.interceptor.InstanceMethodsInterceptPoint; +import com.a.eye.skywalking.api.plugin.interceptor.InstanceMethodsInterceptPoint; import com.a.eye.skywalking.plugin.interceptor.enhance.ClassInstanceMethodsEnhancePluginDefine; import net.bytebuddy.description.method.MethodDescription; diff --git a/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-opentracing-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/opentracing/spanbuilder/interceptor/SpanBuilderNewInstanceInterceptor.java b/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-opentracing-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/opentracing/spanbuilder/interceptor/SpanBuilderNewInstanceInterceptor.java index d11c70a74..6b0b56dd5 100644 --- a/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-opentracing-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/opentracing/spanbuilder/interceptor/SpanBuilderNewInstanceInterceptor.java +++ b/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-opentracing-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/opentracing/spanbuilder/interceptor/SpanBuilderNewInstanceInterceptor.java @@ -1,8 +1,8 @@ package com.a.eye.skywalking.toolkit.activation.opentracing.spanbuilder.interceptor; -import com.a.eye.skywalking.plugin.interceptor.EnhancedClassInstanceContext; +import com.a.eye.skywalking.api.plugin.interceptor.EnhancedClassInstanceContext; import com.a.eye.skywalking.plugin.interceptor.enhance.ConstructorInvokeContext; -import com.a.eye.skywalking.plugin.interceptor.enhance.InstanceConstructorInterceptor; +import com.a.eye.skywalking.api.plugin.interceptor.enhance.InstanceConstructorInterceptor; public class SpanBuilderNewInstanceInterceptor implements InstanceConstructorInterceptor { diff --git a/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-opentracing-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/opentracing/spanbuilder/interceptor/SpanBuilderStartInterceptor.java b/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-opentracing-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/opentracing/spanbuilder/interceptor/SpanBuilderStartInterceptor.java index 93794ac3f..70846c7e0 100644 --- a/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-opentracing-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/opentracing/spanbuilder/interceptor/SpanBuilderStartInterceptor.java +++ b/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-opentracing-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/opentracing/spanbuilder/interceptor/SpanBuilderStartInterceptor.java @@ -2,10 +2,10 @@ package com.a.eye.skywalking.toolkit.activation.opentracing.spanbuilder.intercep import com.a.eye.skywalking.invoke.monitor.LocalMethodInvokeMonitor; import com.a.eye.skywalking.model.Identification; -import com.a.eye.skywalking.plugin.interceptor.EnhancedClassInstanceContext; +import com.a.eye.skywalking.api.plugin.interceptor.EnhancedClassInstanceContext; import com.a.eye.skywalking.plugin.interceptor.enhance.InstanceMethodInvokeContext; -import com.a.eye.skywalking.plugin.interceptor.enhance.InstanceMethodsAroundInterceptor; -import com.a.eye.skywalking.plugin.interceptor.enhance.MethodInterceptResult; +import com.a.eye.skywalking.api.plugin.interceptor.enhance.InstanceMethodsAroundInterceptor; +import com.a.eye.skywalking.api.plugin.interceptor.enhance.MethodInterceptResult; import com.a.eye.skywalking.toolkit.activation.opentracing.spanbuilder.OpenTracingLocalBuriedPointType; import java.util.Map; diff --git a/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-opentracing-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/opentracing/spanbuilder/interceptor/SpanBuilderWithStartTimeInterceptor.java b/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-opentracing-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/opentracing/spanbuilder/interceptor/SpanBuilderWithStartTimeInterceptor.java index a932c25ba..1071743bc 100644 --- a/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-opentracing-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/opentracing/spanbuilder/interceptor/SpanBuilderWithStartTimeInterceptor.java +++ b/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-opentracing-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/opentracing/spanbuilder/interceptor/SpanBuilderWithStartTimeInterceptor.java @@ -1,9 +1,9 @@ package com.a.eye.skywalking.toolkit.activation.opentracing.spanbuilder.interceptor; -import com.a.eye.skywalking.plugin.interceptor.EnhancedClassInstanceContext; +import com.a.eye.skywalking.api.plugin.interceptor.EnhancedClassInstanceContext; import com.a.eye.skywalking.plugin.interceptor.enhance.InstanceMethodInvokeContext; -import com.a.eye.skywalking.plugin.interceptor.enhance.InstanceMethodsAroundInterceptor; -import com.a.eye.skywalking.plugin.interceptor.enhance.MethodInterceptResult; +import com.a.eye.skywalking.api.plugin.interceptor.enhance.InstanceMethodsAroundInterceptor; +import com.a.eye.skywalking.api.plugin.interceptor.enhance.MethodInterceptResult; /** * Created by xin on 2017/1/16. diff --git a/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-opentracing-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/opentracing/spanbuilder/interceptor/SpanBuilderWithTagInterceptor.java b/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-opentracing-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/opentracing/spanbuilder/interceptor/SpanBuilderWithTagInterceptor.java index 3a44e7d2f..6fddea0c7 100644 --- a/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-opentracing-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/opentracing/spanbuilder/interceptor/SpanBuilderWithTagInterceptor.java +++ b/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-opentracing-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/opentracing/spanbuilder/interceptor/SpanBuilderWithTagInterceptor.java @@ -1,9 +1,9 @@ package com.a.eye.skywalking.toolkit.activation.opentracing.spanbuilder.interceptor; -import com.a.eye.skywalking.plugin.interceptor.EnhancedClassInstanceContext; +import com.a.eye.skywalking.api.plugin.interceptor.EnhancedClassInstanceContext; import com.a.eye.skywalking.plugin.interceptor.enhance.InstanceMethodInvokeContext; -import com.a.eye.skywalking.plugin.interceptor.enhance.InstanceMethodsAroundInterceptor; -import com.a.eye.skywalking.plugin.interceptor.enhance.MethodInterceptResult; +import com.a.eye.skywalking.api.plugin.interceptor.enhance.InstanceMethodsAroundInterceptor; +import com.a.eye.skywalking.api.plugin.interceptor.enhance.MethodInterceptResult; import java.util.HashMap; import java.util.Map; diff --git a/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-opentracing-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/opentracing/tracer/SkyWalkingTracerActivation.java b/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-opentracing-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/opentracing/tracer/SkyWalkingTracerActivation.java index 1e026ea04..767e1d9da 100644 --- a/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-opentracing-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/opentracing/tracer/SkyWalkingTracerActivation.java +++ b/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-opentracing-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/opentracing/tracer/SkyWalkingTracerActivation.java @@ -1,7 +1,7 @@ package com.a.eye.skywalking.toolkit.activation.opentracing.tracer; import com.a.eye.skywalking.plugin.interceptor.ConstructorInterceptPoint; -import com.a.eye.skywalking.plugin.interceptor.InstanceMethodsInterceptPoint; +import com.a.eye.skywalking.api.plugin.interceptor.InstanceMethodsInterceptPoint; import com.a.eye.skywalking.plugin.interceptor.enhance.ClassInstanceMethodsEnhancePluginDefine; import net.bytebuddy.description.method.MethodDescription; import net.bytebuddy.matcher.ElementMatcher; diff --git a/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-opentracing-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/opentracing/tracer/interceptor/TracerExtractCrossProcessByteBufferContextInterceptor.java b/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-opentracing-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/opentracing/tracer/interceptor/TracerExtractCrossProcessByteBufferContextInterceptor.java index e6ea5aa44..8650449e2 100644 --- a/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-opentracing-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/opentracing/tracer/interceptor/TracerExtractCrossProcessByteBufferContextInterceptor.java +++ b/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-opentracing-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/opentracing/tracer/interceptor/TracerExtractCrossProcessByteBufferContextInterceptor.java @@ -2,10 +2,10 @@ package com.a.eye.skywalking.toolkit.activation.opentracing.tracer.interceptor; import com.a.eye.skywalking.api.Tracing; import com.a.eye.skywalking.model.RefContext; -import com.a.eye.skywalking.plugin.interceptor.EnhancedClassInstanceContext; +import com.a.eye.skywalking.api.plugin.interceptor.EnhancedClassInstanceContext; import com.a.eye.skywalking.plugin.interceptor.enhance.InstanceMethodInvokeContext; -import com.a.eye.skywalking.plugin.interceptor.enhance.InstanceMethodsAroundInterceptor; -import com.a.eye.skywalking.plugin.interceptor.enhance.MethodInterceptResult; +import com.a.eye.skywalking.api.plugin.interceptor.enhance.InstanceMethodsAroundInterceptor; +import com.a.eye.skywalking.api.plugin.interceptor.enhance.MethodInterceptResult; import java.nio.ByteBuffer; import java.nio.charset.Charset; diff --git a/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-opentracing-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/opentracing/tracer/interceptor/TracerExtractCrossProcessTextMapContextInterceptor.java b/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-opentracing-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/opentracing/tracer/interceptor/TracerExtractCrossProcessTextMapContextInterceptor.java index 5ada55d39..729c555f5 100644 --- a/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-opentracing-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/opentracing/tracer/interceptor/TracerExtractCrossProcessTextMapContextInterceptor.java +++ b/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-opentracing-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/opentracing/tracer/interceptor/TracerExtractCrossProcessTextMapContextInterceptor.java @@ -2,10 +2,10 @@ package com.a.eye.skywalking.toolkit.activation.opentracing.tracer.interceptor; import com.a.eye.skywalking.api.Tracing; import com.a.eye.skywalking.model.RefContext; -import com.a.eye.skywalking.plugin.interceptor.EnhancedClassInstanceContext; +import com.a.eye.skywalking.api.plugin.interceptor.EnhancedClassInstanceContext; import com.a.eye.skywalking.plugin.interceptor.enhance.InstanceMethodInvokeContext; -import com.a.eye.skywalking.plugin.interceptor.enhance.InstanceMethodsAroundInterceptor; -import com.a.eye.skywalking.plugin.interceptor.enhance.MethodInterceptResult; +import com.a.eye.skywalking.api.plugin.interceptor.enhance.InstanceMethodsAroundInterceptor; +import com.a.eye.skywalking.api.plugin.interceptor.enhance.MethodInterceptResult; import java.util.Iterator; import java.util.Map; diff --git a/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-opentracing-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/opentracing/tracer/interceptor/TracerFormatCrossProcessContextInterceptor.java b/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-opentracing-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/opentracing/tracer/interceptor/TracerFormatCrossProcessContextInterceptor.java index 50b88b0d7..bf6a4880f 100644 --- a/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-opentracing-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/opentracing/tracer/interceptor/TracerFormatCrossProcessContextInterceptor.java +++ b/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-opentracing-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/opentracing/tracer/interceptor/TracerFormatCrossProcessContextInterceptor.java @@ -3,11 +3,10 @@ package com.a.eye.skywalking.toolkit.activation.opentracing.tracer.interceptor; import com.a.eye.skywalking.api.Tracing; import com.a.eye.skywalking.model.ContextData; import com.a.eye.skywalking.model.Span; -import com.a.eye.skywalking.plugin.interceptor.EnhancedClassInstanceContext; +import com.a.eye.skywalking.api.plugin.interceptor.EnhancedClassInstanceContext; import com.a.eye.skywalking.plugin.interceptor.enhance.InstanceMethodInvokeContext; -import com.a.eye.skywalking.plugin.interceptor.enhance.InstanceMethodsAroundInterceptor; -import com.a.eye.skywalking.plugin.interceptor.enhance.MethodInterceptResult; -import com.a.eye.skywalking.toolkit.opentracing.SkyWalkingTracer; +import com.a.eye.skywalking.api.plugin.interceptor.enhance.InstanceMethodsAroundInterceptor; +import com.a.eye.skywalking.api.plugin.interceptor.enhance.MethodInterceptResult; /** * @author zhangxin diff --git a/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-trace-context-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/trace/TraceContextInterceptor.java b/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-trace-context-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/trace/TraceContextInterceptor.java index 9dc48a056..89f43ac7d 100644 --- a/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-trace-context-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/trace/TraceContextInterceptor.java +++ b/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-trace-context-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/trace/TraceContextInterceptor.java @@ -1,12 +1,12 @@ package com.a.eye.skywalking.toolkit.activation.trace; import com.a.eye.skywalking.api.Tracing; -import com.a.eye.skywalking.logging.api.ILog; -import com.a.eye.skywalking.logging.api.LogManager; -import com.a.eye.skywalking.plugin.interceptor.enhance.MethodInterceptResult; +import com.a.eye.skywalking.api.logging.api.ILog; +import com.a.eye.skywalking.api.logging.api.LogManager; +import com.a.eye.skywalking.api.plugin.interceptor.enhance.MethodInterceptResult; import com.a.eye.skywalking.plugin.interceptor.enhance.MethodInvokeContext; -import com.a.eye.skywalking.plugin.interceptor.enhance.StaticMethodInvokeContext; -import com.a.eye.skywalking.plugin.interceptor.enhance.StaticMethodsAroundInterceptor; +import com.a.eye.skywalking.api.plugin.interceptor.enhance.StaticMethodInvokeContext; +import com.a.eye.skywalking.api.plugin.interceptor.enhance.StaticMethodsAroundInterceptor; /** * From a4d2f237912d431b9cabf07559acf77d1f866eb4 Mon Sep 17 00:00:00 2001 From: wusheng Date: Mon, 20 Feb 2017 22:34:47 +0800 Subject: [PATCH 07/11] Add skywalking-sniffer-mock module. For testing sdk-plugin and collector(not merged yet) modules. --- skywalking-sniffer/pom.xml | 1 + skywalking-sniffer/skywalking-api/pom.xml | 20 -------- .../skywalking-sniffer-mock/pom.xml | 30 +++++++++++ .../context/MockTracerContextListener.java | 51 +++++++++++++++++++ .../sniffer/mock/context/SegmentAssert.java | 13 +++++ 5 files changed, 95 insertions(+), 20 deletions(-) create mode 100644 skywalking-sniffer/skywalking-sniffer-mock/pom.xml create mode 100644 skywalking-sniffer/skywalking-sniffer-mock/src/main/java/com/a/eye/skywalking/sniffer/mock/context/MockTracerContextListener.java create mode 100644 skywalking-sniffer/skywalking-sniffer-mock/src/main/java/com/a/eye/skywalking/sniffer/mock/context/SegmentAssert.java diff --git a/skywalking-sniffer/pom.xml b/skywalking-sniffer/pom.xml index 2661cf4d9..a6aef14eb 100644 --- a/skywalking-sniffer/pom.xml +++ b/skywalking-sniffer/pom.xml @@ -17,6 +17,7 @@ skywalking-api skywalking-sdk-plugin skywalking-toolkit-activation + skywalking-sniffer-mock diff --git a/skywalking-sniffer/skywalking-api/pom.xml b/skywalking-sniffer/skywalking-api/pom.xml index e11ee28cc..5774f18bd 100644 --- a/skywalking-sniffer/skywalking-api/pom.xml +++ b/skywalking-sniffer/skywalking-api/pom.xml @@ -51,26 +51,6 @@ disruptor 3.3.6 - - - - junit - junit - 4.11 - test - - - org.powermock - powermock-api-mockito - 1.6.5 - test - - - org.powermock - powermock-module-junit4 - 1.6.5 - test - diff --git a/skywalking-sniffer/skywalking-sniffer-mock/pom.xml b/skywalking-sniffer/skywalking-sniffer-mock/pom.xml new file mode 100644 index 000000000..b18693f11 --- /dev/null +++ b/skywalking-sniffer/skywalking-sniffer-mock/pom.xml @@ -0,0 +1,30 @@ + + + + skywalking-sniffer + com.a.eye + 3.0-2017 + + 4.0.0 + skywalking-sniffer-mock + This is a sniffer mock module, test for test-dependency, only. + + + + com.a.eye + skywalking-api + ${project.version} + + + + + junit + junit + 4.12 + + + + + diff --git a/skywalking-sniffer/skywalking-sniffer-mock/src/main/java/com/a/eye/skywalking/sniffer/mock/context/MockTracerContextListener.java b/skywalking-sniffer/skywalking-sniffer-mock/src/main/java/com/a/eye/skywalking/sniffer/mock/context/MockTracerContextListener.java new file mode 100644 index 000000000..ec7e1ccde --- /dev/null +++ b/skywalking-sniffer/skywalking-sniffer-mock/src/main/java/com/a/eye/skywalking/sniffer/mock/context/MockTracerContextListener.java @@ -0,0 +1,51 @@ +package com.a.eye.skywalking.sniffer.mock.context; + +import com.a.eye.skywalking.api.context.TracerContext; +import com.a.eye.skywalking.api.context.TracerContextListener; +import com.a.eye.skywalking.trace.TraceSegment; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import org.junit.Assert; + +/** + * This is mock tracer context listener, which should be added by calling {@link TracerContext.ListenerManager#add(TracerContextListener)}. + * This mock listener will hold all finished trace, which all are generated by {@link TracerContext#finish()}. + * + * Created by wusheng on 2017/2/20. + */ +public class MockTracerContextListener implements TracerContextListener { + private List finishedTraceSegments = Collections.synchronizedList(new ArrayList()); + + @Override public void afterFinished(TraceSegment traceSegment) { + finishedTraceSegments.add(traceSegment); + } + + /** + * Assert all finished {@link #finishedTraceSegments} match the given size. + * + * @param size the give size. + */ + public void assertSize(int size){ + Assert.assertEquals(size, finishedTraceSegments.size()); + } + + /** + * Assert the {@link TraceSegment} at the given index of {@link #finishedTraceSegments}, + * and run the given {@link SegmentAssert#call(TraceSegment)} to assert. + * + * @param index the given index. + * @param segmentAssert the given assert. + */ + public void assertTraceSegment(int index, SegmentAssert segmentAssert){ + assertSize(index + 1); + segmentAssert.call(finishedTraceSegments.get(index)); + } + + /** + * Clear all hold data. + */ + public void clear(){ + finishedTraceSegments.clear(); + } +} diff --git a/skywalking-sniffer/skywalking-sniffer-mock/src/main/java/com/a/eye/skywalking/sniffer/mock/context/SegmentAssert.java b/skywalking-sniffer/skywalking-sniffer-mock/src/main/java/com/a/eye/skywalking/sniffer/mock/context/SegmentAssert.java new file mode 100644 index 000000000..52a2b66d7 --- /dev/null +++ b/skywalking-sniffer/skywalking-sniffer-mock/src/main/java/com/a/eye/skywalking/sniffer/mock/context/SegmentAssert.java @@ -0,0 +1,13 @@ +package com.a.eye.skywalking.sniffer.mock.context; + +import com.a.eye.skywalking.trace.TraceSegment; + +/** + * The SegmentAssert interface should be implemented by any + * class whose instances are intended to assert a trace segment data. + * + * Created by wusheng on 2017/2/20. + */ +public interface SegmentAssert{ + void call(TraceSegment finishedSegment); +} From 69877b80fdebf84a7e703d8b9b18e4a047cab1c7 Mon Sep 17 00:00:00 2001 From: wusheng Date: Mon, 20 Feb 2017 22:52:26 +0800 Subject: [PATCH 08/11] Give a sample code of the first Mock trace. --- .../mock/trace/TraceSegmentBuilder.java | 10 ++++++ .../trace/TraceSegmentBuilderFactory.java | 35 +++++++++++++++++++ .../builders/SingleTomcat200TraceBuilder.java | 27 ++++++++++++++ 3 files changed, 72 insertions(+) create mode 100644 skywalking-sniffer/skywalking-sniffer-mock/src/main/java/com/a/eye/skywalking/sniffer/mock/trace/TraceSegmentBuilder.java create mode 100644 skywalking-sniffer/skywalking-sniffer-mock/src/main/java/com/a/eye/skywalking/sniffer/mock/trace/TraceSegmentBuilderFactory.java create mode 100644 skywalking-sniffer/skywalking-sniffer-mock/src/main/java/com/a/eye/skywalking/sniffer/mock/trace/builders/SingleTomcat200TraceBuilder.java diff --git a/skywalking-sniffer/skywalking-sniffer-mock/src/main/java/com/a/eye/skywalking/sniffer/mock/trace/TraceSegmentBuilder.java b/skywalking-sniffer/skywalking-sniffer-mock/src/main/java/com/a/eye/skywalking/sniffer/mock/trace/TraceSegmentBuilder.java new file mode 100644 index 000000000..57e48fd19 --- /dev/null +++ b/skywalking-sniffer/skywalking-sniffer-mock/src/main/java/com/a/eye/skywalking/sniffer/mock/trace/TraceSegmentBuilder.java @@ -0,0 +1,10 @@ +package com.a.eye.skywalking.sniffer.mock.trace; + +import com.a.eye.skywalking.trace.TraceSegment; + +/** + * Created by wusheng on 2017/2/20. + */ +public interface TraceSegmentBuilder { + TraceSegment build(); +} diff --git a/skywalking-sniffer/skywalking-sniffer-mock/src/main/java/com/a/eye/skywalking/sniffer/mock/trace/TraceSegmentBuilderFactory.java b/skywalking-sniffer/skywalking-sniffer-mock/src/main/java/com/a/eye/skywalking/sniffer/mock/trace/TraceSegmentBuilderFactory.java new file mode 100644 index 000000000..6714ced0b --- /dev/null +++ b/skywalking-sniffer/skywalking-sniffer-mock/src/main/java/com/a/eye/skywalking/sniffer/mock/trace/TraceSegmentBuilderFactory.java @@ -0,0 +1,35 @@ +package com.a.eye.skywalking.sniffer.mock.trace; + +import com.a.eye.skywalking.sniffer.mock.trace.builders.SingleTomcat200TraceBuilder; +import com.a.eye.skywalking.trace.TraceSegment; +import java.util.HashMap; +import java.util.Map; + +/** + * The TraceSegmentBuilderFactory contains all {@link TraceSegmentBuilder} implementations. + * All the implementations can build a true {@link TraceSegment} object, and contain all necessary spans, with all tags/events, all refs. + * + * Created by wusheng on 2017/2/20. + */ +public enum TraceSegmentBuilderFactory { + INSTANCE; + + private Map allBuilders; + + TraceSegmentBuilderFactory(){ + allBuilders = new HashMap(); + initialize(); + } + + public TraceSegment singleTomcat200Trace(){ + return allBuilders.get(SingleTomcat200TraceBuilder.INSTANCE).build(); + } + + private void initialize(){ + initBuilder(SingleTomcat200TraceBuilder.INSTANCE); + } + + private void initBuilder(TraceSegmentBuilder builder){ + allBuilders.put(builder.toString(), builder); + } +} diff --git a/skywalking-sniffer/skywalking-sniffer-mock/src/main/java/com/a/eye/skywalking/sniffer/mock/trace/builders/SingleTomcat200TraceBuilder.java b/skywalking-sniffer/skywalking-sniffer-mock/src/main/java/com/a/eye/skywalking/sniffer/mock/trace/builders/SingleTomcat200TraceBuilder.java new file mode 100644 index 000000000..d84eb8d79 --- /dev/null +++ b/skywalking-sniffer/skywalking-sniffer-mock/src/main/java/com/a/eye/skywalking/sniffer/mock/trace/builders/SingleTomcat200TraceBuilder.java @@ -0,0 +1,27 @@ +package com.a.eye.skywalking.sniffer.mock.trace.builders; + +import com.a.eye.skywalking.api.context.ContextManager; +import com.a.eye.skywalking.sniffer.mock.trace.TraceSegmentBuilder; +import com.a.eye.skywalking.trace.Span; +import com.a.eye.skywalking.trace.TraceSegment; +import com.a.eye.skywalking.trace.tag.Tags; + +/** + * A Trace contains only one span, which represent a tomcat server side span. + * + * Created by wusheng on 2017/2/20. + */ +public enum SingleTomcat200TraceBuilder implements TraceSegmentBuilder { + INSTANCE; + + @Override public TraceSegment build() { + Span webSpan = ContextManager.INSTANCE.createSpan("/web/serviceA"); + { + Tags.COMPONENT.set(webSpan, "tomcat"); + Tags.URL.set(webSpan, "http://10.21.9.35/web/serviceA"); + Tags.SPAN_KIND.set(webSpan, Tags.SPAN_KIND_SERVER); + Tags.STATUS_CODE.set(webSpan, 200); + } + return null; + } +} From 96f6c5fad94e57d2dec30ae7090bf5eaae8c64f8 Mon Sep 17 00:00:00 2001 From: wusheng Date: Mon, 20 Feb 2017 23:34:34 +0800 Subject: [PATCH 09/11] Add Tomcat span, and singleTrace mock. --- .../skywalking/api/context/TracerContext.java | 2 +- .../context/MockTracerContextListener.java | 10 ++++ .../mock/trace/TraceSegmentBuilder.java | 3 +- .../trace/TraceSegmentBuilderFactory.java | 51 ++++++++++++------ .../builders/SingleTomcat200TraceBuilder.java | 27 ---------- .../builders/span/TomcatSpanGenerator.java | 53 +++++++++++++++++++ .../trace/SingleTomcat200TraceBuilder.java | 20 +++++++ .../trace/SingleTomcat404TraceBuilder.java | 20 +++++++ .../trace/SingleTomcat500TraceBuilder.java | 20 +++++++ 9 files changed, 162 insertions(+), 44 deletions(-) delete mode 100644 skywalking-sniffer/skywalking-sniffer-mock/src/main/java/com/a/eye/skywalking/sniffer/mock/trace/builders/SingleTomcat200TraceBuilder.java create mode 100644 skywalking-sniffer/skywalking-sniffer-mock/src/main/java/com/a/eye/skywalking/sniffer/mock/trace/builders/span/TomcatSpanGenerator.java create mode 100644 skywalking-sniffer/skywalking-sniffer-mock/src/main/java/com/a/eye/skywalking/sniffer/mock/trace/builders/trace/SingleTomcat200TraceBuilder.java create mode 100644 skywalking-sniffer/skywalking-sniffer-mock/src/main/java/com/a/eye/skywalking/sniffer/mock/trace/builders/trace/SingleTomcat404TraceBuilder.java create mode 100644 skywalking-sniffer/skywalking-sniffer-mock/src/main/java/com/a/eye/skywalking/sniffer/mock/trace/builders/trace/SingleTomcat500TraceBuilder.java diff --git a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/context/TracerContext.java b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/context/TracerContext.java index ea8faf001..4ef3d3188 100644 --- a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/context/TracerContext.java +++ b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/context/TracerContext.java @@ -171,7 +171,7 @@ public final class TracerContext { /** * Clear the given {@link TracerContextListener} */ - static synchronized void remove(TracerContextListener listener){ + public static synchronized void remove(TracerContextListener listener){ listeners.remove(listener); } } diff --git a/skywalking-sniffer/skywalking-sniffer-mock/src/main/java/com/a/eye/skywalking/sniffer/mock/context/MockTracerContextListener.java b/skywalking-sniffer/skywalking-sniffer-mock/src/main/java/com/a/eye/skywalking/sniffer/mock/context/MockTracerContextListener.java index ec7e1ccde..a79f80e1a 100644 --- a/skywalking-sniffer/skywalking-sniffer-mock/src/main/java/com/a/eye/skywalking/sniffer/mock/context/MockTracerContextListener.java +++ b/skywalking-sniffer/skywalking-sniffer-mock/src/main/java/com/a/eye/skywalking/sniffer/mock/context/MockTracerContextListener.java @@ -48,4 +48,14 @@ public class MockTracerContextListener implements TracerContextListener { public void clear(){ finishedTraceSegments.clear(); } + + /** + * Get {@link TraceSegment} of the given index. + * @param index + * @return + */ + public TraceSegment getFinished(int index){ + assertSize(index + 1); + return finishedTraceSegments.get(index); + } } diff --git a/skywalking-sniffer/skywalking-sniffer-mock/src/main/java/com/a/eye/skywalking/sniffer/mock/trace/TraceSegmentBuilder.java b/skywalking-sniffer/skywalking-sniffer-mock/src/main/java/com/a/eye/skywalking/sniffer/mock/trace/TraceSegmentBuilder.java index 57e48fd19..55743677a 100644 --- a/skywalking-sniffer/skywalking-sniffer-mock/src/main/java/com/a/eye/skywalking/sniffer/mock/trace/TraceSegmentBuilder.java +++ b/skywalking-sniffer/skywalking-sniffer-mock/src/main/java/com/a/eye/skywalking/sniffer/mock/trace/TraceSegmentBuilder.java @@ -1,10 +1,11 @@ package com.a.eye.skywalking.sniffer.mock.trace; +import com.a.eye.skywalking.sniffer.mock.context.MockTracerContextListener; import com.a.eye.skywalking.trace.TraceSegment; /** * Created by wusheng on 2017/2/20. */ public interface TraceSegmentBuilder { - TraceSegment build(); + TraceSegment build(MockTracerContextListener listener); } diff --git a/skywalking-sniffer/skywalking-sniffer-mock/src/main/java/com/a/eye/skywalking/sniffer/mock/trace/TraceSegmentBuilderFactory.java b/skywalking-sniffer/skywalking-sniffer-mock/src/main/java/com/a/eye/skywalking/sniffer/mock/trace/TraceSegmentBuilderFactory.java index 6714ced0b..f13b49a8f 100644 --- a/skywalking-sniffer/skywalking-sniffer-mock/src/main/java/com/a/eye/skywalking/sniffer/mock/trace/TraceSegmentBuilderFactory.java +++ b/skywalking-sniffer/skywalking-sniffer-mock/src/main/java/com/a/eye/skywalking/sniffer/mock/trace/TraceSegmentBuilderFactory.java @@ -1,9 +1,11 @@ package com.a.eye.skywalking.sniffer.mock.trace; -import com.a.eye.skywalking.sniffer.mock.trace.builders.SingleTomcat200TraceBuilder; +import com.a.eye.skywalking.api.context.TracerContext; +import com.a.eye.skywalking.sniffer.mock.context.MockTracerContextListener; +import com.a.eye.skywalking.sniffer.mock.trace.builders.trace.SingleTomcat200TraceBuilder; +import com.a.eye.skywalking.sniffer.mock.trace.builders.trace.SingleTomcat404TraceBuilder; +import com.a.eye.skywalking.sniffer.mock.trace.builders.trace.SingleTomcat500TraceBuilder; import com.a.eye.skywalking.trace.TraceSegment; -import java.util.HashMap; -import java.util.Map; /** * The TraceSegmentBuilderFactory contains all {@link TraceSegmentBuilder} implementations. @@ -14,22 +16,41 @@ import java.util.Map; public enum TraceSegmentBuilderFactory { INSTANCE; - private Map allBuilders; - - TraceSegmentBuilderFactory(){ - allBuilders = new HashMap(); - initialize(); - } - + /** + * @see {@link SingleTomcat200TraceBuilder} + * + * @return + */ public TraceSegment singleTomcat200Trace(){ - return allBuilders.get(SingleTomcat200TraceBuilder.INSTANCE).build(); + return this.build(SingleTomcat200TraceBuilder.INSTANCE); } - private void initialize(){ - initBuilder(SingleTomcat200TraceBuilder.INSTANCE); + /** + * @see {@link SingleTomcat404TraceBuilder} + * + * @return + */ + public TraceSegment singleTomcat404Trace(){ + return this.build(SingleTomcat404TraceBuilder.INSTANCE); } - private void initBuilder(TraceSegmentBuilder builder){ - allBuilders.put(builder.toString(), builder); + /** + * @see {@link SingleTomcat500TraceBuilder} + * + * @return + */ + public TraceSegment singleTomcat500Trace(){ + return this.build(SingleTomcat500TraceBuilder.INSTANCE); } + + private TraceSegment build(TraceSegmentBuilder builder){ + MockTracerContextListener listener = new MockTracerContextListener(); + try{ + TracerContext.ListenerManager.add(listener); + return builder.build(listener); + }finally{ + TracerContext.ListenerManager.remove(listener); + } + } + } diff --git a/skywalking-sniffer/skywalking-sniffer-mock/src/main/java/com/a/eye/skywalking/sniffer/mock/trace/builders/SingleTomcat200TraceBuilder.java b/skywalking-sniffer/skywalking-sniffer-mock/src/main/java/com/a/eye/skywalking/sniffer/mock/trace/builders/SingleTomcat200TraceBuilder.java deleted file mode 100644 index d84eb8d79..000000000 --- a/skywalking-sniffer/skywalking-sniffer-mock/src/main/java/com/a/eye/skywalking/sniffer/mock/trace/builders/SingleTomcat200TraceBuilder.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.a.eye.skywalking.sniffer.mock.trace.builders; - -import com.a.eye.skywalking.api.context.ContextManager; -import com.a.eye.skywalking.sniffer.mock.trace.TraceSegmentBuilder; -import com.a.eye.skywalking.trace.Span; -import com.a.eye.skywalking.trace.TraceSegment; -import com.a.eye.skywalking.trace.tag.Tags; - -/** - * A Trace contains only one span, which represent a tomcat server side span. - * - * Created by wusheng on 2017/2/20. - */ -public enum SingleTomcat200TraceBuilder implements TraceSegmentBuilder { - INSTANCE; - - @Override public TraceSegment build() { - Span webSpan = ContextManager.INSTANCE.createSpan("/web/serviceA"); - { - Tags.COMPONENT.set(webSpan, "tomcat"); - Tags.URL.set(webSpan, "http://10.21.9.35/web/serviceA"); - Tags.SPAN_KIND.set(webSpan, Tags.SPAN_KIND_SERVER); - Tags.STATUS_CODE.set(webSpan, 200); - } - return null; - } -} diff --git a/skywalking-sniffer/skywalking-sniffer-mock/src/main/java/com/a/eye/skywalking/sniffer/mock/trace/builders/span/TomcatSpanGenerator.java b/skywalking-sniffer/skywalking-sniffer-mock/src/main/java/com/a/eye/skywalking/sniffer/mock/trace/builders/span/TomcatSpanGenerator.java new file mode 100644 index 000000000..c9096cf26 --- /dev/null +++ b/skywalking-sniffer/skywalking-sniffer-mock/src/main/java/com/a/eye/skywalking/sniffer/mock/trace/builders/span/TomcatSpanGenerator.java @@ -0,0 +1,53 @@ +package com.a.eye.skywalking.sniffer.mock.trace.builders.span; + +import com.a.eye.skywalking.api.context.ContextManager; +import com.a.eye.skywalking.trace.Span; +import com.a.eye.skywalking.trace.tag.Tags; + +/** + * The TomcatSpanGenerator generate all possible spans, by tracing Tomcat. + * + * Created by wusheng on 2017/2/20. + */ +public enum TomcatSpanGenerator { + INSTANCE; + + /** + * When tomcat response 200. + */ + public void on200(){ + Span webSpan = ContextManager.INSTANCE.createSpan("/web/serviceA"); + Tags.COMPONENT.set(webSpan, "tomcat"); + Tags.URL.set(webSpan, "http://10.21.9.35/web/serviceA"); + Tags.SPAN_KIND.set(webSpan, Tags.SPAN_KIND_SERVER); + Tags.STATUS_CODE.set(webSpan, 200); + ContextManager.INSTANCE.stopSpan(webSpan); + } + + /** + * When tomcat response 404. + */ + public void on404(){ + Span webSpan = ContextManager.INSTANCE.createSpan("/web/service/unknown"); + Tags.COMPONENT.set(webSpan, "tomcat"); + Tags.URL.set(webSpan, "http://10.21.9.35/web/unknown"); + Tags.SPAN_KIND.set(webSpan, Tags.SPAN_KIND_SERVER); + Tags.STATUS_CODE.set(webSpan, 404); + Tags.ERROR.set(webSpan,true); + ContextManager.INSTANCE.stopSpan(webSpan); + } + + /** + * When tomcat response 500. + */ + public void on500(){ + Span webSpan = ContextManager.INSTANCE.createSpan("/web/error/service"); + Tags.COMPONENT.set(webSpan, "tomcat"); + Tags.URL.set(webSpan, "http://10.21.9.35/web/error/service"); + Tags.SPAN_KIND.set(webSpan, Tags.SPAN_KIND_SERVER); + Tags.STATUS_CODE.set(webSpan, 500); + Tags.ERROR.set(webSpan,true); + webSpan.log(new NumberFormatException("Can't convert 'abc' to int.")); + ContextManager.INSTANCE.stopSpan(webSpan); + } +} diff --git a/skywalking-sniffer/skywalking-sniffer-mock/src/main/java/com/a/eye/skywalking/sniffer/mock/trace/builders/trace/SingleTomcat200TraceBuilder.java b/skywalking-sniffer/skywalking-sniffer-mock/src/main/java/com/a/eye/skywalking/sniffer/mock/trace/builders/trace/SingleTomcat200TraceBuilder.java new file mode 100644 index 000000000..5812b24de --- /dev/null +++ b/skywalking-sniffer/skywalking-sniffer-mock/src/main/java/com/a/eye/skywalking/sniffer/mock/trace/builders/trace/SingleTomcat200TraceBuilder.java @@ -0,0 +1,20 @@ +package com.a.eye.skywalking.sniffer.mock.trace.builders.trace; + +import com.a.eye.skywalking.sniffer.mock.context.MockTracerContextListener; +import com.a.eye.skywalking.sniffer.mock.trace.TraceSegmentBuilder; +import com.a.eye.skywalking.sniffer.mock.trace.builders.span.TomcatSpanGenerator; +import com.a.eye.skywalking.trace.TraceSegment; + +/** + * A Trace contains only one span, which represent a tomcat server side span. + * + * Created by wusheng on 2017/2/20. + */ +public enum SingleTomcat200TraceBuilder implements TraceSegmentBuilder { + INSTANCE; + + @Override public TraceSegment build(MockTracerContextListener listener) { + TomcatSpanGenerator.INSTANCE.on200(); + return listener.getFinished(0); + } +} diff --git a/skywalking-sniffer/skywalking-sniffer-mock/src/main/java/com/a/eye/skywalking/sniffer/mock/trace/builders/trace/SingleTomcat404TraceBuilder.java b/skywalking-sniffer/skywalking-sniffer-mock/src/main/java/com/a/eye/skywalking/sniffer/mock/trace/builders/trace/SingleTomcat404TraceBuilder.java new file mode 100644 index 000000000..7ec32e46e --- /dev/null +++ b/skywalking-sniffer/skywalking-sniffer-mock/src/main/java/com/a/eye/skywalking/sniffer/mock/trace/builders/trace/SingleTomcat404TraceBuilder.java @@ -0,0 +1,20 @@ +package com.a.eye.skywalking.sniffer.mock.trace.builders.trace; + +import com.a.eye.skywalking.sniffer.mock.context.MockTracerContextListener; +import com.a.eye.skywalking.sniffer.mock.trace.TraceSegmentBuilder; +import com.a.eye.skywalking.sniffer.mock.trace.builders.span.TomcatSpanGenerator; +import com.a.eye.skywalking.trace.TraceSegment; + +/** + * A Trace contains only one span, which represent a tomcat server side span. + * + * Created by wusheng on 2017/2/20. + */ +public enum SingleTomcat404TraceBuilder implements TraceSegmentBuilder { + INSTANCE; + + @Override public TraceSegment build(MockTracerContextListener listener) { + TomcatSpanGenerator.INSTANCE.on404(); + return listener.getFinished(0); + } +} diff --git a/skywalking-sniffer/skywalking-sniffer-mock/src/main/java/com/a/eye/skywalking/sniffer/mock/trace/builders/trace/SingleTomcat500TraceBuilder.java b/skywalking-sniffer/skywalking-sniffer-mock/src/main/java/com/a/eye/skywalking/sniffer/mock/trace/builders/trace/SingleTomcat500TraceBuilder.java new file mode 100644 index 000000000..150c4ab6e --- /dev/null +++ b/skywalking-sniffer/skywalking-sniffer-mock/src/main/java/com/a/eye/skywalking/sniffer/mock/trace/builders/trace/SingleTomcat500TraceBuilder.java @@ -0,0 +1,20 @@ +package com.a.eye.skywalking.sniffer.mock.trace.builders.trace; + +import com.a.eye.skywalking.sniffer.mock.context.MockTracerContextListener; +import com.a.eye.skywalking.sniffer.mock.trace.TraceSegmentBuilder; +import com.a.eye.skywalking.sniffer.mock.trace.builders.span.TomcatSpanGenerator; +import com.a.eye.skywalking.trace.TraceSegment; + +/** + * A Trace contains only one span, which represent a tomcat server side span. + * + * Created by wusheng on 2017/2/20. + */ +public enum SingleTomcat500TraceBuilder implements TraceSegmentBuilder { + INSTANCE; + + @Override public TraceSegment build(MockTracerContextListener listener) { + TomcatSpanGenerator.INSTANCE.on500(); + return listener.getFinished(0); + } +} From b69cd851499ba0ecb19fad694753446d2bcf1909 Mon Sep 17 00:00:00 2001 From: wusheng Date: Tue, 21 Feb 2017 09:38:02 +0800 Subject: [PATCH 10/11] fix compile issues --- .../a/eye/skywalking/trace/SpanTestCase.java | 34 ++----------------- .../skywalking/api/logging/EasyLogger.java | 4 +-- .../api/logging/SyncFileWriter.java | 4 +-- .../skywalking/api/logging/WriterFactory.java | 2 +- .../plugin/interceptor/EnhanceException.java | 2 +- .../assist/NoCocurrencyAceessObject.java | 2 +- .../enhance/ClassEnhancePluginDefine.java | 7 +++- ...assInstanceMethodsEnhancePluginDefine.java | 1 - ...ClassStaticMethodsEnhancePluginDefine.java | 2 +- .../api/queue/TraceSegmentProcessQueue.java | 6 ++-- .../skywalking/api/util/TraceIdGenerator.java | 2 +- .../api/plugin/TestAroundInterceptor.java | 3 +- .../api/plugin/TestInterceptorDefine.java | 2 -- .../plugin/TestStaticAroundInterceptor.java | 2 +- .../MockTracerContextListenerTestCase.java | 19 +++++++++++ 15 files changed, 41 insertions(+), 51 deletions(-) create mode 100644 skywalking-sniffer/skywalking-sniffer-mock/src/test/java/com/a/eye/skywalking/sniffer/mock/MockTracerContextListenerTestCase.java diff --git a/skywalking-commons/skywalking-trace/src/test/java/com/a/eye/skywalking/trace/SpanTestCase.java b/skywalking-commons/skywalking-trace/src/test/java/com/a/eye/skywalking/trace/SpanTestCase.java index 27209fc92..8108a2aad 100644 --- a/skywalking-commons/skywalking-trace/src/test/java/com/a/eye/skywalking/trace/SpanTestCase.java +++ b/skywalking-commons/skywalking-trace/src/test/java/com/a/eye/skywalking/trace/SpanTestCase.java @@ -39,7 +39,7 @@ public class SpanTestCase { Span span1 = new Span(0, "serviceA"); Tags.SPAN_LAYER.asHttp(span1); Tags.COMPONENT.set(span1, "Spring"); - Tags.PEER_HOST.set(span1, ipToInt("127.0.0.1")); + Tags.PEER_HOST.set(span1, "127.0.0.1"); Tags.ERROR.set(span1, true); Tags.STATUS_CODE.set(span1, 302); Tags.URL.set(span1, "http://127.0.0.1/serviceA"); @@ -49,40 +49,10 @@ public class SpanTestCase { Map tags = span1.getTags(); Assert.assertEquals(8, tags.size()); Assert.assertTrue(Tags.SPAN_LAYER.isHttp(span1)); - Assert.assertEquals("127.0.0.1", intToIp(Tags.PEER_HOST.get(span1))); + Assert.assertEquals("127.0.0.1", Tags.PEER_HOST.get(span1)); Assert.assertTrue(Tags.ERROR.get(span1)); } - private int ipToInt(String ipAddress) { - int result = 0; - String[] ipAddressInArray = ipAddress.split("\\."); - - for (int i = 3; i >= 0; i--) { - - int ip = Integer.parseInt(ipAddressInArray[3 - i]); - - //left shifting 24,16,8,0 and bitwise OR - //1. 192 << 24 - //1. 168 << 16 - //1. 1 << 8 - //1. 2 << 0 - result |= ip << (i * 8); - } - return result; - } - - private static String intToIp(int longIp) { - StringBuffer sb = new StringBuffer(""); - sb.append(String.valueOf((longIp >>> 24))); - sb.append("."); - sb.append(String.valueOf((longIp & 0x00FFFFFF) >>> 16)); - sb.append("."); - sb.append(String.valueOf((longIp & 0x0000FFFF) >>> 8)); - sb.append("."); - sb.append(String.valueOf((longIp & 0x000000FF))); - return sb.toString(); - } - @Test public void testLogException(){ Span span1 = new Span(0, "serviceA"); diff --git a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/logging/EasyLogger.java b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/logging/EasyLogger.java index d5e9dfa12..286366f4c 100644 --- a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/logging/EasyLogger.java +++ b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/logging/EasyLogger.java @@ -2,13 +2,13 @@ package com.a.eye.skywalking.api.logging; import com.a.eye.skywalking.api.logging.api.ILog; -import com.a.eye.skywalking.util.LoggingUtil; +import com.a.eye.skywalking.api.util.LoggingUtil; import java.net.URLEncoder; import java.text.SimpleDateFormat; import java.util.Date; -import static com.a.eye.skywalking.logging.LogLevel.*; +import static com.a.eye.skywalking.api.logging.LogLevel.*; /** * Created by xin on 16-6-23. diff --git a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/logging/SyncFileWriter.java b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/logging/SyncFileWriter.java index 21cfd4872..579e098ba 100644 --- a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/logging/SyncFileWriter.java +++ b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/logging/SyncFileWriter.java @@ -1,9 +1,9 @@ package com.a.eye.skywalking.api.logging; -import com.a.eye.skywalking.conf.Config; -import com.a.eye.skywalking.util.LoggingUtil; +import com.a.eye.skywalking.api.conf.Config; +import com.a.eye.skywalking.api.util.LoggingUtil; import java.io.File; import java.io.FileNotFoundException; import java.io.FileOutputStream; diff --git a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/logging/WriterFactory.java b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/logging/WriterFactory.java index 1e290aa26..3571aaa06 100644 --- a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/logging/WriterFactory.java +++ b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/logging/WriterFactory.java @@ -1,6 +1,6 @@ package com.a.eye.skywalking.api.logging; -import com.a.eye.skywalking.conf.Config; +import com.a.eye.skywalking.api.conf.Config; public class WriterFactory { private WriterFactory(){ diff --git a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/EnhanceException.java b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/EnhanceException.java index adf1fae5c..dec61a839 100644 --- a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/EnhanceException.java +++ b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/EnhanceException.java @@ -1,6 +1,6 @@ package com.a.eye.skywalking.api.plugin.interceptor; -import com.a.eye.skywalking.plugin.PluginException; +import com.a.eye.skywalking.api.plugin.PluginException; public class EnhanceException extends PluginException { private static final long serialVersionUID = -2234782755784217255L; diff --git a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/assist/NoCocurrencyAceessObject.java b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/assist/NoCocurrencyAceessObject.java index eaa0ffadb..5229c1a49 100644 --- a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/assist/NoCocurrencyAceessObject.java +++ b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/assist/NoCocurrencyAceessObject.java @@ -1,7 +1,7 @@ package com.a.eye.skywalking.api.plugin.interceptor.assist; import com.a.eye.skywalking.api.plugin.interceptor.EnhancedClassInstanceContext; -import com.a.eye.skywalking.plugin.interceptor.InterceptorException; +import com.a.eye.skywalking.api.plugin.interceptor.InterceptorException; import com.a.eye.skywalking.api.plugin.interceptor.enhance.InstanceMethodsAroundInterceptor; /** diff --git a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/enhance/ClassEnhancePluginDefine.java b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/enhance/ClassEnhancePluginDefine.java index dbb2d3c3e..cd0f92858 100644 --- a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/enhance/ClassEnhancePluginDefine.java +++ b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/enhance/ClassEnhancePluginDefine.java @@ -3,7 +3,12 @@ package com.a.eye.skywalking.api.plugin.interceptor.enhance; import com.a.eye.skywalking.api.logging.api.ILog; import com.a.eye.skywalking.api.logging.api.LogManager; import com.a.eye.skywalking.api.plugin.AbstractClassEnhancePluginDefine; -import com.a.eye.skywalking.plugin.PluginException; +import com.a.eye.skywalking.api.plugin.PluginException; +import com.a.eye.skywalking.api.plugin.interceptor.ConstructorInterceptPoint; +import com.a.eye.skywalking.api.plugin.interceptor.EnhanceException; +import com.a.eye.skywalking.api.plugin.interceptor.EnhancedClassInstanceContext; +import com.a.eye.skywalking.api.plugin.interceptor.InstanceMethodsInterceptPoint; +import com.a.eye.skywalking.api.plugin.interceptor.StaticMethodsInterceptPoint; import com.a.eye.skywalking.api.util.StringUtil; import net.bytebuddy.description.method.MethodDescription; import net.bytebuddy.dynamic.DynamicType; diff --git a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/enhance/ClassInstanceMethodsEnhancePluginDefine.java b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/enhance/ClassInstanceMethodsEnhancePluginDefine.java index 97571d4dc..9a3888775 100644 --- a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/enhance/ClassInstanceMethodsEnhancePluginDefine.java +++ b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/enhance/ClassInstanceMethodsEnhancePluginDefine.java @@ -1,7 +1,6 @@ package com.a.eye.skywalking.api.plugin.interceptor.enhance; import com.a.eye.skywalking.api.plugin.interceptor.StaticMethodsInterceptPoint; -import com.a.eye.skywalking.plugin.interceptor.StaticMethodsInterceptPoint; /** * Plugins, which only need enhance class static methods. diff --git a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/enhance/ClassStaticMethodsEnhancePluginDefine.java b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/enhance/ClassStaticMethodsEnhancePluginDefine.java index 37b38c077..e97f1447b 100644 --- a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/enhance/ClassStaticMethodsEnhancePluginDefine.java +++ b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/enhance/ClassStaticMethodsEnhancePluginDefine.java @@ -1,7 +1,7 @@ package com.a.eye.skywalking.api.plugin.interceptor.enhance; +import com.a.eye.skywalking.api.plugin.interceptor.ConstructorInterceptPoint; import com.a.eye.skywalking.api.plugin.interceptor.InstanceMethodsInterceptPoint; -import com.a.eye.skywalking.plugin.interceptor.ConstructorInterceptPoint; /** * Plugins, which only need enhance class static methods. diff --git a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/queue/TraceSegmentProcessQueue.java b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/queue/TraceSegmentProcessQueue.java index 10b2420f8..7a3ac2d1b 100644 --- a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/queue/TraceSegmentProcessQueue.java +++ b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/queue/TraceSegmentProcessQueue.java @@ -1,8 +1,8 @@ package com.a.eye.skywalking.api.queue; -import com.a.eye.skywalking.conf.Config; +import com.a.eye.skywalking.api.conf.Config; import com.a.eye.skywalking.api.context.TracerContext; -import com.a.eye.skywalking.context.TracerContextListener; +import com.a.eye.skywalking.api.context.TracerContextListener; import com.a.eye.skywalking.health.report.HealthCollector; import com.a.eye.skywalking.health.report.HeathReading; import com.a.eye.skywalking.trace.TraceSegment; @@ -36,7 +36,7 @@ public enum TraceSegmentProcessQueue implements TracerContextListener { RingBuffer buffer; TraceSegmentProcessQueue() { - disruptor = new Disruptor<>(TraceSegmentHolder.Factory.INSTANCE, Config.Disruptor.BUFFER_SIZE, DaemonThreadFactory.INSTANCE); + disruptor = new Disruptor(TraceSegmentHolder.Factory.INSTANCE, Config.Disruptor.BUFFER_SIZE, DaemonThreadFactory.INSTANCE); buffer = disruptor.getRingBuffer(); } diff --git a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/util/TraceIdGenerator.java b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/util/TraceIdGenerator.java index e68fe7c64..fc3ac560c 100644 --- a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/util/TraceIdGenerator.java +++ b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/util/TraceIdGenerator.java @@ -1,6 +1,6 @@ package com.a.eye.skywalking.api.util; -import com.a.eye.skywalking.conf.Constants; +import com.a.eye.skywalking.api.conf.Constants; import java.util.UUID; public final class TraceIdGenerator { diff --git a/skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/api/plugin/TestAroundInterceptor.java b/skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/api/plugin/TestAroundInterceptor.java index a640985e9..2c37506c2 100644 --- a/skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/api/plugin/TestAroundInterceptor.java +++ b/skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/api/plugin/TestAroundInterceptor.java @@ -1,8 +1,7 @@ package com.a.eye.skywalking.api.plugin; import com.a.eye.skywalking.api.plugin.interceptor.EnhancedClassInstanceContext; -import com.a.eye.skywalking.plugin.interceptor.enhance.ConstructorInvokeContext; -import com.a.eye.skywalking.plugin.interceptor.enhance.InstanceMethodInvokeContext; +import com.a.eye.skywalking.api.plugin.interceptor.enhance.InstanceMethodInvokeContext; import com.a.eye.skywalking.api.plugin.interceptor.enhance.InstanceMethodsAroundInterceptor; import com.a.eye.skywalking.api.plugin.interceptor.enhance.MethodInterceptResult; diff --git a/skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/api/plugin/TestInterceptorDefine.java b/skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/api/plugin/TestInterceptorDefine.java index 6e4c492a2..cc5024b6d 100644 --- a/skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/api/plugin/TestInterceptorDefine.java +++ b/skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/api/plugin/TestInterceptorDefine.java @@ -4,8 +4,6 @@ import com.a.eye.skywalking.api.plugin.interceptor.ConstructorInterceptPoint; import com.a.eye.skywalking.api.plugin.interceptor.InstanceMethodsInterceptPoint; import com.a.eye.skywalking.api.plugin.interceptor.StaticMethodsInterceptPoint; import com.a.eye.skywalking.api.plugin.interceptor.enhance.ClassEnhancePluginDefine; -import com.a.eye.skywalking.plugin.interceptor.ConstructorInterceptPoint; -import com.a.eye.skywalking.plugin.interceptor.StaticMethodsInterceptPoint; import net.bytebuddy.description.method.MethodDescription; import net.bytebuddy.matcher.ElementMatcher; diff --git a/skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/api/plugin/TestStaticAroundInterceptor.java b/skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/api/plugin/TestStaticAroundInterceptor.java index cfe346d88..07dd955ac 100644 --- a/skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/api/plugin/TestStaticAroundInterceptor.java +++ b/skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/api/plugin/TestStaticAroundInterceptor.java @@ -1,7 +1,7 @@ package com.a.eye.skywalking.api.plugin; import com.a.eye.skywalking.api.plugin.interceptor.enhance.MethodInterceptResult; -import com.a.eye.skywalking.plugin.interceptor.enhance.MethodInvokeContext; +import com.a.eye.skywalking.api.plugin.interceptor.enhance.MethodInvokeContext; import com.a.eye.skywalking.api.plugin.interceptor.enhance.StaticMethodInvokeContext; import com.a.eye.skywalking.api.plugin.interceptor.enhance.StaticMethodsAroundInterceptor; diff --git a/skywalking-sniffer/skywalking-sniffer-mock/src/test/java/com/a/eye/skywalking/sniffer/mock/MockTracerContextListenerTestCase.java b/skywalking-sniffer/skywalking-sniffer-mock/src/test/java/com/a/eye/skywalking/sniffer/mock/MockTracerContextListenerTestCase.java new file mode 100644 index 000000000..96e05bb42 --- /dev/null +++ b/skywalking-sniffer/skywalking-sniffer-mock/src/test/java/com/a/eye/skywalking/sniffer/mock/MockTracerContextListenerTestCase.java @@ -0,0 +1,19 @@ +package com.a.eye.skywalking.sniffer.mock; + +import com.a.eye.skywalking.sniffer.mock.context.MockTracerContextListener; +import com.a.eye.skywalking.sniffer.mock.trace.TraceSegmentBuilderFactory; +import org.junit.Assert; +import org.junit.Test; + +/** + * Created by wusheng on 2017/2/21. + */ +public class MockTracerContextListenerTestCase { + @Test + public void testAfterFinished(){ + MockTracerContextListener listener = new MockTracerContextListener(); + listener.afterFinished(TraceSegmentBuilderFactory.INSTANCE.singleTomcat200Trace()); + + Assert.assertNotNull(listener.getFinished(0)); + } +} From 47871d1571542e55735ab08a7fa839ef085aa716 Mon Sep 17 00:00:00 2001 From: wusheng Date: Tue, 21 Feb 2017 09:47:29 +0800 Subject: [PATCH 11/11] Add mock-module test cases. --- .../context/MockTracerContextListener.java | 11 ++++++- .../MockTracerContextListenerTestCase.java | 33 +++++++++++++++++++ 2 files changed, 43 insertions(+), 1 deletion(-) diff --git a/skywalking-sniffer/skywalking-sniffer-mock/src/main/java/com/a/eye/skywalking/sniffer/mock/context/MockTracerContextListener.java b/skywalking-sniffer/skywalking-sniffer-mock/src/main/java/com/a/eye/skywalking/sniffer/mock/context/MockTracerContextListener.java index a79f80e1a..d9de084d2 100644 --- a/skywalking-sniffer/skywalking-sniffer-mock/src/main/java/com/a/eye/skywalking/sniffer/mock/context/MockTracerContextListener.java +++ b/skywalking-sniffer/skywalking-sniffer-mock/src/main/java/com/a/eye/skywalking/sniffer/mock/context/MockTracerContextListener.java @@ -30,6 +30,15 @@ public class MockTracerContextListener implements TracerContextListener { Assert.assertEquals(size, finishedTraceSegments.size()); } + /** + * Assert the given index is a valid index of {@link #finishedTraceSegments} + * + * @param index the given index. + */ + public void assertValidIndex(int index){ + Assert.assertTrue(index < finishedTraceSegments.size()); + } + /** * Assert the {@link TraceSegment} at the given index of {@link #finishedTraceSegments}, * and run the given {@link SegmentAssert#call(TraceSegment)} to assert. @@ -38,7 +47,7 @@ public class MockTracerContextListener implements TracerContextListener { * @param segmentAssert the given assert. */ public void assertTraceSegment(int index, SegmentAssert segmentAssert){ - assertSize(index + 1); + assertValidIndex(index); segmentAssert.call(finishedTraceSegments.get(index)); } diff --git a/skywalking-sniffer/skywalking-sniffer-mock/src/test/java/com/a/eye/skywalking/sniffer/mock/MockTracerContextListenerTestCase.java b/skywalking-sniffer/skywalking-sniffer-mock/src/test/java/com/a/eye/skywalking/sniffer/mock/MockTracerContextListenerTestCase.java index 96e05bb42..ce43770c8 100644 --- a/skywalking-sniffer/skywalking-sniffer-mock/src/test/java/com/a/eye/skywalking/sniffer/mock/MockTracerContextListenerTestCase.java +++ b/skywalking-sniffer/skywalking-sniffer-mock/src/test/java/com/a/eye/skywalking/sniffer/mock/MockTracerContextListenerTestCase.java @@ -1,7 +1,9 @@ package com.a.eye.skywalking.sniffer.mock; import com.a.eye.skywalking.sniffer.mock.context.MockTracerContextListener; +import com.a.eye.skywalking.sniffer.mock.context.SegmentAssert; import com.a.eye.skywalking.sniffer.mock.trace.TraceSegmentBuilderFactory; +import com.a.eye.skywalking.trace.TraceSegment; import org.junit.Assert; import org.junit.Test; @@ -16,4 +18,35 @@ public class MockTracerContextListenerTestCase { Assert.assertNotNull(listener.getFinished(0)); } + + @Test(expected = AssertionError.class) + public void testAssertSize(){ + MockTracerContextListener listener = new MockTracerContextListener(); + listener.afterFinished(TraceSegmentBuilderFactory.INSTANCE.singleTomcat404Trace()); + + listener.assertSize(0); + } + + @Test + public void testAssertTraceSegment(){ + MockTracerContextListener listener = new MockTracerContextListener(); + listener.afterFinished(TraceSegmentBuilderFactory.INSTANCE.singleTomcat404Trace()); + listener.afterFinished(TraceSegmentBuilderFactory.INSTANCE.singleTomcat500Trace()); + + listener.assertTraceSegment(0, new SegmentAssert() { + @Override public void call(TraceSegment finishedSegment) { + Assert.assertNotNull(finishedSegment); + } + }); + } + + @Test(expected = AssertionError.class) + public void testClear(){ + MockTracerContextListener listener = new MockTracerContextListener(); + listener.afterFinished(TraceSegmentBuilderFactory.INSTANCE.singleTomcat404Trace()); + listener.afterFinished(TraceSegmentBuilderFactory.INSTANCE.singleTomcat500Trace()); + + listener.clear(); + listener.assertValidIndex(0); + } }