date:20171228

[incubator-skywalking] branch adjust-document deleted (was 00523c9)

2017-12-28 Thread wusheng

This is an automated email from the ASF dual-hosted git repository.

wusheng pushed a change to branch adjust-document
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking.git.


 was 00523c9  Fix some typo

The revisions that were on this branch are still contained in
other references; therefore, this change does not discard any commits
from the repository.

-- 
To stop receiving notification emails like this one, please contact
['"commits@skywalking.apache.org" '].

[incubator-skywalking] branch master updated (63070e5 -> d3d7f9d)

2017-12-28 Thread wusheng

This is an automated email from the ASF dual-hosted git repository.

wusheng pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking.git.


from 63070e5  Merge pull request #711 from 
apache/feature/new-architecture-graph
 add 544527c  Adjust many documents.
 add 00523c9  Fix some typo
 new d3d7f9d  Merge pull request #712 from apache/adjust-document

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 docs/README.md |  4 +-
 docs/README_ZH.md  |  5 +-
 docs/cn/Application-toolkit-log4j-1.x-CN.md|  1 -
 docs/cn/Application-toolkit-log4j-2.x-CN.md|  1 -
 docs/cn/Application-toolkit-logback-1.x-CN.md  |  1 -
 docs/cn/Application-toolkit-trace-CN.md|  1 -
 docs/cn/How-to-build-CN.md |  1 -
 docs/cn/Plugin-Development-Guide-CN.md | 18 +++--
 ...-Process-Propagation-Headers-Protocol-CN-v1.md} |  8 +-
 ...e-collector-CN.md => Trace-Data-Protocol-CN.md} | 90 +++---
 docs/en/Application-toolkit-log4j-1.x.md   |  1 -
 docs/en/Application-toolkit-log4j-2.x.md   |  1 -
 docs/en/Application-toolkit-logback-1.x.md |  1 -
 docs/en/Application-toolkit-trace.md   |  1 -
 docs/en/Deploy-skywalking-agent.md |  4 +-
 docs/en/How-to-build.md| 14 
 ...oss-Process-Propagation-Headers-Protocol-v1.md} |  8 +-
 travis/push_image.sh   | 34 
 18 files changed, 90 insertions(+), 104 deletions(-)
 rename docs/cn/{Skywalking-3-Cross-Process-Propagation-Headers-Protocol-CN.md 
=> Skywalking-Cross-Process-Propagation-Headers-Protocol-CN-v1.md} (81%)
 rename docs/cn/{How-to-communicate-with-the-collector-CN.md => 
Trace-Data-Protocol-CN.md} (76%)
 create mode 100644 docs/en/How-to-build.md
 rename docs/en/{Skywalking-3-Cross-Process-Propagation-Headers-Protocol.md => 
Skywalking-Cross-Process-Propagation-Headers-Protocol-v1.md} (84%)
 delete mode 100644 travis/push_image.sh

-- 
To stop receiving notification emails like this one, please contact
['"commits@skywalking.apache.org" '].

[incubator-skywalking] 01/01: Merge pull request #712 from apache/adjust-document

2017-12-28 Thread wusheng

This is an automated email from the ASF dual-hosted git repository.

wusheng pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking.git

commit d3d7f9d085fa120ea2e74cfeb2f95e77929f4a9b
Merge: 63070e5 00523c9
Author: 吴晟 Wu Sheng 
AuthorDate: Fri Dec 29 11:36:10 2017 +0800

Merge pull request #712 from apache/adjust-document

Adjust document

 docs/README.md |  4 +-
 docs/README_ZH.md  |  5 +-
 docs/cn/Application-toolkit-log4j-1.x-CN.md|  1 -
 docs/cn/Application-toolkit-log4j-2.x-CN.md|  1 -
 docs/cn/Application-toolkit-logback-1.x-CN.md  |  1 -
 docs/cn/Application-toolkit-trace-CN.md|  1 -
 docs/cn/How-to-build-CN.md |  1 -
 docs/cn/Plugin-Development-Guide-CN.md | 18 +++--
 ...-Process-Propagation-Headers-Protocol-CN-v1.md} |  8 +-
 ...e-collector-CN.md => Trace-Data-Protocol-CN.md} | 90 +++---
 docs/en/Application-toolkit-log4j-1.x.md   |  1 -
 docs/en/Application-toolkit-log4j-2.x.md   |  1 -
 docs/en/Application-toolkit-logback-1.x.md |  1 -
 docs/en/Application-toolkit-trace.md   |  1 -
 docs/en/Deploy-skywalking-agent.md |  4 +-
 docs/en/How-to-build.md| 14 
 ...oss-Process-Propagation-Headers-Protocol-v1.md} |  8 +-
 travis/push_image.sh   | 34 
 18 files changed, 90 insertions(+), 104 deletions(-)

-- 
To stop receiving notification emails like this one, please contact
"commits@skywalking.apache.org" .

[incubator-skywalking] branch adjust-document updated: Fix some typo

2017-12-28 Thread wusheng

This is an automated email from the ASF dual-hosted git repository.

wusheng pushed a commit to branch adjust-document
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking.git


The following commit(s) were added to refs/heads/adjust-document by this push:
 new 00523c9  Fix some typo
00523c9 is described below

commit 00523c9dfd10aa87988788717674d7d52e157406
Author: wu-sheng 
AuthorDate: Fri Dec 29 11:18:04 2017 +0800

Fix some typo
---
 ...Skywalking-Cross-Process-Propagation-Headers-Protocol-CN-v1.md | 8 +---
 .../Skywalking-Cross-Process-Propagation-Headers-Protocol-v1.md   | 2 +-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git 
a/docs/cn/Skywalking-Cross-Process-Propagation-Headers-Protocol-CN-v1.md 
b/docs/cn/Skywalking-Cross-Process-Propagation-Headers-Protocol-CN-v1.md
index 7c1be77..8845534 100644
--- a/docs/cn/Skywalking-Cross-Process-Propagation-Headers-Protocol-CN-v1.md
+++ b/docs/cn/Skywalking-Cross-Process-Propagation-Headers-Protocol-CN-v1.md
@@ -1,13 +1,15 @@
-# Skywalking 3 Cross Process Propagation Headers Protocol
+# Skywalking Cross Process Propagation Headers Protocol
 * Version 1.0
 
-这是Skywalking3跨进程传输头协议第一个公开版本。Skywalking是一个偏向APM的分布式追踪系统，所以，为了提供服务端处理性能。头信息会比其他的追踪系统要更复杂一些。你会发现，这个头信息，更像一个商业APM系统，并且，一些商业APM系统的头信息，比我们的要复杂的多。所以，如果你希望开发或者贡献其他语言探针、或者JAVA探针的其他市县模式，请耐心阅读，并理解此协议内容。
-
+Skywalking是一个偏向APM的分布式追踪系统，所以，为了提供服务端处理性能。头信息会比其他的追踪系统要更复杂一些。
+你会发现，这个头信息，更像一个商业APM系统，并且，一些商业APM系统的头信息，比我们的要复杂的多。
 
 # Header Item
 * Header Name: `sw3`
 * Header Value: 使用`|`分隔，包含以下内容
 
+_消息头使用sw3，因为此协议始于SkyWalking 3.x版本。_
+
 ## Values
 * Trace Segment Id
 
diff --git 
a/docs/en/Skywalking-Cross-Process-Propagation-Headers-Protocol-v1.md 
b/docs/en/Skywalking-Cross-Process-Propagation-Headers-Protocol-v1.md
index 96c9ee6..6388f89 100644
--- a/docs/en/Skywalking-Cross-Process-Propagation-Headers-Protocol-v1.md
+++ b/docs/en/Skywalking-Cross-Process-Propagation-Headers-Protocol-v1.md
@@ -9,7 +9,7 @@ You can find many similar mechanism in other commercial APM 
system.(Some even mu
 * Header Name: `sw3`
 * Header Value: Split by `|`, the parts are following.
 
-_The header protocol comes from SkyWalking 3, back to 2017. So sw3 header name 
keeps now._ 
+_The header protocol came from SkyWalking 3, back to 2017. So sw3 header name 
keeps now._ 
 
 ## Values
 * Trace Segment Id

-- 
To stop receiving notification emails like this one, please contact
['"commits@skywalking.apache.org" '].

[incubator-skywalking] 01/01: Adjust many documents.

2017-12-28 Thread wusheng

This is an automated email from the ASF dual-hosted git repository.

wusheng pushed a commit to branch adjust-document
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking.git

commit 544527ce900b422d9eb35bfc0809a1ead24d66ff
Author: wu-sheng 
AuthorDate: Fri Dec 29 11:09:52 2017 +0800

Adjust many documents.
---
 docs/README.md |  4 +-
 docs/README_ZH.md  |  5 +-
 docs/cn/Application-toolkit-log4j-1.x-CN.md|  1 -
 docs/cn/Application-toolkit-log4j-2.x-CN.md|  1 -
 docs/cn/Application-toolkit-logback-1.x-CN.md  |  1 -
 docs/cn/Application-toolkit-trace-CN.md|  1 -
 docs/cn/How-to-build-CN.md |  1 -
 docs/cn/Plugin-Development-Guide-CN.md | 18 +++--
 ...-Process-Propagation-Headers-Protocol-CN-v1.md} |  0
 ...e-collector-CN.md => Trace-Data-Protocol-CN.md} | 90 +++---
 docs/en/Application-toolkit-log4j-1.x.md   |  1 -
 docs/en/Application-toolkit-log4j-2.x.md   |  1 -
 docs/en/Application-toolkit-logback-1.x.md |  1 -
 docs/en/Application-toolkit-trace.md   |  1 -
 docs/en/Deploy-skywalking-agent.md |  4 +-
 docs/en/How-to-build.md| 14 
 ...oss-Process-Propagation-Headers-Protocol-v1.md} |  8 +-
 travis/push_image.sh   | 34 
 18 files changed, 85 insertions(+), 101 deletions(-)

diff --git a/docs/README.md b/docs/README.md
index df6a22d..f69a04a 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -18,6 +18,8 @@
 * [Plugin 
Test](https://github.com/SkywalkingTest/agent-integration-test-report)
 * [Java Agent Performance 
Test](https://skywalkingtest.github.io/Agent-Benchmarks/)
   * Development Guides
-* [Skywalking 3 Cross Process Propagation Headers Protocol, 
v1.0](en/Skywalking-3-Cross-Process-Propagation-Headers-Protocol.md)
+* [How to build project](en/How-to-build.md)
+* Protocol
+  * [Cross Process Propagation Headers Protocol, 
v1.0](en/Skywalking-Cross-Process-Propagation-Headers-Protocol-v1.md)
   * FAQ
 
diff --git a/docs/README_ZH.md b/docs/README_ZH.md
index 4d63db9..d2936c9 100644
--- a/docs/README_ZH.md
+++ b/docs/README_ZH.md
@@ -22,8 +22,9 @@
   * 开发指南
 * [工程编译指南](cn/How-to-build-CN.md)
 * [插件开发指南](cn/Plugin-Development-Guide-CN.md)
-* 
[跨进程追踪上下文传递协议](cn/Skywalking-3-Cross-Process-Propagation-Headers-Protocol-CN.md)
-* [探针与Collector间网络协议，v3.2+](cn/How-to-communicate-with-the-collector-CN.md)
+* 交互协议
+* [Cross Process Propagation Headers Protocol, v1.0 | 
跨进程追踪上下文传递协议](cn/Skywalking-Cross-Process-Propagation-Headers-Protocol-CN-v1.md)
+* [SkyWalking Trace Data Protocol 
探针与Collector间网络协议](cn/Trace-Data-Protocol-CN.md)
   * FAQ
 * [Trace查询有数据，但是没有拓扑图和JVM数据?](cn/FAQ/Why-have-traces-no-others-CN.md)
 * [加载探针，Console被GRPC日志刷屏](cn/FAQ/Too-many-gRPC-logs-CN.md)
diff --git a/docs/cn/Application-toolkit-log4j-1.x-CN.md 
b/docs/cn/Application-toolkit-log4j-1.x-CN.md
index a1dcef0..bf4891f 100644
--- a/docs/cn/Application-toolkit-log4j-1.x-CN.md
+++ b/docs/cn/Application-toolkit-log4j-1.x-CN.md
@@ -6,7 +6,6 @@
   {project.release.version}

 ```
-[ 
![Download](https://api.bintray.com/packages/wu-sheng/skywalking/org.apache.skywalking.apm-toolkit-log4j-1.x/images/download.svg)
 
](https://bintray.com/wu-sheng/skywalking/org.apache.skywalking.apm-toolkit-log4j-1.x/_latestVersion)
 
 * 配置layout
 ```properties
diff --git a/docs/cn/Application-toolkit-log4j-2.x-CN.md 
b/docs/cn/Application-toolkit-log4j-2.x-CN.md
index 3379031..a9c4e51 100644
--- a/docs/cn/Application-toolkit-log4j-2.x-CN.md
+++ b/docs/cn/Application-toolkit-log4j-2.x-CN.md
@@ -6,7 +6,6 @@
   {project.release.version}

 ```
-[ 
![Download](https://api.bintray.com/packages/wu-sheng/skywalking/org.apache.skywalking.apm-toolkit-log4j-2.x/images/download.svg)
 
](https://bintray.com/wu-sheng/skywalking/org.apache.skywalking.apm-toolkit-log4j-2.x/_latestVersion)
 
 * 在log4j2.xml中的pattern 配置节，配置`[%traceId]`
 ```xml
diff --git a/docs/cn/Application-toolkit-logback-1.x-CN.md 
b/docs/cn/Application-toolkit-logback-1.x-CN.md
index 0182c28..a82ef1e 100644
--- a/docs/cn/Application-toolkit-logback-1.x-CN.md
+++ b/docs/cn/Application-toolkit-logback-1.x-CN.md
@@ -6,7 +6,6 @@
   {project.release.version}

 ```
-[ 
![Download](https://api.bintray.com/packages/wu-sheng/skywalking/org.apache.skywalking.apm-toolkit-log4j-2.x/images/download.svg)
 
](https://bintray.com/wu-sheng/skywalking/org.apache.skywalking.apm-toolkit-log4j-2.x/_latestVersion)
 
 * 在logback.xml中的`Pattern`配制节中，设置`%tid`
 ```xml
diff --git a/docs/cn/Application-toolkit-trace-CN.md 
b/docs/cn/Application-toolkit-trace-CN.md
index 8406909..dab3f7e 100644
--- a/docs/cn/Application-toolkit-trace-CN.md
+++ b/docs/cn/Application-toolkit-trace-CN.md
@@ -6,7 +6,6 @@
   ${skywalking.version}

[incubator-skywalking] branch master updated (96e0420 -> 63070e5)

2017-12-28 Thread wusheng

This is an automated email from the ASF dual-hosted git repository.

wusheng pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking.git.


from 96e0420  Merge pull request #710 from ascrutae/fix/okhttp-issue
 add 1cc2022  Update readme to update architecture and make document easier 
to find.
 add fd54346  Fix typo
 add 5795b17  Update words.
 new 63070e5  Merge pull request #711 from 
apache/feature/new-architecture-graph

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 README.md |  7 ---
 README_ZH.md  | 10 ++
 docs/README.md|  3 ---
 docs/README_ZH.md |  3 ---
 4 files changed, 10 insertions(+), 13 deletions(-)

-- 
To stop receiving notification emails like this one, please contact
['"commits@skywalking.apache.org" '].

[incubator-skywalking] branch feature/new-architecture-graph deleted (was 5795b17)

2017-12-28 Thread wusheng

This is an automated email from the ASF dual-hosted git repository.

wusheng pushed a change to branch feature/new-architecture-graph
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking.git.


 was 5795b17  Update words.

The revisions that were on this branch are still contained in
other references; therefore, this change does not discard any commits
from the repository.

-- 
To stop receiving notification emails like this one, please contact
['"commits@skywalking.apache.org" '].

[incubator-skywalking] branch feature/new-architecture-graph updated: Update words.

2017-12-28 Thread wusheng

This is an automated email from the ASF dual-hosted git repository.

wusheng pushed a commit to branch feature/new-architecture-graph
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking.git


The following commit(s) were added to refs/heads/feature/new-architecture-graph 
by this push:
 new 5795b17  Update words.
5795b17 is described below

commit 5795b17606497f99cc9bb10ec39901dc9ea0b2db
Author: wusheng 
AuthorDate: Thu Dec 28 22:14:50 2017 +0800

Update words.
---
 README.md| 2 +-
 README_ZH.md | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 898f4b5..9767973 100644
--- a/README.md
+++ b/README.md
@@ -25,7 +25,7 @@ Underlying technology is a distributed tracing system.
 # Document
 [![EN 
doc](https://img.shields.io/badge/document-English-blue.svg)](docs/README.md) 
[![cn 
doc](https://img.shields.io/badge/document-中文-blue.svg)](docs/README_ZH.md)
 
-# Architecture
+# 5.x Architecture
 https://skywalkingtest.github.io/page-resources/5.0/architecture.png"/>
 
 # Code of conduct
diff --git a/README_ZH.md b/README_ZH.md
index ca0401a..6c7c2b5 100644
--- a/README_ZH.md
+++ b/README_ZH.md
@@ -28,7 +28,7 @@ Apache SkyWalking | [English](README.md)
 [![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)
 
 
-# Architecture
+# 5.x Architecture
 https://skywalkingtest.github.io/page-resources/5.0/architecture.png"/>
 
 # code of conduct

-- 
To stop receiving notification emails like this one, please contact
['"commits@skywalking.apache.org" '].

[incubator-skywalking] branch feature/new-architecture-graph updated: Fix typo

2017-12-28 Thread wusheng

This is an automated email from the ASF dual-hosted git repository.

wusheng pushed a commit to branch feature/new-architecture-graph
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking.git


The following commit(s) were added to refs/heads/feature/new-architecture-graph 
by this push:
 new fd54346  Fix typo
fd54346 is described below

commit fd543465347e2394fa8f2bdfc6cf3a1ff3b59488
Author: wusheng 
AuthorDate: Thu Dec 28 22:12:05 2017 +0800

Fix typo
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 2524960..898f4b5 100644
--- a/README.md
+++ b/README.md
@@ -28,7 +28,7 @@ Underlying technology is a distributed tracing system.
 # Architecture
 https://skywalkingtest.github.io/page-resources/5.0/architecture.png"/>
 
-# Code f conduct
+# Code of conduct
 This project adheres to the Contributor Covenant [code of 
conduct](CODE_OF_CONDUCT.md). By participating, you are expected to uphold this 
code. Please report unacceptable behavior to wush...@apache.org.
 
 # Screenshots

-- 
To stop receiving notification emails like this one, please contact
['"commits@skywalking.apache.org" '].

[incubator-skywalking] branch adjust-document deleted (was 00523c9)

[incubator-skywalking] branch master updated (63070e5 -> d3d7f9d)

[incubator-skywalking] 01/01: Merge pull request #712 from apache/adjust-document

[incubator-skywalking] branch adjust-document updated: Fix some typo

[incubator-skywalking] 01/01: Adjust many documents.

[incubator-skywalking] branch master updated (96e0420 -> 63070e5)

[incubator-skywalking] branch feature/new-architecture-graph deleted (was 5795b17)

[incubator-skywalking] branch feature/new-architecture-graph updated: Update words.

[incubator-skywalking] branch feature/new-architecture-graph updated: Fix typo

9 matches

Site Navigation

Mail list logo

Footer information