From 99298c2532539d6bdd572a19e125968e3c138276 Mon Sep 17 00:00:00 2001 From: wusheng Date: Thu, 18 Aug 2016 11:37:59 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=96=B0=E7=9A=84=E7=89=88?= =?UTF-8?q?=E6=9C=AC=E5=8F=B7=202.0-2016=EF=BC=8C=E5=87=86=E5=A4=87?= =?UTF-8?q?=E4=B8=8B=E4=B8=80=E7=89=88=E6=9C=AC=E8=BF=AD=E4=BB=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- BUILD_DOC.md | 6 ++--- README.md | 24 ++++++++++++++++++- pom.xml | 4 ++-- samples/skywalking-auth/pom.xml | 2 +- .../dubbo-impl/bin/startSampleDubboService.sh | 2 +- .../example-dubbo/dubbo-impl/pom.xml | 4 ++-- .../example-dubbo/dubbo-interfaces/pom.xml | 2 +- .../skywalking-example/example-dubbo/pom.xml | 2 +- .../example-dubbox-rest/pom.xml | 2 +- .../skywalking-example/example-web/pom.xml | 4 ++-- samples/skywalking-example/pom.xml | 2 +- skywalking-alarm/pom.xml | 2 +- skywalking-analysis/bin/start-analysis.sh | 2 +- skywalking-analysis/pom.xml | 4 ++-- skywalking-collector/pom.xml | 2 +- skywalking-collector/skywalking-agent/pom.xml | 14 +++++------ skywalking-collector/skywalking-api/pom.xml | 6 ++--- .../pom.xml | 2 +- .../dubbo-plugin/pom.xml | 2 +- .../httpClient-4.x-plugin/pom.xml | 4 ++-- .../skywalking-sdk-plugin/jdbc-plugin/pom.xml | 2 +- .../jedis-2.x-plugin/pom.xml | 2 +- .../skywalking-sdk-plugin/pom.xml | 6 ++--- .../tomcat-7.x-8.x-plugin/pom.xml | 2 +- .../dependency-reduced-pom.xml | 2 +- skywalking-protocol/pom.xml | 2 +- skywalking-server/pom.xml | 4 ++-- skywalking-webui/pom.xml | 4 ++-- .../custom-local-method-test/pom.xml | 2 +- test/skywalking-agent-test/jdbc-test/pom.xml | 2 +- test/skywalking-agent-test/pom.xml | 4 ++-- .../redis-test/doc/HOW_TO_RUN_REDIS_TEST.md | 4 ++-- test/skywalking-agent-test/redis-test/pom.xml | 2 +- test/skywalking-test-api/pom.xml | 2 +- 34 files changed, 77 insertions(+), 55 deletions(-) diff --git a/BUILD_DOC.md b/BUILD_DOC.md index f8b37ebf5..598d567c9 100644 --- a/BUILD_DOC.md +++ b/BUILD_DOC.md @@ -13,11 +13,11 @@ $mvn clean install -Dmaven.test.skip=true ``` - 从各工程目录中获取安装包 - - SkyWalking Agent: github/sky-walking/skywalking-collector/skywalking-agent/target/skywalking-agent-1.0-Final.jar + - SkyWalking Agent: github/sky-walking/skywalking-collector/skywalking-agent/target/skywalking-agent-2.0-2016.jar - SkyWalking Server: github/sky-walking/skywalking-server/target/installer - SkyWalking Alarm: github/sky-walking/skywalking-alarm/target/installer - SkyWalking WebUI: github/sky-walking/skywalking-webui/skywalking.war - - SkyWalking Analysis: github/sky-walking/skywalking-analysis/skywalking-analysis-1.0-Final.jar - - 上传skywalking-analysis-1.0-Final.jar. Upload the skywalking-analysis-1.0-Final.jar + - SkyWalking Analysis: github/sky-walking/skywalking-analysis/skywalking-analysis-2.0-2016.jar + - 上传skywalking-analysis-2.0-2016.jar. Upload the skywalking-analysis-2.0-2016.jar - 上传start-analysis.sh到同一目录. Upload the start-analysis.sh to the same directory - 为start-analysis.sh创建crontable定时任务，30分钟执行一次。create crontable for shell, set cycle=30min. diff --git a/README.md b/README.md index aafab1ba8..9d6b5ceaa 100644 --- a/README.md +++ b/README.md @@ -152,4 +152,26 @@ java -jar ... -javaagent:/..ospath../skywalking-agent-x.x-Final.jar * [追踪日志明细存储结构说明. the storage structure of tracking logs](skywalking-server/doc/hbase_table_desc.md) # RoadMap -* ref [Roadmap and Release notes](https://github.com/wu-sheng/sky-walking/releases) +* [Dev] v2.0-2016 + * 移除对于Hadoop，HBase的依赖，降低部署和运维难度 + * 使用内嵌式数据库，和分布式集群 + * 移除副本发送机制 + * 支持数据文件的时间分片，支持集群TB级别日志文件存储 + * 支持统计和高效的准实时统计汇总 + +* [Release] v1.0-Final + - 客户端与服务端间使用扩展后的网络协议，前置的测试版本无法兼容，以提高服务端的稳定性和健壮性。（在内部使用过程中，发生因为安全扫描，导致服务端宕机） + - 引入javaagent模式，无需修改任何代码，完成监控。 + - 所有插件将基于字节码技术实现，原有的配置文件模式将被移除。 + +* [Release] v1.0 beta + * 修复大量前置版本的BUG + * 提供基于MR的分析能力，能够对调用链进行分析汇总，并形成调用链统计视图 + +* [Release] v1.0 alpha2 + * 基于v1.0-alpha1的较稳定版本，在内部环境进行数月运行，修复大量影响服务端运行稳定性的问题。 + * v1.0-beta，将提供定时分析任务，部分分析页面展现功能。 + * 预计：后续版本将在插件模式上有较大改变，计划针对java api的拦截和第三方拦截提供更小侵入性的方法。配置和拦截模式会发生相应变化。具体模式，参考v1.0-beta发布时的说明。 + +* [Release] v1.0-alpha1 + * 第一个较稳定版本，正在进行内部测试，可测试使用。 \ No newline at end of file diff --git a/pom.xml b/pom.xml index fc6d8dae5..fb79056c1 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ com.a.eye skywalking - 1.0-Final + 2.0-2016 samples/skywalking-auth samples/skywalking-example @@ -35,7 +35,7 @@ com.a.eye skywalking-protocol - 1.0-Final + 2.0-2016 diff --git a/samples/skywalking-auth/pom.xml b/samples/skywalking-auth/pom.xml index 0fdda6a52..720006e74 100644 --- a/samples/skywalking-auth/pom.xml +++ b/samples/skywalking-auth/pom.xml @@ -4,7 +4,7 @@ com.a.eye skywalking-auth - 1.0-Final + 2.0-2016 jar skywalking-auth diff --git a/samples/skywalking-example/example-dubbo/dubbo-impl/bin/startSampleDubboService.sh b/samples/skywalking-example/example-dubbo/dubbo-impl/bin/startSampleDubboService.sh index 65d426bb7..d5495327f 100644 --- a/samples/skywalking-example/example-dubbo/dubbo-impl/bin/startSampleDubboService.sh +++ b/samples/skywalking-example/example-dubbo/dubbo-impl/bin/startSampleDubboService.sh @@ -23,4 +23,4 @@ done echo "CLASSPATH=$CLASSPATH" -$JAVA -javaagent:${SAMPLE_DUBBO_BIN_PATH}/../agent/skywalking-agent-1.0-Final.jar -classpath $CLASSPATH com.ai.cloud.skywalking.sample.util.DubboStart +$JAVA -javaagent:${SAMPLE_DUBBO_BIN_PATH}/../agent/skywalking-agent-2.0-2016.jar -classpath $CLASSPATH com.ai.cloud.skywalking.sample.util.DubboStart diff --git a/samples/skywalking-example/example-dubbo/dubbo-impl/pom.xml b/samples/skywalking-example/example-dubbo/dubbo-impl/pom.xml index 604da18b3..3b8e60a95 100644 --- a/samples/skywalking-example/example-dubbo/dubbo-impl/pom.xml +++ b/samples/skywalking-example/example-dubbo/dubbo-impl/pom.xml @@ -3,7 +3,7 @@ example-dubbo com.a.eye - 1.0-Final + 2.0-2016 4.0.0 @@ -21,7 +21,7 @@ com.a.eye dubbo-interfaces - 1.0-Final + 2.0-2016 com.alibaba diff --git a/samples/skywalking-example/example-dubbo/dubbo-interfaces/pom.xml b/samples/skywalking-example/example-dubbo/dubbo-interfaces/pom.xml index a464ff588..ced77ae1a 100644 --- a/samples/skywalking-example/example-dubbo/dubbo-interfaces/pom.xml +++ b/samples/skywalking-example/example-dubbo/dubbo-interfaces/pom.xml @@ -3,7 +3,7 @@ example-dubbo com.a.eye - 1.0-Final + 2.0-2016 4.0.0 diff --git a/samples/skywalking-example/example-dubbo/pom.xml b/samples/skywalking-example/example-dubbo/pom.xml index a72c761af..51d59f8c9 100644 --- a/samples/skywalking-example/example-dubbo/pom.xml +++ b/samples/skywalking-example/example-dubbo/pom.xml @@ -3,7 +3,7 @@ skywalking-example com.a.eye - 1.0-Final + 2.0-2016 4.0.0 diff --git a/samples/skywalking-example/example-dubbox-rest/pom.xml b/samples/skywalking-example/example-dubbox-rest/pom.xml index f07ccba7d..445f948e3 100644 --- a/samples/skywalking-example/example-dubbox-rest/pom.xml +++ b/samples/skywalking-example/example-dubbox-rest/pom.xml @@ -5,7 +5,7 @@ skywalking-example com.a.eye - 1.0-Final + 2.0-2016 4.0.0 diff --git a/samples/skywalking-example/example-web/pom.xml b/samples/skywalking-example/example-web/pom.xml index ca70d534d..76a13cdbe 100644 --- a/samples/skywalking-example/example-web/pom.xml +++ b/samples/skywalking-example/example-web/pom.xml @@ -3,7 +3,7 @@ skywalking-example com.a.eye - 1.0-Final + 2.0-2016 4.0.0 example-web @@ -49,7 +49,7 @@ com.a.eye dubbo-interfaces - 1.0-Final + 2.0-2016 com.alibaba diff --git a/samples/skywalking-example/pom.xml b/samples/skywalking-example/pom.xml index dffd1b074..8b27f4282 100644 --- a/samples/skywalking-example/pom.xml +++ b/samples/skywalking-example/pom.xml @@ -4,7 +4,7 @@ com.a.eye skywalking-example - 1.0-Final + 2.0-2016 example-web diff --git a/skywalking-alarm/pom.xml b/skywalking-alarm/pom.xml index ad160f175..6cbeef14c 100644 --- a/skywalking-alarm/pom.xml +++ b/skywalking-alarm/pom.xml @@ -4,7 +4,7 @@ com.a.eye skywalking-alarm - 1.0-Final + 2.0-2016 jar skywalking-alarm diff --git a/skywalking-analysis/bin/start-analysis.sh b/skywalking-analysis/bin/start-analysis.sh index b70116af6..1d2c01e53 100755 --- a/skywalking-analysis/bin/start-analysis.sh +++ b/skywalking-analysis/bin/start-analysis.sh @@ -97,7 +97,7 @@ END_TIME=`date --date='10 minute ago' "+%Y-%m-%d/%H:%M:%S"` ## execute command echo "Begin to analysis the buried point data between ${START_TIME} to ${END_TIME}." export HADOOP_CLASSPATH=`${HBASE_HOME}/bin/hbase classpath` -nohup ${HADOOP_HOME}/bin/hadoop jar skywalking-analysis-1.0-Final.jar -Dskywalking.analysis.mode=${SW_ANALYSIS_MODE} ${START_TIME} ${END_TIME} > ${SW_RT_LOG_DIR}/map-reduce.log 2>&1 & +nohup ${HADOOP_HOME}/bin/hadoop jar skywalking-analysis-2.0-2016.jar -Dskywalking.analysis.mode=${SW_ANALYSIS_MODE} ${START_TIME} ${END_TIME} > ${SW_RT_LOG_DIR}/map-reduce.log 2>&1 & CURRENT_PID=`echo $!` diff --git a/skywalking-analysis/pom.xml b/skywalking-analysis/pom.xml index 3852d9715..c1468f286 100644 --- a/skywalking-analysis/pom.xml +++ b/skywalking-analysis/pom.xml @@ -4,7 +4,7 @@ com.a.eye skywalking-analysis - 1.0-Final + 2.0-2016 jar skywalking-analysis @@ -36,7 +36,7 @@ com.a.eye skywalking-protocol - 1.0-Final + 2.0-2016 com.google.code.gson diff --git a/skywalking-collector/pom.xml b/skywalking-collector/pom.xml index e5906c9f7..50b263a70 100644 --- a/skywalking-collector/pom.xml +++ b/skywalking-collector/pom.xml @@ -6,7 +6,7 @@ com.a.eye skywalking - 1.0-Final + 2.0-2016 skywalking-collector diff --git a/skywalking-collector/skywalking-agent/pom.xml b/skywalking-collector/skywalking-agent/pom.xml index 85daf7d53..a5dd26a6c 100644 --- a/skywalking-collector/skywalking-agent/pom.xml +++ b/skywalking-collector/skywalking-agent/pom.xml @@ -5,7 +5,7 @@ com.a.eye skywalking-collector - 1.0-Final + 2.0-2016 skywalking-agent @@ -29,32 +29,32 @@ com.a.eye skywalking-jedis-2.x-plugin - 1.0-Final + 2.0-2016 com.a.eye skywalking-jdbc-plugin - 1.0-Final + 2.0-2016 com.a.eye skywalking-httpClient-4.x-plugin - 1.0-Final + 2.0-2016 com.a.eye skywalking-dubbo-plugin - 1.0-Final + 2.0-2016 com.a.eye tomcat-7.x-8.x-plugin - 1.0-Final + 2.0-2016 com.a.eye custom-local-method-interceptor-plugin - 1.0-Final + 2.0-2016 diff --git a/skywalking-collector/skywalking-api/pom.xml b/skywalking-collector/skywalking-api/pom.xml index 79e357cf0..1c8311843 100644 --- a/skywalking-collector/skywalking-api/pom.xml +++ b/skywalking-collector/skywalking-api/pom.xml @@ -5,7 +5,7 @@ com.a.eye skywalking-collector - 1.0-Final + 2.0-2016 @@ -23,7 +23,7 @@ com.a.eye skywalking-protocol - 1.0-Final + 2.0-2016 @@ -41,7 +41,7 @@ com.a.eye skywalking-test-api - 1.0-Final + 2.0-2016 test diff --git a/skywalking-collector/skywalking-sdk-plugin/custom-local-method-interceptor-plugin/pom.xml b/skywalking-collector/skywalking-sdk-plugin/custom-local-method-interceptor-plugin/pom.xml index 97358db58..d6a15cf34 100644 --- a/skywalking-collector/skywalking-sdk-plugin/custom-local-method-interceptor-plugin/pom.xml +++ b/skywalking-collector/skywalking-sdk-plugin/custom-local-method-interceptor-plugin/pom.xml @@ -3,7 +3,7 @@ skywalking-sdk-plugin com.a.eye - 1.0-Final + 2.0-2016 4.0.0 diff --git a/skywalking-collector/skywalking-sdk-plugin/dubbo-plugin/pom.xml b/skywalking-collector/skywalking-sdk-plugin/dubbo-plugin/pom.xml index e9d5af8cb..7878566e7 100644 --- a/skywalking-collector/skywalking-sdk-plugin/dubbo-plugin/pom.xml +++ b/skywalking-collector/skywalking-sdk-plugin/dubbo-plugin/pom.xml @@ -3,7 +3,7 @@ skywalking-sdk-plugin com.a.eye - 1.0-Final + 2.0-2016 4.0.0 diff --git a/skywalking-collector/skywalking-sdk-plugin/httpClient-4.x-plugin/pom.xml b/skywalking-collector/skywalking-sdk-plugin/httpClient-4.x-plugin/pom.xml index a1b78f029..ab3ce8620 100644 --- a/skywalking-collector/skywalking-sdk-plugin/httpClient-4.x-plugin/pom.xml +++ b/skywalking-collector/skywalking-sdk-plugin/httpClient-4.x-plugin/pom.xml @@ -6,7 +6,7 @@ com.a.eye skywalking-sdk-plugin - 1.0-Final + 2.0-2016 skywalking-httpClient-4.x-plugin @@ -23,7 +23,7 @@ com.a.eye skywalking-api - 1.0-Final + 2.0-2016 diff --git a/skywalking-collector/skywalking-sdk-plugin/jdbc-plugin/pom.xml b/skywalking-collector/skywalking-sdk-plugin/jdbc-plugin/pom.xml index 8cc8b86c6..f155218b4 100755 --- a/skywalking-collector/skywalking-sdk-plugin/jdbc-plugin/pom.xml +++ b/skywalking-collector/skywalking-sdk-plugin/jdbc-plugin/pom.xml @@ -3,7 +3,7 @@ skywalking-sdk-plugin com.a.eye - 1.0-Final + 2.0-2016 4.0.0 diff --git a/skywalking-collector/skywalking-sdk-plugin/jedis-2.x-plugin/pom.xml b/skywalking-collector/skywalking-sdk-plugin/jedis-2.x-plugin/pom.xml index f943cfa06..fce4a7a68 100644 --- a/skywalking-collector/skywalking-sdk-plugin/jedis-2.x-plugin/pom.xml +++ b/skywalking-collector/skywalking-sdk-plugin/jedis-2.x-plugin/pom.xml @@ -6,7 +6,7 @@ com.a.eye skywalking-sdk-plugin - 1.0-Final + 2.0-2016 skywalking-jedis-2.x-plugin diff --git a/skywalking-collector/skywalking-sdk-plugin/pom.xml b/skywalking-collector/skywalking-sdk-plugin/pom.xml index 245d27f10..ecadf17b8 100644 --- a/skywalking-collector/skywalking-sdk-plugin/pom.xml +++ b/skywalking-collector/skywalking-sdk-plugin/pom.xml @@ -6,7 +6,7 @@ com.a.eye skywalking-collector - 1.0-Final + 2.0-2016 skywalking-sdk-plugin @@ -32,13 +32,13 @@ com.a.eye skywalking-test-api - 1.0-Final + 2.0-2016 test com.a.eye skywalking-api - 1.0-Final + 2.0-2016 diff --git a/skywalking-collector/skywalking-sdk-plugin/tomcat-7.x-8.x-plugin/pom.xml b/skywalking-collector/skywalking-sdk-plugin/tomcat-7.x-8.x-plugin/pom.xml index fb2c8f89e..b90764dc5 100644 --- a/skywalking-collector/skywalking-sdk-plugin/tomcat-7.x-8.x-plugin/pom.xml +++ b/skywalking-collector/skywalking-sdk-plugin/tomcat-7.x-8.x-plugin/pom.xml @@ -3,7 +3,7 @@ skywalking-sdk-plugin com.a.eye - 1.0-Final + 2.0-2016 4.0.0 diff --git a/skywalking-protocol/dependency-reduced-pom.xml b/skywalking-protocol/dependency-reduced-pom.xml index a96a7a5a6..063b8dab9 100644 --- a/skywalking-protocol/dependency-reduced-pom.xml +++ b/skywalking-protocol/dependency-reduced-pom.xml @@ -4,7 +4,7 @@ com.a.eye skywalking-protocol skywalking-protocol - 1.0-Final + 2.0-2016 http://maven.apache.org diff --git a/skywalking-protocol/pom.xml b/skywalking-protocol/pom.xml index 08f51df4b..0a04b0744 100644 --- a/skywalking-protocol/pom.xml +++ b/skywalking-protocol/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.a.eye - 1.0-Final + 2.0-2016 skywalking-protocol http://maven.apache.org diff --git a/skywalking-server/pom.xml b/skywalking-server/pom.xml index 8510198e8..781d0e02e 100644 --- a/skywalking-server/pom.xml +++ b/skywalking-server/pom.xml @@ -4,7 +4,7 @@ com.a.eye skywalking-server - 1.0-Final + 2.0-2016 jar skywalking-server @@ -44,7 +44,7 @@ com.a.eye skywalking-protocol - 1.0-Final + 2.0-2016 redis.clients diff --git a/skywalking-webui/pom.xml b/skywalking-webui/pom.xml index 7b7976b0e..1bdab47b8 100644 --- a/skywalking-webui/pom.xml +++ b/skywalking-webui/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.a.eye skywalking-webui - 1.0-Final + 2.0-2016 http://maven.apache.org war @@ -37,7 +37,7 @@ com.a.eye skywalking-protocol - 1.0-Final + 2.0-2016 diff --git a/test/skywalking-agent-test/custom-local-method-test/pom.xml b/test/skywalking-agent-test/custom-local-method-test/pom.xml index 93ed5f4b3..305871123 100644 --- a/test/skywalking-agent-test/custom-local-method-test/pom.xml +++ b/test/skywalking-agent-test/custom-local-method-test/pom.xml @@ -5,7 +5,7 @@ skywalking-agent-test com.a.eye - 1.0-Final + 2.0-2016 4.0.0 diff --git a/test/skywalking-agent-test/jdbc-test/pom.xml b/test/skywalking-agent-test/jdbc-test/pom.xml index fca9431e3..0c96ef1f3 100644 --- a/test/skywalking-agent-test/jdbc-test/pom.xml +++ b/test/skywalking-agent-test/jdbc-test/pom.xml @@ -3,7 +3,7 @@ skywalking-agent-test com.a.eye - 1.0-Final + 2.0-2016 4.0.0 diff --git a/test/skywalking-agent-test/pom.xml b/test/skywalking-agent-test/pom.xml index 20075e91a..f905100bf 100644 --- a/test/skywalking-agent-test/pom.xml +++ b/test/skywalking-agent-test/pom.xml @@ -5,7 +5,7 @@ com.a.eye skywalking-agent-test pom - 1.0-Final + 2.0-2016 skywalking-agent-test http://maven.apache.org @@ -35,7 +35,7 @@ com.a.eye skywalking-test-api - 1.0-Final + 2.0-2016 diff --git a/test/skywalking-agent-test/redis-test/doc/HOW_TO_RUN_REDIS_TEST.md b/test/skywalking-agent-test/redis-test/doc/HOW_TO_RUN_REDIS_TEST.md index 28e70a741..7b4727412 100644 --- a/test/skywalking-agent-test/redis-test/doc/HOW_TO_RUN_REDIS_TEST.md +++ b/test/skywalking-agent-test/redis-test/doc/HOW_TO_RUN_REDIS_TEST.md @@ -48,5 +48,5 @@ redis-trib.rb create --replicas 1 127.0.0.1:7000 127.0.0.1:7001 127.0.0.1:7002 1 启动测试用例时，VM参数中需要添加以下的vm参数。**注意**:测试中的环境参数可能跟随机器变化，所以可能需要进行修改。 When you start the test case, VM parameters need to add the following parameters vm. **Notice** :The test environment parameters may change following the machine, it may need to be modified. ``` --javaagent:${SKYWALKING_AGENT_TEST_PROJECT_PATH}/lib/skywalking-agent-1.0-Final.jar -``` \ No newline at end of file +-javaagent:${SKYWALKING_AGENT_TEST_PROJECT_PATH}/lib/skywalking-agent-2.0-2016.jar +``` diff --git a/test/skywalking-agent-test/redis-test/pom.xml b/test/skywalking-agent-test/redis-test/pom.xml index 21a9fee53..b4146ea93 100644 --- a/test/skywalking-agent-test/redis-test/pom.xml +++ b/test/skywalking-agent-test/redis-test/pom.xml @@ -3,7 +3,7 @@ com.a.eye skywalking-agent-test - 1.0-Final + 2.0-2016 4.0.0 diff --git a/test/skywalking-test-api/pom.xml b/test/skywalking-test-api/pom.xml index 80f474825..d5eefe983 100644 --- a/test/skywalking-test-api/pom.xml +++ b/test/skywalking-test-api/pom.xml @@ -6,7 +6,7 @@ ../../pom.xml com.a.eye skywalking - 1.0-Final + 2.0-2016 skywalking-test-api