diff --git a/README.md b/README.md index 7d0c70f5f0..3dbdc6eaf2 100644 --- a/README.md +++ b/README.md @@ -10,15 +10,15 @@ SkyWalking: Large-Scale Distributed Systems Tracing Infrastructure, 是一个对 # 简介 / abstract * 核心理论为[Google Dapper论文：Dapper, a Large-Scale Distributed Systems Tracing Infrastructure](http://research.google.com/pubs/pub36356.html),英语有困难的同学可参考[国内翻译](http://duanple.blog.163.com/blog/static/70971767201329113141336/) -* 本分析系统能通过不修改或少量修改代码的模式，对现有的JAVA应用或J2EE应用进行监控和数据收集，并针对应用进场进行准实时告警。此外提供大量的调用性能分析功能，解决目前的监控系统主要监控进程、端口而非应用实际性能的问题。 +* 本分析系统能通过动态字节码技术，对现有的JAVA应用或J2EE应用进行监控和数据收集，并针对应用进场进行准实时告警。此外提供大量的调用性能分析功能，解决目前的监控系统主要监控进程、端口而非应用实际性能的问题。 * 支持国内常用的dubbo以及dubbox等常见RPC框架，支持应用异常的邮件告警 * skywalking-sdk层面提供的埋点API，同步阻塞访问时间小于100μs -* 通过[byte-buddy](https://github.com/raphw/byte-buddy)，部分插件将通过动态字节码机制，避免代码侵入性，完成监控。动态代码模式埋点，同步阻塞访问时间应在200-300μs +* 通过[byte-buddy](https://github.com/raphw/byte-buddy)，插件将通过动态字节码机制，避免代码侵入性，完成监控。动态代码模式埋点，同步阻塞访问时间应在200-300μs * 提供一定的日志数据分析和展现能力，减少或者避免使用团队的二次开发 * SkyWalking is an open source Large-Scale Distributed Systems Tracing Infrastructure, also been known as APM(Application Performance Management) tool. SkyWalking provides a solution to help monitor and analysis a Large-Scale Distributed Systems. * SkyWalking supports popular rpc frameworks, such as [dubbo](https://github.com/alibaba/dubbo), [dubbox](https://github.com/dangdangdotcom/dubbox), etc., supports email-alert when application occurs unexpected exception。 * SkyWalking's basic API, execution time of blocking saving span must less than 100μs. -* By using [byte-buddy](https://github.com/raphw/byte-buddy) (Thanks to [raphw](https://github.com/raphw)), some plugins use dynamic byte code generation to avoid invasive codes. plugins API, execution time of blocking saving span must between 200μs and 300μs, including execution time of dynamic byte code. +* By using [byte-buddy](https://github.com/raphw/byte-buddy) (Thanks to [raphw](https://github.com/raphw)), plugins use dynamic byte code generation to avoid invasive codes. plugins API, execution time of blocking saving span must between 200μs and 300μs, including execution time of dynamic byte code. * Provide trace log analysis and presentation capabilities, Reduce or avoid add-on functions development. |plugins|using config file|using dynamic byte code| coding |remarks| @@ -31,15 +31,12 @@ SkyWalking: Large-Scale Distributed Systems Tracing Infrastructure, 是一个对 |httpClient-4.x-plugin| - | YES | - | - | |httpClient-4.x-plugin-dubbox-rest-attachment| - | YES | - | required client-4.x-plugin | |jedis-2.x-plugin| - | YES | - | - | -|~~httpclient-4.2.x-plugin~~| - | - | YES | 需要使用新提供的httpClient包装对象 | -|~~httpclient-4.3.x-plugin~~| - | - | YES | 需要使用新提供的httpClient包装对象 | -* 删除插件为最新版本不推荐使用的插件 # 主要贡献者 / Contributors -* 吴晟 [wusheng](https://github.com/wu-sheng)   [亚信 Asiainfo](http://www.asiainfo.com/) wusheng@asiainfo.com -* 张鑫 [zhangxin](https://github.com/ascrutae)   [亚信 Asiainfo](http://www.asiainfo.com/) zhangxin10@asiainfo.com +* 吴晟 [wusheng](https://github.com/wu-sheng)   wu.sheng@foxmail.com +* 张鑫 [zhangxin](https://github.com/ascrutae)    # 交流 * Mail to：wu.sheng@foxmail.com @@ -87,6 +84,9 @@ SkyWalking: Large-Scale Distributed Systems Tracing Infrastructure, 是一个对 - tomcat 7 - redis-3.0.5 +## 插件支持的JDK / Supported jdk version +- 1.6以上版本 / support 1.6+ + ## 编译与部署 / Build and deploy - 服务端发布版本[下载](https://github.com/wu-sheng/sky-walking/releases) (.tar.gz) - Download Server release version. [Download](https://github.com/wu-sheng/sky-walking/releases) (.tar.gz) @@ -119,8 +119,10 @@ SkyWalking: Large-Scale Distributed Systems Tracing Infrastructure, 是一个对 ``` -## 使用全新的main class -- using new main class, instead of the original main class. +## 使用-javaagent 或 全新的main class +- start application with -javaagent. + +- Or using new main class, instead of the original main class. ```shell #原进程启动命令： #original starup command diff --git a/pom.xml b/pom.xml index 8bff1ac21a..bbbb8f995e 100644 --- a/pom.xml +++ b/pom.xml @@ -8,16 +8,11 @@ 1.0-Final samples/skywalking-auth - skywalking-protocol - skywalking-api - skywalking-sdk-plugin + skywalking-collector skywalking-server skywalking-alarm skywalking-analysis skywalking-webui - skywalking-log - skywalking-agent - test/skywalking-test-api pom @@ -30,13 +25,6 @@ - - org.apache.logging.log4j - log4j-core - 2.4.1 - provided - - junit junit diff --git a/skywalking-collector/pom.xml b/skywalking-collector/pom.xml new file mode 100644 index 0000000000..047ce41da5 --- /dev/null +++ b/skywalking-collector/pom.xml @@ -0,0 +1,60 @@ + + + 4.0.0 + + + com.ai.cloud + skywalking + 1.0-Final + + + skywalking-collector + + + skywalking-protocol + skywalking-api + skywalking-sdk-plugin + skywalking-log + skywalking-agent + + pom + + skywalking-collector + http://maven.apache.org + + + UTF-8 + + + + + + org.apache.logging.log4j + log4j-core + 2.4.1 + provided + + + + + + + maven-compiler-plugin + + 1.6 + 1.6 + ${project.build.sourceEncoding} + + + + + + + + bintray-wu-sheng-sky-walking-repository + wu-sheng-sky-walking-repository + https://api.bintray.com/maven/wu-sheng/skywalking/com.ai.cloud.skywalking-collector/;publish=1 + + + \ No newline at end of file diff --git a/skywalking-agent/pom.xml b/skywalking-collector/skywalking-agent/pom.xml similarity index 98% rename from skywalking-agent/pom.xml rename to skywalking-collector/skywalking-agent/pom.xml index f98146b421..3321687ef4 100644 --- a/skywalking-agent/pom.xml +++ b/skywalking-collector/skywalking-agent/pom.xml @@ -4,7 +4,7 @@ com.ai.cloud - skywalking + skywalking-collector 1.0-Final diff --git a/skywalking-agent/src/main/java/com/ai/cloud/skywalking/agent/SkywalkingAgent.java b/skywalking-collector/skywalking-agent/src/main/java/com/ai/cloud/skywalking/agent/SkywalkingAgent.java similarity index 100% rename from skywalking-agent/src/main/java/com/ai/cloud/skywalking/agent/SkywalkingAgent.java rename to skywalking-collector/skywalking-agent/src/main/java/com/ai/cloud/skywalking/agent/SkywalkingAgent.java diff --git a/skywalking-api/pom.xml b/skywalking-collector/skywalking-api/pom.xml similarity index 98% rename from skywalking-api/pom.xml rename to skywalking-collector/skywalking-api/pom.xml index edbe116755..9c1a16567a 100644 --- a/skywalking-api/pom.xml +++ b/skywalking-collector/skywalking-api/pom.xml @@ -4,7 +4,7 @@ com.ai.cloud - skywalking + skywalking-collector 1.0-Final diff --git a/skywalking-api/src/main/java/com/ai/cloud/skywalking/api/BusinessKeyAppender.java b/skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/api/BusinessKeyAppender.java similarity index 100% rename from skywalking-api/src/main/java/com/ai/cloud/skywalking/api/BusinessKeyAppender.java rename to skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/api/BusinessKeyAppender.java diff --git a/skywalking-api/src/main/java/com/ai/cloud/skywalking/api/IBuriedPointReceiver.java b/skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/api/IBuriedPointReceiver.java similarity index 100% rename from skywalking-api/src/main/java/com/ai/cloud/skywalking/api/IBuriedPointReceiver.java rename to skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/api/IBuriedPointReceiver.java diff --git a/skywalking-api/src/main/java/com/ai/cloud/skywalking/api/IBuriedPointSender.java b/skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/api/IBuriedPointSender.java similarity index 100% rename from skywalking-api/src/main/java/com/ai/cloud/skywalking/api/IBuriedPointSender.java rename to skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/api/IBuriedPointSender.java diff --git a/skywalking-api/src/main/java/com/ai/cloud/skywalking/api/IBuriedPointType.java b/skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/api/IBuriedPointType.java similarity index 100% rename from skywalking-api/src/main/java/com/ai/cloud/skywalking/api/IBuriedPointType.java rename to skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/api/IBuriedPointType.java diff --git a/skywalking-api/src/main/java/com/ai/cloud/skywalking/api/IExceptionHandler.java b/skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/api/IExceptionHandler.java similarity index 100% rename from skywalking-api/src/main/java/com/ai/cloud/skywalking/api/IExceptionHandler.java rename to skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/api/IExceptionHandler.java diff --git a/skywalking-api/src/main/java/com/ai/cloud/skywalking/api/Tracing.java b/skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/api/Tracing.java similarity index 100% rename from skywalking-api/src/main/java/com/ai/cloud/skywalking/api/Tracing.java rename to skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/api/Tracing.java diff --git a/skywalking-api/src/main/java/com/ai/cloud/skywalking/buffer/BufferGroup.java b/skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/buffer/BufferGroup.java similarity index 100% rename from skywalking-api/src/main/java/com/ai/cloud/skywalking/buffer/BufferGroup.java rename to skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/buffer/BufferGroup.java diff --git a/skywalking-api/src/main/java/com/ai/cloud/skywalking/buffer/ContextBuffer.java b/skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/buffer/ContextBuffer.java similarity index 100% rename from skywalking-api/src/main/java/com/ai/cloud/skywalking/buffer/ContextBuffer.java rename to skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/buffer/ContextBuffer.java diff --git a/skywalking-api/src/main/java/com/ai/cloud/skywalking/buriedpoint/ApplicationExceptionHandler.java b/skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/buriedpoint/ApplicationExceptionHandler.java similarity index 100% rename from skywalking-api/src/main/java/com/ai/cloud/skywalking/buriedpoint/ApplicationExceptionHandler.java rename to skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/buriedpoint/ApplicationExceptionHandler.java diff --git a/skywalking-api/src/main/java/com/ai/cloud/skywalking/buriedpoint/LocalBuriedPointSender.java b/skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/buriedpoint/LocalBuriedPointSender.java similarity index 100% rename from skywalking-api/src/main/java/com/ai/cloud/skywalking/buriedpoint/LocalBuriedPointSender.java rename to skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/buriedpoint/LocalBuriedPointSender.java diff --git a/skywalking-api/src/main/java/com/ai/cloud/skywalking/buriedpoint/RPCBuriedPointReceiver.java b/skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/buriedpoint/RPCBuriedPointReceiver.java similarity index 100% rename from skywalking-api/src/main/java/com/ai/cloud/skywalking/buriedpoint/RPCBuriedPointReceiver.java rename to skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/buriedpoint/RPCBuriedPointReceiver.java diff --git a/skywalking-api/src/main/java/com/ai/cloud/skywalking/buriedpoint/RPCBuriedPointSender.java b/skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/buriedpoint/RPCBuriedPointSender.java similarity index 100% rename from skywalking-api/src/main/java/com/ai/cloud/skywalking/buriedpoint/RPCBuriedPointSender.java rename to skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/buriedpoint/RPCBuriedPointSender.java diff --git a/skywalking-api/src/main/java/com/ai/cloud/skywalking/buriedpoint/ThreadBuriedPointSender.java b/skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/buriedpoint/ThreadBuriedPointSender.java similarity index 100% rename from skywalking-api/src/main/java/com/ai/cloud/skywalking/buriedpoint/ThreadBuriedPointSender.java rename to skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/buriedpoint/ThreadBuriedPointSender.java diff --git a/skywalking-api/src/main/java/com/ai/cloud/skywalking/buriedpoint/ThreadFactoryBuriedPointSender.java b/skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/buriedpoint/ThreadFactoryBuriedPointSender.java similarity index 100% rename from skywalking-api/src/main/java/com/ai/cloud/skywalking/buriedpoint/ThreadFactoryBuriedPointSender.java rename to skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/buriedpoint/ThreadFactoryBuriedPointSender.java diff --git a/skywalking-api/src/main/java/com/ai/cloud/skywalking/conf/AuthDesc.java b/skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/conf/AuthDesc.java similarity index 100% rename from skywalking-api/src/main/java/com/ai/cloud/skywalking/conf/AuthDesc.java rename to skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/conf/AuthDesc.java diff --git a/skywalking-api/src/main/java/com/ai/cloud/skywalking/conf/Config.java b/skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/conf/Config.java similarity index 100% rename from skywalking-api/src/main/java/com/ai/cloud/skywalking/conf/Config.java rename to skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/conf/Config.java diff --git a/skywalking-api/src/main/java/com/ai/cloud/skywalking/conf/ConfigInitializer.java b/skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/conf/ConfigInitializer.java similarity index 100% rename from skywalking-api/src/main/java/com/ai/cloud/skywalking/conf/ConfigInitializer.java rename to skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/conf/ConfigInitializer.java diff --git a/skywalking-api/src/main/java/com/ai/cloud/skywalking/conf/ConfigValidator.java b/skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/conf/ConfigValidator.java similarity index 100% rename from skywalking-api/src/main/java/com/ai/cloud/skywalking/conf/ConfigValidator.java rename to skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/conf/ConfigValidator.java diff --git a/skywalking-api/src/main/java/com/ai/cloud/skywalking/conf/Constants.java b/skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/conf/Constants.java similarity index 100% rename from skywalking-api/src/main/java/com/ai/cloud/skywalking/conf/Constants.java rename to skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/conf/Constants.java diff --git a/skywalking-api/src/main/java/com/ai/cloud/skywalking/context/Context.java b/skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/context/Context.java similarity index 100% rename from skywalking-api/src/main/java/com/ai/cloud/skywalking/context/Context.java rename to skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/context/Context.java diff --git a/skywalking-api/src/main/java/com/ai/cloud/skywalking/model/ContextData.java b/skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/model/ContextData.java similarity index 100% rename from skywalking-api/src/main/java/com/ai/cloud/skywalking/model/ContextData.java rename to skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/model/ContextData.java diff --git a/skywalking-api/src/main/java/com/ai/cloud/skywalking/model/EmptyContextData.java b/skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/model/EmptyContextData.java similarity index 100% rename from skywalking-api/src/main/java/com/ai/cloud/skywalking/model/EmptyContextData.java rename to skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/model/EmptyContextData.java diff --git a/skywalking-api/src/main/java/com/ai/cloud/skywalking/model/Identification.java b/skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/model/Identification.java similarity index 100% rename from skywalking-api/src/main/java/com/ai/cloud/skywalking/model/Identification.java rename to skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/model/Identification.java diff --git a/skywalking-api/src/main/java/com/ai/cloud/skywalking/plugin/IPlugin.java b/skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/plugin/IPlugin.java similarity index 100% rename from skywalking-api/src/main/java/com/ai/cloud/skywalking/plugin/IPlugin.java rename to skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/plugin/IPlugin.java diff --git a/skywalking-api/src/main/java/com/ai/cloud/skywalking/plugin/PluginBootstrap.java b/skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/plugin/PluginBootstrap.java similarity index 100% rename from skywalking-api/src/main/java/com/ai/cloud/skywalking/plugin/PluginBootstrap.java rename to skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/plugin/PluginBootstrap.java diff --git a/skywalking-api/src/main/java/com/ai/cloud/skywalking/plugin/PluginCfg.java b/skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/plugin/PluginCfg.java similarity index 100% rename from skywalking-api/src/main/java/com/ai/cloud/skywalking/plugin/PluginCfg.java rename to skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/plugin/PluginCfg.java diff --git a/skywalking-api/src/main/java/com/ai/cloud/skywalking/plugin/PluginException.java b/skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/plugin/PluginException.java similarity index 100% rename from skywalking-api/src/main/java/com/ai/cloud/skywalking/plugin/PluginException.java rename to skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/plugin/PluginException.java diff --git a/skywalking-api/src/main/java/com/ai/cloud/skywalking/plugin/PluginResourcesResolver.java b/skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/plugin/PluginResourcesResolver.java similarity index 100% rename from skywalking-api/src/main/java/com/ai/cloud/skywalking/plugin/PluginResourcesResolver.java rename to skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/plugin/PluginResourcesResolver.java diff --git a/skywalking-api/src/main/java/com/ai/cloud/skywalking/plugin/TracingBootstrap.java b/skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/plugin/TracingBootstrap.java similarity index 100% rename from skywalking-api/src/main/java/com/ai/cloud/skywalking/plugin/TracingBootstrap.java rename to skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/plugin/TracingBootstrap.java diff --git a/skywalking-api/src/main/java/com/ai/cloud/skywalking/plugin/boot/BootException.java b/skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/plugin/boot/BootException.java similarity index 100% rename from skywalking-api/src/main/java/com/ai/cloud/skywalking/plugin/boot/BootException.java rename to skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/plugin/boot/BootException.java diff --git a/skywalking-api/src/main/java/com/ai/cloud/skywalking/plugin/boot/BootPluginDefine.java b/skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/plugin/boot/BootPluginDefine.java similarity index 100% rename from skywalking-api/src/main/java/com/ai/cloud/skywalking/plugin/boot/BootPluginDefine.java rename to skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/plugin/boot/BootPluginDefine.java diff --git a/skywalking-api/src/main/java/com/ai/cloud/skywalking/plugin/interceptor/AbstractClassEnhancePluginDefine.java b/skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/plugin/interceptor/AbstractClassEnhancePluginDefine.java similarity index 100% rename from skywalking-api/src/main/java/com/ai/cloud/skywalking/plugin/interceptor/AbstractClassEnhancePluginDefine.java rename to skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/plugin/interceptor/AbstractClassEnhancePluginDefine.java diff --git a/skywalking-api/src/main/java/com/ai/cloud/skywalking/plugin/interceptor/EnhanceException.java b/skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/plugin/interceptor/EnhanceException.java similarity index 100% rename from skywalking-api/src/main/java/com/ai/cloud/skywalking/plugin/interceptor/EnhanceException.java rename to skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/plugin/interceptor/EnhanceException.java diff --git a/skywalking-api/src/main/java/com/ai/cloud/skywalking/plugin/interceptor/EnhancedClassInstanceContext.java b/skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/plugin/interceptor/EnhancedClassInstanceContext.java similarity index 100% rename from skywalking-api/src/main/java/com/ai/cloud/skywalking/plugin/interceptor/EnhancedClassInstanceContext.java rename to skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/plugin/interceptor/EnhancedClassInstanceContext.java diff --git a/skywalking-api/src/main/java/com/ai/cloud/skywalking/plugin/interceptor/InterceptorException.java b/skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/plugin/interceptor/InterceptorException.java similarity index 100% rename from skywalking-api/src/main/java/com/ai/cloud/skywalking/plugin/interceptor/InterceptorException.java rename to skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/plugin/interceptor/InterceptorException.java diff --git a/skywalking-api/src/main/java/com/ai/cloud/skywalking/plugin/interceptor/MethodMatcher.java b/skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/plugin/interceptor/MethodMatcher.java similarity index 100% rename from skywalking-api/src/main/java/com/ai/cloud/skywalking/plugin/interceptor/MethodMatcher.java rename to skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/plugin/interceptor/MethodMatcher.java diff --git a/skywalking-api/src/main/java/com/ai/cloud/skywalking/plugin/interceptor/assist/SimpleObjectFirstInvokeInterceptor.java b/skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/plugin/interceptor/assist/SimpleObjectFirstInvokeInterceptor.java similarity index 100% rename from skywalking-api/src/main/java/com/ai/cloud/skywalking/plugin/interceptor/assist/SimpleObjectFirstInvokeInterceptor.java rename to skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/plugin/interceptor/assist/SimpleObjectFirstInvokeInterceptor.java diff --git a/skywalking-api/src/main/java/com/ai/cloud/skywalking/plugin/interceptor/enhance/ClassConstructorInterceptor.java b/skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/plugin/interceptor/enhance/ClassConstructorInterceptor.java similarity index 100% rename from skywalking-api/src/main/java/com/ai/cloud/skywalking/plugin/interceptor/enhance/ClassConstructorInterceptor.java rename to skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/plugin/interceptor/enhance/ClassConstructorInterceptor.java diff --git a/skywalking-api/src/main/java/com/ai/cloud/skywalking/plugin/interceptor/enhance/ClassEnhancePluginDefine.java b/skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/plugin/interceptor/enhance/ClassEnhancePluginDefine.java similarity index 100% rename from skywalking-api/src/main/java/com/ai/cloud/skywalking/plugin/interceptor/enhance/ClassEnhancePluginDefine.java rename to skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/plugin/interceptor/enhance/ClassEnhancePluginDefine.java diff --git a/skywalking-api/src/main/java/com/ai/cloud/skywalking/plugin/interceptor/enhance/ClassInstanceMethodsEnhancePluginDefine.java b/skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/plugin/interceptor/enhance/ClassInstanceMethodsEnhancePluginDefine.java similarity index 100% rename from skywalking-api/src/main/java/com/ai/cloud/skywalking/plugin/interceptor/enhance/ClassInstanceMethodsEnhancePluginDefine.java rename to skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/plugin/interceptor/enhance/ClassInstanceMethodsEnhancePluginDefine.java diff --git a/skywalking-api/src/main/java/com/ai/cloud/skywalking/plugin/interceptor/enhance/ClassInstanceMethodsInterceptor.java b/skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/plugin/interceptor/enhance/ClassInstanceMethodsInterceptor.java similarity index 100% rename from skywalking-api/src/main/java/com/ai/cloud/skywalking/plugin/interceptor/enhance/ClassInstanceMethodsInterceptor.java rename to skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/plugin/interceptor/enhance/ClassInstanceMethodsInterceptor.java diff --git a/skywalking-api/src/main/java/com/ai/cloud/skywalking/plugin/interceptor/enhance/ClassStaticMethodsEnhancePluginDefine.java b/skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/plugin/interceptor/enhance/ClassStaticMethodsEnhancePluginDefine.java similarity index 100% rename from skywalking-api/src/main/java/com/ai/cloud/skywalking/plugin/interceptor/enhance/ClassStaticMethodsEnhancePluginDefine.java rename to skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/plugin/interceptor/enhance/ClassStaticMethodsEnhancePluginDefine.java diff --git a/skywalking-api/src/main/java/com/ai/cloud/skywalking/plugin/interceptor/enhance/ClassStaticMethodsInterceptor.java b/skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/plugin/interceptor/enhance/ClassStaticMethodsInterceptor.java similarity index 100% rename from skywalking-api/src/main/java/com/ai/cloud/skywalking/plugin/interceptor/enhance/ClassStaticMethodsInterceptor.java rename to skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/plugin/interceptor/enhance/ClassStaticMethodsInterceptor.java diff --git a/skywalking-api/src/main/java/com/ai/cloud/skywalking/plugin/interceptor/enhance/ConstructorInvokeContext.java b/skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/plugin/interceptor/enhance/ConstructorInvokeContext.java similarity index 100% rename from skywalking-api/src/main/java/com/ai/cloud/skywalking/plugin/interceptor/enhance/ConstructorInvokeContext.java rename to skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/plugin/interceptor/enhance/ConstructorInvokeContext.java diff --git a/skywalking-api/src/main/java/com/ai/cloud/skywalking/plugin/interceptor/enhance/FieldGetter.java b/skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/plugin/interceptor/enhance/FieldGetter.java similarity index 100% rename from skywalking-api/src/main/java/com/ai/cloud/skywalking/plugin/interceptor/enhance/FieldGetter.java rename to skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/plugin/interceptor/enhance/FieldGetter.java diff --git a/skywalking-api/src/main/java/com/ai/cloud/skywalking/plugin/interceptor/enhance/FieldSetter.java b/skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/plugin/interceptor/enhance/FieldSetter.java similarity index 100% rename from skywalking-api/src/main/java/com/ai/cloud/skywalking/plugin/interceptor/enhance/FieldSetter.java rename to skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/plugin/interceptor/enhance/FieldSetter.java diff --git a/skywalking-api/src/main/java/com/ai/cloud/skywalking/plugin/interceptor/enhance/InstanceMethodInvokeContext.java b/skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/plugin/interceptor/enhance/InstanceMethodInvokeContext.java similarity index 100% rename from skywalking-api/src/main/java/com/ai/cloud/skywalking/plugin/interceptor/enhance/InstanceMethodInvokeContext.java rename to skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/plugin/interceptor/enhance/InstanceMethodInvokeContext.java diff --git a/skywalking-api/src/main/java/com/ai/cloud/skywalking/plugin/interceptor/enhance/IntanceMethodsAroundInterceptor.java b/skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/plugin/interceptor/enhance/IntanceMethodsAroundInterceptor.java similarity index 100% rename from skywalking-api/src/main/java/com/ai/cloud/skywalking/plugin/interceptor/enhance/IntanceMethodsAroundInterceptor.java rename to skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/plugin/interceptor/enhance/IntanceMethodsAroundInterceptor.java diff --git a/skywalking-api/src/main/java/com/ai/cloud/skywalking/plugin/interceptor/enhance/MethodInterceptResult.java b/skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/plugin/interceptor/enhance/MethodInterceptResult.java similarity index 100% rename from skywalking-api/src/main/java/com/ai/cloud/skywalking/plugin/interceptor/enhance/MethodInterceptResult.java rename to skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/plugin/interceptor/enhance/MethodInterceptResult.java diff --git a/skywalking-api/src/main/java/com/ai/cloud/skywalking/plugin/interceptor/enhance/MethodInvokeContext.java b/skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/plugin/interceptor/enhance/MethodInvokeContext.java similarity index 100% rename from skywalking-api/src/main/java/com/ai/cloud/skywalking/plugin/interceptor/enhance/MethodInvokeContext.java rename to skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/plugin/interceptor/enhance/MethodInvokeContext.java diff --git a/skywalking-api/src/main/java/com/ai/cloud/skywalking/plugin/interceptor/enhance/StaticMethodsAroundInterceptor.java b/skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/plugin/interceptor/enhance/StaticMethodsAroundInterceptor.java similarity index 100% rename from skywalking-api/src/main/java/com/ai/cloud/skywalking/plugin/interceptor/enhance/StaticMethodsAroundInterceptor.java rename to skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/plugin/interceptor/enhance/StaticMethodsAroundInterceptor.java diff --git a/skywalking-api/src/main/java/com/ai/cloud/skywalking/plugin/interceptor/matcher/AnyMethodsMatcher.java b/skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/plugin/interceptor/matcher/AnyMethodsMatcher.java similarity index 100% rename from skywalking-api/src/main/java/com/ai/cloud/skywalking/plugin/interceptor/matcher/AnyMethodsMatcher.java rename to skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/plugin/interceptor/matcher/AnyMethodsMatcher.java diff --git a/skywalking-api/src/main/java/com/ai/cloud/skywalking/plugin/interceptor/matcher/ExclusiveObjectDefaultMethodsMatcher.java b/skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/plugin/interceptor/matcher/ExclusiveObjectDefaultMethodsMatcher.java similarity index 100% rename from skywalking-api/src/main/java/com/ai/cloud/skywalking/plugin/interceptor/matcher/ExclusiveObjectDefaultMethodsMatcher.java rename to skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/plugin/interceptor/matcher/ExclusiveObjectDefaultMethodsMatcher.java diff --git a/skywalking-api/src/main/java/com/ai/cloud/skywalking/plugin/interceptor/matcher/MethodRegexMatcher.java b/skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/plugin/interceptor/matcher/MethodRegexMatcher.java similarity index 100% rename from skywalking-api/src/main/java/com/ai/cloud/skywalking/plugin/interceptor/matcher/MethodRegexMatcher.java rename to skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/plugin/interceptor/matcher/MethodRegexMatcher.java diff --git a/skywalking-api/src/main/java/com/ai/cloud/skywalking/plugin/interceptor/matcher/MethodsExclusiveMatcher.java b/skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/plugin/interceptor/matcher/MethodsExclusiveMatcher.java similarity index 100% rename from skywalking-api/src/main/java/com/ai/cloud/skywalking/plugin/interceptor/matcher/MethodsExclusiveMatcher.java rename to skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/plugin/interceptor/matcher/MethodsExclusiveMatcher.java diff --git a/skywalking-api/src/main/java/com/ai/cloud/skywalking/plugin/interceptor/matcher/PrivateMethodMatcher.java b/skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/plugin/interceptor/matcher/PrivateMethodMatcher.java similarity index 100% rename from skywalking-api/src/main/java/com/ai/cloud/skywalking/plugin/interceptor/matcher/PrivateMethodMatcher.java rename to skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/plugin/interceptor/matcher/PrivateMethodMatcher.java diff --git a/skywalking-api/src/main/java/com/ai/cloud/skywalking/plugin/interceptor/matcher/SimpleMethodMatcher.java b/skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/plugin/interceptor/matcher/SimpleMethodMatcher.java similarity index 100% rename from skywalking-api/src/main/java/com/ai/cloud/skywalking/plugin/interceptor/matcher/SimpleMethodMatcher.java rename to skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/plugin/interceptor/matcher/SimpleMethodMatcher.java diff --git a/skywalking-api/src/main/java/com/ai/cloud/skywalking/selfexamination/HeathReading.java b/skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/selfexamination/HeathReading.java similarity index 100% rename from skywalking-api/src/main/java/com/ai/cloud/skywalking/selfexamination/HeathReading.java rename to skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/selfexamination/HeathReading.java diff --git a/skywalking-api/src/main/java/com/ai/cloud/skywalking/selfexamination/SDKHealthCollector.java b/skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/selfexamination/SDKHealthCollector.java similarity index 100% rename from skywalking-api/src/main/java/com/ai/cloud/skywalking/selfexamination/SDKHealthCollector.java rename to skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/selfexamination/SDKHealthCollector.java diff --git a/skywalking-api/src/main/java/com/ai/cloud/skywalking/sender/DataSender.java b/skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/sender/DataSender.java similarity index 100% rename from skywalking-api/src/main/java/com/ai/cloud/skywalking/sender/DataSender.java rename to skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/sender/DataSender.java diff --git a/skywalking-api/src/main/java/com/ai/cloud/skywalking/sender/DataSenderFactoryWithBalance.java b/skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/sender/DataSenderFactoryWithBalance.java similarity index 100% rename from skywalking-api/src/main/java/com/ai/cloud/skywalking/sender/DataSenderFactoryWithBalance.java rename to skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/sender/DataSenderFactoryWithBalance.java diff --git a/skywalking-api/src/main/java/com/ai/cloud/skywalking/sender/DataSenderWithCopies.java b/skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/sender/DataSenderWithCopies.java similarity index 100% rename from skywalking-api/src/main/java/com/ai/cloud/skywalking/sender/DataSenderWithCopies.java rename to skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/sender/DataSenderWithCopies.java diff --git a/skywalking-api/src/main/java/com/ai/cloud/skywalking/sender/IDataSender.java b/skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/sender/IDataSender.java similarity index 100% rename from skywalking-api/src/main/java/com/ai/cloud/skywalking/sender/IDataSender.java rename to skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/sender/IDataSender.java diff --git a/skywalking-api/src/main/java/com/ai/cloud/skywalking/util/BuriedPointMachineUtil.java b/skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/util/BuriedPointMachineUtil.java similarity index 100% rename from skywalking-api/src/main/java/com/ai/cloud/skywalking/util/BuriedPointMachineUtil.java rename to skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/util/BuriedPointMachineUtil.java diff --git a/skywalking-api/src/main/java/com/ai/cloud/skywalking/util/ContextGenerator.java b/skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/util/ContextGenerator.java similarity index 100% rename from skywalking-api/src/main/java/com/ai/cloud/skywalking/util/ContextGenerator.java rename to skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/util/ContextGenerator.java diff --git a/skywalking-api/src/main/java/com/ai/cloud/skywalking/util/StringUtil.java b/skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/util/StringUtil.java similarity index 100% rename from skywalking-api/src/main/java/com/ai/cloud/skywalking/util/StringUtil.java rename to skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/util/StringUtil.java diff --git a/skywalking-api/src/main/java/com/ai/cloud/skywalking/util/TraceIdGenerator.java b/skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/util/TraceIdGenerator.java similarity index 100% rename from skywalking-api/src/main/java/com/ai/cloud/skywalking/util/TraceIdGenerator.java rename to skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/util/TraceIdGenerator.java diff --git a/skywalking-api/src/test/java/test/ai/cloud/api/TimeTest.java b/skywalking-collector/skywalking-api/src/test/java/test/ai/cloud/api/TimeTest.java similarity index 100% rename from skywalking-api/src/test/java/test/ai/cloud/api/TimeTest.java rename to skywalking-collector/skywalking-api/src/test/java/test/ai/cloud/api/TimeTest.java diff --git a/skywalking-api/src/test/java/test/ai/cloud/assertspandata/SDKGeneratedDataTest.java b/skywalking-collector/skywalking-api/src/test/java/test/ai/cloud/assertspandata/SDKGeneratedDataTest.java similarity index 100% rename from skywalking-api/src/test/java/test/ai/cloud/assertspandata/SDKGeneratedDataTest.java rename to skywalking-collector/skywalking-api/src/test/java/test/ai/cloud/assertspandata/SDKGeneratedDataTest.java diff --git a/skywalking-api/src/test/java/test/ai/cloud/bytebuddy/ConstructorInterceptor.java b/skywalking-collector/skywalking-api/src/test/java/test/ai/cloud/bytebuddy/ConstructorInterceptor.java similarity index 100% rename from skywalking-api/src/test/java/test/ai/cloud/bytebuddy/ConstructorInterceptor.java rename to skywalking-collector/skywalking-api/src/test/java/test/ai/cloud/bytebuddy/ConstructorInterceptor.java diff --git a/skywalking-api/src/test/java/test/ai/cloud/bytebuddy/MethodInterceptor.java b/skywalking-collector/skywalking-api/src/test/java/test/ai/cloud/bytebuddy/MethodInterceptor.java similarity index 100% rename from skywalking-api/src/test/java/test/ai/cloud/bytebuddy/MethodInterceptor.java rename to skywalking-collector/skywalking-api/src/test/java/test/ai/cloud/bytebuddy/MethodInterceptor.java diff --git a/skywalking-api/src/test/java/test/ai/cloud/bytebuddy/SimulateMain.java b/skywalking-collector/skywalking-api/src/test/java/test/ai/cloud/bytebuddy/SimulateMain.java similarity index 100% rename from skywalking-api/src/test/java/test/ai/cloud/bytebuddy/SimulateMain.java rename to skywalking-collector/skywalking-api/src/test/java/test/ai/cloud/bytebuddy/SimulateMain.java diff --git a/skywalking-api/src/test/java/test/ai/cloud/bytebuddy/SimulateMain2.java b/skywalking-collector/skywalking-api/src/test/java/test/ai/cloud/bytebuddy/SimulateMain2.java similarity index 100% rename from skywalking-api/src/test/java/test/ai/cloud/bytebuddy/SimulateMain2.java rename to skywalking-collector/skywalking-api/src/test/java/test/ai/cloud/bytebuddy/SimulateMain2.java diff --git a/skywalking-api/src/test/java/test/ai/cloud/bytebuddy/TestClass.java b/skywalking-collector/skywalking-api/src/test/java/test/ai/cloud/bytebuddy/TestClass.java similarity index 100% rename from skywalking-api/src/test/java/test/ai/cloud/bytebuddy/TestClass.java rename to skywalking-collector/skywalking-api/src/test/java/test/ai/cloud/bytebuddy/TestClass.java diff --git a/skywalking-api/src/test/java/test/ai/cloud/checksum/CheckSumTest.java b/skywalking-collector/skywalking-api/src/test/java/test/ai/cloud/checksum/CheckSumTest.java similarity index 100% rename from skywalking-api/src/test/java/test/ai/cloud/checksum/CheckSumTest.java rename to skywalking-collector/skywalking-api/src/test/java/test/ai/cloud/checksum/CheckSumTest.java diff --git a/skywalking-api/src/test/java/test/ai/cloud/consumerworker/ConsumerWorkerTest.java b/skywalking-collector/skywalking-api/src/test/java/test/ai/cloud/consumerworker/ConsumerWorkerTest.java similarity index 100% rename from skywalking-api/src/test/java/test/ai/cloud/consumerworker/ConsumerWorkerTest.java rename to skywalking-collector/skywalking-api/src/test/java/test/ai/cloud/consumerworker/ConsumerWorkerTest.java diff --git a/skywalking-api/src/test/java/test/ai/cloud/matcher/ExclusionMatcherTest.java b/skywalking-collector/skywalking-api/src/test/java/test/ai/cloud/matcher/ExclusionMatcherTest.java similarity index 100% rename from skywalking-api/src/test/java/test/ai/cloud/matcher/ExclusionMatcherTest.java rename to skywalking-collector/skywalking-api/src/test/java/test/ai/cloud/matcher/ExclusionMatcherTest.java diff --git a/skywalking-api/src/test/java/test/ai/cloud/matcher/TestAroundInterceptor.java b/skywalking-collector/skywalking-api/src/test/java/test/ai/cloud/matcher/TestAroundInterceptor.java similarity index 100% rename from skywalking-api/src/test/java/test/ai/cloud/matcher/TestAroundInterceptor.java rename to skywalking-collector/skywalking-api/src/test/java/test/ai/cloud/matcher/TestAroundInterceptor.java diff --git a/skywalking-api/src/test/java/test/ai/cloud/matcher/TestMatcherClass.java b/skywalking-collector/skywalking-api/src/test/java/test/ai/cloud/matcher/TestMatcherClass.java similarity index 100% rename from skywalking-api/src/test/java/test/ai/cloud/matcher/TestMatcherClass.java rename to skywalking-collector/skywalking-api/src/test/java/test/ai/cloud/matcher/TestMatcherClass.java diff --git a/skywalking-api/src/test/java/test/ai/cloud/matcher/TestMatcherDefine.java b/skywalking-collector/skywalking-api/src/test/java/test/ai/cloud/matcher/TestMatcherDefine.java similarity index 100% rename from skywalking-api/src/test/java/test/ai/cloud/matcher/TestMatcherDefine.java rename to skywalking-collector/skywalking-api/src/test/java/test/ai/cloud/matcher/TestMatcherDefine.java diff --git a/skywalking-api/src/test/java/test/ai/cloud/plugin/BeInterceptedClass.java b/skywalking-collector/skywalking-api/src/test/java/test/ai/cloud/plugin/BeInterceptedClass.java similarity index 100% rename from skywalking-api/src/test/java/test/ai/cloud/plugin/BeInterceptedClass.java rename to skywalking-collector/skywalking-api/src/test/java/test/ai/cloud/plugin/BeInterceptedClass.java diff --git a/skywalking-api/src/test/java/test/ai/cloud/plugin/PluginMainTest.java b/skywalking-collector/skywalking-api/src/test/java/test/ai/cloud/plugin/PluginMainTest.java similarity index 100% rename from skywalking-api/src/test/java/test/ai/cloud/plugin/PluginMainTest.java rename to skywalking-collector/skywalking-api/src/test/java/test/ai/cloud/plugin/PluginMainTest.java diff --git a/skywalking-api/src/test/java/test/ai/cloud/plugin/PluginResourceResoverTest.java b/skywalking-collector/skywalking-api/src/test/java/test/ai/cloud/plugin/PluginResourceResoverTest.java similarity index 100% rename from skywalking-api/src/test/java/test/ai/cloud/plugin/PluginResourceResoverTest.java rename to skywalking-collector/skywalking-api/src/test/java/test/ai/cloud/plugin/PluginResourceResoverTest.java diff --git a/skywalking-api/src/test/java/test/ai/cloud/plugin/TestAroundInterceptor.java b/skywalking-collector/skywalking-api/src/test/java/test/ai/cloud/plugin/TestAroundInterceptor.java similarity index 100% rename from skywalking-api/src/test/java/test/ai/cloud/plugin/TestAroundInterceptor.java rename to skywalking-collector/skywalking-api/src/test/java/test/ai/cloud/plugin/TestAroundInterceptor.java diff --git a/skywalking-api/src/test/java/test/ai/cloud/plugin/TestInterceptorDefine.java b/skywalking-collector/skywalking-api/src/test/java/test/ai/cloud/plugin/TestInterceptorDefine.java similarity index 100% rename from skywalking-api/src/test/java/test/ai/cloud/plugin/TestInterceptorDefine.java rename to skywalking-collector/skywalking-api/src/test/java/test/ai/cloud/plugin/TestInterceptorDefine.java diff --git a/skywalking-api/src/test/java/test/ai/cloud/plugin/TestStaticAroundInterceptor.java b/skywalking-collector/skywalking-api/src/test/java/test/ai/cloud/plugin/TestStaticAroundInterceptor.java similarity index 100% rename from skywalking-api/src/test/java/test/ai/cloud/plugin/TestStaticAroundInterceptor.java rename to skywalking-collector/skywalking-api/src/test/java/test/ai/cloud/plugin/TestStaticAroundInterceptor.java diff --git a/skywalking-api/src/test/resources/log4j2.xml b/skywalking-collector/skywalking-api/src/test/resources/log4j2.xml similarity index 100% rename from skywalking-api/src/test/resources/log4j2.xml rename to skywalking-collector/skywalking-api/src/test/resources/log4j2.xml diff --git a/skywalking-api/src/test/resources/sky-walking.auth b/skywalking-collector/skywalking-api/src/test/resources/sky-walking.auth similarity index 100% rename from skywalking-api/src/test/resources/sky-walking.auth rename to skywalking-collector/skywalking-api/src/test/resources/sky-walking.auth diff --git a/skywalking-api/src/test/resources/skywalking-plugin.def b/skywalking-collector/skywalking-api/src/test/resources/skywalking-plugin.def similarity index 100% rename from skywalking-api/src/test/resources/skywalking-plugin.def rename to skywalking-collector/skywalking-api/src/test/resources/skywalking-plugin.def diff --git a/skywalking-log/example/pom.xml b/skywalking-collector/skywalking-log/example/pom.xml similarity index 100% rename from skywalking-log/example/pom.xml rename to skywalking-collector/skywalking-log/example/pom.xml diff --git a/skywalking-log/example/src/test/java/com/ai/cloud/log/test/TestA.java b/skywalking-collector/skywalking-log/example/src/test/java/com/ai/cloud/log/test/TestA.java similarity index 100% rename from skywalking-log/example/src/test/java/com/ai/cloud/log/test/TestA.java rename to skywalking-collector/skywalking-log/example/src/test/java/com/ai/cloud/log/test/TestA.java diff --git a/skywalking-log/example/src/test/java/com/ai/cloud/log/test/TestB.java b/skywalking-collector/skywalking-log/example/src/test/java/com/ai/cloud/log/test/TestB.java similarity index 100% rename from skywalking-log/example/src/test/java/com/ai/cloud/log/test/TestB.java rename to skywalking-collector/skywalking-log/example/src/test/java/com/ai/cloud/log/test/TestB.java diff --git a/skywalking-log/example/src/test/resources/log4j.properties b/skywalking-collector/skywalking-log/example/src/test/resources/log4j.properties similarity index 100% rename from skywalking-log/example/src/test/resources/log4j.properties rename to skywalking-collector/skywalking-log/example/src/test/resources/log4j.properties diff --git a/skywalking-log/example/src/test/resources/log4j2.xml b/skywalking-collector/skywalking-log/example/src/test/resources/log4j2.xml similarity index 100% rename from skywalking-log/example/src/test/resources/log4j2.xml rename to skywalking-collector/skywalking-log/example/src/test/resources/log4j2.xml diff --git a/skywalking-log/log4j-1.x-plugin/pom.xml b/skywalking-collector/skywalking-log/log4j-1.x-plugin/pom.xml similarity index 88% rename from skywalking-log/log4j-1.x-plugin/pom.xml rename to skywalking-collector/skywalking-log/log4j-1.x-plugin/pom.xml index 6f2f59caac..411a936117 100644 --- a/skywalking-log/log4j-1.x-plugin/pom.xml +++ b/skywalking-collector/skywalking-log/log4j-1.x-plugin/pom.xml @@ -38,14 +38,6 @@ - - maven-compiler-plugin - - 1.7 - 1.7 - ${project.build.sourceEncoding} - - org.apache.maven.plugins maven-resources-plugin diff --git a/skywalking-log/log4j-1.x-plugin/src/main/java/com/ai/cloud/skywalking/plugin/log/log4j/v1/x/TraceIdPatternConverter.java b/skywalking-collector/skywalking-log/log4j-1.x-plugin/src/main/java/com/ai/cloud/skywalking/plugin/log/log4j/v1/x/TraceIdPatternConverter.java similarity index 100% rename from skywalking-log/log4j-1.x-plugin/src/main/java/com/ai/cloud/skywalking/plugin/log/log4j/v1/x/TraceIdPatternConverter.java rename to skywalking-collector/skywalking-log/log4j-1.x-plugin/src/main/java/com/ai/cloud/skywalking/plugin/log/log4j/v1/x/TraceIdPatternConverter.java diff --git a/skywalking-log/log4j-1.x-plugin/src/main/java/com/ai/cloud/skywalking/plugin/log/log4j/v1/x/TraceIdPatternLayout.java b/skywalking-collector/skywalking-log/log4j-1.x-plugin/src/main/java/com/ai/cloud/skywalking/plugin/log/log4j/v1/x/TraceIdPatternLayout.java similarity index 100% rename from skywalking-log/log4j-1.x-plugin/src/main/java/com/ai/cloud/skywalking/plugin/log/log4j/v1/x/TraceIdPatternLayout.java rename to skywalking-collector/skywalking-log/log4j-1.x-plugin/src/main/java/com/ai/cloud/skywalking/plugin/log/log4j/v1/x/TraceIdPatternLayout.java diff --git a/skywalking-log/log4j-1.x-plugin/src/main/java/com/ai/cloud/skywalking/plugin/log/log4j/v1/x/TraceIdPatternParser.java b/skywalking-collector/skywalking-log/log4j-1.x-plugin/src/main/java/com/ai/cloud/skywalking/plugin/log/log4j/v1/x/TraceIdPatternParser.java similarity index 100% rename from skywalking-log/log4j-1.x-plugin/src/main/java/com/ai/cloud/skywalking/plugin/log/log4j/v1/x/TraceIdPatternParser.java rename to skywalking-collector/skywalking-log/log4j-1.x-plugin/src/main/java/com/ai/cloud/skywalking/plugin/log/log4j/v1/x/TraceIdPatternParser.java diff --git a/skywalking-log/log4j-1.x-plugin/src/test/java/com/ai/TestLog.java b/skywalking-collector/skywalking-log/log4j-1.x-plugin/src/test/java/com/ai/TestLog.java similarity index 100% rename from skywalking-log/log4j-1.x-plugin/src/test/java/com/ai/TestLog.java rename to skywalking-collector/skywalking-log/log4j-1.x-plugin/src/test/java/com/ai/TestLog.java diff --git a/skywalking-log/log4j-1.x-plugin/src/test/resources/log4j.properties b/skywalking-collector/skywalking-log/log4j-1.x-plugin/src/test/resources/log4j.properties similarity index 100% rename from skywalking-log/log4j-1.x-plugin/src/test/resources/log4j.properties rename to skywalking-collector/skywalking-log/log4j-1.x-plugin/src/test/resources/log4j.properties diff --git a/skywalking-log/log4j-2.x-plugin/pom.xml b/skywalking-collector/skywalking-log/log4j-2.x-plugin/pom.xml similarity index 86% rename from skywalking-log/log4j-2.x-plugin/pom.xml rename to skywalking-collector/skywalking-log/log4j-2.x-plugin/pom.xml index e640ab5dfc..81253acce9 100644 --- a/skywalking-log/log4j-2.x-plugin/pom.xml +++ b/skywalking-collector/skywalking-log/log4j-2.x-plugin/pom.xml @@ -37,14 +37,6 @@ - - maven-compiler-plugin - - 1.7 - 1.7 - ${project.build.sourceEncoding} - - org.apache.maven.plugins maven-resources-plugin diff --git a/skywalking-log/log4j-2.x-plugin/src/main/java/com/ai/cloud/skywalking/plugin/log/log4j/v2/x/TraceIdConverter.java b/skywalking-collector/skywalking-log/log4j-2.x-plugin/src/main/java/com/ai/cloud/skywalking/plugin/log/log4j/v2/x/TraceIdConverter.java similarity index 100% rename from skywalking-log/log4j-2.x-plugin/src/main/java/com/ai/cloud/skywalking/plugin/log/log4j/v2/x/TraceIdConverter.java rename to skywalking-collector/skywalking-log/log4j-2.x-plugin/src/main/java/com/ai/cloud/skywalking/plugin/log/log4j/v2/x/TraceIdConverter.java diff --git a/skywalking-log/log4j-2.x-plugin/src/test/java/TestLog.java b/skywalking-collector/skywalking-log/log4j-2.x-plugin/src/test/java/TestLog.java similarity index 100% rename from skywalking-log/log4j-2.x-plugin/src/test/java/TestLog.java rename to skywalking-collector/skywalking-log/log4j-2.x-plugin/src/test/java/TestLog.java diff --git a/skywalking-log/log4j-2.x-plugin/src/test/resources/log4j2.xml b/skywalking-collector/skywalking-log/log4j-2.x-plugin/src/test/resources/log4j2.xml similarity index 100% rename from skywalking-log/log4j-2.x-plugin/src/test/resources/log4j2.xml rename to skywalking-collector/skywalking-log/log4j-2.x-plugin/src/test/resources/log4j2.xml diff --git a/skywalking-log/pom.xml b/skywalking-collector/skywalking-log/pom.xml similarity index 93% rename from skywalking-log/pom.xml rename to skywalking-collector/skywalking-log/pom.xml index 2baf5fa656..107c7f4b4e 100644 --- a/skywalking-log/pom.xml +++ b/skywalking-collector/skywalking-log/pom.xml @@ -1,10 +1,14 @@ 4.0.0 + + + com.ai.cloud + skywalking-collector + 1.0-Final + - com.ai.cloud skywalking-log - 1.0-Final log4j-1.x-plugin log4j-2.x-plugin diff --git a/skywalking-protocol/pom.xml b/skywalking-collector/skywalking-protocol/pom.xml similarity index 84% rename from skywalking-protocol/pom.xml rename to skywalking-collector/skywalking-protocol/pom.xml index 50f5b57311..100d57dfb2 100644 --- a/skywalking-protocol/pom.xml +++ b/skywalking-collector/skywalking-protocol/pom.xml @@ -2,12 +2,16 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - com.ai.cloud - skywalking-protocol - 1.0-Final + + com.ai.cloud + skywalking-collector + 1.0-Final + skywalking-protocol http://maven.apache.org + skywalking-protocol + jar UTF-8 @@ -24,14 +28,6 @@ - - maven-compiler-plugin - - 1.7 - 1.7 - ${project.build.sourceEncoding} - - org.apache.maven.plugins maven-resources-plugin diff --git a/skywalking-protocol/src/main/java/com/ai/cloud/skywalking/protocol/CallType.java b/skywalking-collector/skywalking-protocol/src/main/java/com/ai/cloud/skywalking/protocol/CallType.java similarity index 100% rename from skywalking-protocol/src/main/java/com/ai/cloud/skywalking/protocol/CallType.java rename to skywalking-collector/skywalking-protocol/src/main/java/com/ai/cloud/skywalking/protocol/CallType.java diff --git a/skywalking-protocol/src/main/java/com/ai/cloud/skywalking/protocol/Span.java b/skywalking-collector/skywalking-protocol/src/main/java/com/ai/cloud/skywalking/protocol/Span.java similarity index 100% rename from skywalking-protocol/src/main/java/com/ai/cloud/skywalking/protocol/Span.java rename to skywalking-collector/skywalking-protocol/src/main/java/com/ai/cloud/skywalking/protocol/Span.java diff --git a/skywalking-protocol/src/main/java/com/ai/cloud/skywalking/protocol/SpanData.java b/skywalking-collector/skywalking-protocol/src/main/java/com/ai/cloud/skywalking/protocol/SpanData.java similarity index 100% rename from skywalking-protocol/src/main/java/com/ai/cloud/skywalking/protocol/SpanData.java rename to skywalking-collector/skywalking-protocol/src/main/java/com/ai/cloud/skywalking/protocol/SpanData.java diff --git a/skywalking-protocol/src/main/java/com/ai/cloud/skywalking/util/AtomicRangeInteger.java b/skywalking-collector/skywalking-protocol/src/main/java/com/ai/cloud/skywalking/util/AtomicRangeInteger.java similarity index 100% rename from skywalking-protocol/src/main/java/com/ai/cloud/skywalking/util/AtomicRangeInteger.java rename to skywalking-collector/skywalking-protocol/src/main/java/com/ai/cloud/skywalking/util/AtomicRangeInteger.java diff --git a/skywalking-protocol/src/main/java/com/ai/cloud/skywalking/util/ProtocolPackager.java b/skywalking-collector/skywalking-protocol/src/main/java/com/ai/cloud/skywalking/util/ProtocolPackager.java similarity index 100% rename from skywalking-protocol/src/main/java/com/ai/cloud/skywalking/util/ProtocolPackager.java rename to skywalking-collector/skywalking-protocol/src/main/java/com/ai/cloud/skywalking/util/ProtocolPackager.java diff --git a/skywalking-protocol/src/main/java/com/ai/cloud/skywalking/util/SpanLevelIdComparators.java b/skywalking-collector/skywalking-protocol/src/main/java/com/ai/cloud/skywalking/util/SpanLevelIdComparators.java similarity index 100% rename from skywalking-protocol/src/main/java/com/ai/cloud/skywalking/util/SpanLevelIdComparators.java rename to skywalking-collector/skywalking-protocol/src/main/java/com/ai/cloud/skywalking/util/SpanLevelIdComparators.java diff --git a/skywalking-protocol/src/test/java/test/ai/cloud/skywalking/util/AtomicRangeIntegerTest.java b/skywalking-collector/skywalking-protocol/src/test/java/test/ai/cloud/skywalking/util/AtomicRangeIntegerTest.java similarity index 100% rename from skywalking-protocol/src/test/java/test/ai/cloud/skywalking/util/AtomicRangeIntegerTest.java rename to skywalking-collector/skywalking-protocol/src/test/java/test/ai/cloud/skywalking/util/AtomicRangeIntegerTest.java diff --git a/skywalking-sdk-plugin/.gitignore b/skywalking-collector/skywalking-sdk-plugin/.gitignore similarity index 100% rename from skywalking-sdk-plugin/.gitignore rename to skywalking-collector/skywalking-sdk-plugin/.gitignore diff --git a/skywalking-sdk-plugin/README.md b/skywalking-collector/skywalking-sdk-plugin/README.md similarity index 100% rename from skywalking-sdk-plugin/README.md rename to skywalking-collector/skywalking-sdk-plugin/README.md diff --git a/skywalking-sdk-plugin/dubbo-plugin/README.md b/skywalking-collector/skywalking-sdk-plugin/dubbo-plugin/README.md similarity index 100% rename from skywalking-sdk-plugin/dubbo-plugin/README.md rename to skywalking-collector/skywalking-sdk-plugin/dubbo-plugin/README.md diff --git a/skywalking-sdk-plugin/dubbo-plugin/pom.xml b/skywalking-collector/skywalking-sdk-plugin/dubbo-plugin/pom.xml similarity index 94% rename from skywalking-sdk-plugin/dubbo-plugin/pom.xml rename to skywalking-collector/skywalking-sdk-plugin/dubbo-plugin/pom.xml index 411462c0a5..acb6b87b69 100644 --- a/skywalking-sdk-plugin/dubbo-plugin/pom.xml +++ b/skywalking-collector/skywalking-sdk-plugin/dubbo-plugin/pom.xml @@ -130,14 +130,6 @@ - - maven-compiler-plugin - - 1.7 - 1.7 - ${project.build.sourceEncoding} - - org.apache.maven.plugins diff --git a/skywalking-sdk-plugin/dubbo-plugin/src/main/java/com/ai/cloud/skywalking/plugin/dubbo/DubboBuriedPointType.java b/skywalking-collector/skywalking-sdk-plugin/dubbo-plugin/src/main/java/com/ai/cloud/skywalking/plugin/dubbo/DubboBuriedPointType.java similarity index 100% rename from skywalking-sdk-plugin/dubbo-plugin/src/main/java/com/ai/cloud/skywalking/plugin/dubbo/DubboBuriedPointType.java rename to skywalking-collector/skywalking-sdk-plugin/dubbo-plugin/src/main/java/com/ai/cloud/skywalking/plugin/dubbo/DubboBuriedPointType.java diff --git a/skywalking-sdk-plugin/dubbo-plugin/src/main/java/com/ai/cloud/skywalking/plugin/dubbo/DubboPluginDefine.java b/skywalking-collector/skywalking-sdk-plugin/dubbo-plugin/src/main/java/com/ai/cloud/skywalking/plugin/dubbo/DubboPluginDefine.java similarity index 100% rename from skywalking-sdk-plugin/dubbo-plugin/src/main/java/com/ai/cloud/skywalking/plugin/dubbo/DubboPluginDefine.java rename to skywalking-collector/skywalking-sdk-plugin/dubbo-plugin/src/main/java/com/ai/cloud/skywalking/plugin/dubbo/DubboPluginDefine.java diff --git a/skywalking-sdk-plugin/dubbo-plugin/src/main/java/com/ai/cloud/skywalking/plugin/dubbo/ProtocolFilterBuildChainInterceptor.java b/skywalking-collector/skywalking-sdk-plugin/dubbo-plugin/src/main/java/com/ai/cloud/skywalking/plugin/dubbo/ProtocolFilterBuildChainInterceptor.java similarity index 100% rename from skywalking-sdk-plugin/dubbo-plugin/src/main/java/com/ai/cloud/skywalking/plugin/dubbo/ProtocolFilterBuildChainInterceptor.java rename to skywalking-collector/skywalking-sdk-plugin/dubbo-plugin/src/main/java/com/ai/cloud/skywalking/plugin/dubbo/ProtocolFilterBuildChainInterceptor.java diff --git a/skywalking-sdk-plugin/dubbo-plugin/src/main/java/com/ai/cloud/skywalking/plugin/dubbo/SWDubboEnhanceFilter.java b/skywalking-collector/skywalking-sdk-plugin/dubbo-plugin/src/main/java/com/ai/cloud/skywalking/plugin/dubbo/SWDubboEnhanceFilter.java similarity index 100% rename from skywalking-sdk-plugin/dubbo-plugin/src/main/java/com/ai/cloud/skywalking/plugin/dubbo/SWDubboEnhanceFilter.java rename to skywalking-collector/skywalking-sdk-plugin/dubbo-plugin/src/main/java/com/ai/cloud/skywalking/plugin/dubbo/SWDubboEnhanceFilter.java diff --git a/skywalking-sdk-plugin/dubbo-plugin/src/main/java/com/ai/cloud/skywalking/plugin/dubbox/bugfix/below283/BugFixAcitve.java b/skywalking-collector/skywalking-sdk-plugin/dubbo-plugin/src/main/java/com/ai/cloud/skywalking/plugin/dubbox/bugfix/below283/BugFixAcitve.java similarity index 100% rename from skywalking-sdk-plugin/dubbo-plugin/src/main/java/com/ai/cloud/skywalking/plugin/dubbox/bugfix/below283/BugFixAcitve.java rename to skywalking-collector/skywalking-sdk-plugin/dubbo-plugin/src/main/java/com/ai/cloud/skywalking/plugin/dubbox/bugfix/below283/BugFixAcitve.java diff --git a/skywalking-sdk-plugin/dubbo-plugin/src/main/java/com/ai/cloud/skywalking/plugin/dubbox/bugfix/below283/SWBaseBean.java b/skywalking-collector/skywalking-sdk-plugin/dubbo-plugin/src/main/java/com/ai/cloud/skywalking/plugin/dubbox/bugfix/below283/SWBaseBean.java similarity index 100% rename from skywalking-sdk-plugin/dubbo-plugin/src/main/java/com/ai/cloud/skywalking/plugin/dubbox/bugfix/below283/SWBaseBean.java rename to skywalking-collector/skywalking-sdk-plugin/dubbo-plugin/src/main/java/com/ai/cloud/skywalking/plugin/dubbox/bugfix/below283/SWBaseBean.java diff --git a/skywalking-sdk-plugin/dubbo-plugin/src/main/resources/META-INF/dubbo/com.alibaba.dubbo.rpc.Filter b/skywalking-collector/skywalking-sdk-plugin/dubbo-plugin/src/main/resources/META-INF/dubbo/com.alibaba.dubbo.rpc.Filter similarity index 100% rename from skywalking-sdk-plugin/dubbo-plugin/src/main/resources/META-INF/dubbo/com.alibaba.dubbo.rpc.Filter rename to skywalking-collector/skywalking-sdk-plugin/dubbo-plugin/src/main/resources/META-INF/dubbo/com.alibaba.dubbo.rpc.Filter diff --git a/skywalking-sdk-plugin/dubbo-plugin/src/main/resources/skywalking-plugin.def b/skywalking-collector/skywalking-sdk-plugin/dubbo-plugin/src/main/resources/skywalking-plugin.def similarity index 100% rename from skywalking-sdk-plugin/dubbo-plugin/src/main/resources/skywalking-plugin.def rename to skywalking-collector/skywalking-sdk-plugin/dubbo-plugin/src/main/resources/skywalking-plugin.def diff --git a/skywalking-sdk-plugin/dubbo-plugin/src/test/java/com/ai/cloud/skywalking/plugin/test/dubbo/consumer/DubboConsumer.java b/skywalking-collector/skywalking-sdk-plugin/dubbo-plugin/src/test/java/com/ai/cloud/skywalking/plugin/test/dubbo/consumer/DubboConsumer.java similarity index 100% rename from skywalking-sdk-plugin/dubbo-plugin/src/test/java/com/ai/cloud/skywalking/plugin/test/dubbo/consumer/DubboConsumer.java rename to skywalking-collector/skywalking-sdk-plugin/dubbo-plugin/src/test/java/com/ai/cloud/skywalking/plugin/test/dubbo/consumer/DubboConsumer.java diff --git a/skywalking-sdk-plugin/dubbo-plugin/src/test/java/com/ai/cloud/skywalking/plugin/test/dubbo/impl/DubboInterAImpl.java b/skywalking-collector/skywalking-sdk-plugin/dubbo-plugin/src/test/java/com/ai/cloud/skywalking/plugin/test/dubbo/impl/DubboInterAImpl.java similarity index 100% rename from skywalking-sdk-plugin/dubbo-plugin/src/test/java/com/ai/cloud/skywalking/plugin/test/dubbo/impl/DubboInterAImpl.java rename to skywalking-collector/skywalking-sdk-plugin/dubbo-plugin/src/test/java/com/ai/cloud/skywalking/plugin/test/dubbo/impl/DubboInterAImpl.java diff --git a/skywalking-sdk-plugin/dubbo-plugin/src/test/java/com/ai/cloud/skywalking/plugin/test/dubbo/impl/DubboStart.java b/skywalking-collector/skywalking-sdk-plugin/dubbo-plugin/src/test/java/com/ai/cloud/skywalking/plugin/test/dubbo/impl/DubboStart.java similarity index 100% rename from skywalking-sdk-plugin/dubbo-plugin/src/test/java/com/ai/cloud/skywalking/plugin/test/dubbo/impl/DubboStart.java rename to skywalking-collector/skywalking-sdk-plugin/dubbo-plugin/src/test/java/com/ai/cloud/skywalking/plugin/test/dubbo/impl/DubboStart.java diff --git a/skywalking-sdk-plugin/dubbo-plugin/src/test/java/com/ai/cloud/skywalking/plugin/test/dubbo/interfaces/IDubboInterA.java b/skywalking-collector/skywalking-sdk-plugin/dubbo-plugin/src/test/java/com/ai/cloud/skywalking/plugin/test/dubbo/interfaces/IDubboInterA.java similarity index 100% rename from skywalking-sdk-plugin/dubbo-plugin/src/test/java/com/ai/cloud/skywalking/plugin/test/dubbo/interfaces/IDubboInterA.java rename to skywalking-collector/skywalking-sdk-plugin/dubbo-plugin/src/test/java/com/ai/cloud/skywalking/plugin/test/dubbo/interfaces/IDubboInterA.java diff --git a/skywalking-sdk-plugin/dubbo-plugin/src/test/java/com/ai/cloud/skywalking/plugin/test/dubbox283/consumer/DubboxRestConsumer.java b/skywalking-collector/skywalking-sdk-plugin/dubbo-plugin/src/test/java/com/ai/cloud/skywalking/plugin/test/dubbox283/consumer/DubboxRestConsumer.java similarity index 100% rename from skywalking-sdk-plugin/dubbo-plugin/src/test/java/com/ai/cloud/skywalking/plugin/test/dubbox283/consumer/DubboxRestConsumer.java rename to skywalking-collector/skywalking-sdk-plugin/dubbo-plugin/src/test/java/com/ai/cloud/skywalking/plugin/test/dubbox283/consumer/DubboxRestConsumer.java diff --git a/skywalking-sdk-plugin/dubbo-plugin/src/test/java/com/ai/cloud/skywalking/plugin/test/dubbox283/consumer/DubboxRestStart.java b/skywalking-collector/skywalking-sdk-plugin/dubbo-plugin/src/test/java/com/ai/cloud/skywalking/plugin/test/dubbox283/consumer/DubboxRestStart.java similarity index 100% rename from skywalking-sdk-plugin/dubbo-plugin/src/test/java/com/ai/cloud/skywalking/plugin/test/dubbox283/consumer/DubboxRestStart.java rename to skywalking-collector/skywalking-sdk-plugin/dubbo-plugin/src/test/java/com/ai/cloud/skywalking/plugin/test/dubbox283/consumer/DubboxRestStart.java diff --git a/skywalking-sdk-plugin/dubbo-plugin/src/test/java/com/ai/cloud/skywalking/plugin/test/dubbox283/impl/DubboxRestInterAImpl.java b/skywalking-collector/skywalking-sdk-plugin/dubbo-plugin/src/test/java/com/ai/cloud/skywalking/plugin/test/dubbox283/impl/DubboxRestInterAImpl.java similarity index 100% rename from skywalking-sdk-plugin/dubbo-plugin/src/test/java/com/ai/cloud/skywalking/plugin/test/dubbox283/impl/DubboxRestInterAImpl.java rename to skywalking-collector/skywalking-sdk-plugin/dubbo-plugin/src/test/java/com/ai/cloud/skywalking/plugin/test/dubbox283/impl/DubboxRestInterAImpl.java diff --git a/skywalking-sdk-plugin/dubbo-plugin/src/test/java/com/ai/cloud/skywalking/plugin/test/dubbox283/interfaces/IDubboxRestInterA.java b/skywalking-collector/skywalking-sdk-plugin/dubbo-plugin/src/test/java/com/ai/cloud/skywalking/plugin/test/dubbox283/interfaces/IDubboxRestInterA.java similarity index 100% rename from skywalking-sdk-plugin/dubbo-plugin/src/test/java/com/ai/cloud/skywalking/plugin/test/dubbox283/interfaces/IDubboxRestInterA.java rename to skywalking-collector/skywalking-sdk-plugin/dubbo-plugin/src/test/java/com/ai/cloud/skywalking/plugin/test/dubbox283/interfaces/IDubboxRestInterA.java diff --git a/skywalking-sdk-plugin/dubbo-plugin/src/test/java/com/ai/cloud/skywalking/plugin/test/dubbox283/interfaces/param/DubboxRestInterAParameter.java b/skywalking-collector/skywalking-sdk-plugin/dubbo-plugin/src/test/java/com/ai/cloud/skywalking/plugin/test/dubbox283/interfaces/param/DubboxRestInterAParameter.java similarity index 100% rename from skywalking-sdk-plugin/dubbo-plugin/src/test/java/com/ai/cloud/skywalking/plugin/test/dubbox283/interfaces/param/DubboxRestInterAParameter.java rename to skywalking-collector/skywalking-sdk-plugin/dubbo-plugin/src/test/java/com/ai/cloud/skywalking/plugin/test/dubbox283/interfaces/param/DubboxRestInterAParameter.java diff --git a/skywalking-sdk-plugin/dubbo-plugin/src/test/java/com/ai/cloud/skywalking/plugin/test/dubbox284/consumer/DubboxRestConsumer.java b/skywalking-collector/skywalking-sdk-plugin/dubbo-plugin/src/test/java/com/ai/cloud/skywalking/plugin/test/dubbox284/consumer/DubboxRestConsumer.java similarity index 100% rename from skywalking-sdk-plugin/dubbo-plugin/src/test/java/com/ai/cloud/skywalking/plugin/test/dubbox284/consumer/DubboxRestConsumer.java rename to skywalking-collector/skywalking-sdk-plugin/dubbo-plugin/src/test/java/com/ai/cloud/skywalking/plugin/test/dubbox284/consumer/DubboxRestConsumer.java diff --git a/skywalking-sdk-plugin/dubbo-plugin/src/test/java/com/ai/cloud/skywalking/plugin/test/dubbox284/consumer/DubboxRestStart.java b/skywalking-collector/skywalking-sdk-plugin/dubbo-plugin/src/test/java/com/ai/cloud/skywalking/plugin/test/dubbox284/consumer/DubboxRestStart.java similarity index 100% rename from skywalking-sdk-plugin/dubbo-plugin/src/test/java/com/ai/cloud/skywalking/plugin/test/dubbox284/consumer/DubboxRestStart.java rename to skywalking-collector/skywalking-sdk-plugin/dubbo-plugin/src/test/java/com/ai/cloud/skywalking/plugin/test/dubbox284/consumer/DubboxRestStart.java diff --git a/skywalking-sdk-plugin/dubbo-plugin/src/test/java/com/ai/cloud/skywalking/plugin/test/dubbox284/impl/DubboxRestInterAImpl.java b/skywalking-collector/skywalking-sdk-plugin/dubbo-plugin/src/test/java/com/ai/cloud/skywalking/plugin/test/dubbox284/impl/DubboxRestInterAImpl.java similarity index 100% rename from skywalking-sdk-plugin/dubbo-plugin/src/test/java/com/ai/cloud/skywalking/plugin/test/dubbox284/impl/DubboxRestInterAImpl.java rename to skywalking-collector/skywalking-sdk-plugin/dubbo-plugin/src/test/java/com/ai/cloud/skywalking/plugin/test/dubbox284/impl/DubboxRestInterAImpl.java diff --git a/skywalking-sdk-plugin/dubbo-plugin/src/test/java/com/ai/cloud/skywalking/plugin/test/dubbox284/interfaces/IDubboxRestInterA.java b/skywalking-collector/skywalking-sdk-plugin/dubbo-plugin/src/test/java/com/ai/cloud/skywalking/plugin/test/dubbox284/interfaces/IDubboxRestInterA.java similarity index 100% rename from skywalking-sdk-plugin/dubbo-plugin/src/test/java/com/ai/cloud/skywalking/plugin/test/dubbox284/interfaces/IDubboxRestInterA.java rename to skywalking-collector/skywalking-sdk-plugin/dubbo-plugin/src/test/java/com/ai/cloud/skywalking/plugin/test/dubbox284/interfaces/IDubboxRestInterA.java diff --git a/skywalking-sdk-plugin/dubbo-plugin/src/test/java/com/ai/cloud/skywalking/plugin/test/dubbox284/interfaces/param/DubboxRestInterAParameter.java b/skywalking-collector/skywalking-sdk-plugin/dubbo-plugin/src/test/java/com/ai/cloud/skywalking/plugin/test/dubbox284/interfaces/param/DubboxRestInterAParameter.java similarity index 100% rename from skywalking-sdk-plugin/dubbo-plugin/src/test/java/com/ai/cloud/skywalking/plugin/test/dubbox284/interfaces/param/DubboxRestInterAParameter.java rename to skywalking-collector/skywalking-sdk-plugin/dubbo-plugin/src/test/java/com/ai/cloud/skywalking/plugin/test/dubbox284/interfaces/param/DubboxRestInterAParameter.java diff --git a/skywalking-sdk-plugin/dubbo-plugin/src/test/resources/consumer/dubbo-consumer.xml b/skywalking-collector/skywalking-sdk-plugin/dubbo-plugin/src/test/resources/consumer/dubbo-consumer.xml similarity index 100% rename from skywalking-sdk-plugin/dubbo-plugin/src/test/resources/consumer/dubbo-consumer.xml rename to skywalking-collector/skywalking-sdk-plugin/dubbo-plugin/src/test/resources/consumer/dubbo-consumer.xml diff --git a/skywalking-sdk-plugin/dubbo-plugin/src/test/resources/consumer/dubbox283-consumer.xml b/skywalking-collector/skywalking-sdk-plugin/dubbo-plugin/src/test/resources/consumer/dubbox283-consumer.xml similarity index 100% rename from skywalking-sdk-plugin/dubbo-plugin/src/test/resources/consumer/dubbox283-consumer.xml rename to skywalking-collector/skywalking-sdk-plugin/dubbo-plugin/src/test/resources/consumer/dubbox283-consumer.xml diff --git a/skywalking-sdk-plugin/dubbo-plugin/src/test/resources/consumer/dubbox284-consumer.xml b/skywalking-collector/skywalking-sdk-plugin/dubbo-plugin/src/test/resources/consumer/dubbox284-consumer.xml similarity index 100% rename from skywalking-sdk-plugin/dubbo-plugin/src/test/resources/consumer/dubbox284-consumer.xml rename to skywalking-collector/skywalking-sdk-plugin/dubbo-plugin/src/test/resources/consumer/dubbox284-consumer.xml diff --git a/skywalking-sdk-plugin/dubbo-plugin/src/test/resources/log4j.properties b/skywalking-collector/skywalking-sdk-plugin/dubbo-plugin/src/test/resources/log4j.properties similarity index 100% rename from skywalking-sdk-plugin/dubbo-plugin/src/test/resources/log4j.properties rename to skywalking-collector/skywalking-sdk-plugin/dubbo-plugin/src/test/resources/log4j.properties diff --git a/skywalking-sdk-plugin/dubbo-plugin/src/test/resources/log4j2.xml b/skywalking-collector/skywalking-sdk-plugin/dubbo-plugin/src/test/resources/log4j2.xml similarity index 100% rename from skywalking-sdk-plugin/dubbo-plugin/src/test/resources/log4j2.xml rename to skywalking-collector/skywalking-sdk-plugin/dubbo-plugin/src/test/resources/log4j2.xml diff --git a/skywalking-sdk-plugin/dubbo-plugin/src/test/resources/provider/dubbo-provider.xml b/skywalking-collector/skywalking-sdk-plugin/dubbo-plugin/src/test/resources/provider/dubbo-provider.xml similarity index 100% rename from skywalking-sdk-plugin/dubbo-plugin/src/test/resources/provider/dubbo-provider.xml rename to skywalking-collector/skywalking-sdk-plugin/dubbo-plugin/src/test/resources/provider/dubbo-provider.xml diff --git a/skywalking-sdk-plugin/dubbo-plugin/src/test/resources/provider/dubbox283-provider.xml b/skywalking-collector/skywalking-sdk-plugin/dubbo-plugin/src/test/resources/provider/dubbox283-provider.xml similarity index 100% rename from skywalking-sdk-plugin/dubbo-plugin/src/test/resources/provider/dubbox283-provider.xml rename to skywalking-collector/skywalking-sdk-plugin/dubbo-plugin/src/test/resources/provider/dubbox283-provider.xml diff --git a/skywalking-sdk-plugin/dubbo-plugin/src/test/resources/provider/dubbox284-provider.xml b/skywalking-collector/skywalking-sdk-plugin/dubbo-plugin/src/test/resources/provider/dubbox284-provider.xml similarity index 100% rename from skywalking-sdk-plugin/dubbo-plugin/src/test/resources/provider/dubbox284-provider.xml rename to skywalking-collector/skywalking-sdk-plugin/dubbo-plugin/src/test/resources/provider/dubbox284-provider.xml diff --git a/skywalking-sdk-plugin/dubbo-plugin/src/test/resources/sky-walking.auth b/skywalking-collector/skywalking-sdk-plugin/dubbo-plugin/src/test/resources/sky-walking.auth similarity index 100% rename from skywalking-sdk-plugin/dubbo-plugin/src/test/resources/sky-walking.auth rename to skywalking-collector/skywalking-sdk-plugin/dubbo-plugin/src/test/resources/sky-walking.auth diff --git a/skywalking-sdk-plugin/dubbo-plugin/src/test/resources/springContext.xml b/skywalking-collector/skywalking-sdk-plugin/dubbo-plugin/src/test/resources/springContext.xml similarity index 100% rename from skywalking-sdk-plugin/dubbo-plugin/src/test/resources/springContext.xml rename to skywalking-collector/skywalking-sdk-plugin/dubbo-plugin/src/test/resources/springContext.xml diff --git a/skywalking-sdk-plugin/httpClient-4.x-plugin-dubbox-rest-attachment/README.md b/skywalking-collector/skywalking-sdk-plugin/httpClient-4.x-plugin-dubbox-rest-attachment/README.md similarity index 100% rename from skywalking-sdk-plugin/httpClient-4.x-plugin-dubbox-rest-attachment/README.md rename to skywalking-collector/skywalking-sdk-plugin/httpClient-4.x-plugin-dubbox-rest-attachment/README.md diff --git a/skywalking-sdk-plugin/httpClient-4.x-plugin-dubbox-rest-attachment/pom.xml b/skywalking-collector/skywalking-sdk-plugin/httpClient-4.x-plugin-dubbox-rest-attachment/pom.xml similarity index 90% rename from skywalking-sdk-plugin/httpClient-4.x-plugin-dubbox-rest-attachment/pom.xml rename to skywalking-collector/skywalking-sdk-plugin/httpClient-4.x-plugin-dubbox-rest-attachment/pom.xml index c5178a1b9c..7fef952c3f 100644 --- a/skywalking-sdk-plugin/httpClient-4.x-plugin-dubbox-rest-attachment/pom.xml +++ b/skywalking-collector/skywalking-sdk-plugin/httpClient-4.x-plugin-dubbox-rest-attachment/pom.xml @@ -58,14 +58,6 @@ - - maven-compiler-plugin - - 1.7 - 1.7 - ${project.build.sourceEncoding} - - org.apache.maven.plugins maven-resources-plugin diff --git a/skywalking-sdk-plugin/httpClient-4.x-plugin-dubbox-rest-attachment/src/main/java/org/skywalking/httpClient/v4/plugin/dubbox/rest/attachment/DubboxRestHeadSetterAttachment.java b/skywalking-collector/skywalking-sdk-plugin/httpClient-4.x-plugin-dubbox-rest-attachment/src/main/java/org/skywalking/httpClient/v4/plugin/dubbox/rest/attachment/DubboxRestHeadSetterAttachment.java similarity index 100% rename from skywalking-sdk-plugin/httpClient-4.x-plugin-dubbox-rest-attachment/src/main/java/org/skywalking/httpClient/v4/plugin/dubbox/rest/attachment/DubboxRestHeadSetterAttachment.java rename to skywalking-collector/skywalking-sdk-plugin/httpClient-4.x-plugin-dubbox-rest-attachment/src/main/java/org/skywalking/httpClient/v4/plugin/dubbox/rest/attachment/DubboxRestHeadSetterAttachment.java diff --git a/skywalking-sdk-plugin/httpClient-4.x-plugin-dubbox-rest-attachment/src/main/resources/skywalking-plugin.def b/skywalking-collector/skywalking-sdk-plugin/httpClient-4.x-plugin-dubbox-rest-attachment/src/main/resources/skywalking-plugin.def similarity index 100% rename from skywalking-sdk-plugin/httpClient-4.x-plugin-dubbox-rest-attachment/src/main/resources/skywalking-plugin.def rename to skywalking-collector/skywalking-sdk-plugin/httpClient-4.x-plugin-dubbox-rest-attachment/src/main/resources/skywalking-plugin.def diff --git a/skywalking-sdk-plugin/httpClient-4.x-plugin-dubbox-rest-attachment/src/test/java/test/skywalking/httpClient/v4x/plugin/dubbox/rest/attachment/TestHttpClientV43.java b/skywalking-collector/skywalking-sdk-plugin/httpClient-4.x-plugin-dubbox-rest-attachment/src/test/java/test/skywalking/httpClient/v4x/plugin/dubbox/rest/attachment/TestHttpClientV43.java similarity index 100% rename from skywalking-sdk-plugin/httpClient-4.x-plugin-dubbox-rest-attachment/src/test/java/test/skywalking/httpClient/v4x/plugin/dubbox/rest/attachment/TestHttpClientV43.java rename to skywalking-collector/skywalking-sdk-plugin/httpClient-4.x-plugin-dubbox-rest-attachment/src/test/java/test/skywalking/httpClient/v4x/plugin/dubbox/rest/attachment/TestHttpClientV43.java diff --git a/skywalking-sdk-plugin/httpClient-4.x-plugin-dubbox-rest-attachment/src/test/resources/log4j2.xml b/skywalking-collector/skywalking-sdk-plugin/httpClient-4.x-plugin-dubbox-rest-attachment/src/test/resources/log4j2.xml similarity index 100% rename from skywalking-sdk-plugin/httpClient-4.x-plugin-dubbox-rest-attachment/src/test/resources/log4j2.xml rename to skywalking-collector/skywalking-sdk-plugin/httpClient-4.x-plugin-dubbox-rest-attachment/src/test/resources/log4j2.xml diff --git a/skywalking-sdk-plugin/httpClient-4.x-plugin-dubbox-rest-attachment/src/test/resources/sky-walking.auth b/skywalking-collector/skywalking-sdk-plugin/httpClient-4.x-plugin-dubbox-rest-attachment/src/test/resources/sky-walking.auth similarity index 100% rename from skywalking-sdk-plugin/httpClient-4.x-plugin-dubbox-rest-attachment/src/test/resources/sky-walking.auth rename to skywalking-collector/skywalking-sdk-plugin/httpClient-4.x-plugin-dubbox-rest-attachment/src/test/resources/sky-walking.auth diff --git a/skywalking-sdk-plugin/httpClient-4.x-plugin/README.md b/skywalking-collector/skywalking-sdk-plugin/httpClient-4.x-plugin/README.md similarity index 100% rename from skywalking-sdk-plugin/httpClient-4.x-plugin/README.md rename to skywalking-collector/skywalking-sdk-plugin/httpClient-4.x-plugin/README.md diff --git a/skywalking-sdk-plugin/httpClient-4.x-plugin/pom.xml b/skywalking-collector/skywalking-sdk-plugin/httpClient-4.x-plugin/pom.xml similarity index 90% rename from skywalking-sdk-plugin/httpClient-4.x-plugin/pom.xml rename to skywalking-collector/skywalking-sdk-plugin/httpClient-4.x-plugin/pom.xml index b65e914731..c2529e8058 100644 --- a/skywalking-sdk-plugin/httpClient-4.x-plugin/pom.xml +++ b/skywalking-collector/skywalking-sdk-plugin/httpClient-4.x-plugin/pom.xml @@ -58,14 +58,6 @@ - - maven-compiler-plugin - - 1.7 - 1.7 - ${project.build.sourceEncoding} - - org.apache.maven.plugins maven-resources-plugin diff --git a/skywalking-sdk-plugin/httpClient-4.x-plugin/src/main/java/org/skywalking/httpClient/v4/plugin/HttpClientExecuteInterceptor.java b/skywalking-collector/skywalking-sdk-plugin/httpClient-4.x-plugin/src/main/java/org/skywalking/httpClient/v4/plugin/HttpClientExecuteInterceptor.java similarity index 100% rename from skywalking-sdk-plugin/httpClient-4.x-plugin/src/main/java/org/skywalking/httpClient/v4/plugin/HttpClientExecuteInterceptor.java rename to skywalking-collector/skywalking-sdk-plugin/httpClient-4.x-plugin/src/main/java/org/skywalking/httpClient/v4/plugin/HttpClientExecuteInterceptor.java diff --git a/skywalking-sdk-plugin/httpClient-4.x-plugin/src/main/java/org/skywalking/httpClient/v4/plugin/WebBuriedPointType.java b/skywalking-collector/skywalking-sdk-plugin/httpClient-4.x-plugin/src/main/java/org/skywalking/httpClient/v4/plugin/WebBuriedPointType.java similarity index 100% rename from skywalking-sdk-plugin/httpClient-4.x-plugin/src/main/java/org/skywalking/httpClient/v4/plugin/WebBuriedPointType.java rename to skywalking-collector/skywalking-sdk-plugin/httpClient-4.x-plugin/src/main/java/org/skywalking/httpClient/v4/plugin/WebBuriedPointType.java diff --git a/skywalking-sdk-plugin/httpClient-4.x-plugin/src/main/java/org/skywalking/httpClient/v4/plugin/define/AbstractHttpClientPluginDefine.java b/skywalking-collector/skywalking-sdk-plugin/httpClient-4.x-plugin/src/main/java/org/skywalking/httpClient/v4/plugin/define/AbstractHttpClientPluginDefine.java similarity index 100% rename from skywalking-sdk-plugin/httpClient-4.x-plugin/src/main/java/org/skywalking/httpClient/v4/plugin/define/AbstractHttpClientPluginDefine.java rename to skywalking-collector/skywalking-sdk-plugin/httpClient-4.x-plugin/src/main/java/org/skywalking/httpClient/v4/plugin/define/AbstractHttpClientPluginDefine.java diff --git a/skywalking-sdk-plugin/httpClient-4.x-plugin/src/main/java/org/skywalking/httpClient/v4/plugin/define/DefaultRequestDirectorPluginDefine.java b/skywalking-collector/skywalking-sdk-plugin/httpClient-4.x-plugin/src/main/java/org/skywalking/httpClient/v4/plugin/define/DefaultRequestDirectorPluginDefine.java similarity index 100% rename from skywalking-sdk-plugin/httpClient-4.x-plugin/src/main/java/org/skywalking/httpClient/v4/plugin/define/DefaultRequestDirectorPluginDefine.java rename to skywalking-collector/skywalking-sdk-plugin/httpClient-4.x-plugin/src/main/java/org/skywalking/httpClient/v4/plugin/define/DefaultRequestDirectorPluginDefine.java diff --git a/skywalking-sdk-plugin/httpClient-4.x-plugin/src/main/java/org/skywalking/httpClient/v4/plugin/define/HttpClientPluginDefine.java b/skywalking-collector/skywalking-sdk-plugin/httpClient-4.x-plugin/src/main/java/org/skywalking/httpClient/v4/plugin/define/HttpClientPluginDefine.java similarity index 100% rename from skywalking-sdk-plugin/httpClient-4.x-plugin/src/main/java/org/skywalking/httpClient/v4/plugin/define/HttpClientPluginDefine.java rename to skywalking-collector/skywalking-sdk-plugin/httpClient-4.x-plugin/src/main/java/org/skywalking/httpClient/v4/plugin/define/HttpClientPluginDefine.java diff --git a/skywalking-sdk-plugin/httpClient-4.x-plugin/src/main/java/org/skywalking/httpClient/v4/plugin/define/InternalHttpClientPluginDefine.java b/skywalking-collector/skywalking-sdk-plugin/httpClient-4.x-plugin/src/main/java/org/skywalking/httpClient/v4/plugin/define/InternalHttpClientPluginDefine.java similarity index 100% rename from skywalking-sdk-plugin/httpClient-4.x-plugin/src/main/java/org/skywalking/httpClient/v4/plugin/define/InternalHttpClientPluginDefine.java rename to skywalking-collector/skywalking-sdk-plugin/httpClient-4.x-plugin/src/main/java/org/skywalking/httpClient/v4/plugin/define/InternalHttpClientPluginDefine.java diff --git a/skywalking-sdk-plugin/httpClient-4.x-plugin/src/main/java/org/skywalking/httpClient/v4/plugin/define/MinimalHttpClientPluginDefine.java b/skywalking-collector/skywalking-sdk-plugin/httpClient-4.x-plugin/src/main/java/org/skywalking/httpClient/v4/plugin/define/MinimalHttpClientPluginDefine.java similarity index 100% rename from skywalking-sdk-plugin/httpClient-4.x-plugin/src/main/java/org/skywalking/httpClient/v4/plugin/define/MinimalHttpClientPluginDefine.java rename to skywalking-collector/skywalking-sdk-plugin/httpClient-4.x-plugin/src/main/java/org/skywalking/httpClient/v4/plugin/define/MinimalHttpClientPluginDefine.java diff --git a/skywalking-sdk-plugin/httpClient-4.x-plugin/src/main/resources/skywalking-plugin.def b/skywalking-collector/skywalking-sdk-plugin/httpClient-4.x-plugin/src/main/resources/skywalking-plugin.def similarity index 100% rename from skywalking-sdk-plugin/httpClient-4.x-plugin/src/main/resources/skywalking-plugin.def rename to skywalking-collector/skywalking-sdk-plugin/httpClient-4.x-plugin/src/main/resources/skywalking-plugin.def diff --git a/skywalking-sdk-plugin/httpClient-4.x-plugin/src/test/java/org/skywalking/httpClient/v4/plugin/TestHttpClientV42.java b/skywalking-collector/skywalking-sdk-plugin/httpClient-4.x-plugin/src/test/java/org/skywalking/httpClient/v4/plugin/TestHttpClientV42.java similarity index 100% rename from skywalking-sdk-plugin/httpClient-4.x-plugin/src/test/java/org/skywalking/httpClient/v4/plugin/TestHttpClientV42.java rename to skywalking-collector/skywalking-sdk-plugin/httpClient-4.x-plugin/src/test/java/org/skywalking/httpClient/v4/plugin/TestHttpClientV42.java diff --git a/skywalking-sdk-plugin/httpClient-4.x-plugin/src/test/java/org/skywalking/httpClient/v4/plugin/TestHttpClientV43.java b/skywalking-collector/skywalking-sdk-plugin/httpClient-4.x-plugin/src/test/java/org/skywalking/httpClient/v4/plugin/TestHttpClientV43.java similarity index 100% rename from skywalking-sdk-plugin/httpClient-4.x-plugin/src/test/java/org/skywalking/httpClient/v4/plugin/TestHttpClientV43.java rename to skywalking-collector/skywalking-sdk-plugin/httpClient-4.x-plugin/src/test/java/org/skywalking/httpClient/v4/plugin/TestHttpClientV43.java diff --git a/skywalking-sdk-plugin/httpClient-4.x-plugin/src/test/resources/log4j2.xml b/skywalking-collector/skywalking-sdk-plugin/httpClient-4.x-plugin/src/test/resources/log4j2.xml similarity index 100% rename from skywalking-sdk-plugin/httpClient-4.x-plugin/src/test/resources/log4j2.xml rename to skywalking-collector/skywalking-sdk-plugin/httpClient-4.x-plugin/src/test/resources/log4j2.xml diff --git a/skywalking-sdk-plugin/httpClient-4.x-plugin/src/test/resources/sky-walking.auth b/skywalking-collector/skywalking-sdk-plugin/httpClient-4.x-plugin/src/test/resources/sky-walking.auth similarity index 100% rename from skywalking-sdk-plugin/httpClient-4.x-plugin/src/test/resources/sky-walking.auth rename to skywalking-collector/skywalking-sdk-plugin/httpClient-4.x-plugin/src/test/resources/sky-walking.auth diff --git a/skywalking-sdk-plugin/jdbc-plugin/README.md b/skywalking-collector/skywalking-sdk-plugin/jdbc-plugin/README.md similarity index 100% rename from skywalking-sdk-plugin/jdbc-plugin/README.md rename to skywalking-collector/skywalking-sdk-plugin/jdbc-plugin/README.md diff --git a/skywalking-collector/skywalking-sdk-plugin/jdbc-plugin/pom.xml b/skywalking-collector/skywalking-sdk-plugin/jdbc-plugin/pom.xml new file mode 100755 index 0000000000..de60ee5f35 --- /dev/null +++ b/skywalking-collector/skywalking-sdk-plugin/jdbc-plugin/pom.xml @@ -0,0 +1,70 @@ + + + skywalking-sdk-plugin + com.ai.cloud + 1.0-Final + + 4.0.0 + + skywalking-jdbc-plugin + jar + + jdbc-plugin + http://maven.apache.org + + + UTF-8 + + + + + com.ai.cloud + skywalking-api + ${project.version} + + + mysql + mysql-connector-java + 5.1.36 + test + + + com.oracle + ojdbc14 + 10.2.0.4.0 + test + + + + + + + org.apache.maven.plugins + maven-deploy-plugin + + + + org.apache.maven.plugins + maven-source-plugin + + + + attach-sources + + jar + + + + + + + + + + bintray-wu-sheng-sky-walking-repository + wu-sheng-sky-walking-repository + https://api.bintray.com/maven/wu-sheng/skywalking/com.ai.cloud.skywalking-jdbc-plugin/;publish=1 + + + diff --git a/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/ai/cloud/skywalking/plugin/jdbc/CallableStatementTracing.java b/skywalking-collector/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/ai/cloud/skywalking/plugin/jdbc/CallableStatementTracing.java similarity index 100% rename from skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/ai/cloud/skywalking/plugin/jdbc/CallableStatementTracing.java rename to skywalking-collector/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/ai/cloud/skywalking/plugin/jdbc/CallableStatementTracing.java diff --git a/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/ai/cloud/skywalking/plugin/jdbc/ConnectionTracing.java b/skywalking-collector/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/ai/cloud/skywalking/plugin/jdbc/ConnectionTracing.java similarity index 100% rename from skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/ai/cloud/skywalking/plugin/jdbc/ConnectionTracing.java rename to skywalking-collector/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/ai/cloud/skywalking/plugin/jdbc/ConnectionTracing.java diff --git a/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/ai/cloud/skywalking/plugin/jdbc/JDBCBuriedPointType.java b/skywalking-collector/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/ai/cloud/skywalking/plugin/jdbc/JDBCBuriedPointType.java similarity index 100% rename from skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/ai/cloud/skywalking/plugin/jdbc/JDBCBuriedPointType.java rename to skywalking-collector/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/ai/cloud/skywalking/plugin/jdbc/JDBCBuriedPointType.java diff --git a/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/ai/cloud/skywalking/plugin/jdbc/JDBCPluginDefine.java b/skywalking-collector/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/ai/cloud/skywalking/plugin/jdbc/JDBCPluginDefine.java similarity index 100% rename from skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/ai/cloud/skywalking/plugin/jdbc/JDBCPluginDefine.java rename to skywalking-collector/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/ai/cloud/skywalking/plugin/jdbc/JDBCPluginDefine.java diff --git a/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/ai/cloud/skywalking/plugin/jdbc/PreparedStatementTracing.java b/skywalking-collector/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/ai/cloud/skywalking/plugin/jdbc/PreparedStatementTracing.java similarity index 100% rename from skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/ai/cloud/skywalking/plugin/jdbc/PreparedStatementTracing.java rename to skywalking-collector/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/ai/cloud/skywalking/plugin/jdbc/PreparedStatementTracing.java diff --git a/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/ai/cloud/skywalking/plugin/jdbc/SWCallableStatement.java b/skywalking-collector/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/ai/cloud/skywalking/plugin/jdbc/SWCallableStatement.java similarity index 100% rename from skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/ai/cloud/skywalking/plugin/jdbc/SWCallableStatement.java rename to skywalking-collector/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/ai/cloud/skywalking/plugin/jdbc/SWCallableStatement.java diff --git a/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/ai/cloud/skywalking/plugin/jdbc/SWConnection.java b/skywalking-collector/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/ai/cloud/skywalking/plugin/jdbc/SWConnection.java similarity index 100% rename from skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/ai/cloud/skywalking/plugin/jdbc/SWConnection.java rename to skywalking-collector/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/ai/cloud/skywalking/plugin/jdbc/SWConnection.java diff --git a/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/ai/cloud/skywalking/plugin/jdbc/SWPreparedStatement.java b/skywalking-collector/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/ai/cloud/skywalking/plugin/jdbc/SWPreparedStatement.java similarity index 100% rename from skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/ai/cloud/skywalking/plugin/jdbc/SWPreparedStatement.java rename to skywalking-collector/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/ai/cloud/skywalking/plugin/jdbc/SWPreparedStatement.java diff --git a/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/ai/cloud/skywalking/plugin/jdbc/SWStatement.java b/skywalking-collector/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/ai/cloud/skywalking/plugin/jdbc/SWStatement.java similarity index 100% rename from skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/ai/cloud/skywalking/plugin/jdbc/SWStatement.java rename to skywalking-collector/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/ai/cloud/skywalking/plugin/jdbc/SWStatement.java diff --git a/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/ai/cloud/skywalking/plugin/jdbc/StatementTracing.java b/skywalking-collector/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/ai/cloud/skywalking/plugin/jdbc/StatementTracing.java similarity index 100% rename from skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/ai/cloud/skywalking/plugin/jdbc/StatementTracing.java rename to skywalking-collector/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/ai/cloud/skywalking/plugin/jdbc/StatementTracing.java diff --git a/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/ai/cloud/skywalking/plugin/jdbc/TracingDriver.java b/skywalking-collector/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/ai/cloud/skywalking/plugin/jdbc/TracingDriver.java similarity index 100% rename from skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/ai/cloud/skywalking/plugin/jdbc/TracingDriver.java rename to skywalking-collector/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/ai/cloud/skywalking/plugin/jdbc/TracingDriver.java diff --git a/skywalking-sdk-plugin/jdbc-plugin/src/main/resources/driver-mapping-url.def b/skywalking-collector/skywalking-sdk-plugin/jdbc-plugin/src/main/resources/driver-mapping-url.def similarity index 100% rename from skywalking-sdk-plugin/jdbc-plugin/src/main/resources/driver-mapping-url.def rename to skywalking-collector/skywalking-sdk-plugin/jdbc-plugin/src/main/resources/driver-mapping-url.def diff --git a/skywalking-sdk-plugin/jdbc-plugin/src/main/resources/skywalking-plugin.def b/skywalking-collector/skywalking-sdk-plugin/jdbc-plugin/src/main/resources/skywalking-plugin.def similarity index 100% rename from skywalking-sdk-plugin/jdbc-plugin/src/main/resources/skywalking-plugin.def rename to skywalking-collector/skywalking-sdk-plugin/jdbc-plugin/src/main/resources/skywalking-plugin.def diff --git a/skywalking-sdk-plugin/jdbc-plugin/src/test/java/test/ai/cloud/skywalking/plugin/drivermanger/MyDriver.java b/skywalking-collector/skywalking-sdk-plugin/jdbc-plugin/src/test/java/test/ai/cloud/skywalking/plugin/drivermanger/MyDriver.java similarity index 100% rename from skywalking-sdk-plugin/jdbc-plugin/src/test/java/test/ai/cloud/skywalking/plugin/drivermanger/MyDriver.java rename to skywalking-collector/skywalking-sdk-plugin/jdbc-plugin/src/test/java/test/ai/cloud/skywalking/plugin/drivermanger/MyDriver.java diff --git a/skywalking-sdk-plugin/jdbc-plugin/src/test/java/test/ai/cloud/skywalking/plugin/drivermanger/TestMyDriver.java b/skywalking-collector/skywalking-sdk-plugin/jdbc-plugin/src/test/java/test/ai/cloud/skywalking/plugin/drivermanger/TestMyDriver.java similarity index 100% rename from skywalking-sdk-plugin/jdbc-plugin/src/test/java/test/ai/cloud/skywalking/plugin/drivermanger/TestMyDriver.java rename to skywalking-collector/skywalking-sdk-plugin/jdbc-plugin/src/test/java/test/ai/cloud/skywalking/plugin/drivermanger/TestMyDriver.java diff --git a/skywalking-sdk-plugin/jdbc-plugin/src/test/java/test/ai/cloud/skywalking/plugin/mysql/MysqlJDBCTest.java b/skywalking-collector/skywalking-sdk-plugin/jdbc-plugin/src/test/java/test/ai/cloud/skywalking/plugin/mysql/MysqlJDBCTest.java similarity index 100% rename from skywalking-sdk-plugin/jdbc-plugin/src/test/java/test/ai/cloud/skywalking/plugin/mysql/MysqlJDBCTest.java rename to skywalking-collector/skywalking-sdk-plugin/jdbc-plugin/src/test/java/test/ai/cloud/skywalking/plugin/mysql/MysqlJDBCTest.java diff --git a/skywalking-sdk-plugin/jdbc-plugin/src/test/java/test/ai/cloud/skywalking/plugin/oracle/OracleJDBCTest.java b/skywalking-collector/skywalking-sdk-plugin/jdbc-plugin/src/test/java/test/ai/cloud/skywalking/plugin/oracle/OracleJDBCTest.java similarity index 100% rename from skywalking-sdk-plugin/jdbc-plugin/src/test/java/test/ai/cloud/skywalking/plugin/oracle/OracleJDBCTest.java rename to skywalking-collector/skywalking-sdk-plugin/jdbc-plugin/src/test/java/test/ai/cloud/skywalking/plugin/oracle/OracleJDBCTest.java diff --git a/skywalking-sdk-plugin/jdbc-plugin/src/test/resources/sky-walking.auth b/skywalking-collector/skywalking-sdk-plugin/jdbc-plugin/src/test/resources/sky-walking.auth similarity index 100% rename from skywalking-sdk-plugin/jdbc-plugin/src/test/resources/sky-walking.auth rename to skywalking-collector/skywalking-sdk-plugin/jdbc-plugin/src/test/resources/sky-walking.auth diff --git a/skywalking-sdk-plugin/jedis-2.x-plugin/README.md b/skywalking-collector/skywalking-sdk-plugin/jedis-2.x-plugin/README.md similarity index 100% rename from skywalking-sdk-plugin/jedis-2.x-plugin/README.md rename to skywalking-collector/skywalking-sdk-plugin/jedis-2.x-plugin/README.md diff --git a/skywalking-sdk-plugin/jedis-2.x-plugin/pom.xml b/skywalking-collector/skywalking-sdk-plugin/jedis-2.x-plugin/pom.xml similarity index 88% rename from skywalking-sdk-plugin/jedis-2.x-plugin/pom.xml rename to skywalking-collector/skywalking-sdk-plugin/jedis-2.x-plugin/pom.xml index ced4a83cc5..e73955bdef 100644 --- a/skywalking-sdk-plugin/jedis-2.x-plugin/pom.xml +++ b/skywalking-collector/skywalking-sdk-plugin/jedis-2.x-plugin/pom.xml @@ -43,14 +43,6 @@ - - maven-compiler-plugin - - 1.7 - 1.7 - ${project.build.sourceEncoding} - - org.apache.maven.plugins maven-resources-plugin diff --git a/skywalking-sdk-plugin/jedis-2.x-plugin/src/main/java/com/ai/cloud/skywalking/jedis/v2/plugin/JedisBaseInterceptor.java b/skywalking-collector/skywalking-sdk-plugin/jedis-2.x-plugin/src/main/java/com/ai/cloud/skywalking/jedis/v2/plugin/JedisBaseInterceptor.java similarity index 100% rename from skywalking-sdk-plugin/jedis-2.x-plugin/src/main/java/com/ai/cloud/skywalking/jedis/v2/plugin/JedisBaseInterceptor.java rename to skywalking-collector/skywalking-sdk-plugin/jedis-2.x-plugin/src/main/java/com/ai/cloud/skywalking/jedis/v2/plugin/JedisBaseInterceptor.java diff --git a/skywalking-sdk-plugin/jedis-2.x-plugin/src/main/java/com/ai/cloud/skywalking/jedis/v2/plugin/JedisClusterInterceptor.java b/skywalking-collector/skywalking-sdk-plugin/jedis-2.x-plugin/src/main/java/com/ai/cloud/skywalking/jedis/v2/plugin/JedisClusterInterceptor.java similarity index 100% rename from skywalking-sdk-plugin/jedis-2.x-plugin/src/main/java/com/ai/cloud/skywalking/jedis/v2/plugin/JedisClusterInterceptor.java rename to skywalking-collector/skywalking-sdk-plugin/jedis-2.x-plugin/src/main/java/com/ai/cloud/skywalking/jedis/v2/plugin/JedisClusterInterceptor.java diff --git a/skywalking-sdk-plugin/jedis-2.x-plugin/src/main/java/com/ai/cloud/skywalking/jedis/v2/plugin/JedisInterceptor.java b/skywalking-collector/skywalking-sdk-plugin/jedis-2.x-plugin/src/main/java/com/ai/cloud/skywalking/jedis/v2/plugin/JedisInterceptor.java similarity index 100% rename from skywalking-sdk-plugin/jedis-2.x-plugin/src/main/java/com/ai/cloud/skywalking/jedis/v2/plugin/JedisInterceptor.java rename to skywalking-collector/skywalking-sdk-plugin/jedis-2.x-plugin/src/main/java/com/ai/cloud/skywalking/jedis/v2/plugin/JedisInterceptor.java diff --git a/skywalking-sdk-plugin/jedis-2.x-plugin/src/main/java/com/ai/cloud/skywalking/jedis/v2/plugin/RedisBuriedPointType.java b/skywalking-collector/skywalking-sdk-plugin/jedis-2.x-plugin/src/main/java/com/ai/cloud/skywalking/jedis/v2/plugin/RedisBuriedPointType.java similarity index 100% rename from skywalking-sdk-plugin/jedis-2.x-plugin/src/main/java/com/ai/cloud/skywalking/jedis/v2/plugin/RedisBuriedPointType.java rename to skywalking-collector/skywalking-sdk-plugin/jedis-2.x-plugin/src/main/java/com/ai/cloud/skywalking/jedis/v2/plugin/RedisBuriedPointType.java diff --git a/skywalking-sdk-plugin/jedis-2.x-plugin/src/main/java/com/ai/cloud/skywalking/jedis/v2/plugin/define/JedisClusterPluginDefine.java b/skywalking-collector/skywalking-sdk-plugin/jedis-2.x-plugin/src/main/java/com/ai/cloud/skywalking/jedis/v2/plugin/define/JedisClusterPluginDefine.java similarity index 100% rename from skywalking-sdk-plugin/jedis-2.x-plugin/src/main/java/com/ai/cloud/skywalking/jedis/v2/plugin/define/JedisClusterPluginDefine.java rename to skywalking-collector/skywalking-sdk-plugin/jedis-2.x-plugin/src/main/java/com/ai/cloud/skywalking/jedis/v2/plugin/define/JedisClusterPluginDefine.java diff --git a/skywalking-sdk-plugin/jedis-2.x-plugin/src/main/java/com/ai/cloud/skywalking/jedis/v2/plugin/define/JedisPluginDefine.java b/skywalking-collector/skywalking-sdk-plugin/jedis-2.x-plugin/src/main/java/com/ai/cloud/skywalking/jedis/v2/plugin/define/JedisPluginDefine.java similarity index 100% rename from skywalking-sdk-plugin/jedis-2.x-plugin/src/main/java/com/ai/cloud/skywalking/jedis/v2/plugin/define/JedisPluginDefine.java rename to skywalking-collector/skywalking-sdk-plugin/jedis-2.x-plugin/src/main/java/com/ai/cloud/skywalking/jedis/v2/plugin/define/JedisPluginDefine.java diff --git a/skywalking-sdk-plugin/jedis-2.x-plugin/src/main/resources/skywalking-plugin.def b/skywalking-collector/skywalking-sdk-plugin/jedis-2.x-plugin/src/main/resources/skywalking-plugin.def similarity index 100% rename from skywalking-sdk-plugin/jedis-2.x-plugin/src/main/resources/skywalking-plugin.def rename to skywalking-collector/skywalking-sdk-plugin/jedis-2.x-plugin/src/main/resources/skywalking-plugin.def diff --git a/skywalking-sdk-plugin/jedis-2.x-plugin/src/test/java/com/ai/cloud/skywalking/jedis/v2/plugin/JedisClusterTest.java b/skywalking-collector/skywalking-sdk-plugin/jedis-2.x-plugin/src/test/java/com/ai/cloud/skywalking/jedis/v2/plugin/JedisClusterTest.java similarity index 100% rename from skywalking-sdk-plugin/jedis-2.x-plugin/src/test/java/com/ai/cloud/skywalking/jedis/v2/plugin/JedisClusterTest.java rename to skywalking-collector/skywalking-sdk-plugin/jedis-2.x-plugin/src/test/java/com/ai/cloud/skywalking/jedis/v2/plugin/JedisClusterTest.java diff --git a/skywalking-sdk-plugin/jedis-2.x-plugin/src/test/java/com/ai/cloud/skywalking/jedis/v2/plugin/JedisTest.java b/skywalking-collector/skywalking-sdk-plugin/jedis-2.x-plugin/src/test/java/com/ai/cloud/skywalking/jedis/v2/plugin/JedisTest.java similarity index 100% rename from skywalking-sdk-plugin/jedis-2.x-plugin/src/test/java/com/ai/cloud/skywalking/jedis/v2/plugin/JedisTest.java rename to skywalking-collector/skywalking-sdk-plugin/jedis-2.x-plugin/src/test/java/com/ai/cloud/skywalking/jedis/v2/plugin/JedisTest.java diff --git a/skywalking-sdk-plugin/jedis-2.x-plugin/src/test/resources/log4j2.xml b/skywalking-collector/skywalking-sdk-plugin/jedis-2.x-plugin/src/test/resources/log4j2.xml similarity index 100% rename from skywalking-sdk-plugin/jedis-2.x-plugin/src/test/resources/log4j2.xml rename to skywalking-collector/skywalking-sdk-plugin/jedis-2.x-plugin/src/test/resources/log4j2.xml diff --git a/skywalking-sdk-plugin/jedis-2.x-plugin/src/test/resources/sky-walking.auth b/skywalking-collector/skywalking-sdk-plugin/jedis-2.x-plugin/src/test/resources/sky-walking.auth similarity index 100% rename from skywalking-sdk-plugin/jedis-2.x-plugin/src/test/resources/sky-walking.auth rename to skywalking-collector/skywalking-sdk-plugin/jedis-2.x-plugin/src/test/resources/sky-walking.auth diff --git a/skywalking-sdk-plugin/pom.xml b/skywalking-collector/skywalking-sdk-plugin/pom.xml similarity index 85% rename from skywalking-sdk-plugin/pom.xml rename to skywalking-collector/skywalking-sdk-plugin/pom.xml index 8f798253c3..f342e4b547 100644 --- a/skywalking-sdk-plugin/pom.xml +++ b/skywalking-collector/skywalking-sdk-plugin/pom.xml @@ -5,7 +5,7 @@ com.ai.cloud - skywalking + skywalking-collector 1.0-Final @@ -15,8 +15,6 @@ spring-plugin jdbc-plugin web-plugin - httpclient-4.2.x-plugin - httpclient-4.3.x-plugin httpClient-4.x-plugin httpClient-4.x-plugin-dubbox-rest-attachment jedis-2.x-plugin @@ -41,14 +39,6 @@ - - maven-compiler-plugin - - 1.7 - 1.7 - ${project.build.sourceEncoding} - - org.apache.maven.plugins maven-resources-plugin diff --git a/skywalking-sdk-plugin/spring-plugin/README.md b/skywalking-collector/skywalking-sdk-plugin/spring-plugin/README.md similarity index 100% rename from skywalking-sdk-plugin/spring-plugin/README.md rename to skywalking-collector/skywalking-sdk-plugin/spring-plugin/README.md diff --git a/skywalking-sdk-plugin/spring-plugin/pom.xml b/skywalking-collector/skywalking-sdk-plugin/spring-plugin/pom.xml similarity index 93% rename from skywalking-sdk-plugin/spring-plugin/pom.xml rename to skywalking-collector/skywalking-sdk-plugin/spring-plugin/pom.xml index 0abec8115c..4999ab091d 100644 --- a/skywalking-sdk-plugin/spring-plugin/pom.xml +++ b/skywalking-collector/skywalking-sdk-plugin/spring-plugin/pom.xml @@ -85,14 +85,6 @@ - - maven-compiler-plugin - - 1.7 - 1.7 - ${project.build.sourceEncoding} - - org.apache.maven.plugins maven-resources-plugin diff --git a/skywalking-sdk-plugin/spring-plugin/src/main/java/com/ai/cloud/skywalking/plugin/spring/SpringBuriedPointType.java b/skywalking-collector/skywalking-sdk-plugin/spring-plugin/src/main/java/com/ai/cloud/skywalking/plugin/spring/SpringBuriedPointType.java similarity index 100% rename from skywalking-sdk-plugin/spring-plugin/src/main/java/com/ai/cloud/skywalking/plugin/spring/SpringBuriedPointType.java rename to skywalking-collector/skywalking-sdk-plugin/spring-plugin/src/main/java/com/ai/cloud/skywalking/plugin/spring/SpringBuriedPointType.java diff --git a/skywalking-sdk-plugin/spring-plugin/src/main/java/com/ai/cloud/skywalking/plugin/spring/SpringTagNamespaceHandler.java b/skywalking-collector/skywalking-sdk-plugin/spring-plugin/src/main/java/com/ai/cloud/skywalking/plugin/spring/SpringTagNamespaceHandler.java similarity index 100% rename from skywalking-sdk-plugin/spring-plugin/src/main/java/com/ai/cloud/skywalking/plugin/spring/SpringTagNamespaceHandler.java rename to skywalking-collector/skywalking-sdk-plugin/spring-plugin/src/main/java/com/ai/cloud/skywalking/plugin/spring/SpringTagNamespaceHandler.java diff --git a/skywalking-sdk-plugin/spring-plugin/src/main/java/com/ai/cloud/skywalking/plugin/spring/TracingAspect.java b/skywalking-collector/skywalking-sdk-plugin/spring-plugin/src/main/java/com/ai/cloud/skywalking/plugin/spring/TracingAspect.java similarity index 100% rename from skywalking-sdk-plugin/spring-plugin/src/main/java/com/ai/cloud/skywalking/plugin/spring/TracingAspect.java rename to skywalking-collector/skywalking-sdk-plugin/spring-plugin/src/main/java/com/ai/cloud/skywalking/plugin/spring/TracingAspect.java diff --git a/skywalking-sdk-plugin/spring-plugin/src/main/java/com/ai/cloud/skywalking/plugin/spring/TracingEnhanceProcessor.java b/skywalking-collector/skywalking-sdk-plugin/spring-plugin/src/main/java/com/ai/cloud/skywalking/plugin/spring/TracingEnhanceProcessor.java similarity index 100% rename from skywalking-sdk-plugin/spring-plugin/src/main/java/com/ai/cloud/skywalking/plugin/spring/TracingEnhanceProcessor.java rename to skywalking-collector/skywalking-sdk-plugin/spring-plugin/src/main/java/com/ai/cloud/skywalking/plugin/spring/TracingEnhanceProcessor.java diff --git a/skywalking-sdk-plugin/spring-plugin/src/main/java/com/ai/cloud/skywalking/plugin/spring/TracingPattern.java b/skywalking-collector/skywalking-sdk-plugin/spring-plugin/src/main/java/com/ai/cloud/skywalking/plugin/spring/TracingPattern.java similarity index 100% rename from skywalking-sdk-plugin/spring-plugin/src/main/java/com/ai/cloud/skywalking/plugin/spring/TracingPattern.java rename to skywalking-collector/skywalking-sdk-plugin/spring-plugin/src/main/java/com/ai/cloud/skywalking/plugin/spring/TracingPattern.java diff --git a/skywalking-sdk-plugin/spring-plugin/src/main/java/com/ai/cloud/skywalking/plugin/spring/TracingPatternParser.java b/skywalking-collector/skywalking-sdk-plugin/spring-plugin/src/main/java/com/ai/cloud/skywalking/plugin/spring/TracingPatternParser.java similarity index 100% rename from skywalking-sdk-plugin/spring-plugin/src/main/java/com/ai/cloud/skywalking/plugin/spring/TracingPatternParser.java rename to skywalking-collector/skywalking-sdk-plugin/spring-plugin/src/main/java/com/ai/cloud/skywalking/plugin/spring/TracingPatternParser.java diff --git a/skywalking-sdk-plugin/spring-plugin/src/main/java/com/ai/cloud/skywalking/plugin/spring/util/ConcurrentHashSet.java b/skywalking-collector/skywalking-sdk-plugin/spring-plugin/src/main/java/com/ai/cloud/skywalking/plugin/spring/util/ConcurrentHashSet.java similarity index 100% rename from skywalking-sdk-plugin/spring-plugin/src/main/java/com/ai/cloud/skywalking/plugin/spring/util/ConcurrentHashSet.java rename to skywalking-collector/skywalking-sdk-plugin/spring-plugin/src/main/java/com/ai/cloud/skywalking/plugin/spring/util/ConcurrentHashSet.java diff --git a/skywalking-sdk-plugin/spring-plugin/src/main/resources/META-INF/skywalking.xsd b/skywalking-collector/skywalking-sdk-plugin/spring-plugin/src/main/resources/META-INF/skywalking.xsd similarity index 100% rename from skywalking-sdk-plugin/spring-plugin/src/main/resources/META-INF/skywalking.xsd rename to skywalking-collector/skywalking-sdk-plugin/spring-plugin/src/main/resources/META-INF/skywalking.xsd diff --git a/skywalking-sdk-plugin/spring-plugin/src/main/resources/META-INF/spring.handlers b/skywalking-collector/skywalking-sdk-plugin/spring-plugin/src/main/resources/META-INF/spring.handlers similarity index 100% rename from skywalking-sdk-plugin/spring-plugin/src/main/resources/META-INF/spring.handlers rename to skywalking-collector/skywalking-sdk-plugin/spring-plugin/src/main/resources/META-INF/spring.handlers diff --git a/skywalking-sdk-plugin/spring-plugin/src/main/resources/META-INF/spring.schemas b/skywalking-collector/skywalking-sdk-plugin/spring-plugin/src/main/resources/META-INF/spring.schemas similarity index 100% rename from skywalking-sdk-plugin/spring-plugin/src/main/resources/META-INF/spring.schemas rename to skywalking-collector/skywalking-sdk-plugin/spring-plugin/src/main/resources/META-INF/spring.schemas diff --git a/skywalking-sdk-plugin/spring-plugin/src/test/java/com/ai/cloud/skywalking/plugin/spring/test/TestBean.java b/skywalking-collector/skywalking-sdk-plugin/spring-plugin/src/test/java/com/ai/cloud/skywalking/plugin/spring/test/TestBean.java similarity index 100% rename from skywalking-sdk-plugin/spring-plugin/src/test/java/com/ai/cloud/skywalking/plugin/spring/test/TestBean.java rename to skywalking-collector/skywalking-sdk-plugin/spring-plugin/src/test/java/com/ai/cloud/skywalking/plugin/spring/test/TestBean.java diff --git a/skywalking-sdk-plugin/spring-plugin/src/test/resources/jdbc.properties b/skywalking-collector/skywalking-sdk-plugin/spring-plugin/src/test/resources/jdbc.properties similarity index 100% rename from skywalking-sdk-plugin/spring-plugin/src/test/resources/jdbc.properties rename to skywalking-collector/skywalking-sdk-plugin/spring-plugin/src/test/resources/jdbc.properties diff --git a/skywalking-sdk-plugin/spring-plugin/src/test/resources/log4j2.xml b/skywalking-collector/skywalking-sdk-plugin/spring-plugin/src/test/resources/log4j2.xml similarity index 100% rename from skywalking-sdk-plugin/spring-plugin/src/test/resources/log4j2.xml rename to skywalking-collector/skywalking-sdk-plugin/spring-plugin/src/test/resources/log4j2.xml diff --git a/skywalking-sdk-plugin/spring-plugin/src/test/resources/sky-walking.auth b/skywalking-collector/skywalking-sdk-plugin/spring-plugin/src/test/resources/sky-walking.auth similarity index 100% rename from skywalking-sdk-plugin/spring-plugin/src/test/resources/sky-walking.auth rename to skywalking-collector/skywalking-sdk-plugin/spring-plugin/src/test/resources/sky-walking.auth diff --git a/skywalking-sdk-plugin/spring-plugin/src/test/resources/springConfig-common.xml b/skywalking-collector/skywalking-sdk-plugin/spring-plugin/src/test/resources/springConfig-common.xml similarity index 100% rename from skywalking-sdk-plugin/spring-plugin/src/test/resources/springConfig-common.xml rename to skywalking-collector/skywalking-sdk-plugin/spring-plugin/src/test/resources/springConfig-common.xml diff --git a/skywalking-sdk-plugin/src/main/resources/plugin-span-type-notice.txt b/skywalking-collector/skywalking-sdk-plugin/src/main/resources/plugin-span-type-notice.txt similarity index 100% rename from skywalking-sdk-plugin/src/main/resources/plugin-span-type-notice.txt rename to skywalking-collector/skywalking-sdk-plugin/src/main/resources/plugin-span-type-notice.txt diff --git a/skywalking-sdk-plugin/web-plugin/README.md b/skywalking-collector/skywalking-sdk-plugin/web-plugin/README.md similarity index 100% rename from skywalking-sdk-plugin/web-plugin/README.md rename to skywalking-collector/skywalking-sdk-plugin/web-plugin/README.md diff --git a/skywalking-sdk-plugin/web-plugin/pom.xml b/skywalking-collector/skywalking-sdk-plugin/web-plugin/pom.xml similarity index 89% rename from skywalking-sdk-plugin/web-plugin/pom.xml rename to skywalking-collector/skywalking-sdk-plugin/web-plugin/pom.xml index ad7fd9e2c2..c1a4149007 100644 --- a/skywalking-sdk-plugin/web-plugin/pom.xml +++ b/skywalking-collector/skywalking-sdk-plugin/web-plugin/pom.xml @@ -41,14 +41,6 @@ - - maven-compiler-plugin - - 1.7 - 1.7 - ${project.build.sourceEncoding} - - org.apache.maven.plugins diff --git a/skywalking-sdk-plugin/web-plugin/src/main/java/com/ai/cloud/skywalking/plugin/web/SkyWalkingFilter.java b/skywalking-collector/skywalking-sdk-plugin/web-plugin/src/main/java/com/ai/cloud/skywalking/plugin/web/SkyWalkingFilter.java similarity index 100% rename from skywalking-sdk-plugin/web-plugin/src/main/java/com/ai/cloud/skywalking/plugin/web/SkyWalkingFilter.java rename to skywalking-collector/skywalking-sdk-plugin/web-plugin/src/main/java/com/ai/cloud/skywalking/plugin/web/SkyWalkingFilter.java diff --git a/skywalking-sdk-plugin/web-plugin/src/main/java/com/ai/cloud/skywalking/plugin/web/WebBuriedPointType.java b/skywalking-collector/skywalking-sdk-plugin/web-plugin/src/main/java/com/ai/cloud/skywalking/plugin/web/WebBuriedPointType.java similarity index 100% rename from skywalking-sdk-plugin/web-plugin/src/main/java/com/ai/cloud/skywalking/plugin/web/WebBuriedPointType.java rename to skywalking-collector/skywalking-sdk-plugin/web-plugin/src/main/java/com/ai/cloud/skywalking/plugin/web/WebBuriedPointType.java diff --git a/skywalking-sdk-plugin/httpclient-4.2.x-plugin/README.md b/skywalking-sdk-plugin/httpclient-4.2.x-plugin/README.md deleted file mode 100644 index dcba62f026..0000000000 --- a/skywalking-sdk-plugin/httpclient-4.2.x-plugin/README.md +++ /dev/null @@ -1,21 +0,0 @@ -# 如何追踪HttpClient发起HTTP调用？ - -## httpclient 4.2.x -- 引入所需插件 -```xml - - - com.ai.cloud - skywalking-httpClient-4.2.x-plugin - {latest_version} - -``` -- 使用SWTracingHttpClient封装所需的httpClient，此httpClient所有调用都会被监控 -```java -HttpClient httpclient = new SWTracingHttpClient(new DefaultHttpClient()); -``` -- 上下文将被存储在http request head，中，默认名称和SkyWalkingFilter保持一致。 -- 如果服务端使用dubbox 2.8.4 的提供的http-rest，请使用方法重载 -```java -HttpClient httpclient = new SWTracingHttpClient(new DefaultHttpClient(), "Dubbo-Attachments"); -``` \ No newline at end of file diff --git a/skywalking-sdk-plugin/httpclient-4.2.x-plugin/pom.xml b/skywalking-sdk-plugin/httpclient-4.2.x-plugin/pom.xml deleted file mode 100644 index e368a706f2..0000000000 --- a/skywalking-sdk-plugin/httpclient-4.2.x-plugin/pom.xml +++ /dev/null @@ -1,63 +0,0 @@ - - - skywalking-sdk-plugin - com.ai.cloud - 1.0-Final - - 4.0.0 - - skywalking-httpclient-4.2.x-plugin - jar - - httpclient-4.2.x-plugin - http://maven.apache.org - - - UTF-8 - - - - - com.ai.cloud - skywalking-api - ${project.version} - - - org.apache.httpcomponents - httpclient - 4.2.1 - compile - - - - - - maven-compiler-plugin - - 1.7 - 1.7 - ${project.build.sourceEncoding} - - - - org.apache.maven.plugins - maven-deploy-plugin - - - - org.apache.maven.plugins - maven-source-plugin - - - - attach-sources - - jar - - - - - - - diff --git a/skywalking-sdk-plugin/httpclient-4.2.x-plugin/src/main/java/com/ai/cloud/skywalking/plugin/httpclient/v42x/HttpClientTracing.java b/skywalking-sdk-plugin/httpclient-4.2.x-plugin/src/main/java/com/ai/cloud/skywalking/plugin/httpclient/v42x/HttpClientTracing.java deleted file mode 100644 index 3080417d22..0000000000 --- a/skywalking-sdk-plugin/httpclient-4.2.x-plugin/src/main/java/com/ai/cloud/skywalking/plugin/httpclient/v42x/HttpClientTracing.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.ai.cloud.skywalking.plugin.httpclient.v42x; - -import com.ai.cloud.skywalking.buriedpoint.RPCBuriedPointSender; -import com.ai.cloud.skywalking.conf.AuthDesc; -import com.ai.cloud.skywalking.model.Identification; -import org.apache.http.HttpRequest; - -import java.io.IOException; - -public class HttpClientTracing { - - private static RPCBuriedPointSender sender = new RPCBuriedPointSender(); - - public static R execute(String url, String traceHearName, HttpRequest httpRequest, Executor executor) throws IOException { - if (!AuthDesc.isAuth()) { - return executor.execute(); - } - - try { - httpRequest.setHeader(traceHearName, - "ContextData=" + sender.beforeSend(Identification.newBuilder() - .viewPoint(url) - .spanType(WebBuriedPointType.instance()) - .build()) - .toString()); - return executor.execute(); - } catch (IOException e) { - sender.handleException(e); - throw e; - } finally { - sender.afterSend(); - } - } - - public interface Executor { - R execute() throws IOException; - } - - -} diff --git a/skywalking-sdk-plugin/httpclient-4.2.x-plugin/src/main/java/com/ai/cloud/skywalking/plugin/httpclient/v42x/SWTracingHttpClient.java b/skywalking-sdk-plugin/httpclient-4.2.x-plugin/src/main/java/com/ai/cloud/skywalking/plugin/httpclient/v42x/SWTracingHttpClient.java deleted file mode 100644 index 6f157959a0..0000000000 --- a/skywalking-sdk-plugin/httpclient-4.2.x-plugin/src/main/java/com/ai/cloud/skywalking/plugin/httpclient/v42x/SWTracingHttpClient.java +++ /dev/null @@ -1,128 +0,0 @@ -package com.ai.cloud.skywalking.plugin.httpclient.v42x; - -import org.apache.http.HttpHost; -import org.apache.http.HttpRequest; -import org.apache.http.HttpResponse; -import org.apache.http.client.ClientProtocolException; -import org.apache.http.client.HttpClient; -import org.apache.http.client.ResponseHandler; -import org.apache.http.client.methods.HttpUriRequest; -import org.apache.http.conn.ClientConnectionManager; -import org.apache.http.params.HttpParams; -import org.apache.http.protocol.HttpContext; - -import java.io.IOException; - -public class SWTracingHttpClient implements HttpClient { - - private static final String DEFAULT_TRACE_NAME = "SkyWalking-TRACING-NAME"; - - private HttpClient client; - private String traceHeaderName; - - public SWTracingHttpClient(HttpClient client, String traceHeaderName) { - this.client = client; - if (traceHeaderName == null || traceHeaderName.length() <= 0) { - throw new IllegalArgumentException("Trace header name can not be null"); - } - this.traceHeaderName = traceHeaderName; - } - - public SWTracingHttpClient(HttpClient client) { - this.client = client; - this.traceHeaderName = DEFAULT_TRACE_NAME; - } - - @Override - public HttpParams getParams() { - return client.getParams(); - } - - @Override - public ClientConnectionManager getConnectionManager() { - return client.getConnectionManager(); - } - - @Override - public HttpResponse execute(final HttpUriRequest httpUriRequest) throws IOException, ClientProtocolException { - return HttpClientTracing.execute(httpUriRequest.getURI().toString(), traceHeaderName, httpUriRequest, new HttpClientTracing.Executor() { - @Override - public HttpResponse execute() throws IOException { - return client.execute(httpUriRequest); - } - }); - } - - @Override - public HttpResponse execute(final HttpUriRequest httpUriRequest, final HttpContext httpContext) throws IOException, ClientProtocolException { - return HttpClientTracing.execute(httpUriRequest.getURI().toString(), traceHeaderName, httpUriRequest, new HttpClientTracing.Executor() { - @Override - public HttpResponse execute() throws IOException { - return client.execute(httpUriRequest, httpContext); - } - }); - } - - @Override - public HttpResponse execute(final HttpHost httpHost, final HttpRequest httpRequest) throws IOException, ClientProtocolException { - return HttpClientTracing.execute(httpHost.toURI(), traceHeaderName, httpRequest, new HttpClientTracing.Executor() { - @Override - public HttpResponse execute() throws IOException { - return client.execute(httpHost, httpRequest); - } - }); - } - - @Override - public HttpResponse execute(final HttpHost httpHost, final HttpRequest httpRequest, final HttpContext httpContext) throws IOException, ClientProtocolException { - return HttpClientTracing.execute(httpHost.toURI(), traceHeaderName, httpRequest, new HttpClientTracing.Executor() { - @Override - public HttpResponse execute() throws IOException { - return client.execute(httpHost, httpRequest, httpContext); - } - }); - } - - @Override - public T execute(final HttpUriRequest httpUriRequest, final ResponseHandler responseHandler) throws IOException, ClientProtocolException { - return HttpClientTracing.execute(httpUriRequest.getURI().toString(), traceHeaderName, httpUriRequest, new HttpClientTracing.Executor() { - @Override - public T execute() throws IOException { - return client.execute(httpUriRequest, responseHandler); - } - }); - - } - - @Override - public T execute(final HttpUriRequest httpUriRequest, final ResponseHandler responseHandler, final HttpContext httpContext) throws IOException, ClientProtocolException { - return HttpClientTracing.execute(httpUriRequest.getURI().toString(), traceHeaderName, httpUriRequest, new HttpClientTracing.Executor() { - @Override - public T execute() throws IOException { - return client.execute(httpUriRequest, responseHandler, httpContext); - } - }); - - } - - @Override - public T execute(final HttpHost httpHost, final HttpRequest httpRequest, final ResponseHandler responseHandler) throws IOException, ClientProtocolException { - return HttpClientTracing.execute(httpHost.toURI(), traceHeaderName, httpRequest, new HttpClientTracing.Executor() { - @Override - public T execute() throws IOException { - return client.execute(httpHost, httpRequest, responseHandler); - } - }); - - } - - @Override - public T execute(final HttpHost httpHost, final HttpRequest httpRequest, final ResponseHandler responseHandler, HttpContext httpContext) throws IOException, ClientProtocolException { - return HttpClientTracing.execute(httpHost.toURI(), traceHeaderName, httpRequest, new HttpClientTracing.Executor() { - @Override - public T execute() throws IOException { - return client.execute(httpHost, httpRequest, responseHandler); - } - }); - } -} diff --git a/skywalking-sdk-plugin/httpclient-4.2.x-plugin/src/main/java/com/ai/cloud/skywalking/plugin/httpclient/v42x/WebBuriedPointType.java b/skywalking-sdk-plugin/httpclient-4.2.x-plugin/src/main/java/com/ai/cloud/skywalking/plugin/httpclient/v42x/WebBuriedPointType.java deleted file mode 100644 index 15aeeef683..0000000000 --- a/skywalking-sdk-plugin/httpclient-4.2.x-plugin/src/main/java/com/ai/cloud/skywalking/plugin/httpclient/v42x/WebBuriedPointType.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.ai.cloud.skywalking.plugin.httpclient.v42x; - -import com.ai.cloud.skywalking.api.IBuriedPointType; -import com.ai.cloud.skywalking.protocol.CallType; - -public class WebBuriedPointType implements IBuriedPointType { - - private static WebBuriedPointType webBuriedPointType; - - public static IBuriedPointType instance() { - if (webBuriedPointType == null) { - webBuriedPointType = new WebBuriedPointType(); - } - - return webBuriedPointType; - } - - @Override - public String getTypeName() { - return "W"; - } - - @Override - public CallType getCallType() { - return CallType.SYNC; - } - - private WebBuriedPointType() { - // Non - } -} diff --git a/skywalking-sdk-plugin/httpclient-4.3.x-plugin/README.md b/skywalking-sdk-plugin/httpclient-4.3.x-plugin/README.md deleted file mode 100644 index a712dcf1b9..0000000000 --- a/skywalking-sdk-plugin/httpclient-4.3.x-plugin/README.md +++ /dev/null @@ -1,19 +0,0 @@ -## httpclient 4.3.x -- 引入所需插件 -```xml - - - com.ai.cloud - skywalking-httpClient-4.3.x-plugin - {latest_version} - -``` -- 使用SWTracingCloseableHttpClient封装所需的httpClient，此httpClient所有调用都会被监控 -```java -CloseableHttpClient httpclient = new SWTracingCloseableHttpClient(closeableHttpClient); -``` -- 上下文将被存储在http request head，中，默认名称和SkyWalkingFilter保持一致。 -- 如果服务端使用dubbox 2.8.4 的提供的http-rest，请使用方法重载 -```java -CloseableHttpClient httpclient = new SWTracingCloseableHttpClient(closeableHttpClient, "Dubbo-Attachments"); -``` diff --git a/skywalking-sdk-plugin/httpclient-4.3.x-plugin/pom.xml b/skywalking-sdk-plugin/httpclient-4.3.x-plugin/pom.xml deleted file mode 100644 index 34cd9410cf..0000000000 --- a/skywalking-sdk-plugin/httpclient-4.3.x-plugin/pom.xml +++ /dev/null @@ -1,51 +0,0 @@ - - - skywalking-sdk-plugin - com.ai.cloud - 1.0-Final - - 4.0.0 - - skywalking-httpclient-4.3.x-plugin - jar - - httpclient-4.3.x-plugin - http://maven.apache.org - - - UTF-8 - - - - - junit - junit - 3.8.1 - test - - - com.ai.cloud - skywalking-api - 1.0-Final - - - org.apache.httpcomponents - httpclient - 4.3 - compile - - - - - - maven-compiler-plugin - - 1.7 - 1.7 - ${project.build.sourceEncoding} - - - - - diff --git a/skywalking-sdk-plugin/httpclient-4.3.x-plugin/src/main/java/com/ai/cloud/skywalking/plugin/httpclient/v43x/HttpClientTracing.java b/skywalking-sdk-plugin/httpclient-4.3.x-plugin/src/main/java/com/ai/cloud/skywalking/plugin/httpclient/v43x/HttpClientTracing.java deleted file mode 100644 index 2b179ee84a..0000000000 --- a/skywalking-sdk-plugin/httpclient-4.3.x-plugin/src/main/java/com/ai/cloud/skywalking/plugin/httpclient/v43x/HttpClientTracing.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.ai.cloud.skywalking.plugin.httpclient.v43x; - -import com.ai.cloud.skywalking.buriedpoint.RPCBuriedPointSender; -import com.ai.cloud.skywalking.conf.AuthDesc; -import com.ai.cloud.skywalking.model.Identification; -import org.apache.http.HttpRequest; - -import java.io.IOException; - -public class HttpClientTracing { - - private static RPCBuriedPointSender sender = new RPCBuriedPointSender(); - - public static R execute(String url, String traceHearName, HttpRequest httpRequest, Executor executor) throws IOException { - if (!AuthDesc.isAuth()) { - return executor.execute(); - } - - try { - httpRequest.setHeader(traceHearName, - "ContextData=" + sender.beforeSend(Identification.newBuilder() - .viewPoint(url) - .spanType(WebBuriedPointType.instance()) - .build()) - .toString()); - return executor.execute(); - } catch (IOException e) { - sender.handleException(e); - throw e; - } finally { - sender.afterSend(); - } - } - - public interface Executor { - R execute() throws IOException; - } - - -} diff --git a/skywalking-sdk-plugin/httpclient-4.3.x-plugin/src/main/java/com/ai/cloud/skywalking/plugin/httpclient/v43x/SWTracingCloseableHttpClient.java b/skywalking-sdk-plugin/httpclient-4.3.x-plugin/src/main/java/com/ai/cloud/skywalking/plugin/httpclient/v43x/SWTracingCloseableHttpClient.java deleted file mode 100644 index b3827907f7..0000000000 --- a/skywalking-sdk-plugin/httpclient-4.3.x-plugin/src/main/java/com/ai/cloud/skywalking/plugin/httpclient/v43x/SWTracingCloseableHttpClient.java +++ /dev/null @@ -1,139 +0,0 @@ -package com.ai.cloud.skywalking.plugin.httpclient.v43x; - -import org.apache.http.HttpHost; -import org.apache.http.HttpRequest; -import org.apache.http.client.ClientProtocolException; -import org.apache.http.client.ResponseHandler; -import org.apache.http.client.methods.CloseableHttpResponse; -import org.apache.http.client.methods.HttpUriRequest; -import org.apache.http.conn.ClientConnectionManager; -import org.apache.http.impl.client.CloseableHttpClient; -import org.apache.http.params.HttpParams; -import org.apache.http.protocol.HttpContext; - -import java.io.IOException; - -public class SWTracingCloseableHttpClient extends CloseableHttpClient { - private static final String DEFAULT_TRACE_NAME = "SkyWalking-TRACING-NAME"; - - private CloseableHttpClient client; - private String traceHeaderName; - - public SWTracingCloseableHttpClient(CloseableHttpClient client, String traceHeaderName) { - this.client = client; - if (traceHeaderName == null || traceHeaderName.length() <= 0) { - throw new IllegalArgumentException("Trace header name can not be null"); - } - this.traceHeaderName = traceHeaderName; - } - - public SWTracingCloseableHttpClient(CloseableHttpClient client) { - this.client = client; - this.traceHeaderName = DEFAULT_TRACE_NAME; - } - - @Override - public void close() throws IOException { - client.close(); - } - - @Override - public HttpParams getParams() { - return client.getParams(); - } - - @Override - public ClientConnectionManager getConnectionManager() { - return client.getConnectionManager(); - } - - @Override - public CloseableHttpResponse execute(final HttpUriRequest request) throws IOException, ClientProtocolException { - return HttpClientTracing.execute(request.getURI().toString(), traceHeaderName, request, new HttpClientTracing.Executor() { - @Override - public CloseableHttpResponse execute() throws IOException { - return client.execute(request); - } - }); - } - - @Override - public CloseableHttpResponse execute(final HttpUriRequest request, final HttpContext context) throws IOException, ClientProtocolException { - return HttpClientTracing.execute(request.getURI().toString(), traceHeaderName, request, new HttpClientTracing.Executor() { - @Override - public CloseableHttpResponse execute() throws IOException { - return client.execute(request, context); - } - }); - } - - @Override - public CloseableHttpResponse execute(final HttpHost target, final HttpRequest request) throws IOException, ClientProtocolException { - return HttpClientTracing.execute(target.toURI().toString(), traceHeaderName, request, new HttpClientTracing.Executor() { - @Override - public CloseableHttpResponse execute() throws IOException { - return client.execute(target, request); - } - }); - } - - @Override - protected CloseableHttpResponse doExecute(final HttpHost target, final HttpRequest request, final HttpContext context) throws IOException, ClientProtocolException { - return HttpClientTracing.execute(target.toURI().toString(), traceHeaderName, request, new HttpClientTracing.Executor() { - @Override - public CloseableHttpResponse execute() throws IOException { - return client.execute(target, request, context); - } - }); - } - - @Override - public CloseableHttpResponse execute(final HttpHost target, final HttpRequest request, final HttpContext context) throws IOException, ClientProtocolException { - return HttpClientTracing.execute(target.toURI().toString(), traceHeaderName, request, new HttpClientTracing.Executor() { - @Override - public CloseableHttpResponse execute() throws IOException { - return client.execute(target, request, context); - } - }); - } - - @Override - public T execute(final HttpUriRequest request, final ResponseHandler responseHandler) throws IOException, ClientProtocolException { - return HttpClientTracing.execute(request.getURI().toString(), traceHeaderName, request, new HttpClientTracing.Executor() { - @Override - public T execute() throws IOException { - return client.execute(request, responseHandler); - } - }); - } - - @Override - public T execute(final HttpUriRequest request, final ResponseHandler responseHandler, final HttpContext context) throws IOException, ClientProtocolException { - return HttpClientTracing.execute(request.getURI().toString(), traceHeaderName, request, new HttpClientTracing.Executor() { - @Override - public T execute() throws IOException { - return client.execute(request, responseHandler, context); - } - }); - } - - @Override - public T execute(final HttpHost target, final HttpRequest request, final ResponseHandler responseHandler) throws IOException, ClientProtocolException { - return HttpClientTracing.execute(target.toURI().toString(), traceHeaderName, request, new HttpClientTracing.Executor() { - @Override - public T execute() throws IOException { - return client.execute(target, request, responseHandler); - } - }); - } - - @Override - public T execute(final HttpHost target, final HttpRequest request, final ResponseHandler responseHandler, final HttpContext context) throws IOException, ClientProtocolException { - return HttpClientTracing.execute(target.toURI().toString(), traceHeaderName, request, new HttpClientTracing.Executor() { - @Override - public T execute() throws IOException { - return client.execute(target, request, responseHandler, context); - } - }); - } -} diff --git a/skywalking-sdk-plugin/httpclient-4.3.x-plugin/src/main/java/com/ai/cloud/skywalking/plugin/httpclient/v43x/WebBuriedPointType.java b/skywalking-sdk-plugin/httpclient-4.3.x-plugin/src/main/java/com/ai/cloud/skywalking/plugin/httpclient/v43x/WebBuriedPointType.java deleted file mode 100644 index e9b0af155f..0000000000 --- a/skywalking-sdk-plugin/httpclient-4.3.x-plugin/src/main/java/com/ai/cloud/skywalking/plugin/httpclient/v43x/WebBuriedPointType.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.ai.cloud.skywalking.plugin.httpclient.v43x; - -import com.ai.cloud.skywalking.api.IBuriedPointType; -import com.ai.cloud.skywalking.protocol.CallType; - -public class WebBuriedPointType implements IBuriedPointType { - - private static WebBuriedPointType webBuriedPointType; - - public static IBuriedPointType instance() { - if (webBuriedPointType == null) { - webBuriedPointType = new WebBuriedPointType(); - } - - return webBuriedPointType; - } - - @Override - public String getTypeName() { - return "W"; - } - - @Override - public CallType getCallType() { - return CallType.SYNC; - } - - private WebBuriedPointType() { - // Non - } -} diff --git a/skywalking-sdk-plugin/jdbc-plugin/pom.xml b/skywalking-sdk-plugin/jdbc-plugin/pom.xml deleted file mode 100755 index b30a49cda9..0000000000 --- a/skywalking-sdk-plugin/jdbc-plugin/pom.xml +++ /dev/null @@ -1,78 +0,0 @@ - - - skywalking-sdk-plugin - com.ai.cloud - 1.0-Final - - 4.0.0 - - skywalking-jdbc-plugin - jar - - jdbc-plugin - http://maven.apache.org - - - UTF-8 - - - - - com.ai.cloud - skywalking-api - ${project.version} - - - mysql - mysql-connector-java - 5.1.36 - test - - - com.oracle - ojdbc14 - 10.2.0.4.0 - test - - - - - - - maven-compiler-plugin - - 1.7 - 1.7 - ${project.build.sourceEncoding} - - - - org.apache.maven.plugins - maven-deploy-plugin - - - - org.apache.maven.plugins - maven-source-plugin - - - - attach-sources - - jar - - - - - - - - - - bintray-wu-sheng-sky-walking-repository - wu-sheng-sky-walking-repository - https://api.bintray.com/maven/wu-sheng/skywalking/com.ai.cloud.skywalking-jdbc-plugin/;publish=1 - - - diff --git a/test/skywalking-agent-test/pom.xml b/test/skywalking-agent-test/pom.xml index 2415c662a9..f56667df01 100644 --- a/test/skywalking-agent-test/pom.xml +++ b/test/skywalking-agent-test/pom.xml @@ -45,8 +45,8 @@ maven-compiler-plugin - 1.7 - 1.7 + 1.6 + 1.6 ${project.build.sourceEncoding} diff --git a/test/skywalking-agent-test/redis-test/src/main/java/com/ai/cloud/skywalking/agent/test/RedisOperator.java b/test/skywalking-agent-test/redis-test/src/main/java/com/ai/cloud/skywalking/agent/test/RedisOperator.java index 63ebfcfdd9..1109575ee2 100644 --- a/test/skywalking-agent-test/redis-test/src/main/java/com/ai/cloud/skywalking/agent/test/RedisOperator.java +++ b/test/skywalking-agent-test/redis-test/src/main/java/com/ai/cloud/skywalking/agent/test/RedisOperator.java @@ -2,6 +2,7 @@ package com.ai.cloud.skywalking.agent.test; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; + import redis.clients.jedis.Jedis; import redis.clients.jedis.JedisPool; @@ -31,7 +32,7 @@ public class RedisOperator { } - public static void setData(String key, String value) { + public static void setData(String key, String value) throws Exception { Jedis jedis = null; try { jedis = jedisPool.getResource(); @@ -45,7 +46,7 @@ public class RedisOperator { } } - public static String getData(String key) { + public static String getData(String key) throws Exception { Jedis jedis = null; try { jedis = jedisPool.getResource(); @@ -60,7 +61,7 @@ public class RedisOperator { } - public static void delData(String key) { + public static void delData(String key) throws Exception { Jedis jedis = null; try { jedis = jedisPool.getResource(); diff --git a/test/skywalking-agent-test/redis-test/src/main/java/com/ai/cloud/skywalking/agent/test/RedisPluginTest.java b/test/skywalking-agent-test/redis-test/src/main/java/com/ai/cloud/skywalking/agent/test/RedisPluginTest.java index 4858727340..2d6d285b6f 100644 --- a/test/skywalking-agent-test/redis-test/src/main/java/com/ai/cloud/skywalking/agent/test/RedisPluginTest.java +++ b/test/skywalking-agent-test/redis-test/src/main/java/com/ai/cloud/skywalking/agent/test/RedisPluginTest.java @@ -1,6 +1,7 @@ package com.ai.cloud.skywalking.agent.test; import com.ai.skywalking.testframework.api.TraceTreeAssert; + import org.junit.After; import org.junit.Test; @@ -12,7 +13,7 @@ public class RedisPluginTest { } @Test - public void testSetData() { + public void testSetData() throws Exception { RedisOperator.setData("key1", "value1"); TraceTreeAssert.assertEquals(new String[][]{ {"0", "127.0.0.1:6379 set", "key=key1"}, @@ -20,7 +21,7 @@ public class RedisPluginTest { } @Test - public void testGetData() { + public void testGetData() throws Exception { RedisOperator.getData("key1"); TraceTreeAssert.assertEquals(new String[][]{ {"0", "127.0.0.1:6379 get", "key=key1"}, @@ -29,7 +30,7 @@ public class RedisPluginTest { @Test - public void testDelData() { + public void testDelData() throws Exception { RedisOperator.delData("key1"); TraceTreeAssert.assertEquals(new String[][]{ {"0", "127.0.0.1:6379 del", "key=key1"},