From 45d9491cc074efba8545c58a1b047924664e08a4 Mon Sep 17 00:00:00 2001 From: wusheng Date: Fri, 23 Feb 2018 21:49:21 +0800 Subject: [PATCH 1/5] Adjust build guide document. --- docs/cn/How-to-build-CN.md | 3 +++ docs/en/How-to-build.md | 3 +++ 2 files changed, 6 insertions(+) diff --git a/docs/cn/How-to-build-CN.md b/docs/cn/How-to-build-CN.md index 07ce42936..75e4daebc 100644 --- a/docs/cn/How-to-build-CN.md +++ b/docs/cn/How-to-build-CN.md @@ -6,6 +6,9 @@ ### 编译步骤 1. 准备环境，jdk8，Maven +1. `git clone https://github.com/apache/incubator-skywalking.git` +1. `git submodule init` +1. `git submodule update` 1. 执行`mvn clean package` 1. 生成包在`/packages`目录下，包括一个`skywalking-agent`的探针目录，以及两个collector包（.tar.gz是linux环境，.zip是windows环境） diff --git a/docs/en/How-to-build.md b/docs/en/How-to-build.md index c6ea808e8..422881b81 100644 --- a/docs/en/How-to-build.md +++ b/docs/en/How-to-build.md @@ -3,6 +3,9 @@ This document helps people to compile and build the project in your maven and ID ## Build in maven 1. Prepare JDK8 and maven3 +1. `git clone https://github.com/apache/incubator-skywalking.git` +1. `git submodule init` +1. `git submodule update` 1. Run `mvn clean package` 1. All packages are in `/packages`, which includes `skywalking-agent` folder, and two collector files(.tar.gz for Linux and .zip for Windows) From 29fcc3d1d41158f85445fab899a7442ba39e66a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=B4=E6=99=9F=20Wu=20Sheng?= Date: Fri, 23 Feb 2018 22:03:58 +0800 Subject: [PATCH 2/5] Update README.md UI has already included in main repo. --- README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/README.md b/README.md index 5ba47c4d7..33ad37bf7 100644 --- a/README.md +++ b/README.md @@ -22,7 +22,6 @@ Underlying technology is a distributed tracing system. * Use **@Trace** annotation for any methods you want to trace. * Integrate traceId into logs for log4j, log4j2 and logback. * Pure Java server implementation, provide RESTful and gRPC services. Compatibility with other language agents/SDKs. -* The UI released on [skywalking-ui](https://github.com/apache/incubator-skywalking-ui) # Document [![EN doc](https://img.shields.io/badge/document-English-blue.svg)](docs/README.md) [![cn doc](https://img.shields.io/badge/文档-中文版-blue.svg)](docs/README_ZH.md) From 8a33bf75b99aaebea00936a403729d264e57e8f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=B4=E6=99=9F=20Wu=20Sheng?= Date: Fri, 23 Feb 2018 22:04:35 +0800 Subject: [PATCH 3/5] Update README_ZH.md UI has already included in main repo. --- README_ZH.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/README_ZH.md b/README_ZH.md index 06dd40de7..ce50abed4 100644 --- a/README_ZH.md +++ b/README_ZH.md @@ -23,8 +23,6 @@ Apache SkyWalking | [English](README.md) * 将 traceId 集成到 log4j, log4j2 或 logback这些日志组件中 * 纯Java后端Collector实现，提供RESTful和gRPC接口。兼容接受其他语言探针发送数据 * [如何将探针的Metric和Trace数据上传到Collector？](/docs/cn/How-to-communicate-with-the-collector-CN.md) -* UI工程请查看 [skywalking-ui](https://github.com/apache/incubator-skywalking-ui) -* 中文QQ群：392443393 # Document [![EN doc](https://img.shields.io/badge/document-English-blue.svg)](docs/README.md) [![cn doc](https://img.shields.io/badge/文档-中文版-blue.svg)](docs/README_ZH.md) From f82d3394a2b4950ec95c57e8e95386803b59a2c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=B4=E6=99=9F=20Wu=20Sheng?= Date: Fri, 23 Feb 2018 22:05:22 +0800 Subject: [PATCH 4/5] Update README_ZH.md Fix format --- README_ZH.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README_ZH.md b/README_ZH.md index ce50abed4..86830872c 100644 --- a/README_ZH.md +++ b/README_ZH.md @@ -58,7 +58,7 @@ This project adheres to the Contributor Covenant [code of conduct](CODE_OF_CONDU - 自动化集成测试报告 - [Java探针测试报告](https://github.com/SkywalkingTest/agent-integration-test-report) - 性能测试报告 -  - [Java探针测试报告](https://skywalkingtest.github.io/Agent-Benchmarks/) + - [Java探针测试报告](https://skywalkingtest.github.io/Agent-Benchmarks/) # Contact Us * 直接提交Issue From de383fe3411edfe91f9c558866982259e061141d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=B4=E6=99=9F=20Wu=20Sheng?= Date: Fri, 23 Feb 2018 22:06:31 +0800 Subject: [PATCH 5/5] Update README_ZH.md Fix format in cn --- README_ZH.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README_ZH.md b/README_ZH.md index 86830872c..d419163a6 100644 --- a/README_ZH.md +++ b/README_ZH.md @@ -15,7 +15,7 @@ Apache SkyWalking | [English](README.md) * Java自动探针，**不需要修改应用程序源代码** -  * 高性能探针，针对单实例5000tps的应用，在**全量采集的情况下**，只增加**10%**的CPU开销。 +  * 高性能探针，针对单实例5000tps的应用，在**全量采集的情况下**，只增加 **10%** 的CPU开销。 * [中间件，框架与类库支持列表](docs/Supported-list.md). * 手动探针 * [使用OpenTracing手动探针API](http://opentracing.io/documentation/pages/supported-tracers)