You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicecomb.apache.org by ni...@apache.org on 2018/01/12 09:45:40 UTC

[incubator-servicecomb-website] branch asf-site updated (c3be50d -> 0b0a929)

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

ningjiang pushed a change to branch asf-site
in repository https://gitbox.apache.org/repos/asf/incubator-servicecomb-website.git.


    from c3be50d  SCB-123 Add DISLAIMER file to ServiceComb git repo
     add e7d7f77  SCB-123 Add DISLAIMER file to ServiceComb git repo
     add 38d55be  SCB-226 add 7th live streaming material
     add 20299b7  SCB-172 add how to upgrade to zipkin2 post
     add c6777e6  [SCB-132] Metrics MD (#24)
     new 8425a64  Merge branch 'master' into asf-site
     new 0b0a929  Publish the website

The 2 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:
 _data/authors.yml                                  |   5 +
 _data/navigation.yml                               |   7 +
 _pages/about-slides.md                             |   3 +
 _pages/cn/about-slides.md                          |   3 +
 _posts/2018-01-10-howto-upgrade-to-zipkin-v2.md    | 238 +++++++++++++
 _users/cn/metrics-in-1.0.0-m1.md                   | 118 +++---
 ...rics-integration-with-prometheus-in-1.0.0-m1.md |  12 +-
 ...-write-file-extension-and-sample-in-1.0.0-m1.md | 124 ++-----
 _users/metrics-in-1.0.0-m1.md                      | 208 +++++++++++
 ...rics-integration-with-prometheus-in-1.0.0-m1.md |  73 ++--
 .../20180111/ServiceComb_Metrics_Introduction.pdf  | Bin 0 -> 961428 bytes
 DISCLAIMER => content/DISCLAIMER                   |   0
 .../20180111/ServiceComb_Metrics_Introduction.pdf  | Bin 0 -> 961428 bytes
 content/cn/docs/autoscale-on-company/index.html    |  18 +-
 content/cn/docs/communication-btw-sc-ms/index.html |  18 +-
 content/cn/docs/company-on-kubernetes/index.html   |  18 +-
 content/cn/docs/distributed_saga_1/index.html      |  18 +-
 content/cn/docs/distributed_saga_2/index.html      |  18 +-
 content/cn/docs/distributed_saga_3/index.html      |  18 +-
 content/cn/docs/go-to-cloud/index.html             |  18 +-
 .../docs/how-to-reform-a-legacy-system/index.html  |  18 +-
 content/cn/docs/jira_beginner_guide/index.html     |  16 +-
 content/cn/docs/linuxcon-workshop-demo/index.html  |  18 +-
 .../cn/docs/maven_dependency_management/index.html |  18 +-
 .../index.html                                     |  18 +-
 .../seckill-development-journey-part-I/index.html  |  18 +-
 .../seckill-development-journey-part-II/index.html |  18 +-
 .../index.html                                     |  18 +-
 .../index.html                                     |  18 +-
 .../cn/docs/tracing-with-servicecomb/index.html    |  18 +-
 content/cn/slides/index.html                       |   5 +
 content/cn/users/metrics-in-1.0.0-m1/index.html    |  84 ++---
 .../index.html                                     |  12 +-
 .../index.html                                     | 141 ++------
 content/docs/autoscale-on-company/index.html       |  18 +-
 content/docs/communication-btw-sc-ms/index.html    |  18 +-
 content/docs/company-on-kubernetes/index.html      |  18 +-
 content/docs/distributed_saga_1/index.html         |  18 +-
 content/docs/distributed_saga_2/index.html         |  18 +-
 content/docs/distributed_saga_3/index.html         |  18 +-
 content/docs/go-to-cloud/index.html                |  18 +-
 .../docs/how-to-reform-a-legacy-system/index.html  |  18 +-
 .../index.html                                     | 396 +++++++++++++--------
 content/docs/linuxcon-workshop-demo/index.html     |  18 +-
 .../seckill-development-journey-part-I/index.html  |  18 +-
 .../seckill-development-journey-part-II/index.html |  18 +-
 .../index.html                                     |  18 +-
 content/docs/service-center-ui/index.html          |  24 +-
 .../service-registry-refactor-proposal/index.html  |  21 +-
 .../index.html                                     |  18 +-
 content/docs/tracing-with-servicecomb/index.html   |  18 +-
 content/feed.xml                                   | 358 +++++++++++++------
 content/sitemap.xml                                | 134 ++++---
 content/sitemap/index.html                         |   2 +
 content/slides/index.html                          |   5 +
 content/users/application-boot-process/index.html  |  28 ++
 content/users/communicate-protocol/index.html      |  28 ++
 content/users/customized-tracing/index.html        |  28 ++
 content/users/develop-with-jax-rs/index.html       |  28 ++
 .../users/develop-with-rest-template/index.html    |  28 ++
 content/users/develop-with-rpc/index.html          |  28 ++
 content/users/develop-with-springmvc/index.html    |  28 ++
 .../users/develop-with-transparent-rpc/index.html  |  28 ++
 content/users/distributed-tracing/index.html       |  28 ++
 content/users/edging-service/nginx/index.html      |  28 ++
 content/users/edging-service/zuul/index.html       |  28 ++
 content/users/faq/index.html                       |  28 ++
 content/users/huawei-cloud-faq/index.html          |  28 ++
 content/users/index.html                           |  28 ++
 content/users/invoke-control/index.html            |  28 ++
 content/users/local-develop-test/index.html        |  28 ++
 .../{cn => }/users/metrics-in-1.0.0-m1/index.html  | 358 +++++++++----------
 .../index.html                                     | 240 ++++++-------
 content/users/run-mode/index.html                  |  28 ++
 content/users/service-configurations/index.html    |  28 ++
 content/users/service-contract/index.html          |  28 ++
 content/users/service-definition/index.html        |  28 ++
 content/users/service-heartbeat/index.html         |  28 ++
 .../users/service-interface-constraints/index.html |  28 ++
 content/users/setup-environment/index.html         |  28 ++
 content/users/use-service-contract/index.html      |  28 ++
 .../use-servicecomb-in-spring-boot/index.html      |  28 ++
 content/users/use-tls/index.html                   |  28 ++
 content/year-archive/index.html                    |  69 ++++
 84 files changed, 2651 insertions(+), 1273 deletions(-)
 create mode 100644 _posts/2018-01-10-howto-upgrade-to-zipkin-v2.md
 create mode 100644 _users/metrics-in-1.0.0-m1.md
 copy _users/{cn => }/metrics-integration-with-prometheus-in-1.0.0-m1.md (50%)
 create mode 100644 assets/slides/20180111/ServiceComb_Metrics_Introduction.pdf
 copy DISCLAIMER => content/DISCLAIMER (100%)
 create mode 100644 content/assets/slides/20180111/ServiceComb_Metrics_Introduction.pdf
 copy content/docs/{tracing-with-servicecomb => howto-upgrade-topzipkin2}/index.html (51%)
 copy content/{cn => }/users/metrics-in-1.0.0-m1/index.html (60%)
 copy content/{cn => }/users/metrics-integration-with-prometheus-in-1.0.0-m1/index.html (68%)

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

[incubator-servicecomb-website] 01/02: Merge branch 'master' into asf-site

Posted by ni...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

ningjiang pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/incubator-servicecomb-website.git

commit 8425a64e6e8c7bdafc78eb53711b240bc4367ee9
Merge: c3be50d c6777e6
Author: Willem Jiang <ji...@huawei.com>
AuthorDate: Fri Jan 12 17:44:04 2018 +0800

    Merge branch 'master' into asf-site

 _data/authors.yml                                  |   5 +
 _data/navigation.yml                               |   7 +
 _pages/about-slides.md                             |   3 +
 _pages/cn/about-slides.md                          |   3 +
 _posts/2018-01-10-howto-upgrade-to-zipkin-v2.md    | 238 +++++++++++++++++++++
 _users/cn/metrics-in-1.0.0-m1.md                   | 118 +++++-----
 ...rics-integration-with-prometheus-in-1.0.0-m1.md |  12 +-
 ...-write-file-extension-and-sample-in-1.0.0-m1.md | 124 +++--------
 _users/metrics-in-1.0.0-m1.md                      | 208 ++++++++++++++++++
 ...rics-integration-with-prometheus-in-1.0.0-m1.md |  73 ++++---
 .../20180111/ServiceComb_Metrics_Introduction.pdf  | Bin 0 -> 961428 bytes
 11 files changed, 595 insertions(+), 196 deletions(-)

-- 
To stop receiving notification emails like this one, please contact
"commits@servicecomb.apache.org" <co...@servicecomb.apache.org>.

[incubator-servicecomb-website] 02/02: Publish the website

Posted by ni...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

ningjiang pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/incubator-servicecomb-website.git

commit 0b0a92979ad5f48e69aec751121cf9fd0eb3ffc6
Author: Willem Jiang <ji...@huawei.com>
AuthorDate: Fri Jan 12 17:45:15 2018 +0800

    Publish the website
---
 content/DISCLAIMER                                 |   1 +
 .../20180111/ServiceComb_Metrics_Introduction.pdf  | Bin 0 -> 961428 bytes
 content/cn/docs/autoscale-on-company/index.html    |  18 +-
 content/cn/docs/communication-btw-sc-ms/index.html |  18 +-
 content/cn/docs/company-on-kubernetes/index.html   |  18 +-
 content/cn/docs/distributed_saga_1/index.html      |  18 +-
 content/cn/docs/distributed_saga_2/index.html      |  18 +-
 content/cn/docs/distributed_saga_3/index.html      |  18 +-
 content/cn/docs/go-to-cloud/index.html             |  18 +-
 .../docs/how-to-reform-a-legacy-system/index.html  |  18 +-
 content/cn/docs/jira_beginner_guide/index.html     |  16 +-
 content/cn/docs/linuxcon-workshop-demo/index.html  |  18 +-
 .../cn/docs/maven_dependency_management/index.html |  18 +-
 .../index.html                                     |  18 +-
 .../seckill-development-journey-part-I/index.html  |  18 +-
 .../seckill-development-journey-part-II/index.html |  18 +-
 .../index.html                                     |  18 +-
 .../index.html                                     |  18 +-
 .../cn/docs/tracing-with-servicecomb/index.html    |  18 +-
 content/cn/slides/index.html                       |   5 +
 content/cn/users/metrics-in-1.0.0-m1/index.html    |  84 ++---
 .../index.html                                     |  12 +-
 .../index.html                                     | 141 ++------
 content/docs/autoscale-on-company/index.html       |  18 +-
 content/docs/communication-btw-sc-ms/index.html    |  18 +-
 content/docs/company-on-kubernetes/index.html      |  18 +-
 content/docs/distributed_saga_1/index.html         |  18 +-
 content/docs/distributed_saga_2/index.html         |  18 +-
 content/docs/distributed_saga_3/index.html         |  18 +-
 content/docs/go-to-cloud/index.html                |  18 +-
 .../docs/how-to-reform-a-legacy-system/index.html  |  18 +-
 .../index.html                                     | 396 +++++++++++++--------
 content/docs/linuxcon-workshop-demo/index.html     |  18 +-
 .../seckill-development-journey-part-I/index.html  |  18 +-
 .../seckill-development-journey-part-II/index.html |  18 +-
 .../index.html                                     |  18 +-
 content/docs/service-center-ui/index.html          |  24 +-
 .../service-registry-refactor-proposal/index.html  |  21 +-
 .../index.html                                     |  18 +-
 content/docs/tracing-with-servicecomb/index.html   |  18 +-
 content/feed.xml                                   | 358 +++++++++++++------
 content/sitemap.xml                                | 134 ++++---
 content/sitemap/index.html                         |   2 +
 content/slides/index.html                          |   5 +
 content/users/application-boot-process/index.html  |  28 ++
 content/users/communicate-protocol/index.html      |  28 ++
 content/users/customized-tracing/index.html        |  28 ++
 content/users/develop-with-jax-rs/index.html       |  28 ++
 .../users/develop-with-rest-template/index.html    |  28 ++
 content/users/develop-with-rpc/index.html          |  28 ++
 content/users/develop-with-springmvc/index.html    |  28 ++
 .../users/develop-with-transparent-rpc/index.html  |  28 ++
 content/users/distributed-tracing/index.html       |  28 ++
 content/users/edging-service/nginx/index.html      |  28 ++
 content/users/edging-service/zuul/index.html       |  28 ++
 content/users/faq/index.html                       |  28 ++
 content/users/huawei-cloud-faq/index.html          |  28 ++
 content/users/index.html                           |  28 ++
 content/users/invoke-control/index.html            |  28 ++
 content/users/local-develop-test/index.html        |  28 ++
 .../{cn => }/users/metrics-in-1.0.0-m1/index.html  | 358 +++++++++----------
 .../index.html                                     | 240 ++++++-------
 content/users/run-mode/index.html                  |  28 ++
 content/users/service-configurations/index.html    |  28 ++
 content/users/service-contract/index.html          |  28 ++
 content/users/service-definition/index.html        |  28 ++
 content/users/service-heartbeat/index.html         |  28 ++
 .../users/service-interface-constraints/index.html |  28 ++
 content/users/setup-environment/index.html         |  28 ++
 content/users/use-service-contract/index.html      |  28 ++
 .../use-servicecomb-in-spring-boot/index.html      |  28 ++
 content/users/use-tls/index.html                   |  28 ++
 content/year-archive/index.html                    |  69 ++++
 73 files changed, 2057 insertions(+), 1077 deletions(-)

diff --git a/content/DISCLAIMER b/content/DISCLAIMER
new file mode 100644
index 0000000..2e9ded2
--- /dev/null
+++ b/content/DISCLAIMER
@@ -0,0 +1 @@
+Apache ServiceComb(incubating)is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by Apache Incubator. Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and decision making process have stabilized in a manner consistent with other successful ASF projects. While incubation status is not necessarily a reflection of the completeness or stability of the code, it does indicate that  [...]
diff --git a/content/assets/slides/20180111/ServiceComb_Metrics_Introduction.pdf b/content/assets/slides/20180111/ServiceComb_Metrics_Introduction.pdf
new file mode 100644
index 0000000..0f2453f
Binary files /dev/null and b/content/assets/slides/20180111/ServiceComb_Metrics_Introduction.pdf differ
diff --git a/content/cn/docs/autoscale-on-company/index.html b/content/cn/docs/autoscale-on-company/index.html
index 1d7026a..bc7d2eb 100644
--- a/content/cn/docs/autoscale-on-company/index.html
+++ b/content/cn/docs/autoscale-on-company/index.html
@@ -638,11 +638,11 @@ bash LinuxCon-Beijing-WorkShop/kubernetes/stress-test.sh
     
     <h2 class="archive__item-title" itemprop="headline">
       
-        <a href="/docs/service-registry-refactor-proposal/" rel="permalink">Proposal for refactoring service registry module in Java Chassis
+        <a href="/docs/howto-upgrade-topzipkin2/" rel="permalink">Howto Upgrade to Zipkin2
 </a>
       
     </h2>
-    <p class="archive__item-excerpt" itemprop="description">Analysis of service registry and propose a new architecture for it
+    <p class="archive__item-excerpt" itemprop="description">Changes between v1 and v2 of zipkin and how Java Chassis upgraded to zipkin2
 </p>
     
       <p class="page__meta"><i class="fa fa-clock-o" aria-hidden="true"></i> 
@@ -650,7 +650,7 @@ bash LinuxCon-Beijing-WorkShop/kubernetes/stress-test.sh
 
 
 
-  2 分钟 阅读
+  4 分钟 阅读
 
 </p>
     
@@ -667,11 +667,11 @@ bash LinuxCon-Beijing-WorkShop/kubernetes/stress-test.sh
     
     <h2 class="archive__item-title" itemprop="headline">
       
-        <a href="/cn/docs/jira_beginner_guide/" rel="permalink">老司机带你刷任务 - ServiceComb JIRA入门指南
+        <a href="/docs/service-registry-refactor-proposal/" rel="permalink">Proposal for refactoring service registry module in Java Chassis
 </a>
       
     </h2>
-    <p class="archive__item-excerpt" itemprop="description">ServiceComb JIRA入门指南
+    <p class="archive__item-excerpt" itemprop="description">Analysis of service registry and propose a new architecture for it
 </p>
     
       <p class="page__meta"><i class="fa fa-clock-o" aria-hidden="true"></i> 
@@ -679,7 +679,7 @@ bash LinuxCon-Beijing-WorkShop/kubernetes/stress-test.sh
 
 
 
-  少于 1 分钟 阅读
+  2 分钟 阅读
 
 </p>
     
@@ -696,11 +696,11 @@ bash LinuxCon-Beijing-WorkShop/kubernetes/stress-test.sh
     
     <h2 class="archive__item-title" itemprop="headline">
       
-        <a href="/docs/service-center-ui/" rel="permalink">Service-Center Management UI Console
+        <a href="/cn/docs/jira_beginner_guide/" rel="permalink">老司机带你刷任务 - ServiceComb JIRA入门指南
 </a>
       
     </h2>
-    <p class="archive__item-excerpt" itemprop="description">An introduction Service-Center Management Console
+    <p class="archive__item-excerpt" itemprop="description">ServiceComb JIRA入门指南
 </p>
     
       <p class="page__meta"><i class="fa fa-clock-o" aria-hidden="true"></i> 
@@ -708,7 +708,7 @@ bash LinuxCon-Beijing-WorkShop/kubernetes/stress-test.sh
 
 
 
-  2 分钟 阅读
+  少于 1 分钟 阅读
 
 </p>
     
diff --git a/content/cn/docs/communication-btw-sc-ms/index.html b/content/cn/docs/communication-btw-sc-ms/index.html
index 0e5fc88..a7eecee 100644
--- a/content/cn/docs/communication-btw-sc-ms/index.html
+++ b/content/cn/docs/communication-btw-sc-ms/index.html
@@ -548,11 +548,11 @@ When Consumer needs to communicate to Provider then consumer reads endpoints of
     
     <h2 class="archive__item-title" itemprop="headline">
       
-        <a href="/docs/service-registry-refactor-proposal/" rel="permalink">Proposal for refactoring service registry module in Java Chassis
+        <a href="/docs/howto-upgrade-topzipkin2/" rel="permalink">Howto Upgrade to Zipkin2
 </a>
       
     </h2>
-    <p class="archive__item-excerpt" itemprop="description">Analysis of service registry and propose a new architecture for it
+    <p class="archive__item-excerpt" itemprop="description">Changes between v1 and v2 of zipkin and how Java Chassis upgraded to zipkin2
 </p>
     
       <p class="page__meta"><i class="fa fa-clock-o" aria-hidden="true"></i> 
@@ -560,7 +560,7 @@ When Consumer needs to communicate to Provider then consumer reads endpoints of
 
 
 
-  2 分钟 阅读
+  4 分钟 阅读
 
 </p>
     
@@ -577,11 +577,11 @@ When Consumer needs to communicate to Provider then consumer reads endpoints of
     
     <h2 class="archive__item-title" itemprop="headline">
       
-        <a href="/cn/docs/jira_beginner_guide/" rel="permalink">老司机带你刷任务 - ServiceComb JIRA入门指南
+        <a href="/docs/service-registry-refactor-proposal/" rel="permalink">Proposal for refactoring service registry module in Java Chassis
 </a>
       
     </h2>
-    <p class="archive__item-excerpt" itemprop="description">ServiceComb JIRA入门指南
+    <p class="archive__item-excerpt" itemprop="description">Analysis of service registry and propose a new architecture for it
 </p>
     
       <p class="page__meta"><i class="fa fa-clock-o" aria-hidden="true"></i> 
@@ -589,7 +589,7 @@ When Consumer needs to communicate to Provider then consumer reads endpoints of
 
 
 
-  少于 1 分钟 阅读
+  2 分钟 阅读
 
 </p>
     
@@ -606,11 +606,11 @@ When Consumer needs to communicate to Provider then consumer reads endpoints of
     
     <h2 class="archive__item-title" itemprop="headline">
       
-        <a href="/docs/service-center-ui/" rel="permalink">Service-Center Management UI Console
+        <a href="/cn/docs/jira_beginner_guide/" rel="permalink">老司机带你刷任务 - ServiceComb JIRA入门指南
 </a>
       
     </h2>
-    <p class="archive__item-excerpt" itemprop="description">An introduction Service-Center Management Console
+    <p class="archive__item-excerpt" itemprop="description">ServiceComb JIRA入门指南
 </p>
     
       <p class="page__meta"><i class="fa fa-clock-o" aria-hidden="true"></i> 
@@ -618,7 +618,7 @@ When Consumer needs to communicate to Provider then consumer reads endpoints of
 
 
 
-  2 分钟 阅读
+  少于 1 分钟 阅读
 
 </p>
     
diff --git a/content/cn/docs/company-on-kubernetes/index.html b/content/cn/docs/company-on-kubernetes/index.html
index 9236e3c..c2964ea 100644
--- a/content/cn/docs/company-on-kubernetes/index.html
+++ b/content/cn/docs/company-on-kubernetes/index.html
@@ -648,11 +648,11 @@ kubectl get svc company-manager -o yaml | grep nodePort -C 1
     
     <h2 class="archive__item-title" itemprop="headline">
       
-        <a href="/docs/service-registry-refactor-proposal/" rel="permalink">Proposal for refactoring service registry module in Java Chassis
+        <a href="/docs/howto-upgrade-topzipkin2/" rel="permalink">Howto Upgrade to Zipkin2
 </a>
       
     </h2>
-    <p class="archive__item-excerpt" itemprop="description">Analysis of service registry and propose a new architecture for it
+    <p class="archive__item-excerpt" itemprop="description">Changes between v1 and v2 of zipkin and how Java Chassis upgraded to zipkin2
 </p>
     
       <p class="page__meta"><i class="fa fa-clock-o" aria-hidden="true"></i> 
@@ -660,7 +660,7 @@ kubectl get svc company-manager -o yaml | grep nodePort -C 1
 
 
 
-  2 分钟 阅读
+  4 分钟 阅读
 
 </p>
     
@@ -677,11 +677,11 @@ kubectl get svc company-manager -o yaml | grep nodePort -C 1
     
     <h2 class="archive__item-title" itemprop="headline">
       
-        <a href="/cn/docs/jira_beginner_guide/" rel="permalink">老司机带你刷任务 - ServiceComb JIRA入门指南
+        <a href="/docs/service-registry-refactor-proposal/" rel="permalink">Proposal for refactoring service registry module in Java Chassis
 </a>
       
     </h2>
-    <p class="archive__item-excerpt" itemprop="description">ServiceComb JIRA入门指南
+    <p class="archive__item-excerpt" itemprop="description">Analysis of service registry and propose a new architecture for it
 </p>
     
       <p class="page__meta"><i class="fa fa-clock-o" aria-hidden="true"></i> 
@@ -689,7 +689,7 @@ kubectl get svc company-manager -o yaml | grep nodePort -C 1
 
 
 
-  少于 1 分钟 阅读
+  2 分钟 阅读
 
 </p>
     
@@ -706,11 +706,11 @@ kubectl get svc company-manager -o yaml | grep nodePort -C 1
     
     <h2 class="archive__item-title" itemprop="headline">
       
-        <a href="/docs/service-center-ui/" rel="permalink">Service-Center Management UI Console
+        <a href="/cn/docs/jira_beginner_guide/" rel="permalink">老司机带你刷任务 - ServiceComb JIRA入门指南
 </a>
       
     </h2>
-    <p class="archive__item-excerpt" itemprop="description">An introduction Service-Center Management Console
+    <p class="archive__item-excerpt" itemprop="description">ServiceComb JIRA入门指南
 </p>
     
       <p class="page__meta"><i class="fa fa-clock-o" aria-hidden="true"></i> 
@@ -718,7 +718,7 @@ kubectl get svc company-manager -o yaml | grep nodePort -C 1
 
 
 
-  2 分钟 阅读
+  少于 1 分钟 阅读
 
 </p>
     
diff --git a/content/cn/docs/distributed_saga_1/index.html b/content/cn/docs/distributed_saga_1/index.html
index 22a3e8f..fa3f0f9 100644
--- a/content/cn/docs/distributed_saga_1/index.html
+++ b/content/cn/docs/distributed_saga_1/index.html
@@ -633,11 +633,11 @@ Caitie McCaffrey也在她的<a href="https://www.youtube.com/watch?v=xDuwrtwYHu8
     
     <h2 class="archive__item-title" itemprop="headline">
       
-        <a href="/docs/service-registry-refactor-proposal/" rel="permalink">Proposal for refactoring service registry module in Java Chassis
+        <a href="/docs/howto-upgrade-topzipkin2/" rel="permalink">Howto Upgrade to Zipkin2
 </a>
       
     </h2>
-    <p class="archive__item-excerpt" itemprop="description">Analysis of service registry and propose a new architecture for it
+    <p class="archive__item-excerpt" itemprop="description">Changes between v1 and v2 of zipkin and how Java Chassis upgraded to zipkin2
 </p>
     
       <p class="page__meta"><i class="fa fa-clock-o" aria-hidden="true"></i> 
@@ -645,7 +645,7 @@ Caitie McCaffrey也在她的<a href="https://www.youtube.com/watch?v=xDuwrtwYHu8
 
 
 
-  2 分钟 阅读
+  4 分钟 阅读
 
 </p>
     
@@ -662,11 +662,11 @@ Caitie McCaffrey也在她的<a href="https://www.youtube.com/watch?v=xDuwrtwYHu8
     
     <h2 class="archive__item-title" itemprop="headline">
       
-        <a href="/cn/docs/jira_beginner_guide/" rel="permalink">老司机带你刷任务 - ServiceComb JIRA入门指南
+        <a href="/docs/service-registry-refactor-proposal/" rel="permalink">Proposal for refactoring service registry module in Java Chassis
 </a>
       
     </h2>
-    <p class="archive__item-excerpt" itemprop="description">ServiceComb JIRA入门指南
+    <p class="archive__item-excerpt" itemprop="description">Analysis of service registry and propose a new architecture for it
 </p>
     
       <p class="page__meta"><i class="fa fa-clock-o" aria-hidden="true"></i> 
@@ -674,7 +674,7 @@ Caitie McCaffrey也在她的<a href="https://www.youtube.com/watch?v=xDuwrtwYHu8
 
 
 
-  少于 1 分钟 阅读
+  2 分钟 阅读
 
 </p>
     
@@ -691,11 +691,11 @@ Caitie McCaffrey也在她的<a href="https://www.youtube.com/watch?v=xDuwrtwYHu8
     
     <h2 class="archive__item-title" itemprop="headline">
       
-        <a href="/docs/service-center-ui/" rel="permalink">Service-Center Management UI Console
+        <a href="/cn/docs/jira_beginner_guide/" rel="permalink">老司机带你刷任务 - ServiceComb JIRA入门指南
 </a>
       
     </h2>
-    <p class="archive__item-excerpt" itemprop="description">An introduction Service-Center Management Console
+    <p class="archive__item-excerpt" itemprop="description">ServiceComb JIRA入门指南
 </p>
     
       <p class="page__meta"><i class="fa fa-clock-o" aria-hidden="true"></i> 
@@ -703,7 +703,7 @@ Caitie McCaffrey也在她的<a href="https://www.youtube.com/watch?v=xDuwrtwYHu8
 
 
 
-  2 分钟 阅读
+  少于 1 分钟 阅读
 
 </p>
     
diff --git a/content/cn/docs/distributed_saga_2/index.html b/content/cn/docs/distributed_saga_2/index.html
index 1a19096..ac5dacc 100644
--- a/content/cn/docs/distributed_saga_2/index.html
+++ b/content/cn/docs/distributed_saga_2/index.html
@@ -609,11 +609,11 @@ Caitie McCaffrey在她的演讲<a href="https://www.youtube.com/watch?v=1H6tounp
     
     <h2 class="archive__item-title" itemprop="headline">
       
-        <a href="/docs/service-registry-refactor-proposal/" rel="permalink">Proposal for refactoring service registry module in Java Chassis
+        <a href="/docs/howto-upgrade-topzipkin2/" rel="permalink">Howto Upgrade to Zipkin2
 </a>
       
     </h2>
-    <p class="archive__item-excerpt" itemprop="description">Analysis of service registry and propose a new architecture for it
+    <p class="archive__item-excerpt" itemprop="description">Changes between v1 and v2 of zipkin and how Java Chassis upgraded to zipkin2
 </p>
     
       <p class="page__meta"><i class="fa fa-clock-o" aria-hidden="true"></i> 
@@ -621,7 +621,7 @@ Caitie McCaffrey在她的演讲<a href="https://www.youtube.com/watch?v=1H6tounp
 
 
 
-  2 分钟 阅读
+  4 分钟 阅读
 
 </p>
     
@@ -638,11 +638,11 @@ Caitie McCaffrey在她的演讲<a href="https://www.youtube.com/watch?v=1H6tounp
     
     <h2 class="archive__item-title" itemprop="headline">
       
-        <a href="/cn/docs/jira_beginner_guide/" rel="permalink">老司机带你刷任务 - ServiceComb JIRA入门指南
+        <a href="/docs/service-registry-refactor-proposal/" rel="permalink">Proposal for refactoring service registry module in Java Chassis
 </a>
       
     </h2>
-    <p class="archive__item-excerpt" itemprop="description">ServiceComb JIRA入门指南
+    <p class="archive__item-excerpt" itemprop="description">Analysis of service registry and propose a new architecture for it
 </p>
     
       <p class="page__meta"><i class="fa fa-clock-o" aria-hidden="true"></i> 
@@ -650,7 +650,7 @@ Caitie McCaffrey在她的演讲<a href="https://www.youtube.com/watch?v=1H6tounp
 
 
 
-  少于 1 分钟 阅读
+  2 分钟 阅读
 
 </p>
     
@@ -667,11 +667,11 @@ Caitie McCaffrey在她的演讲<a href="https://www.youtube.com/watch?v=1H6tounp
     
     <h2 class="archive__item-title" itemprop="headline">
       
-        <a href="/docs/service-center-ui/" rel="permalink">Service-Center Management UI Console
+        <a href="/cn/docs/jira_beginner_guide/" rel="permalink">老司机带你刷任务 - ServiceComb JIRA入门指南
 </a>
       
     </h2>
-    <p class="archive__item-excerpt" itemprop="description">An introduction Service-Center Management Console
+    <p class="archive__item-excerpt" itemprop="description">ServiceComb JIRA入门指南
 </p>
     
       <p class="page__meta"><i class="fa fa-clock-o" aria-hidden="true"></i> 
@@ -679,7 +679,7 @@ Caitie McCaffrey在她的演讲<a href="https://www.youtube.com/watch?v=1H6tounp
 
 
 
-  2 分钟 阅读
+  少于 1 分钟 阅读
 
 </p>
     
diff --git a/content/cn/docs/distributed_saga_3/index.html b/content/cn/docs/distributed_saga_3/index.html
index e3944ed..bf6b634 100644
--- a/content/cn/docs/distributed_saga_3/index.html
+++ b/content/cn/docs/distributed_saga_3/index.html
@@ -631,11 +631,11 @@ n个处于不确定状态的服务向其他n-1个服务咨询将产生<strong>O(
     
     <h2 class="archive__item-title" itemprop="headline">
       
-        <a href="/docs/service-registry-refactor-proposal/" rel="permalink">Proposal for refactoring service registry module in Java Chassis
+        <a href="/docs/howto-upgrade-topzipkin2/" rel="permalink">Howto Upgrade to Zipkin2
 </a>
       
     </h2>
-    <p class="archive__item-excerpt" itemprop="description">Analysis of service registry and propose a new architecture for it
+    <p class="archive__item-excerpt" itemprop="description">Changes between v1 and v2 of zipkin and how Java Chassis upgraded to zipkin2
 </p>
     
       <p class="page__meta"><i class="fa fa-clock-o" aria-hidden="true"></i> 
@@ -643,7 +643,7 @@ n个处于不确定状态的服务向其他n-1个服务咨询将产生<strong>O(
 
 
 
-  2 分钟 阅读
+  4 分钟 阅读
 
 </p>
     
@@ -660,11 +660,11 @@ n个处于不确定状态的服务向其他n-1个服务咨询将产生<strong>O(
     
     <h2 class="archive__item-title" itemprop="headline">
       
-        <a href="/cn/docs/jira_beginner_guide/" rel="permalink">老司机带你刷任务 - ServiceComb JIRA入门指南
+        <a href="/docs/service-registry-refactor-proposal/" rel="permalink">Proposal for refactoring service registry module in Java Chassis
 </a>
       
     </h2>
-    <p class="archive__item-excerpt" itemprop="description">ServiceComb JIRA入门指南
+    <p class="archive__item-excerpt" itemprop="description">Analysis of service registry and propose a new architecture for it
 </p>
     
       <p class="page__meta"><i class="fa fa-clock-o" aria-hidden="true"></i> 
@@ -672,7 +672,7 @@ n个处于不确定状态的服务向其他n-1个服务咨询将产生<strong>O(
 
 
 
-  少于 1 分钟 阅读
+  2 分钟 阅读
 
 </p>
     
@@ -689,11 +689,11 @@ n个处于不确定状态的服务向其他n-1个服务咨询将产生<strong>O(
     
     <h2 class="archive__item-title" itemprop="headline">
       
-        <a href="/docs/service-center-ui/" rel="permalink">Service-Center Management UI Console
+        <a href="/cn/docs/jira_beginner_guide/" rel="permalink">老司机带你刷任务 - ServiceComb JIRA入门指南
 </a>
       
     </h2>
-    <p class="archive__item-excerpt" itemprop="description">An introduction Service-Center Management Console
+    <p class="archive__item-excerpt" itemprop="description">ServiceComb JIRA入门指南
 </p>
     
       <p class="page__meta"><i class="fa fa-clock-o" aria-hidden="true"></i> 
@@ -701,7 +701,7 @@ n个处于不确定状态的服务向其他n-1个服务咨询将产生<strong>O(
 
 
 
-  2 分钟 阅读
+  少于 1 分钟 阅读
 
 </p>
     
diff --git a/content/cn/docs/go-to-cloud/index.html b/content/cn/docs/go-to-cloud/index.html
index e837393..8bcb4ea 100644
--- a/content/cn/docs/go-to-cloud/index.html
+++ b/content/cn/docs/go-to-cloud/index.html
@@ -690,11 +690,11 @@ watching microservice 4 successfully,服务注册成功<br />
     
     <h2 class="archive__item-title" itemprop="headline">
       
-        <a href="/docs/service-registry-refactor-proposal/" rel="permalink">Proposal for refactoring service registry module in Java Chassis
+        <a href="/docs/howto-upgrade-topzipkin2/" rel="permalink">Howto Upgrade to Zipkin2
 </a>
       
     </h2>
-    <p class="archive__item-excerpt" itemprop="description">Analysis of service registry and propose a new architecture for it
+    <p class="archive__item-excerpt" itemprop="description">Changes between v1 and v2 of zipkin and how Java Chassis upgraded to zipkin2
 </p>
     
       <p class="page__meta"><i class="fa fa-clock-o" aria-hidden="true"></i> 
@@ -702,7 +702,7 @@ watching microservice 4 successfully,服务注册成功<br />
 
 
 
-  2 分钟 阅读
+  4 分钟 阅读
 
 </p>
     
@@ -719,11 +719,11 @@ watching microservice 4 successfully,服务注册成功<br />
     
     <h2 class="archive__item-title" itemprop="headline">
       
-        <a href="/cn/docs/jira_beginner_guide/" rel="permalink">老司机带你刷任务 - ServiceComb JIRA入门指南
+        <a href="/docs/service-registry-refactor-proposal/" rel="permalink">Proposal for refactoring service registry module in Java Chassis
 </a>
       
     </h2>
-    <p class="archive__item-excerpt" itemprop="description">ServiceComb JIRA入门指南
+    <p class="archive__item-excerpt" itemprop="description">Analysis of service registry and propose a new architecture for it
 </p>
     
       <p class="page__meta"><i class="fa fa-clock-o" aria-hidden="true"></i> 
@@ -731,7 +731,7 @@ watching microservice 4 successfully,服务注册成功<br />
 
 
 
-  少于 1 分钟 阅读
+  2 分钟 阅读
 
 </p>
     
@@ -748,11 +748,11 @@ watching microservice 4 successfully,服务注册成功<br />
     
     <h2 class="archive__item-title" itemprop="headline">
       
-        <a href="/docs/service-center-ui/" rel="permalink">Service-Center Management UI Console
+        <a href="/cn/docs/jira_beginner_guide/" rel="permalink">老司机带你刷任务 - ServiceComb JIRA入门指南
 </a>
       
     </h2>
-    <p class="archive__item-excerpt" itemprop="description">An introduction Service-Center Management Console
+    <p class="archive__item-excerpt" itemprop="description">ServiceComb JIRA入门指南
 </p>
     
       <p class="page__meta"><i class="fa fa-clock-o" aria-hidden="true"></i> 
@@ -760,7 +760,7 @@ watching microservice 4 successfully,服务注册成功<br />
 
 
 
-  2 分钟 阅读
+  少于 1 分钟 阅读
 
 </p>
     
diff --git a/content/cn/docs/how-to-reform-a-legacy-system/index.html b/content/cn/docs/how-to-reform-a-legacy-system/index.html
index c2260f4..2dffe04 100644
--- a/content/cn/docs/how-to-reform-a-legacy-system/index.html
+++ b/content/cn/docs/how-to-reform-a-legacy-system/index.html
@@ -886,11 +886,11 @@
     
     <h2 class="archive__item-title" itemprop="headline">
       
-        <a href="/docs/service-registry-refactor-proposal/" rel="permalink">Proposal for refactoring service registry module in Java Chassis
+        <a href="/docs/howto-upgrade-topzipkin2/" rel="permalink">Howto Upgrade to Zipkin2
 </a>
       
     </h2>
-    <p class="archive__item-excerpt" itemprop="description">Analysis of service registry and propose a new architecture for it
+    <p class="archive__item-excerpt" itemprop="description">Changes between v1 and v2 of zipkin and how Java Chassis upgraded to zipkin2
 </p>
     
       <p class="page__meta"><i class="fa fa-clock-o" aria-hidden="true"></i> 
@@ -898,7 +898,7 @@
 
 
 
-  2 分钟 阅读
+  4 分钟 阅读
 
 </p>
     
@@ -915,11 +915,11 @@
     
     <h2 class="archive__item-title" itemprop="headline">
       
-        <a href="/cn/docs/jira_beginner_guide/" rel="permalink">老司机带你刷任务 - ServiceComb JIRA入门指南
+        <a href="/docs/service-registry-refactor-proposal/" rel="permalink">Proposal for refactoring service registry module in Java Chassis
 </a>
       
     </h2>
-    <p class="archive__item-excerpt" itemprop="description">ServiceComb JIRA入门指南
+    <p class="archive__item-excerpt" itemprop="description">Analysis of service registry and propose a new architecture for it
 </p>
     
       <p class="page__meta"><i class="fa fa-clock-o" aria-hidden="true"></i> 
@@ -927,7 +927,7 @@
 
 
 
-  少于 1 分钟 阅读
+  2 分钟 阅读
 
 </p>
     
@@ -944,11 +944,11 @@
     
     <h2 class="archive__item-title" itemprop="headline">
       
-        <a href="/docs/service-center-ui/" rel="permalink">Service-Center Management UI Console
+        <a href="/cn/docs/jira_beginner_guide/" rel="permalink">老司机带你刷任务 - ServiceComb JIRA入门指南
 </a>
       
     </h2>
-    <p class="archive__item-excerpt" itemprop="description">An introduction Service-Center Management Console
+    <p class="archive__item-excerpt" itemprop="description">ServiceComb JIRA入门指南
 </p>
     
       <p class="page__meta"><i class="fa fa-clock-o" aria-hidden="true"></i> 
@@ -956,7 +956,7 @@
 
 
 
-  2 分钟 阅读
+  少于 1 分钟 阅读
 
 </p>
     
diff --git a/content/cn/docs/jira_beginner_guide/index.html b/content/cn/docs/jira_beginner_guide/index.html
index 86d422f..d887da6 100644
--- a/content/cn/docs/jira_beginner_guide/index.html
+++ b/content/cn/docs/jira_beginner_guide/index.html
@@ -543,11 +543,11 @@
     
     <h2 class="archive__item-title" itemprop="headline">
       
-        <a href="/docs/service-registry-refactor-proposal/" rel="permalink">Proposal for refactoring service registry module in Java Chassis
+        <a href="/docs/howto-upgrade-topzipkin2/" rel="permalink">Howto Upgrade to Zipkin2
 </a>
       
     </h2>
-    <p class="archive__item-excerpt" itemprop="description">Analysis of service registry and propose a new architecture for it
+    <p class="archive__item-excerpt" itemprop="description">Changes between v1 and v2 of zipkin and how Java Chassis upgraded to zipkin2
 </p>
     
       <p class="page__meta"><i class="fa fa-clock-o" aria-hidden="true"></i> 
@@ -555,7 +555,7 @@
 
 
 
-  2 分钟 阅读
+  4 分钟 阅读
 
 </p>
     
@@ -572,11 +572,11 @@
     
     <h2 class="archive__item-title" itemprop="headline">
       
-        <a href="/docs/service-center-ui/" rel="permalink">Service-Center Management UI Console
+        <a href="/docs/service-registry-refactor-proposal/" rel="permalink">Proposal for refactoring service registry module in Java Chassis
 </a>
       
     </h2>
-    <p class="archive__item-excerpt" itemprop="description">An introduction Service-Center Management Console
+    <p class="archive__item-excerpt" itemprop="description">Analysis of service registry and propose a new architecture for it
 </p>
     
       <p class="page__meta"><i class="fa fa-clock-o" aria-hidden="true"></i> 
@@ -630,11 +630,11 @@
     
     <h2 class="archive__item-title" itemprop="headline">
       
-        <a href="/cn/docs/how-to-reform-a-legacy-system/" rel="permalink">最头疼的遗留系统该如何改造?
+        <a href="/docs/service-center-ui/" rel="permalink">Service-Center Management UI Console
 </a>
       
     </h2>
-    <p class="archive__item-excerpt" itemprop="description">微服务是否是业界期待已久的企业架构解决方案?在对遗留系统进行微服务的改造过程中存在怎样的困难和挑战,应该注意些什么?
+    <p class="archive__item-excerpt" itemprop="description">An introduction Service-Center Management Console
 </p>
     
       <p class="page__meta"><i class="fa fa-clock-o" aria-hidden="true"></i> 
@@ -642,7 +642,7 @@
 
 
 
-  少于 1 分钟 阅读
+  2 分钟 阅读
 
 </p>
     
diff --git a/content/cn/docs/linuxcon-workshop-demo/index.html b/content/cn/docs/linuxcon-workshop-demo/index.html
index 1398489..1072bc9 100644
--- a/content/cn/docs/linuxcon-workshop-demo/index.html
+++ b/content/cn/docs/linuxcon-workshop-demo/index.html
@@ -1281,11 +1281,11 @@ DevOps在微服务开发中的实践。希望能对大家有所帮助。</p>
     
     <h2 class="archive__item-title" itemprop="headline">
       
-        <a href="/docs/service-registry-refactor-proposal/" rel="permalink">Proposal for refactoring service registry module in Java Chassis
+        <a href="/docs/howto-upgrade-topzipkin2/" rel="permalink">Howto Upgrade to Zipkin2
 </a>
       
     </h2>
-    <p class="archive__item-excerpt" itemprop="description">Analysis of service registry and propose a new architecture for it
+    <p class="archive__item-excerpt" itemprop="description">Changes between v1 and v2 of zipkin and how Java Chassis upgraded to zipkin2
 </p>
     
       <p class="page__meta"><i class="fa fa-clock-o" aria-hidden="true"></i> 
@@ -1293,7 +1293,7 @@ DevOps在微服务开发中的实践。希望能对大家有所帮助。</p>
 
 
 
-  2 分钟 阅读
+  4 分钟 阅读
 
 </p>
     
@@ -1310,11 +1310,11 @@ DevOps在微服务开发中的实践。希望能对大家有所帮助。</p>
     
     <h2 class="archive__item-title" itemprop="headline">
       
-        <a href="/cn/docs/jira_beginner_guide/" rel="permalink">老司机带你刷任务 - ServiceComb JIRA入门指南
+        <a href="/docs/service-registry-refactor-proposal/" rel="permalink">Proposal for refactoring service registry module in Java Chassis
 </a>
       
     </h2>
-    <p class="archive__item-excerpt" itemprop="description">ServiceComb JIRA入门指南
+    <p class="archive__item-excerpt" itemprop="description">Analysis of service registry and propose a new architecture for it
 </p>
     
       <p class="page__meta"><i class="fa fa-clock-o" aria-hidden="true"></i> 
@@ -1322,7 +1322,7 @@ DevOps在微服务开发中的实践。希望能对大家有所帮助。</p>
 
 
 
-  少于 1 分钟 阅读
+  2 分钟 阅读
 
 </p>
     
@@ -1339,11 +1339,11 @@ DevOps在微服务开发中的实践。希望能对大家有所帮助。</p>
     
     <h2 class="archive__item-title" itemprop="headline">
       
-        <a href="/docs/service-center-ui/" rel="permalink">Service-Center Management UI Console
+        <a href="/cn/docs/jira_beginner_guide/" rel="permalink">老司机带你刷任务 - ServiceComb JIRA入门指南
 </a>
       
     </h2>
-    <p class="archive__item-excerpt" itemprop="description">An introduction Service-Center Management Console
+    <p class="archive__item-excerpt" itemprop="description">ServiceComb JIRA入门指南
 </p>
     
       <p class="page__meta"><i class="fa fa-clock-o" aria-hidden="true"></i> 
@@ -1351,7 +1351,7 @@ DevOps在微服务开发中的实践。希望能对大家有所帮助。</p>
 
 
 
-  2 分钟 阅读
+  少于 1 分钟 阅读
 
 </p>
     
diff --git a/content/cn/docs/maven_dependency_management/index.html b/content/cn/docs/maven_dependency_management/index.html
index d7bc500..fa68d34 100644
--- a/content/cn/docs/maven_dependency_management/index.html
+++ b/content/cn/docs/maven_dependency_management/index.html
@@ -641,11 +641,11 @@
     
     <h2 class="archive__item-title" itemprop="headline">
       
-        <a href="/docs/service-registry-refactor-proposal/" rel="permalink">Proposal for refactoring service registry module in Java Chassis
+        <a href="/docs/howto-upgrade-topzipkin2/" rel="permalink">Howto Upgrade to Zipkin2
 </a>
       
     </h2>
-    <p class="archive__item-excerpt" itemprop="description">Analysis of service registry and propose a new architecture for it
+    <p class="archive__item-excerpt" itemprop="description">Changes between v1 and v2 of zipkin and how Java Chassis upgraded to zipkin2
 </p>
     
       <p class="page__meta"><i class="fa fa-clock-o" aria-hidden="true"></i> 
@@ -653,7 +653,7 @@
 
 
 
-  2 分钟 阅读
+  4 分钟 阅读
 
 </p>
     
@@ -670,11 +670,11 @@
     
     <h2 class="archive__item-title" itemprop="headline">
       
-        <a href="/cn/docs/jira_beginner_guide/" rel="permalink">老司机带你刷任务 - ServiceComb JIRA入门指南
+        <a href="/docs/service-registry-refactor-proposal/" rel="permalink">Proposal for refactoring service registry module in Java Chassis
 </a>
       
     </h2>
-    <p class="archive__item-excerpt" itemprop="description">ServiceComb JIRA入门指南
+    <p class="archive__item-excerpt" itemprop="description">Analysis of service registry and propose a new architecture for it
 </p>
     
       <p class="page__meta"><i class="fa fa-clock-o" aria-hidden="true"></i> 
@@ -682,7 +682,7 @@
 
 
 
-  少于 1 分钟 阅读
+  2 分钟 阅读
 
 </p>
     
@@ -699,11 +699,11 @@
     
     <h2 class="archive__item-title" itemprop="headline">
       
-        <a href="/docs/service-center-ui/" rel="permalink">Service-Center Management UI Console
+        <a href="/cn/docs/jira_beginner_guide/" rel="permalink">老司机带你刷任务 - ServiceComb JIRA入门指南
 </a>
       
     </h2>
-    <p class="archive__item-excerpt" itemprop="description">An introduction Service-Center Management Console
+    <p class="archive__item-excerpt" itemprop="description">ServiceComb JIRA入门指南
 </p>
     
       <p class="page__meta"><i class="fa fa-clock-o" aria-hidden="true"></i> 
@@ -711,7 +711,7 @@
 
 
 
-  2 分钟 阅读
+  少于 1 分钟 阅读
 
 </p>
     
diff --git a/content/cn/docs/performance-test-on-seckill-with-jmeter/index.html b/content/cn/docs/performance-test-on-seckill-with-jmeter/index.html
index 3a882f6..be91afd 100644
--- a/content/cn/docs/performance-test-on-seckill-with-jmeter/index.html
+++ b/content/cn/docs/performance-test-on-seckill-with-jmeter/index.html
@@ -639,11 +639,11 @@
     
     <h2 class="archive__item-title" itemprop="headline">
       
-        <a href="/docs/service-registry-refactor-proposal/" rel="permalink">Proposal for refactoring service registry module in Java Chassis
+        <a href="/docs/howto-upgrade-topzipkin2/" rel="permalink">Howto Upgrade to Zipkin2
 </a>
       
     </h2>
-    <p class="archive__item-excerpt" itemprop="description">Analysis of service registry and propose a new architecture for it
+    <p class="archive__item-excerpt" itemprop="description">Changes between v1 and v2 of zipkin and how Java Chassis upgraded to zipkin2
 </p>
     
       <p class="page__meta"><i class="fa fa-clock-o" aria-hidden="true"></i> 
@@ -651,7 +651,7 @@
 
 
 
-  2 分钟 阅读
+  4 分钟 阅读
 
 </p>
     
@@ -668,11 +668,11 @@
     
     <h2 class="archive__item-title" itemprop="headline">
       
-        <a href="/cn/docs/jira_beginner_guide/" rel="permalink">老司机带你刷任务 - ServiceComb JIRA入门指南
+        <a href="/docs/service-registry-refactor-proposal/" rel="permalink">Proposal for refactoring service registry module in Java Chassis
 </a>
       
     </h2>
-    <p class="archive__item-excerpt" itemprop="description">ServiceComb JIRA入门指南
+    <p class="archive__item-excerpt" itemprop="description">Analysis of service registry and propose a new architecture for it
 </p>
     
       <p class="page__meta"><i class="fa fa-clock-o" aria-hidden="true"></i> 
@@ -680,7 +680,7 @@
 
 
 
-  少于 1 分钟 阅读
+  2 分钟 阅读
 
 </p>
     
@@ -697,11 +697,11 @@
     
     <h2 class="archive__item-title" itemprop="headline">
       
-        <a href="/docs/service-center-ui/" rel="permalink">Service-Center Management UI Console
+        <a href="/cn/docs/jira_beginner_guide/" rel="permalink">老司机带你刷任务 - ServiceComb JIRA入门指南
 </a>
       
     </h2>
-    <p class="archive__item-excerpt" itemprop="description">An introduction Service-Center Management Console
+    <p class="archive__item-excerpt" itemprop="description">ServiceComb JIRA入门指南
 </p>
     
       <p class="page__meta"><i class="fa fa-clock-o" aria-hidden="true"></i> 
@@ -709,7 +709,7 @@
 
 
 
-  2 分钟 阅读
+  少于 1 分钟 阅读
 
 </p>
     
diff --git a/content/cn/docs/seckill-development-journey-part-I/index.html b/content/cn/docs/seckill-development-journey-part-I/index.html
index cd5520a..4ab010b 100644
--- a/content/cn/docs/seckill-development-journey-part-I/index.html
+++ b/content/cn/docs/seckill-development-journey-part-I/index.html
@@ -573,11 +573,11 @@
     
     <h2 class="archive__item-title" itemprop="headline">
       
-        <a href="/docs/service-registry-refactor-proposal/" rel="permalink">Proposal for refactoring service registry module in Java Chassis
+        <a href="/docs/howto-upgrade-topzipkin2/" rel="permalink">Howto Upgrade to Zipkin2
 </a>
       
     </h2>
-    <p class="archive__item-excerpt" itemprop="description">Analysis of service registry and propose a new architecture for it
+    <p class="archive__item-excerpt" itemprop="description">Changes between v1 and v2 of zipkin and how Java Chassis upgraded to zipkin2
 </p>
     
       <p class="page__meta"><i class="fa fa-clock-o" aria-hidden="true"></i> 
@@ -585,7 +585,7 @@
 
 
 
-  2 分钟 阅读
+  4 分钟 阅读
 
 </p>
     
@@ -602,11 +602,11 @@
     
     <h2 class="archive__item-title" itemprop="headline">
       
-        <a href="/cn/docs/jira_beginner_guide/" rel="permalink">老司机带你刷任务 - ServiceComb JIRA入门指南
+        <a href="/docs/service-registry-refactor-proposal/" rel="permalink">Proposal for refactoring service registry module in Java Chassis
 </a>
       
     </h2>
-    <p class="archive__item-excerpt" itemprop="description">ServiceComb JIRA入门指南
+    <p class="archive__item-excerpt" itemprop="description">Analysis of service registry and propose a new architecture for it
 </p>
     
       <p class="page__meta"><i class="fa fa-clock-o" aria-hidden="true"></i> 
@@ -614,7 +614,7 @@
 
 
 
-  少于 1 分钟 阅读
+  2 分钟 阅读
 
 </p>
     
@@ -631,11 +631,11 @@
     
     <h2 class="archive__item-title" itemprop="headline">
       
-        <a href="/docs/service-center-ui/" rel="permalink">Service-Center Management UI Console
+        <a href="/cn/docs/jira_beginner_guide/" rel="permalink">老司机带你刷任务 - ServiceComb JIRA入门指南
 </a>
       
     </h2>
-    <p class="archive__item-excerpt" itemprop="description">An introduction Service-Center Management Console
+    <p class="archive__item-excerpt" itemprop="description">ServiceComb JIRA入门指南
 </p>
     
       <p class="page__meta"><i class="fa fa-clock-o" aria-hidden="true"></i> 
@@ -643,7 +643,7 @@
 
 
 
-  2 分钟 阅读
+  少于 1 分钟 阅读
 
 </p>
     
diff --git a/content/cn/docs/seckill-development-journey-part-II/index.html b/content/cn/docs/seckill-development-journey-part-II/index.html
index a46bcfb..3c3f124 100644
--- a/content/cn/docs/seckill-development-journey-part-II/index.html
+++ b/content/cn/docs/seckill-development-journey-part-II/index.html
@@ -562,11 +562,11 @@
     
     <h2 class="archive__item-title" itemprop="headline">
       
-        <a href="/docs/service-registry-refactor-proposal/" rel="permalink">Proposal for refactoring service registry module in Java Chassis
+        <a href="/docs/howto-upgrade-topzipkin2/" rel="permalink">Howto Upgrade to Zipkin2
 </a>
       
     </h2>
-    <p class="archive__item-excerpt" itemprop="description">Analysis of service registry and propose a new architecture for it
+    <p class="archive__item-excerpt" itemprop="description">Changes between v1 and v2 of zipkin and how Java Chassis upgraded to zipkin2
 </p>
     
       <p class="page__meta"><i class="fa fa-clock-o" aria-hidden="true"></i> 
@@ -574,7 +574,7 @@
 
 
 
-  2 分钟 阅读
+  4 分钟 阅读
 
 </p>
     
@@ -591,11 +591,11 @@
     
     <h2 class="archive__item-title" itemprop="headline">
       
-        <a href="/cn/docs/jira_beginner_guide/" rel="permalink">老司机带你刷任务 - ServiceComb JIRA入门指南
+        <a href="/docs/service-registry-refactor-proposal/" rel="permalink">Proposal for refactoring service registry module in Java Chassis
 </a>
       
     </h2>
-    <p class="archive__item-excerpt" itemprop="description">ServiceComb JIRA入门指南
+    <p class="archive__item-excerpt" itemprop="description">Analysis of service registry and propose a new architecture for it
 </p>
     
       <p class="page__meta"><i class="fa fa-clock-o" aria-hidden="true"></i> 
@@ -603,7 +603,7 @@
 
 
 
-  少于 1 分钟 阅读
+  2 分钟 阅读
 
 </p>
     
@@ -620,11 +620,11 @@
     
     <h2 class="archive__item-title" itemprop="headline">
       
-        <a href="/docs/service-center-ui/" rel="permalink">Service-Center Management UI Console
+        <a href="/cn/docs/jira_beginner_guide/" rel="permalink">老司机带你刷任务 - ServiceComb JIRA入门指南
 </a>
       
     </h2>
-    <p class="archive__item-excerpt" itemprop="description">An introduction Service-Center Management Console
+    <p class="archive__item-excerpt" itemprop="description">ServiceComb JIRA入门指南
 </p>
     
       <p class="page__meta"><i class="fa fa-clock-o" aria-hidden="true"></i> 
@@ -632,7 +632,7 @@
 
 
 
-  2 分钟 阅读
+  少于 1 分钟 阅读
 
 </p>
     
diff --git a/content/cn/docs/seckill-development-journey-part-III/index.html b/content/cn/docs/seckill-development-journey-part-III/index.html
index 9c2af0b..ef7764c 100644
--- a/content/cn/docs/seckill-development-journey-part-III/index.html
+++ b/content/cn/docs/seckill-development-journey-part-III/index.html
@@ -576,11 +576,11 @@
     
     <h2 class="archive__item-title" itemprop="headline">
       
-        <a href="/docs/service-registry-refactor-proposal/" rel="permalink">Proposal for refactoring service registry module in Java Chassis
+        <a href="/docs/howto-upgrade-topzipkin2/" rel="permalink">Howto Upgrade to Zipkin2
 </a>
       
     </h2>
-    <p class="archive__item-excerpt" itemprop="description">Analysis of service registry and propose a new architecture for it
+    <p class="archive__item-excerpt" itemprop="description">Changes between v1 and v2 of zipkin and how Java Chassis upgraded to zipkin2
 </p>
     
       <p class="page__meta"><i class="fa fa-clock-o" aria-hidden="true"></i> 
@@ -588,7 +588,7 @@
 
 
 
-  2 分钟 阅读
+  4 分钟 阅读
 
 </p>
     
@@ -605,11 +605,11 @@
     
     <h2 class="archive__item-title" itemprop="headline">
       
-        <a href="/cn/docs/jira_beginner_guide/" rel="permalink">老司机带你刷任务 - ServiceComb JIRA入门指南
+        <a href="/docs/service-registry-refactor-proposal/" rel="permalink">Proposal for refactoring service registry module in Java Chassis
 </a>
       
     </h2>
-    <p class="archive__item-excerpt" itemprop="description">ServiceComb JIRA入门指南
+    <p class="archive__item-excerpt" itemprop="description">Analysis of service registry and propose a new architecture for it
 </p>
     
       <p class="page__meta"><i class="fa fa-clock-o" aria-hidden="true"></i> 
@@ -617,7 +617,7 @@
 
 
 
-  少于 1 分钟 阅读
+  2 分钟 阅读
 
 </p>
     
@@ -634,11 +634,11 @@
     
     <h2 class="archive__item-title" itemprop="headline">
       
-        <a href="/docs/service-center-ui/" rel="permalink">Service-Center Management UI Console
+        <a href="/cn/docs/jira_beginner_guide/" rel="permalink">老司机带你刷任务 - ServiceComb JIRA入门指南
 </a>
       
     </h2>
-    <p class="archive__item-excerpt" itemprop="description">An introduction Service-Center Management Console
+    <p class="archive__item-excerpt" itemprop="description">ServiceComb JIRA入门指南
 </p>
     
       <p class="page__meta"><i class="fa fa-clock-o" aria-hidden="true"></i> 
@@ -646,7 +646,7 @@
 
 
 
-  2 分钟 阅读
+  少于 1 分钟 阅读
 
 </p>
     
diff --git a/content/cn/docs/stress-test-on-company-with-jmeter-in-k8s/index.html b/content/cn/docs/stress-test-on-company-with-jmeter-in-k8s/index.html
index 9ac2a07..a1127fe 100644
--- a/content/cn/docs/stress-test-on-company-with-jmeter-in-k8s/index.html
+++ b/content/cn/docs/stress-test-on-company-with-jmeter-in-k8s/index.html
@@ -674,11 +674,11 @@ sampler.getHeaderManager<span class="o">()</span>.removeHeaderNamed<span class="
     
     <h2 class="archive__item-title" itemprop="headline">
       
-        <a href="/docs/service-registry-refactor-proposal/" rel="permalink">Proposal for refactoring service registry module in Java Chassis
+        <a href="/docs/howto-upgrade-topzipkin2/" rel="permalink">Howto Upgrade to Zipkin2
 </a>
       
     </h2>
-    <p class="archive__item-excerpt" itemprop="description">Analysis of service registry and propose a new architecture for it
+    <p class="archive__item-excerpt" itemprop="description">Changes between v1 and v2 of zipkin and how Java Chassis upgraded to zipkin2
 </p>
     
       <p class="page__meta"><i class="fa fa-clock-o" aria-hidden="true"></i> 
@@ -686,7 +686,7 @@ sampler.getHeaderManager<span class="o">()</span>.removeHeaderNamed<span class="
 
 
 
-  2 分钟 阅读
+  4 分钟 阅读
 
 </p>
     
@@ -703,11 +703,11 @@ sampler.getHeaderManager<span class="o">()</span>.removeHeaderNamed<span class="
     
     <h2 class="archive__item-title" itemprop="headline">
       
-        <a href="/cn/docs/jira_beginner_guide/" rel="permalink">老司机带你刷任务 - ServiceComb JIRA入门指南
+        <a href="/docs/service-registry-refactor-proposal/" rel="permalink">Proposal for refactoring service registry module in Java Chassis
 </a>
       
     </h2>
-    <p class="archive__item-excerpt" itemprop="description">ServiceComb JIRA入门指南
+    <p class="archive__item-excerpt" itemprop="description">Analysis of service registry and propose a new architecture for it
 </p>
     
       <p class="page__meta"><i class="fa fa-clock-o" aria-hidden="true"></i> 
@@ -715,7 +715,7 @@ sampler.getHeaderManager<span class="o">()</span>.removeHeaderNamed<span class="
 
 
 
-  少于 1 分钟 阅读
+  2 分钟 阅读
 
 </p>
     
@@ -732,11 +732,11 @@ sampler.getHeaderManager<span class="o">()</span>.removeHeaderNamed<span class="
     
     <h2 class="archive__item-title" itemprop="headline">
       
-        <a href="/docs/service-center-ui/" rel="permalink">Service-Center Management UI Console
+        <a href="/cn/docs/jira_beginner_guide/" rel="permalink">老司机带你刷任务 - ServiceComb JIRA入门指南
 </a>
       
     </h2>
-    <p class="archive__item-excerpt" itemprop="description">An introduction Service-Center Management Console
+    <p class="archive__item-excerpt" itemprop="description">ServiceComb JIRA入门指南
 </p>
     
       <p class="page__meta"><i class="fa fa-clock-o" aria-hidden="true"></i> 
@@ -744,7 +744,7 @@ sampler.getHeaderManager<span class="o">()</span>.removeHeaderNamed<span class="
 
 
 
-  2 分钟 阅读
+  少于 1 分钟 阅读
 
 </p>
     
diff --git a/content/cn/docs/tracing-with-servicecomb/index.html b/content/cn/docs/tracing-with-servicecomb/index.html
index 0642bbb..e5f22c8 100644
--- a/content/cn/docs/tracing-with-servicecomb/index.html
+++ b/content/cn/docs/tracing-with-servicecomb/index.html
@@ -625,11 +625,11 @@
     
     <h2 class="archive__item-title" itemprop="headline">
       
-        <a href="/docs/service-registry-refactor-proposal/" rel="permalink">Proposal for refactoring service registry module in Java Chassis
+        <a href="/docs/howto-upgrade-topzipkin2/" rel="permalink">Howto Upgrade to Zipkin2
 </a>
       
     </h2>
-    <p class="archive__item-excerpt" itemprop="description">Analysis of service registry and propose a new architecture for it
+    <p class="archive__item-excerpt" itemprop="description">Changes between v1 and v2 of zipkin and how Java Chassis upgraded to zipkin2
 </p>
     
       <p class="page__meta"><i class="fa fa-clock-o" aria-hidden="true"></i> 
@@ -637,7 +637,7 @@
 
 
 
-  2 分钟 阅读
+  4 分钟 阅读
 
 </p>
     
@@ -654,11 +654,11 @@
     
     <h2 class="archive__item-title" itemprop="headline">
       
-        <a href="/cn/docs/jira_beginner_guide/" rel="permalink">老司机带你刷任务 - ServiceComb JIRA入门指南
+        <a href="/docs/service-registry-refactor-proposal/" rel="permalink">Proposal for refactoring service registry module in Java Chassis
 </a>
       
     </h2>
-    <p class="archive__item-excerpt" itemprop="description">ServiceComb JIRA入门指南
+    <p class="archive__item-excerpt" itemprop="description">Analysis of service registry and propose a new architecture for it
 </p>
     
       <p class="page__meta"><i class="fa fa-clock-o" aria-hidden="true"></i> 
@@ -666,7 +666,7 @@
 
 
 
-  少于 1 分钟 阅读
+  2 分钟 阅读
 
 </p>
     
@@ -683,11 +683,11 @@
     
     <h2 class="archive__item-title" itemprop="headline">
       
-        <a href="/docs/service-center-ui/" rel="permalink">Service-Center Management UI Console
+        <a href="/cn/docs/jira_beginner_guide/" rel="permalink">老司机带你刷任务 - ServiceComb JIRA入门指南
 </a>
       
     </h2>
-    <p class="archive__item-excerpt" itemprop="description">An introduction Service-Center Management Console
+    <p class="archive__item-excerpt" itemprop="description">ServiceComb JIRA入门指南
 </p>
     
       <p class="page__meta"><i class="fa fa-clock-o" aria-hidden="true"></i> 
@@ -695,7 +695,7 @@
 
 
 
-  2 分钟 阅读
+  少于 1 分钟 阅读
 
 </p>
     
diff --git a/content/cn/slides/index.html b/content/cn/slides/index.html
index 03c41ba..1561fb4 100644
--- a/content/cn/slides/index.html
+++ b/content/cn/slides/index.html
@@ -317,6 +317,11 @@
   <li><a href="/assets/slides/20171221/data.consistency.live.pdf">ServiceComb的数据一致性</a></li>
 </ul>
 
+<h2 id="servicecomb-直播第七期-20180111"><a href="http://www.itdks.com/liveevent/detail/9543">ServiceComb 直播第七期</a>, 20180111</h2>
+<ul>
+  <li><a href="/assets/slides/20180111/ServiceComb_Metrics_Introduction.pdf">ServiceComb Metrics 介绍</a></li>
+</ul>
+
         
       </section>
 
diff --git a/content/cn/users/metrics-in-1.0.0-m1/index.html b/content/cn/users/metrics-in-1.0.0-m1/index.html
index 37ab76c..83345e6 100644
--- a/content/cn/users/metrics-in-1.0.0-m1/index.html
+++ b/content/cn/users/metrics-in-1.0.0-m1/index.html
@@ -622,7 +622,7 @@
   </nav>
 </aside>
 
-<p>微服务框架从0.5.0版本开始支持监控功能Metrics,1.0.0-m1版本正式发布,我们会继续追加新特性新功能,订阅ServiceComb邮件列表(dev-subscribe@servicecomb.incubator.apache.org)以持续获取最新信息。</p>
+<p>微服务框架从0.5.0版本开始支持监控功能Metrics,1.0.0-m1版本正式发布,请通过查看用户手册和<a href="https://github.com/apache/incubator-servicecomb-java-chassis/releases">Release Note</a>获取更多信息,我们也会继续追加新特性新功能,欢迎订阅ServiceComb邮件列表(dev-subscribe@servicecomb.incubator.apache.org)参与讨论。</p>
 
 <h2 id="背景">背景</h2>
 <p>将系统微服务化是技术潮流和趋势,但是它解决了很多问题的同时也带来了新的问题。</p>
@@ -633,7 +633,7 @@
 
 <p><img src="/assets/images/MicroserviceArch.png" alt="MicroserviceArch" /></p>
 
-<p>这是微服务化后的系统架构图,经过功能切分,开发人员得到解脱,拥有了极致的CI/CD,但是运维人员却需要维护海量的微服务实例,所以如果不进行性能监控,就无法定位时延高的微服务,也无法制定弹性伸缩策略。</p>
+<p>这是微服务化后的系统架构图,经过功能切分,开发人员获得了架构独立、快速迭代等诸多微服务带来的好处,但是运维人员却需要维护海量的微服务实例,所以如果不进行性能监控,当系统出现故障或用户体验下降时,就无法快速定位问题,也无法制定策略(例如弹性伸缩)来预防。</p>
 
 <h2 id="1000-m1版本原理">1.0.00-m1版本原理</h2>
 <p>在0.5.0版本的实现介绍<a href="/cn/users/metrics-in-0.5.0/">0.5.0版本中的监控</a>中,存在一些问题:</p>
@@ -645,7 +645,7 @@
   <li>由于foundation-metrics模块过于底层,用户无法以可选的方式决定是否启用;</li>
 </ol>
 
-<p>因此,从0.5.0版本升级到1.0.0-m1版本,我们进行了一次全面的重构,重构后的Metrics将分为三个模块</p>
+<p>因此,从0.5.0版本升级到1.0.0-m1版本,我们进行了一次全面的重构,重构后的Metrics将分为如下几个模块</p>
 
 <table>
   <thead>
@@ -657,23 +657,19 @@
   <tbody>
     <tr>
       <td style="text-align: left">metrics-core</td>
-      <td style="text-align: left">Metric核心模块,引入后即启用Metrics数据收集功能</td>
+      <td style="text-align: left">Metrics核心模块,引入后即启用Metrics数据收集功能</td>
     </tr>
     <tr>
       <td style="text-align: left">metrics-common</td>
-      <td style="text-align: left">Metric通用模块,主要包含Metric DTO用于数据发布</td>
+      <td style="text-align: left">Metrics通用模块,主要包含Metric DTO用于数据发布</td>
     </tr>
     <tr>
       <td style="text-align: left">metrics-extension</td>
-      <td style="text-align: left">包含Metric的一些扩展功能</td>
+      <td style="text-align: left">包含Metrics的一些扩展功能</td>
     </tr>
     <tr>
       <td style="text-align: left">metrics-integration</td>
-      <td style="text-align: left">包含Metric与其它三方系统集成</td>
-    </tr>
-    <tr>
-      <td style="text-align: left">metrics-sample</td>
-      <td style="text-align: left">包含Metric的一些示例</td>
+      <td style="text-align: left">包含Metrics与其它三方系统集成</td>
     </tr>
   </tbody>
 </table>
@@ -682,7 +678,7 @@
 <img src="/assets/images/MetricsDependency.png" alt="MetricsDependency.png" /></p>
 
 <h3 id="数据采集不再依赖hystrixhandler-bizkeeper使用事件埋点收集与调用相关的所有数据">数据采集不再依赖Hystrix(handler-bizkeeper),使用事件埋点收集与调用相关的所有数据</h3>
-<p>1.0.0-m1版本不再从Hystrix获取调用的TPS和Latency,避免了不配置Java Chassis Bizkeeper Handler就不会输出这两项数据的问题;使用foundation-common中的EventBus作为事件总线,metrics-core中的DefaultEventListenerManager初始化后会立即注入三个事件监听处理类:</p>
+<p>1.0.0-m1版本不再从Hystrix获取调用的TPS和Latency,避免了不配置Java Chassis Bizkeeper Handler就不会输出这两项数据的问题;使用foundation-common中的EventBus作为事件总线,metrics-core中的DefaultEventListenerManager初始化后会立即注册三个事件监听处理类:</p>
 
 <table>
   <thead>
@@ -707,12 +703,12 @@
   </tbody>
 </table>
 
-<p><em>特别说明,Java Chassis的Reactor框架基于Vertx,微服务Producer端收到Invocation后,并不会马上同步处理请求,而是将它放入一个处理队列中,Invocation在队列中的时间称为LifeTimeInQueue,队列的长度称为waitInQueue,这是衡量微服务压力的两个重要指标,可以参考操作系统磁盘读写队列的概念;Consumer端并不会有队列,因此永远不会触发InvocationStartProcessingEvent。</em></p>
+<p><em>特别说明,Java Chassis的Reactor框架基于<a href="http://vertx.io/">Vertx</a>,在同步调用模式下,微服务Producer端收到Invocation后,并不会马上同步处理请求,而是将它放入一个处理队列中,Invocation在队列中的时间称为<strong>LifeTimeInQueue</strong>,队列的长度称为<strong>waitInQueue</strong>,这是衡量微服务压力的两个重要指标,可以参考操作系统磁盘读写队列的概念;Consumer端并不会有队列,因此永远不会触发InvocationStartProcessingEvent。</em></p>
 
-<p>事件触发的代码广泛分布在Java Chassis的RestInvocation、HighwayServerInvoke、HighwayClient和VertxHttpMethod中,如果微服务没有启用Metrics,EventBus中不会注入事件监听处理类,因此对性能的影响微乎其微。</p>
+<p>事件触发的代码分布在Java Chassis的RestInvocation、HighwayServerInvoke和InvokerUtils中,如果微服务没有启用Metrics,EventBus中就不会注册Metrics事件监听处理器,因此对性能的影响微乎其微。</p>
 
 <h3 id="使用netflix-servo作为metric的计数器">使用Netflix Servo作为Metric的计数器</h3>
-<p>Netflix Servo具有性能极高的计数器(Monitor),我们使用了四种:</p>
+<p><a href="https://github.com/Netflix/servo">Netflix Servo</a>具有性能极高的计数器(Monitor),我们使用了四种:</p>
 
 <table>
   <thead>
@@ -728,7 +724,7 @@
     </tr>
     <tr>
       <td style="text-align: left">StepCounter</td>
-      <td style="text-align: left">周期累加计数器</td>
+      <td style="text-align: left">周期累加计数器(以前曾经称为ResettableCounter)</td>
     </tr>
     <tr>
       <td style="text-align: left">MinGauge</td>
@@ -744,16 +740,22 @@
 <p><em>依赖的Servo版本为0.10.1</em></p>
 
 <h3 id="周期设置">周期设置</h3>
-<p>Metric可以分为两大类:</p>
+<p>Metrics有很多种分类方式,在技术实现上我们偏向以取值方式区分为两种:</p>
 <ol>
-  <li>时间无关型(直接取值):诸如调用总次数、资源使用状况等等,Consumer无论何时获取Metric,总返回当前最新值;</li>
-  <li>时间相关型(统计取值):只有经过一个固定的周期时间才能够获取结果值,例如最大、最小、平均值等等,固定周期一般可以称为“统计时间窗”,在Servo中,这个时间被称为<a href="https://github.com/Netflix/servo/wiki/Getting-Started">“Polling Intervals”</a>。<br />
-从1.0.0-m1开始,通过servicecomb.metrics.window_time设置周期,效果与servo.pollers一致。</li>
+  <li>直接取值
+  任何时候都能够立刻获取到最新值,例如资源使用率,包括CPU使用率,线程数,Heap使用数据等等,还有调用累加次数,当前队列长度等等。</li>
+  <li>统计取值
+  经过一个特定的时间周期才能够统计出值,这个时间间隔我们可以称为窗口周期(Window Time)或统计周期,例如:<br />
+  a) 多值取其一的,比如Max、Min、Median(中位值);  <br />
+  b) 与时间相关的,比如TPS(transaction per second);  <br />
+  c) 与个数相关的,比如累加平均值、方差等等;  <br />
+  获取此类Metrics的值,返回的是上一个周期的统计结果,具有一定的延后性。在Servo中,这个时间被称为<a href="https://github.com/Netflix/servo/wiki/Getting-Started">“Polling Intervals”</a>。  <br />
+  从1.0.0-m1开始,可以通过microservice.yaml中的servicecomb.metrics.window_time配置设置周期,效果与servo.pollers一致。
+    <h2 id="metric列表">Metric列表</h2>
+    <p>从1.0.0-m1开始,支持微服务Operation级别的Metric输出,列表如下:</p>
+  </li>
 </ol>
 
-<h2 id="metric列表">Metric列表</h2>
-<p>从1.0.0-m1开始,支持微服务Operation级别的Metric输出,列表如下:</p>
-
 <table>
   <thead>
     <tr>
@@ -837,119 +839,119 @@
     </tr>
     <tr>
       <td style="text-align: left">servicecomb</td>
-      <td style="text-align: left">instance/operationName</td>
+      <td style="text-align: left">instance | operationName</td>
       <td style="text-align: left">producer</td>
       <td style="text-align: left">waitInQueue</td>
       <td style="text-align: left">count</td>
     </tr>
     <tr>
       <td style="text-align: left">servicecomb</td>
-      <td style="text-align: left">instance/operationName</td>
+      <td style="text-align: left">instance | operationName</td>
       <td style="text-align: left">producer</td>
       <td style="text-align: left">lifeTimeInQueue</td>
       <td style="text-align: left">average</td>
     </tr>
     <tr>
       <td style="text-align: left">servicecomb</td>
-      <td style="text-align: left">instance/operationName</td>
+      <td style="text-align: left">instance | operationName</td>
       <td style="text-align: left">producer</td>
       <td style="text-align: left">lifeTimeInQueue</td>
       <td style="text-align: left">max</td>
     </tr>
     <tr>
       <td style="text-align: left">servicecomb</td>
-      <td style="text-align: left">instance/operationName</td>
+      <td style="text-align: left">instance | operationName</td>
       <td style="text-align: left">producer</td>
       <td style="text-align: left">lifeTimeInQueue</td>
       <td style="text-align: left">min</td>
     </tr>
     <tr>
       <td style="text-align: left">servicecomb</td>
-      <td style="text-align: left">instance/operationName</td>
+      <td style="text-align: left">instance | operationName</td>
       <td style="text-align: left">producer</td>
       <td style="text-align: left">executionTime</td>
       <td style="text-align: left">average</td>
     </tr>
     <tr>
       <td style="text-align: left">servicecomb</td>
-      <td style="text-align: left">instance/operationName</td>
+      <td style="text-align: left">instance | operationName</td>
       <td style="text-align: left">producer</td>
       <td style="text-align: left">executionTime</td>
       <td style="text-align: left">max</td>
     </tr>
     <tr>
       <td style="text-align: left">servicecomb</td>
-      <td style="text-align: left">instance/operationName</td>
+      <td style="text-align: left">instance | operationName</td>
       <td style="text-align: left">producer</td>
       <td style="text-align: left">executionTime</td>
       <td style="text-align: left">min</td>
     </tr>
     <tr>
       <td style="text-align: left">servicecomb</td>
-      <td style="text-align: left">instance/operationName</td>
+      <td style="text-align: left">instance | operationName</td>
       <td style="text-align: left">producer</td>
       <td style="text-align: left">producerLatency</td>
       <td style="text-align: left">average</td>
     </tr>
     <tr>
       <td style="text-align: left">servicecomb</td>
-      <td style="text-align: left">instance/operationName</td>
+      <td style="text-align: left">instance | operationName</td>
       <td style="text-align: left">producer</td>
       <td style="text-align: left">producerLatency</td>
       <td style="text-align: left">max</td>
     </tr>
     <tr>
       <td style="text-align: left">servicecomb</td>
-      <td style="text-align: left">instance/operationName</td>
+      <td style="text-align: left">instance | operationName</td>
       <td style="text-align: left">producer</td>
       <td style="text-align: left">producerLatency</td>
       <td style="text-align: left">min</td>
     </tr>
     <tr>
       <td style="text-align: left">servicecomb</td>
-      <td style="text-align: left">instance/operationName</td>
+      <td style="text-align: left">instance | operationName</td>
       <td style="text-align: left">producer</td>
       <td style="text-align: left">producerCall</td>
       <td style="text-align: left">total</td>
     </tr>
     <tr>
       <td style="text-align: left">servicecomb</td>
-      <td style="text-align: left">instance/operationName</td>
+      <td style="text-align: left">instance | operationName</td>
       <td style="text-align: left">producer</td>
       <td style="text-align: left">producerCall</td>
       <td style="text-align: left">tps</td>
     </tr>
     <tr>
       <td style="text-align: left">servicecomb</td>
-      <td style="text-align: left">instance/operationName</td>
+      <td style="text-align: left">instance | operationName</td>
       <td style="text-align: left">consumer</td>
       <td style="text-align: left">consumerLatency</td>
       <td style="text-align: left">average</td>
     </tr>
     <tr>
       <td style="text-align: left">servicecomb</td>
-      <td style="text-align: left">instance/operationName</td>
+      <td style="text-align: left">instance | operationName</td>
       <td style="text-align: left">consumer</td>
       <td style="text-align: left">consumerLatency</td>
       <td style="text-align: left">max</td>
     </tr>
     <tr>
       <td style="text-align: left">servicecomb</td>
-      <td style="text-align: left">instance/operationName</td>
+      <td style="text-align: left">instance | operationName</td>
       <td style="text-align: left">consumer</td>
       <td style="text-align: left">consumerLatency</td>
       <td style="text-align: left">min</td>
     </tr>
     <tr>
       <td style="text-align: left">servicecomb</td>
-      <td style="text-align: left">instance/operationName</td>
+      <td style="text-align: left">instance | operationName</td>
       <td style="text-align: left">consumer</td>
       <td style="text-align: left">consumerCall</td>
       <td style="text-align: left">total</td>
     </tr>
     <tr>
       <td style="text-align: left">servicecomb</td>
-      <td style="text-align: left">instance/operationName</td>
+      <td style="text-align: left">instance | operationName</td>
       <td style="text-align: left">consumer</td>
       <td style="text-align: left">consumerCall</td>
       <td style="text-align: left">tps</td>
@@ -957,7 +959,7 @@
   </tbody>
 </table>
 
-<p><em>operationName代表微服务Operation的全名,使用的是Java Chassis MicroserviceQualifiedName,它是微服务名.SchemaID.操作方法名的组合。</em></p>
+<p><strong>当Level的值是“instance”的时候,代表微服务事例级别的Metric,否则代表微服务具体Operation的Metric,operationName使用的是Java Chassis MicroserviceQualifiedName,它是微服务名.SchemaID.操作方法名的组合。</strong></p>
 
 <h2 id="如何配置">如何配置</h2>
 <h3 id="全局配置">全局配置</h3>
diff --git a/content/cn/users/metrics-integration-with-prometheus-in-1.0.0-m1/index.html b/content/cn/users/metrics-integration-with-prometheus-in-1.0.0-m1/index.html
index bf889ba..94e4633 100644
--- a/content/cn/users/metrics-integration-with-prometheus-in-1.0.0-m1/index.html
+++ b/content/cn/users/metrics-integration-with-prometheus-in-1.0.0-m1/index.html
@@ -616,14 +616,14 @@
   </nav>
 </aside>
 
-<p>微服务框架从0.5.0版本开始支持监控功能Metrics,1.0.0-m1版本正式发布,我们会继续追加新特性新功能,订阅ServiceComb邮件列表(dev-subscribe@servicecomb.incubator.apache.org)以持续获取最新信息。</p>
+<p>微服务框架从0.5.0版本开始支持监控功能Metrics,1.0.0-m1版本正式发布,请通过查看用户手册和<a href="https://github.com/apache/incubator-servicecomb-java-chassis/releases">Release Note</a>获取更多信息,我们也会继续追加新特性新功能,欢迎订阅ServiceComb邮件列表(dev-subscribe@servicecomb.incubator.apache.org)参与讨论。</p>
 
 <h2 id="背景">背景</h2>
 <p><a href="http://www.prometheus.io/">普罗米修斯</a>是相似于Google Borgmon的一个开源监控系统,也是<a href="https://www.cncf.io/">CNCF</a>的成员之一,目前社区非常活跃,Java Chassis Metrics在1.0.0-m1中支持对接普罗米修斯,并进一步实现使用<a href="https://grafana.com/">Grafana</a>查询Metrics数据。</p>
 
 <h2 id="对接原理">对接原理</h2>
 <p>由于Java Chassis由Java语言开发,我们使用<a href="https://github.com/prometheus/client_java">prometheus java client</a>中的Simple Client作为对接SDK,版本为0.1.0。<br />
-Prometheus推荐Pull模式拉取Metrics数据,被监控微服务作为Producer发布数据provider接口,我们采用Simple Http Server发布微服务采集到的Metrics数据。<br />
+Prometheus推荐Pull模式拉取Metrics数据,被监控微服务作为Producer发布数据provider接口,我们采用Simple HTTP Server发布微服务采集到的Metrics数据。<br />
 作为一个集成(可选)模块,代码在metrics-integration/metrics-prometheus中,你可以看到它依赖:</p>
 <div class="language-xml highlighter-rouge"><pre class="highlight"><code>  <span class="nt">&lt;dependency&gt;</span>
     <span class="nt">&lt;groupId&gt;</span>io.prometheus<span class="nt">&lt;/groupId&gt;</span>
@@ -661,7 +661,7 @@ Prometheus推荐Pull模式拉取Metrics数据,被监控微服务作为Producer
 </span><span class="p">}}</span><span class="w">
 </span></code></pre>
 </div>
-<p>但使用Prometheus Simple Http Server接口发布的数据是Prometheus采集的标准格式:</p>
+<p>使用Prometheus Simple HTTP Server接口发布的数据是Prometheus采集的标准格式:</p>
 <div class="language-text highlighter-rouge"><pre class="highlight"><code># HELP Instance Level Instance Level Metrics
 # TYPE Instance Level untyped
 servicecomb_instance_producer_producerLatency_average 0.0
@@ -681,9 +681,9 @@ servicecomb_calculator_metricsEndpoint_metrics_producer_waitInQueue_count 0.0
 servicecomb_calculator_metricsEndpoint_metrics_producer_lifeTimeInQueue_count 0.0
 </code></pre>
 </div>
-<p>所以它们两个是完全独立各有用途的,取决你如何使用。</p>
+<p>所以它们两个是完全独立各有用途的。</p>
 
-<p><em>Prometheus Simple Http Server同样使用/metrics作为默认URL,metrics-prometheus会使用9696作为默认端口,因此微服务启动后你可以使用http://localhost:9696/metrics 访问它。</em></p>
+<p><em>Prometheus Simple HTTP Server同样使用/metrics作为默认URL,metrics-prometheus会使用9696作为默认端口,因此微服务启动后你可以使用http://localhost:9696/metrics 访问它。</em></p>
 
 <p>我们可以看到在Prometheus的Metric命名统一使用下划线代替了点,因为需要遵守它的<a href="https://prometheus.io/docs/practices/naming/">命名规则</a>。</p>
 
@@ -738,7 +738,7 @@ servicecomb_calculator_metricsEndpoint_metrics_producer_lifeTimeInQueue_count 0.
 <h3 id="配置grafana可选">配置Grafana(可选)</h3>
 <p>如何在Grafana中添加Prometheus作为数据源请参考<a href="https://prometheus.io/docs/visualization/grafana/">这篇文章</a>。</p>
 <h2 id="运行效果">运行效果</h2>
-<p>配置好并启动了微服务、Prometheus之后,就可以打开Prometheus Web界面(默认地址是http://localhost:9090/ ),在Metrics列表中看到ServiceComb开头的Java Chassis Metrics,如下图所示:
+<p>配置好Prometheus并启动了微服务之后,就可以打开Prometheus Web界面(默认地址是http://localhost:9090/ ),在Metrics列表中看到ServiceComb开头的Java Chassis Metrics,如下图所示:
 <img src="/assets/images/MetricsInPrometheus.png" alt="MetricsInPrometheus" /></p>
 
 <p>为了能够达到更好的查询效果,在Grafana中添加Prometheus作为数据源,通过Grafana查询数据如下图示:</p>
diff --git a/content/cn/users/metrics-write-file-extension-and-sample-in-1.0.0-m1/index.html b/content/cn/users/metrics-write-file-extension-and-sample-in-1.0.0-m1/index.html
index e867bf5..679e497 100644
--- a/content/cn/users/metrics-write-file-extension-and-sample-in-1.0.0-m1/index.html
+++ b/content/cn/users/metrics-write-file-extension-and-sample-in-1.0.0-m1/index.html
@@ -599,23 +599,22 @@
     <!-- <header><h4 class="nav__title"><i class="fa fa-file-text"></i> 在本页上</h4></header> -->
 <ul class="toc__menu" id="markdown-toc">
   <li><a href="#背景" id="markdown-toc-背景">背景</a></li>
-  <li><a href="#配置" id="markdown-toc-配置">配置</a>    <ul>
-      <li><a href="#全局配置" id="markdown-toc-全局配置">全局配置</a></li>
-      <li><a href="#依赖配置" id="markdown-toc-依赖配置">依赖配置</a></li>
-    </ul>
-  </li>
+  <li><a href="#全局配置" id="markdown-toc-全局配置">全局配置</a></li>
+  <li><a href="#依赖和代码使用" id="markdown-toc-依赖和代码使用">依赖和代码使用</a></li>
+  <li><a href="#使用spring-boot-starter开发注意事项" id="markdown-toc-使用spring-boot-starter开发注意事项">使用Spring Boot Starter开发注意事项</a></li>
+  <li><a href="#运行示例" id="markdown-toc-运行示例">运行示例</a></li>
   <li><a href="#q--a" id="markdown-toc-q--a">Q &amp; A</a></li>
 </ul>
 
   </nav>
 </aside>
 
-<p>微服务框架从0.5.0版本开始支持监控功能Metrics,1.0.0-m1版本正式发布,我们会继续追加新特性新功能,订阅ServiceComb邮件列表(dev-subscribe@servicecomb.incubator.apache.org)以持续获取最新信息。</p>
+<p>微服务框架从0.5.0版本开始支持监控功能Metrics,1.0.0-m1版本正式发布,请通过查看用户手册和<a href="https://github.com/apache/incubator-servicecomb-java-chassis/releases">Release Note</a>获取更多信息,我们也会继续追加新特性新功能,欢迎订阅ServiceComb邮件列表(dev-subscribe@servicecomb.incubator.apache.org)参与讨论。</p>
 
 <h2 id="背景">背景</h2>
-<p>0.5.0版本的foundation-metrics实现了将采集到的Metrics数据写入文件,在1.0.0-m1中,此功能移动到metrics-extension中;<br />
+<p>0.5.0版本的foundation-metrics实现了将采集到的Metrics数据写入文件,在1.0.0-m1中,此功能以Sample的形式移动到了samples/metrics-write-file-sample中;<br />
 从1.0.0-m1版本开始支持输出Operation级别的Metric,因此无法通过固定配置的方式配置日志输出,将采用代码的方式在运行时为每一个Metric自动创建专用的RollingFileAppender。
-功能包含如下模块:</p>
+示例代码包含如下三个模块:</p>
 
 <table>
   <thead>
@@ -630,24 +629,19 @@
       <td style="text-align: left">定期获取Metrics数据写入文件主模块</td>
     </tr>
     <tr>
-      <td style="text-align: left">metrics-write-file-config</td>
-      <td style="text-align: left">写文件方式配置模块</td>
-    </tr>
-    <tr>
-      <td style="text-align: left">metrics-write-file-config-log4j</td>
+      <td style="text-align: left">metrics-write-file-config-log4j-springboot</td>
       <td style="text-align: left">使用Log4j的RollingFileAppender写文件</td>
     </tr>
     <tr>
-      <td style="text-align: left">metrics-write-file-config-log4j2</td>
+      <td style="text-align: left">metrics-write-file-config-log4j2-springboot</td>
       <td style="text-align: left">使用Log4j2的RollingFileAppender写文件</td>
     </tr>
   </tbody>
 </table>
 
-<p><em>暂未提供logback的metrics-write-file-config,参考Log4j和log4j2的例子可以很容易实现metrics-write-file-config-logback</em></p>
+<p><em>暂未提供logback的示例,参考Log4j和Log4j2的例子可以很容易实现</em></p>
 
-<h2 id="配置">配置</h2>
-<h3 id="全局配置">全局配置</h3>
+<h2 id="全局配置">全局配置</h2>
 <p>与0.5.0类似,需要在microservice.yaml中添加如下配置项:</p>
 <div class="language-yaml highlighter-rouge"><pre class="highlight"><code><span class="s">APPLICATION_ID</span><span class="pi">:</span> <span class="s">demo</span>
 <span class="s">service_description</span><span class="pi">:</span>
@@ -678,46 +672,23 @@
   <li>新版本增加了对rolling file的设置,这些配置在老版本是配置在日志的xml或properties文件里的。</li>
 </ol>
 
-<h3 id="依赖配置">依赖配置</h3>
-<p>Java Chassis支持直接启动和Spring Boot Starter启动两种模式,两种模式下的配置详细描述如下:</p>
-<h4 id="直接启动不使用spring-boot依赖配置">直接启动(不使用Spring Boot)依赖配置</h4>
-<h5 id="项目使用log4j作为日志实现">项目使用log4j作为日志实现</h5>
-<p>请参考samples/metrics-write-file-sample/metrics-write-file-log4j项目:</p>
-<div class="language-xml highlighter-rouge"><pre class="highlight"><code>    <span class="nt">&lt;dependency&gt;</span>
-      <span class="nt">&lt;groupId&gt;</span>io.servicecomb<span class="nt">&lt;/groupId&gt;</span>
-      <span class="nt">&lt;artifactId&gt;</span>metrics-write-file-config<span class="nt">&lt;/artifactId&gt;</span>
-    <span class="nt">&lt;/dependency&gt;</span>
-    <span class="nt">&lt;dependency&gt;</span>
-      <span class="nt">&lt;groupId&gt;</span>io.servicecomb<span class="nt">&lt;/groupId&gt;</span>
-      <span class="nt">&lt;artifactId&gt;</span>metrics-write-file-config-log4j<span class="nt">&lt;/artifactId&gt;</span>
-    <span class="nt">&lt;/dependency&gt;</span>
-    <span class="nt">&lt;dependency&gt;</span>
-      <span class="nt">&lt;groupId&gt;</span>io.servicecomb<span class="nt">&lt;/groupId&gt;</span>
-      <span class="nt">&lt;artifactId&gt;</span>metrics-write-file<span class="nt">&lt;/artifactId&gt;</span>
-    <span class="nt">&lt;/dependency&gt;</span>
-</code></pre>
-</div>
-<p>依赖的log4j的版本为1.2.17。</p>
-<h5 id="项目使用log4j2作为日志实现">项目使用log4j2作为日志实现</h5>
-<p>请参考samples/metrics-write-file-sample/metrics-write-file-log4j2项目:</p>
-<div class="language-xml highlighter-rouge"><pre class="highlight"><code>    <span class="nt">&lt;dependency&gt;</span>
-      <span class="nt">&lt;groupId&gt;</span>io.servicecomb<span class="nt">&lt;/groupId&gt;</span>
-      <span class="nt">&lt;artifactId&gt;</span>metrics-write-file-config<span class="nt">&lt;/artifactId&gt;</span>
-    <span class="nt">&lt;/dependency&gt;</span>
-    <span class="nt">&lt;dependency&gt;</span>
-      <span class="nt">&lt;groupId&gt;</span>io.servicecomb<span class="nt">&lt;/groupId&gt;</span>
-      <span class="nt">&lt;artifactId&gt;</span>metrics-write-file-config-log4j2<span class="nt">&lt;/artifactId&gt;</span>
-    <span class="nt">&lt;/dependency&gt;</span>
-    <span class="nt">&lt;dependency&gt;</span>
-      <span class="nt">&lt;groupId&gt;</span>io.servicecomb<span class="nt">&lt;/groupId&gt;</span>
-      <span class="nt">&lt;artifactId&gt;</span>metrics-write-file<span class="nt">&lt;/artifactId&gt;</span>
-    <span class="nt">&lt;/dependency&gt;</span>
+<h2 id="依赖和代码使用">依赖和代码使用</h2>
+<ol>
+  <li>首先需要引入metrics-write-file模块,这个模块包括了获取Metrics数据并转化为指定格式后写文件的逻辑:
+    <div class="language-xml highlighter-rouge"><pre class="highlight"><code> <span class="nt">&lt;dependency&gt;</span>
+   <span class="nt">&lt;groupId&gt;</span>io.servicecomb.samples<span class="nt">&lt;/groupId&gt;</span>
+   <span class="nt">&lt;artifactId&gt;</span>metrics-write-file<span class="nt">&lt;/artifactId&gt;</span>
+ <span class="nt">&lt;/dependency&gt;</span>
 </code></pre>
-</div>
-<p>可以看到,与使用log4j唯一不同的是将metrics-write-file-config-log4j更换为metrics-write-file-config-log4j2,依赖的log4j2的版本为2.8.2。</p>
-<h4 id="spring-boot-starter启动依赖配置">Spring Boot Starter启动依赖配置</h4>
-<h5 id="项目使用log4j作为日志实现-1">项目使用log4j作为日志实现</h5>
-<p>请参考samples/metrics-write-file-sample/metrics-write-file-log4j-springboot项目:</p>
+    </div>
+    <p><em>也可以参考其中的实现修改代码或复制代码到项目中。</em></p>
+  </li>
+  <li>metrics-write-file模块不包含动态生成写文件RollingFileAppender的代码,根据项目实际使用的日志实现,如果是log4j,拷贝metrics-write-file-log4j-springboot模块中的Log4JMetricsFileWriter,如果是log4j2,拷贝metrics-write-file-log4j2-springboot模块中的Log4J2MetricsFileWriter。
+  <em>也可以参考其中的实现修改代码或自己实现FileWriter。</em></li>
+</ol>
+
+<h2 id="使用spring-boot-starter开发注意事项">使用Spring Boot Starter开发注意事项</h2>
+<p>Java Chassis集成了Spring Boot Starter,如果使用Spring Boot Starter启动微服务同时又使用Log4j作为日志实现,则需要处理依赖问题,请参考samples/metrics-write-file-sample/metrics-write-file-log4j-springboot项目:</p>
 <div class="language-xml highlighter-rouge"><pre class="highlight"><code>    <span class="c">&lt;!--need exclusion log4j-over-slf4j--&gt;</span>
     <span class="nt">&lt;dependency&gt;</span>
       <span class="nt">&lt;groupId&gt;</span>org.springframework.boot<span class="nt">&lt;/groupId&gt;</span>
@@ -735,68 +706,28 @@
       <span class="nt">&lt;groupId&gt;</span>io.servicecomb<span class="nt">&lt;/groupId&gt;</span>
       <span class="nt">&lt;artifactId&gt;</span>spring-boot-starter-provider<span class="nt">&lt;/artifactId&gt;</span>
     <span class="nt">&lt;/dependency&gt;</span>
-    
-    <span class="c">&lt;!--metrics dependency--&gt;</span>
-    <span class="nt">&lt;dependency&gt;</span>
-      <span class="nt">&lt;groupId&gt;</span>io.servicecomb<span class="nt">&lt;/groupId&gt;</span>
-      <span class="nt">&lt;artifactId&gt;</span>metrics-write-file-config<span class="nt">&lt;/artifactId&gt;</span>
-    <span class="nt">&lt;/dependency&gt;</span>
-    <span class="nt">&lt;dependency&gt;</span>
-      <span class="nt">&lt;groupId&gt;</span>io.servicecomb<span class="nt">&lt;/groupId&gt;</span>
-      <span class="nt">&lt;artifactId&gt;</span>metrics-write-file-config-log4j2<span class="nt">&lt;/artifactId&gt;</span>
-    <span class="nt">&lt;/dependency&gt;</span>
-    <span class="nt">&lt;dependency&gt;</span>
-      <span class="nt">&lt;groupId&gt;</span>io.servicecomb<span class="nt">&lt;/groupId&gt;</span>
-      <span class="nt">&lt;artifactId&gt;</span>metrics-write-file<span class="nt">&lt;/artifactId&gt;</span>
-    <span class="nt">&lt;/dependency&gt;</span>
 </code></pre>
 </div>
-<p>spring boot starter中包含了log4j-over-slf4j,这个依赖会在运行态屏蔽掉log4j的RollingFileAppender,使我们无法动态创建它,请确定这种排除对你的系统不会有影响,关于log4j-over-slf4j的更多信息可以参考<a href="https://www.slf4j.org/legacy.html">这篇文章</a>。</p>
-<h5 id="项目使用log4j2作为日志实现-1">项目使用log4j2作为日志实现</h5>
-<p>请参考samples/metrics-write-file-sample/metrics-write-file-log4j2-springboot项目:</p>
-<div class="language-xml highlighter-rouge"><pre class="highlight"><code>    <span class="nt">&lt;dependency&gt;</span>
-      <span class="nt">&lt;groupId&gt;</span>org.springframework.boot<span class="nt">&lt;/groupId&gt;</span>
-      <span class="nt">&lt;artifactId&gt;</span>spring-boot-starter<span class="nt">&lt;/artifactId&gt;</span>
-    <span class="nt">&lt;/dependency&gt;</span>
+<p>Spring Boot Starter中包含了log4j-over-slf4j,这个Log Bridge并没有完全实现log4j的所有接口,包括RollingFileAppender,所以我们需要排除它让slf4j直接调用log4j而不是这个Log Bridge,请确定这种排除对你的系统不会有影响,关于log4j-over-slf4j的更多信息可以参考<a href="https://www.slf4j.org/legacy.html#log4j-over-slf4j">这篇文章</a>。</p>
 
-    <span class="c">&lt;!--servicecomb spring boot starter--&gt;</span>
-    <span class="nt">&lt;dependency&gt;</span>
-      <span class="nt">&lt;groupId&gt;</span>io.servicecomb<span class="nt">&lt;/groupId&gt;</span>
-      <span class="nt">&lt;artifactId&gt;</span>spring-boot-starter-provider<span class="nt">&lt;/artifactId&gt;</span>
-    <span class="nt">&lt;/dependency&gt;</span>
-    
-    <span class="c">&lt;!--metrics dependency--&gt;</span>
-    <span class="nt">&lt;dependency&gt;</span>
-      <span class="nt">&lt;groupId&gt;</span>io.servicecomb<span class="nt">&lt;/groupId&gt;</span>
-      <span class="nt">&lt;artifactId&gt;</span>metrics-write-file-config<span class="nt">&lt;/artifactId&gt;</span>
-    <span class="nt">&lt;/dependency&gt;</span>
-    <span class="nt">&lt;dependency&gt;</span>
-      <span class="nt">&lt;groupId&gt;</span>io.servicecomb<span class="nt">&lt;/groupId&gt;</span>
-      <span class="nt">&lt;artifactId&gt;</span>metrics-write-file-config-log4j2<span class="nt">&lt;/artifactId&gt;</span>
-    <span class="nt">&lt;/dependency&gt;</span>
-    <span class="nt">&lt;dependency&gt;</span>
-      <span class="nt">&lt;groupId&gt;</span>io.servicecomb<span class="nt">&lt;/groupId&gt;</span>
-      <span class="nt">&lt;artifactId&gt;</span>metrics-write-file<span class="nt">&lt;/artifactId&gt;</span>
-    <span class="nt">&lt;/dependency&gt;</span>
-</code></pre>
-</div>
-<p>可以看到,spring boot starter默认使用的是log4j作为日志实现,无论你是否排除log4j的相关依赖,并不会对log4j2 write file造成任何影响,两者并存,因此依赖方面与直接启动是相同的。</p>
+<h2 id="运行示例">运行示例</h2>
+<p>metrics-write-file-config-log4j-springboot和metrics-write-file-config-log4j2-springboot都是可以直接运行的示例项目,使用ServiceApplication启动完成后,观察输出目录target/metric/下会生成很多Metrics文件,如果在浏览器中刷新几下http://localhost:8080/f 请求,则可以看到对应的Operation级别的Metrics文件也会在目录下自动生成。</p>
 
 <h2 id="q--a">Q &amp; A</h2>
 <ol>
   <li>
     <p>在新的1.0.0-m1版本里,我是否还需要在日志配置文件(例如log4j2.xml) 中追加任何修改吗?<br />
-不需要,metrics-write-file-config-xxx会在运行态自动为metric生成对应的RollingFileAppender,并且这个Appender与你日志配置的Appenders没有任何关系。</p>
+  不需要,会在运行态自动为metric生成对应的RollingFileAppender,并且这个Appender与你日志配置的Appenders没有任何关系。</p>
   </li>
   <li>
-    <p>我发现metrics-write-file-config-log4j2中创建RollingFileAppender是使用一个标记为过期的createAppender方法,为什么不使用新的的newBuilder … build模式?<br />
-开发的时候发现newBuilder … build与微服务框架存在某种冲突导致不可用,另外,官方文档的<a href="https://logging.apache.org/log4j/2.x/manual/customconfig.html">示例代码</a>仍然使用的是createAppender,缺乏资料也给定位问题造成了一定的麻烦;我们将在下一个版本1.0.0-m2中去修复,已标记TODO。</p>
+    <p>我发现Log4J2MetricsFileWriter中创建RollingFileAppender是使用一个标记为过期的createAppender方法,为什么不使用新的的newBuilder … build模式?<br />
+  开发的时候发现newBuilder … build与微服务框架存在某种冲突导致不可用,另外,官方文档的<a href="https://logging.apache.org/log4j/2.x/manual/customconfig.html">示例代码</a>仍然使用的是createAppender,缺乏资料也给定位问题造成了一定的麻烦;我们未来会去改进,已标记TODO。</p>
   </li>
   <li>
     <p>集成后出现RollingFileAppender抛ClassNotFoundException之类的错误?<br />
-众所周知,Java开发主流都使用slf4j或jcl做为日志框架,然后桥接具体的日志实现,例如log4j、log4j2和logback,通过配置文件初始化日志组件,达到随意更换弱绑定的效果,并不推荐编码方式创建日志组件。
-但由于1.0.0-m1版本开始支持Operation级别的Metric输出,不同的微服务Operation不同,并且单Operation会有15+以上的Metric,因此手动配置已不具备可操作性,必须通过Coding的方式动态生成RollingFileAppender。
-如果你的项目中包含类似log4j-over-slf4j这样的Bridging依赖,就很可能会出现这样的问题,请使用mvn dependency:tree检查。</p>
+  众所周知,Java开发主流都使用slf4j或jcl做为日志框架,然后桥接具体的日志实现,例如log4j、log4j2和logback,通过配置文件初始化日志组件,达到随意更换弱绑定的效果,并不推荐编码方式创建日志组件。
+  但由于1.0.0-m1版本开始支持Operation级别的Metric输出,不同的微服务Operation不同,并且单Operation会有15+以上的Metric,因此手动配置已不具备可操作性,必须通过Coding的方式动态生成RollingFileAppender。
+  如果你的项目中包含类似log4j-over-slf4j这样的Bridging依赖,就很可能会出现这样的问题,请使用mvn dependency:tree检查。</p>
   </li>
 </ol>
 
diff --git a/content/docs/autoscale-on-company/index.html b/content/docs/autoscale-on-company/index.html
index 7a62afc..2291dc9 100644
--- a/content/docs/autoscale-on-company/index.html
+++ b/content/docs/autoscale-on-company/index.html
@@ -643,11 +643,11 @@ Fig 5    HPA Data of The End</p>
     
     <h2 class="archive__item-title" itemprop="headline">
       
-        <a href="/docs/service-registry-refactor-proposal/" rel="permalink">Proposal for refactoring service registry module in Java Chassis
+        <a href="/docs/howto-upgrade-topzipkin2/" rel="permalink">Howto Upgrade to Zipkin2
 </a>
       
     </h2>
-    <p class="archive__item-excerpt" itemprop="description">Analysis of service registry and propose a new architecture for it
+    <p class="archive__item-excerpt" itemprop="description">Changes between v1 and v2 of zipkin and how Java Chassis upgraded to zipkin2
 </p>
     
       <p class="page__meta"><i class="fa fa-clock-o" aria-hidden="true"></i> 
@@ -655,7 +655,7 @@ Fig 5    HPA Data of The End</p>
 
 
 
-  2 minute read
+  4 minute read
 
 </p>
     
@@ -672,11 +672,11 @@ Fig 5    HPA Data of The End</p>
     
     <h2 class="archive__item-title" itemprop="headline">
       
-        <a href="/cn/docs/jira_beginner_guide/" rel="permalink">老司机带你刷任务 - ServiceComb JIRA入门指南
+        <a href="/docs/service-registry-refactor-proposal/" rel="permalink">Proposal for refactoring service registry module in Java Chassis
 </a>
       
     </h2>
-    <p class="archive__item-excerpt" itemprop="description">ServiceComb JIRA入门指南
+    <p class="archive__item-excerpt" itemprop="description">Analysis of service registry and propose a new architecture for it
 </p>
     
       <p class="page__meta"><i class="fa fa-clock-o" aria-hidden="true"></i> 
@@ -684,7 +684,7 @@ Fig 5    HPA Data of The End</p>
 
 
 
-  less than 1 minute read
+  2 minute read
 
 </p>
     
@@ -701,11 +701,11 @@ Fig 5    HPA Data of The End</p>
     
     <h2 class="archive__item-title" itemprop="headline">
       
-        <a href="/docs/service-center-ui/" rel="permalink">Service-Center Management UI Console
+        <a href="/cn/docs/jira_beginner_guide/" rel="permalink">老司机带你刷任务 - ServiceComb JIRA入门指南
 </a>
       
     </h2>
-    <p class="archive__item-excerpt" itemprop="description">An introduction Service-Center Management Console
+    <p class="archive__item-excerpt" itemprop="description">ServiceComb JIRA入门指南
 </p>
     
       <p class="page__meta"><i class="fa fa-clock-o" aria-hidden="true"></i> 
@@ -713,7 +713,7 @@ Fig 5    HPA Data of The End</p>
 
 
 
-  2 minute read
+  less than 1 minute read
 
 </p>
     
diff --git a/content/docs/communication-btw-sc-ms/index.html b/content/docs/communication-btw-sc-ms/index.html
index 492b9ee..d5bef45 100644
--- a/content/docs/communication-btw-sc-ms/index.html
+++ b/content/docs/communication-btw-sc-ms/index.html
@@ -545,11 +545,11 @@ When Consumer needs to communicate to Provider then consumer reads endpoints of
     
     <h2 class="archive__item-title" itemprop="headline">
       
-        <a href="/docs/service-registry-refactor-proposal/" rel="permalink">Proposal for refactoring service registry module in Java Chassis
+        <a href="/docs/howto-upgrade-topzipkin2/" rel="permalink">Howto Upgrade to Zipkin2
 </a>
       
     </h2>
-    <p class="archive__item-excerpt" itemprop="description">Analysis of service registry and propose a new architecture for it
+    <p class="archive__item-excerpt" itemprop="description">Changes between v1 and v2 of zipkin and how Java Chassis upgraded to zipkin2
 </p>
     
       <p class="page__meta"><i class="fa fa-clock-o" aria-hidden="true"></i> 
@@ -557,7 +557,7 @@ When Consumer needs to communicate to Provider then consumer reads endpoints of
 
 
 
-  2 minute read
+  4 minute read
 
 </p>
     
@@ -574,11 +574,11 @@ When Consumer needs to communicate to Provider then consumer reads endpoints of
     
     <h2 class="archive__item-title" itemprop="headline">
       
-        <a href="/cn/docs/jira_beginner_guide/" rel="permalink">老司机带你刷任务 - ServiceComb JIRA入门指南
+        <a href="/docs/service-registry-refactor-proposal/" rel="permalink">Proposal for refactoring service registry module in Java Chassis
 </a>
       
     </h2>
-    <p class="archive__item-excerpt" itemprop="description">ServiceComb JIRA入门指南
+    <p class="archive__item-excerpt" itemprop="description">Analysis of service registry and propose a new architecture for it
 </p>
     
       <p class="page__meta"><i class="fa fa-clock-o" aria-hidden="true"></i> 
@@ -586,7 +586,7 @@ When Consumer needs to communicate to Provider then consumer reads endpoints of
 
 
 
-  less than 1 minute read
+  2 minute read
 
 </p>
     
@@ -603,11 +603,11 @@ When Consumer needs to communicate to Provider then consumer reads endpoints of
     
     <h2 class="archive__item-title" itemprop="headline">
       
-        <a href="/docs/service-center-ui/" rel="permalink">Service-Center Management UI Console
+        <a href="/cn/docs/jira_beginner_guide/" rel="permalink">老司机带你刷任务 - ServiceComb JIRA入门指南
 </a>
       
     </h2>
-    <p class="archive__item-excerpt" itemprop="description">An introduction Service-Center Management Console
+    <p class="archive__item-excerpt" itemprop="description">ServiceComb JIRA入门指南
 </p>
     
       <p class="page__meta"><i class="fa fa-clock-o" aria-hidden="true"></i> 
@@ -615,7 +615,7 @@ When Consumer needs to communicate to Provider then consumer reads endpoints of
 
 
 
-  2 minute read
+  less than 1 minute read
 
 </p>
     
diff --git a/content/docs/company-on-kubernetes/index.html b/content/docs/company-on-kubernetes/index.html
index 3e1aae8..bc17dd9 100644
--- a/content/docs/company-on-kubernetes/index.html
+++ b/content/docs/company-on-kubernetes/index.html
@@ -640,11 +640,11 @@ kubectl get svc company-manager -o yaml | grep nodePort -C 1
     
     <h2 class="archive__item-title" itemprop="headline">
       
-        <a href="/docs/service-registry-refactor-proposal/" rel="permalink">Proposal for refactoring service registry module in Java Chassis
+        <a href="/docs/howto-upgrade-topzipkin2/" rel="permalink">Howto Upgrade to Zipkin2
 </a>
       
     </h2>
-    <p class="archive__item-excerpt" itemprop="description">Analysis of service registry and propose a new architecture for it
+    <p class="archive__item-excerpt" itemprop="description">Changes between v1 and v2 of zipkin and how Java Chassis upgraded to zipkin2
 </p>
     
       <p class="page__meta"><i class="fa fa-clock-o" aria-hidden="true"></i> 
@@ -652,7 +652,7 @@ kubectl get svc company-manager -o yaml | grep nodePort -C 1
 
 
 
-  2 minute read
+  4 minute read
 
 </p>
     
@@ -669,11 +669,11 @@ kubectl get svc company-manager -o yaml | grep nodePort -C 1
     
     <h2 class="archive__item-title" itemprop="headline">
       
-        <a href="/cn/docs/jira_beginner_guide/" rel="permalink">老司机带你刷任务 - ServiceComb JIRA入门指南
+        <a href="/docs/service-registry-refactor-proposal/" rel="permalink">Proposal for refactoring service registry module in Java Chassis
 </a>
       
     </h2>
-    <p class="archive__item-excerpt" itemprop="description">ServiceComb JIRA入门指南
+    <p class="archive__item-excerpt" itemprop="description">Analysis of service registry and propose a new architecture for it
 </p>
     
       <p class="page__meta"><i class="fa fa-clock-o" aria-hidden="true"></i> 
@@ -681,7 +681,7 @@ kubectl get svc company-manager -o yaml | grep nodePort -C 1
 
 
 
-  less than 1 minute read
+  2 minute read
 
 </p>
     
@@ -698,11 +698,11 @@ kubectl get svc company-manager -o yaml | grep nodePort -C 1
     
     <h2 class="archive__item-title" itemprop="headline">
       
-        <a href="/docs/service-center-ui/" rel="permalink">Service-Center Management UI Console
+        <a href="/cn/docs/jira_beginner_guide/" rel="permalink">老司机带你刷任务 - ServiceComb JIRA入门指南
 </a>
       
     </h2>
-    <p class="archive__item-excerpt" itemprop="description">An introduction Service-Center Management Console
+    <p class="archive__item-excerpt" itemprop="description">ServiceComb JIRA入门指南
 </p>
     
       <p class="page__meta"><i class="fa fa-clock-o" aria-hidden="true"></i> 
@@ -710,7 +710,7 @@ kubectl get svc company-manager -o yaml | grep nodePort -C 1
 
 
 
-  2 minute read
+  less than 1 minute read
 
 </p>
     
diff --git a/content/docs/distributed_saga_1/index.html b/content/docs/distributed_saga_1/index.html
index 07cf606..a6b8181 100644
--- a/content/docs/distributed_saga_1/index.html
+++ b/content/docs/distributed_saga_1/index.html
@@ -675,11 +675,11 @@ next blog post.</p>
     
     <h2 class="archive__item-title" itemprop="headline">
       
-        <a href="/docs/service-registry-refactor-proposal/" rel="permalink">Proposal for refactoring service registry module in Java Chassis
+        <a href="/docs/howto-upgrade-topzipkin2/" rel="permalink">Howto Upgrade to Zipkin2
 </a>
       
     </h2>
-    <p class="archive__item-excerpt" itemprop="description">Analysis of service registry and propose a new architecture for it
+    <p class="archive__item-excerpt" itemprop="description">Changes between v1 and v2 of zipkin and how Java Chassis upgraded to zipkin2
 </p>
     
       <p class="page__meta"><i class="fa fa-clock-o" aria-hidden="true"></i> 
@@ -687,7 +687,7 @@ next blog post.</p>
 
 
 
-  2 minute read
+  4 minute read
 
 </p>
     
@@ -704,11 +704,11 @@ next blog post.</p>
     
     <h2 class="archive__item-title" itemprop="headline">
       
-        <a href="/cn/docs/jira_beginner_guide/" rel="permalink">老司机带你刷任务 - ServiceComb JIRA入门指南
+        <a href="/docs/service-registry-refactor-proposal/" rel="permalink">Proposal for refactoring service registry module in Java Chassis
 </a>
       
     </h2>
-    <p class="archive__item-excerpt" itemprop="description">ServiceComb JIRA入门指南
+    <p class="archive__item-excerpt" itemprop="description">Analysis of service registry and propose a new architecture for it
 </p>
     
       <p class="page__meta"><i class="fa fa-clock-o" aria-hidden="true"></i> 
@@ -716,7 +716,7 @@ next blog post.</p>
 
 
 
-  less than 1 minute read
+  2 minute read
 
 </p>
     
@@ -733,11 +733,11 @@ next blog post.</p>
     
     <h2 class="archive__item-title" itemprop="headline">
       
-        <a href="/docs/service-center-ui/" rel="permalink">Service-Center Management UI Console
+        <a href="/cn/docs/jira_beginner_guide/" rel="permalink">老司机带你刷任务 - ServiceComb JIRA入门指南
 </a>
       
     </h2>
-    <p class="archive__item-excerpt" itemprop="description">An introduction Service-Center Management Console
+    <p class="archive__item-excerpt" itemprop="description">ServiceComb JIRA入门指南
 </p>
     
       <p class="page__meta"><i class="fa fa-clock-o" aria-hidden="true"></i> 
@@ -745,7 +745,7 @@ next blog post.</p>
 
 
 
-  2 minute read
+  less than 1 minute read
 
 </p>
     
diff --git a/content/docs/distributed_saga_2/index.html b/content/docs/distributed_saga_2/index.html
index cd6b50a..7e446a8 100644
--- a/content/docs/distributed_saga_2/index.html
+++ b/content/docs/distributed_saga_2/index.html
@@ -621,11 +621,11 @@ there are a few requirements on design of microservices to ensure saga consisten
     
     <h2 class="archive__item-title" itemprop="headline">
       
-        <a href="/docs/service-registry-refactor-proposal/" rel="permalink">Proposal for refactoring service registry module in Java Chassis
+        <a href="/docs/howto-upgrade-topzipkin2/" rel="permalink">Howto Upgrade to Zipkin2
 </a>
       
     </h2>
-    <p class="archive__item-excerpt" itemprop="description">Analysis of service registry and propose a new architecture for it
+    <p class="archive__item-excerpt" itemprop="description">Changes between v1 and v2 of zipkin and how Java Chassis upgraded to zipkin2
 </p>
     
       <p class="page__meta"><i class="fa fa-clock-o" aria-hidden="true"></i> 
@@ -633,7 +633,7 @@ there are a few requirements on design of microservices to ensure saga consisten
 
 
 
-  2 minute read
+  4 minute read
 
 </p>
     
@@ -650,11 +650,11 @@ there are a few requirements on design of microservices to ensure saga consisten
     
     <h2 class="archive__item-title" itemprop="headline">
       
-        <a href="/cn/docs/jira_beginner_guide/" rel="permalink">老司机带你刷任务 - ServiceComb JIRA入门指南
+        <a href="/docs/service-registry-refactor-proposal/" rel="permalink">Proposal for refactoring service registry module in Java Chassis
 </a>
       
     </h2>
-    <p class="archive__item-excerpt" itemprop="description">ServiceComb JIRA入门指南
+    <p class="archive__item-excerpt" itemprop="description">Analysis of service registry and propose a new architecture for it
 </p>
     
       <p class="page__meta"><i class="fa fa-clock-o" aria-hidden="true"></i> 
@@ -662,7 +662,7 @@ there are a few requirements on design of microservices to ensure saga consisten
 
 
 
-  less than 1 minute read
+  2 minute read
 
 </p>
     
@@ -679,11 +679,11 @@ there are a few requirements on design of microservices to ensure saga consisten
     
     <h2 class="archive__item-title" itemprop="headline">
       
-        <a href="/docs/service-center-ui/" rel="permalink">Service-Center Management UI Console
+        <a href="/cn/docs/jira_beginner_guide/" rel="permalink">老司机带你刷任务 - ServiceComb JIRA入门指南
 </a>
       
     </h2>
-    <p class="archive__item-excerpt" itemprop="description">An introduction Service-Center Management Console
+    <p class="archive__item-excerpt" itemprop="description">ServiceComb JIRA入门指南
 </p>
     
       <p class="page__meta"><i class="fa fa-clock-o" aria-hidden="true"></i> 
@@ -691,7 +691,7 @@ there are a few requirements on design of microservices to ensure saga consisten
 
 
 
-  2 minute read
+  less than 1 minute read
 
 </p>
     
diff --git a/content/docs/distributed_saga_3/index.html b/content/docs/distributed_saga_3/index.html
index e35b960..af4a9d7 100644
--- a/content/docs/distributed_saga_3/index.html
+++ b/content/docs/distributed_saga_3/index.html
@@ -654,11 +654,11 @@ and allows easier troubleshooting of any problem occurred in transactions.</p>
     
     <h2 class="archive__item-title" itemprop="headline">
       
-        <a href="/docs/service-registry-refactor-proposal/" rel="permalink">Proposal for refactoring service registry module in Java Chassis
+        <a href="/docs/howto-upgrade-topzipkin2/" rel="permalink">Howto Upgrade to Zipkin2
 </a>
       
     </h2>
-    <p class="archive__item-excerpt" itemprop="description">Analysis of service registry and propose a new architecture for it
+    <p class="archive__item-excerpt" itemprop="description">Changes between v1 and v2 of zipkin and how Java Chassis upgraded to zipkin2
 </p>
     
       <p class="page__meta"><i class="fa fa-clock-o" aria-hidden="true"></i> 
@@ -666,7 +666,7 @@ and allows easier troubleshooting of any problem occurred in transactions.</p>
 
 
 
-  2 minute read
+  4 minute read
 
 </p>
     
@@ -683,11 +683,11 @@ and allows easier troubleshooting of any problem occurred in transactions.</p>
     
     <h2 class="archive__item-title" itemprop="headline">
       
-        <a href="/cn/docs/jira_beginner_guide/" rel="permalink">老司机带你刷任务 - ServiceComb JIRA入门指南
+        <a href="/docs/service-registry-refactor-proposal/" rel="permalink">Proposal for refactoring service registry module in Java Chassis
 </a>
       
     </h2>
-    <p class="archive__item-excerpt" itemprop="description">ServiceComb JIRA入门指南
+    <p class="archive__item-excerpt" itemprop="description">Analysis of service registry and propose a new architecture for it
 </p>
     
       <p class="page__meta"><i class="fa fa-clock-o" aria-hidden="true"></i> 
@@ -695,7 +695,7 @@ and allows easier troubleshooting of any problem occurred in transactions.</p>
 
 
 
-  less than 1 minute read
+  2 minute read
 
 </p>
     
@@ -712,11 +712,11 @@ and allows easier troubleshooting of any problem occurred in transactions.</p>
     
     <h2 class="archive__item-title" itemprop="headline">
       
-        <a href="/docs/service-center-ui/" rel="permalink">Service-Center Management UI Console
+        <a href="/cn/docs/jira_beginner_guide/" rel="permalink">老司机带你刷任务 - ServiceComb JIRA入门指南
 </a>
       
     </h2>
-    <p class="archive__item-excerpt" itemprop="description">An introduction Service-Center Management Console
+    <p class="archive__item-excerpt" itemprop="description">ServiceComb JIRA入门指南
 </p>
     
       <p class="page__meta"><i class="fa fa-clock-o" aria-hidden="true"></i> 
@@ -724,7 +724,7 @@ and allows easier troubleshooting of any problem occurred in transactions.</p>
 
 
 
-  2 minute read
+  less than 1 minute read
 
 </p>
     
diff --git a/content/docs/go-to-cloud/index.html b/content/docs/go-to-cloud/index.html
index 10e471a..1a54757 100644
--- a/content/docs/go-to-cloud/index.html
+++ b/content/docs/go-to-cloud/index.html
@@ -689,11 +689,11 @@ watching microservice 4 successfully,服务注册成功<br />
     
     <h2 class="archive__item-title" itemprop="headline">
       
-        <a href="/docs/service-registry-refactor-proposal/" rel="permalink">Proposal for refactoring service registry module in Java Chassis
+        <a href="/docs/howto-upgrade-topzipkin2/" rel="permalink">Howto Upgrade to Zipkin2
 </a>
       
     </h2>
-    <p class="archive__item-excerpt" itemprop="description">Analysis of service registry and propose a new architecture for it
+    <p class="archive__item-excerpt" itemprop="description">Changes between v1 and v2 of zipkin and how Java Chassis upgraded to zipkin2
 </p>
     
       <p class="page__meta"><i class="fa fa-clock-o" aria-hidden="true"></i> 
@@ -701,7 +701,7 @@ watching microservice 4 successfully,服务注册成功<br />
 
 
 
-  2 minute read
+  4 minute read
 
 </p>
     
@@ -718,11 +718,11 @@ watching microservice 4 successfully,服务注册成功<br />
     
     <h2 class="archive__item-title" itemprop="headline">
       
-        <a href="/cn/docs/jira_beginner_guide/" rel="permalink">老司机带你刷任务 - ServiceComb JIRA入门指南
+        <a href="/docs/service-registry-refactor-proposal/" rel="permalink">Proposal for refactoring service registry module in Java Chassis
 </a>
       
     </h2>
-    <p class="archive__item-excerpt" itemprop="description">ServiceComb JIRA入门指南
+    <p class="archive__item-excerpt" itemprop="description">Analysis of service registry and propose a new architecture for it
 </p>
     
       <p class="page__meta"><i class="fa fa-clock-o" aria-hidden="true"></i> 
@@ -730,7 +730,7 @@ watching microservice 4 successfully,服务注册成功<br />
 
 
 
-  less than 1 minute read
+  2 minute read
 
 </p>
     
@@ -747,11 +747,11 @@ watching microservice 4 successfully,服务注册成功<br />
     
     <h2 class="archive__item-title" itemprop="headline">
       
-        <a href="/docs/service-center-ui/" rel="permalink">Service-Center Management UI Console
+        <a href="/cn/docs/jira_beginner_guide/" rel="permalink">老司机带你刷任务 - ServiceComb JIRA入门指南
 </a>
       
     </h2>
-    <p class="archive__item-excerpt" itemprop="description">An introduction Service-Center Management Console
+    <p class="archive__item-excerpt" itemprop="description">ServiceComb JIRA入门指南
 </p>
     
       <p class="page__meta"><i class="fa fa-clock-o" aria-hidden="true"></i> 
@@ -759,7 +759,7 @@ watching microservice 4 successfully,服务注册成功<br />
 
 
 
-  2 minute read
+  less than 1 minute read
 
 </p>
     
diff --git a/content/docs/how-to-reform-a-legacy-system/index.html b/content/docs/how-to-reform-a-legacy-system/index.html
index 889df47..be81d4e 100644
--- a/content/docs/how-to-reform-a-legacy-system/index.html
+++ b/content/docs/how-to-reform-a-legacy-system/index.html
@@ -883,11 +883,11 @@
     
     <h2 class="archive__item-title" itemprop="headline">
       
-        <a href="/docs/service-registry-refactor-proposal/" rel="permalink">Proposal for refactoring service registry module in Java Chassis
+        <a href="/docs/howto-upgrade-topzipkin2/" rel="permalink">Howto Upgrade to Zipkin2
 </a>
       
     </h2>
-    <p class="archive__item-excerpt" itemprop="description">Analysis of service registry and propose a new architecture for it
+    <p class="archive__item-excerpt" itemprop="description">Changes between v1 and v2 of zipkin and how Java Chassis upgraded to zipkin2
 </p>
     
       <p class="page__meta"><i class="fa fa-clock-o" aria-hidden="true"></i> 
@@ -895,7 +895,7 @@
 
 
 
-  2 minute read
+  4 minute read
 
 </p>
     
@@ -912,11 +912,11 @@
     
     <h2 class="archive__item-title" itemprop="headline">
       
-        <a href="/cn/docs/jira_beginner_guide/" rel="permalink">老司机带你刷任务 - ServiceComb JIRA入门指南
+        <a href="/docs/service-registry-refactor-proposal/" rel="permalink">Proposal for refactoring service registry module in Java Chassis
 </a>
       
     </h2>
-    <p class="archive__item-excerpt" itemprop="description">ServiceComb JIRA入门指南
+    <p class="archive__item-excerpt" itemprop="description">Analysis of service registry and propose a new architecture for it
 </p>
     
       <p class="page__meta"><i class="fa fa-clock-o" aria-hidden="true"></i> 
@@ -924,7 +924,7 @@
 
 
 
-  less than 1 minute read
+  2 minute read
 
 </p>
     
@@ -941,11 +941,11 @@
     
     <h2 class="archive__item-title" itemprop="headline">
       
-        <a href="/docs/service-center-ui/" rel="permalink">Service-Center Management UI Console
+        <a href="/cn/docs/jira_beginner_guide/" rel="permalink">老司机带你刷任务 - ServiceComb JIRA入门指南
 </a>
       
     </h2>
-    <p class="archive__item-excerpt" itemprop="description">An introduction Service-Center Management Console
+    <p class="archive__item-excerpt" itemprop="description">ServiceComb JIRA入门指南
 </p>
     
       <p class="page__meta"><i class="fa fa-clock-o" aria-hidden="true"></i> 
@@ -953,7 +953,7 @@
 
 
 
-  2 minute read
+  less than 1 minute read
 
 </p>
     
diff --git a/content/docs/tracing-with-servicecomb/index.html b/content/docs/howto-upgrade-topzipkin2/index.html
similarity index 51%
copy from content/docs/tracing-with-servicecomb/index.html
copy to content/docs/howto-upgrade-topzipkin2/index.html
index 6317998..924968c 100644
--- a/content/docs/tracing-with-servicecomb/index.html
+++ b/content/docs/howto-upgrade-topzipkin2/index.html
@@ -19,35 +19,35 @@
 
 
 
-<title>Distributed Tracing with ServiceComb and Zipkin - Apache ServiceComb (incubating)</title>
+<title>Howto Upgrade to Zipkin2 - Apache ServiceComb (incubating)</title>
 
 
 
 
-<meta name="description" content="A introduction of how to set up distributed tracing with ServiceComb and Zipkin">
+<meta name="description" content="Changes between v1 and v2 of zipkin and how Java Chassis upgraded to zipkin2">
 
 
 
 
-<meta name="author" content="Sean Yin">
+<meta name="author" content="Yang Bo">
 
 <meta property="og:locale" content="en">
 <meta property="og:site_name" content="Apache ServiceComb (incubating)">
-<meta property="og:title" content="Distributed Tracing with ServiceComb and Zipkin">
+<meta property="og:title" content="Howto Upgrade to Zipkin2">
 
 
-  <link rel="canonical" href="http://github.com/pages/apache/incubator-servicecomb-website/docs/tracing-with-servicecomb/">
-  <meta property="og:url" content="http://github.com/pages/apache/incubator-servicecomb-website/docs/tracing-with-servicecomb/">
+  <link rel="canonical" href="http://github.com/pages/apache/incubator-servicecomb-website/docs/howto-upgrade-topzipkin2/">
+  <meta property="og:url" content="http://github.com/pages/apache/incubator-servicecomb-website/docs/howto-upgrade-topzipkin2/">
 
 
 
-  <meta property="og:description" content="A introduction of how to set up distributed tracing with ServiceComb and Zipkin">
+  <meta property="og:description" content="Changes between v1 and v2 of zipkin and how Java Chassis upgraded to zipkin2">
 
 
 
   <meta name="twitter:site" content="@ServiceComb">
-  <meta name="twitter:title" content="Distributed Tracing with ServiceComb and Zipkin">
-  <meta name="twitter:description" content="A introduction of how to set up distributed tracing with ServiceComb and Zipkin">
+  <meta name="twitter:title" content="Howto Upgrade to Zipkin2">
+  <meta name="twitter:description" content="Changes between v1 and v2 of zipkin and how Java Chassis upgraded to zipkin2">
   <meta name="twitter:url" content="">
 
   
@@ -56,7 +56,7 @@
   
 
   
-    <meta name="twitter:creator" content="@seanyinx">
+    <meta name="twitter:creator" content="@">
   
 
 
@@ -70,7 +70,7 @@
 
 
   <meta property="og:type" content="article">
-  <meta property="article:published_time" content="2017-07-17T00:00:00+08:00">
+  <meta property="article:published_time" content="2018-01-10T00:00:00+08:00">
 
 
 
@@ -216,7 +216,7 @@
         <div class="nav-lang">
           
             
-            <a href=/cn/docs/tracing-with-servicecomb/>中文</a>
+            <a href=/cn/docs/howto-upgrade-topzipkin2/>中文</a>
           
         </div>
       </nav>
@@ -242,11 +242,11 @@
   
 
   <div class="author__content">
-    <h3 class="author__name" itemprop="name">Sean Yin</h3>
+    <h3 class="author__name" itemprop="name">Yang Bo</h3>
     
       <p class="author__bio" itemprop="description">
 	    
-        Nothing but speed is indestructible
+        Simplicity is beauty
 	    
       </p>
     
@@ -258,17 +258,11 @@
       
 
       
-        <li>
-          <a href="http://seanyinx.github.io" itemprop="url">
-            <i class="fa fa-fw fa-chain" aria-hidden="true"></i> Website
-          </a>
-        </li>
-      
 
       
         <li>
-          <a href="mailto:seanyinx@gmail.com">
-            <meta itemprop="email" content="seanyinx@gmail.com" />
+          <a href="mailto:yangbo12@huawei.com">
+            <meta itemprop="email" content="yangbo12@huawei.com" />
             <i class="fa fa-fw fa-envelope-square" aria-hidden="true"></i> Email
           </a>
         </li>
@@ -277,12 +271,6 @@
       
 
       
-        <li>
-          <a href="https://twitter.com/seanyinx" itemprop="sameAs">
-            <i class="fa fa-fw fa-twitter-square" aria-hidden="true"></i> Twitter
-          </a>
-        </li>
-      
 
       
 
@@ -341,16 +329,16 @@
 
 
   <article class="page" itemscope itemtype="http://schema.org/CreativeWork">
-    <meta itemprop="headline" content="Distributed Tracing with ServiceComb and Zipkin">
-    <meta itemprop="description" content="A introduction of how to set up distributed tracing with ServiceComb and Zipkin">
-    <meta itemprop="datePublished" content="July 17, 2017">
-    <meta itemprop="dateModified" content="July 17, 2017">
+    <meta itemprop="headline" content="Howto Upgrade to Zipkin2">
+    <meta itemprop="description" content="Changes between v1 and v2 of zipkin and how Java Chassis upgraded to zipkin2">
+    <meta itemprop="datePublished" content="January 10, 2018">
+    <meta itemprop="dateModified" content="January 11, 2018">
 
     <div class="page__inner-wrap">
       
         
           <header>
-            <h1 class="page__title" itemprop="headline">Distributed Tracing with ServiceComb and Zipkin
+            <h1 class="page__title" itemprop="headline">Howto Upgrade to Zipkin2
 </h1>
             
               <p class="page__meta"><i class="fa fa-clock-o" aria-hidden="true"></i> 
@@ -367,121 +355,252 @@
       
 
       <section class="page__content" itemprop="text">
-        <p>Microservice architecture solves many problems of monolithic applications, but it also comes with costs. Request latencies
-due to network instability is one of the prices we have to pay.</p>
-
-<p>In monolithic applications, modules are all running in one process and there's no such thing as communication issues among 
-modules. However, with microservice architecture, services are communicating through a network and we have to deal with all 
-network related issues, such as delays, timeouts, and partition.</p>
+        <h2 id="background">Background</h2>
+
+<p>Java Chassis uses zipkin as the default tracing implementation.</p>
+
+<p>Zipkin introduced <a href="http://zipkin.io/zipkin-api/#/">v2 http api</a> in version 1.31 which simplifies data types. There are also various other improvements and new features added to the zipkin libraries, so it seems a good time for us to follow the upstream and upgrade to zipkin2.</p>
+
+<h3 id="version-matrix">Version matrix</h3>
+
+<table>
+  <thead>
+    <tr>
+      <th>module</th>
+      <th>current</th>
+      <th>target</th>
+      <th>supports v2 since</th>
+    </tr>
+  </thead>
+  <tbody>
+    <tr>
+      <td>zipkin</td>
+      <td>1.24.0</td>
+      <td>2.4.2</td>
+      <td>2.0.0</td>
+    </tr>
+    <tr>
+      <td>brave</td>
+      <td>4.13.1</td>
+      <td>4.13.1</td>
+      <td>4.7.1</td>
+    </tr>
+    <tr>
+      <td>reporter</td>
+      <td>0.10.0</td>
+      <td>2.2.2</td>
+      <td>2.0.0</td>
+    </tr>
+  </tbody>
+</table>
+
+<h2 id="whats-changed">What’s changed</h2>
+
+<p>Zipkin did a very good job on maintaining backward compatibility. All the changes that breaks compatiblity are packaged into a new group(<code class="highlighter-rouge">io.zipkin.java</code> -&gt; <code class="highlighter-rouge">io.zipkin.zipkin2</code>, <code class="highlighter-rouge">io.zipkin.reporter</code> -&gt; <code class="highlighter-rouge">io.zipkin.reporter2</code>). And v1/v2 libraries can coexist.</p>
+
+<p>The zipkin2 library can use both v1 and v2 api to communicate with server.</p>
+
+<p>The <code class="highlighter-rouge">zipkin2.Span</code> class changed a bit from the old <code class="highlighter-rouge">zipkin.Span</code> class. The public fields are refactored to methods. And the <code class="highlighter-rouge">BinaryAnnotation</code> class is removed along with <code class="highlighter-rouge">zipkin.Span.binaryAnnotaions</code> field. It’s functionality is replaced by <code class="highlighter-rouge">zipkin2.Span.tags()</code> method which return a <code class="hi [...]
+
+<h2 id="upgrade-to-zipkin2-for-java-chassis">Upgrade to zipkin2 for Java Chassis</h2>
+
+<h3 id="modify-the-maven-dependencies-to-use-the-target-version-of-related-libraries">Modify the maven dependencies to use the target version of related libraries.</h3>
+<p>Change the group <code class="highlighter-rouge">io.zipkin.java</code> and <code class="highlighter-rouge">io.zipkin.reporter</code> to <code class="highlighter-rouge">io.zipkin.zipkin2</code> and <code class="highlighter-rouge">io.zipkin.reporter2</code> respectively.</p>
+
+<div class="language-diff highlighter-rouge"><pre class="highlight"><code>java-chassis-dependencies/pom.xml
+<span class="gu">@@ -50,8 +50,8 @@
+</span>     &lt;cxf.version&gt;3.1.6&lt;/cxf.version&gt;
+     &lt;logback.version&gt;1.1.7&lt;/logback.version&gt;
+     &lt;brave.version&gt;4.13.1&lt;/brave.version&gt;
+<span class="gd">-    &lt;zipkin.version&gt;1.24.0&lt;/zipkin.version&gt;
+-    &lt;zipkin-reporter.version&gt;0.10.0&lt;/zipkin-reporter.version&gt;
+</span><span class="gi">+    &lt;zipkin.version&gt;2.4.2&lt;/zipkin.version&gt;
++    &lt;zipkin-reporter.version&gt;2.2.2&lt;/zipkin-reporter.version&gt;
+</span>   &lt;/properties&gt;
+ 
+   &lt;dependencyManagement&gt;
+<span class="gu">@@ -646,7 +646,7 @@
+</span> 
+       &lt;!-- zipkin dependencies --&gt;
+       &lt;dependency&gt;
+<span class="gd">-        &lt;groupId&gt;io.zipkin.java&lt;/groupId&gt;
+</span><span class="gi">+        &lt;groupId&gt;io.zipkin.zipkin2&lt;/groupId&gt;
+</span>         &lt;artifactId&gt;zipkin&lt;/artifactId&gt;
+         &lt;version&gt;${zipkin.version}&lt;/version&gt;
+       &lt;/dependency&gt;
+<span class="gu">@@ -661,7 +661,7 @@
+</span>         &lt;version&gt;${brave.version}&lt;/version&gt;
+       &lt;/dependency&gt;
+       &lt;dependency&gt;
+<span class="gd">-        &lt;groupId&gt;io.zipkin.reporter&lt;/groupId&gt;
+</span><span class="gi">+        &lt;groupId&gt;io.zipkin.reporter2&lt;/groupId&gt;
+</span>         &lt;artifactId&gt;zipkin-sender-okhttp3&lt;/artifactId&gt;
+         &lt;version&gt;${zipkin-reporter.version}&lt;/version&gt;
+       &lt;/dependency&gt;
+
+handlers/handler-tracing-zipkin/pom.xml
+<span class="gu">@@ -50,7 +50,7 @@
+</span>       &lt;artifactId&gt;brave&lt;/artifactId&gt;
+     &lt;/dependency&gt;
+     &lt;dependency&gt;
+<span class="gd">-      &lt;groupId&gt;io.zipkin.reporter&lt;/groupId&gt;
+</span><span class="gi">+      &lt;groupId&gt;io.zipkin.reporter2&lt;/groupId&gt;
+</span>       &lt;artifactId&gt;zipkin-sender-okhttp3&lt;/artifactId&gt;
+     &lt;/dependency&gt;
+     &lt;dependency&gt;
 
-<p>In addition, given more and more services deployed, we can easily lose the sight on how requests flow through
-the web of microservices in our applications. How can we monitor the network latencies and flow of requests through our system?</p>
-
-<h2 id="zipkin">Zipkin</h2>
-<blockquote>
-  <p><a href="http://zipkin.io/">Zipkin</a> is a distributed tracing system. It helps gather timing data needed to troubleshoot latency 
-problems in microservice architectures. It manages both the collection and lookup of this data. Zipkin’s design is based 
-on the Google <a href="http://research.google.com/pubs/pub36356.html">Dapper paper</a>.[1]</p>
-</blockquote>
+</code></pre>
+</div>
 
-<p>ServiceComb integrates with Zipkin to provide automatic tracing, so that users can focus on fulfilling their business requirements.</p>
+<h3 id="make-brave-to-use-zipkin2-instead-of-zipkin">Make brave to use zipkin2 instead of zipkin</h3>
+
+<p>Change the zipkin.xxx import to zipkin2.xxx on imports, and most importantly, use <code class="highlighter-rouge">spanReporter()</code> instead of <code class="highlighter-rouge">reporter()</code> for generating reporter for brave, change the api path to /api/v2/xxx when creating sender.</p>
+
+<div class="language-diff highlighter-rouge"><pre class="highlight"><code>handlers/handler-tracing-zipkin/src/main/java/io/servicecomb/tracing/zipkin/TracingConfiguration.java
+<span class="gu">@@ -31,11 +31,11 @@
+</span> import brave.http.HttpTracing;
+ import brave.propagation.CurrentTraceContext;
+ import io.servicecomb.config.DynamicProperties;
+<span class="gd">-import zipkin.Span;
+-import zipkin.reporter.AsyncReporter;
+-import zipkin.reporter.Reporter;
+-import zipkin.reporter.Sender;
+-import zipkin.reporter.okhttp3.OkHttpSender;
+</span><span class="gi">+import zipkin2.Span;
++import zipkin2.reporter.AsyncReporter;
++import zipkin2.reporter.Reporter;
++import zipkin2.reporter.Sender;
++import zipkin2.reporter.okhttp3.OkHttpSender;
+</span> 
+ @Configuration
+ class TracingConfiguration {
+<span class="gu">@@ -56,14 +56,15 @@ Sender sender(DynamicProperties dynamicProperties) {
+</span>     return AsyncReporter.builder(sender).build();
+   }
+ 
+<span class="gi">+
+</span>   @Bean
+   Tracing tracing(Reporter&lt;Span&gt; reporter, DynamicProperties dynamicProperties,
+       CurrentTraceContext currentTraceContext) {
+     return Tracing.newBuilder()
+         .localServiceName(dynamicProperties.getStringProperty(CONFIG_QUALIFIED_MICROSERVICE_NAME_KEY,
+             DEFAULT_MICROSERVICE_NAME))
+         .currentTraceContext(currentTraceContext) // puts trace IDs into logs
+<span class="gd">-        .reporter(reporter)
+</span><span class="gi">+        .spanReporter(reporter)
+</span>         .build();
+   }
+</code></pre>
+</div>
 
-<h2 id="instructions">Instructions</h2>
-<p>We will use the <a href="https://github.com/ServiceComb/LinuxCon-Beijing-WorkShop">workshop demo</a> as an example to illustrate how
-to apply distributed tracing with Zipkin.</p>
+<p><strong>Note</strong>:</p>
 
-<h3 id="adding-dependencies">Adding Dependencies</h3>
-<p>A microservice written with ServiceComb Java Chassis just need to add one dependency below to its pom.xml.</p>
-<div class="language-xml highlighter-rouge"><pre class="highlight"><code>    <span class="nt">&lt;dependency&gt;</span>
-      <span class="nt">&lt;groupId&gt;</span>io.servicecomb<span class="nt">&lt;/groupId&gt;</span>
-      <span class="nt">&lt;artifactId&gt;</span>handler-tracing-zipkin<span class="nt">&lt;/artifactId&gt;</span>
-    <span class="nt">&lt;/dependency&gt;</span>
+<p>In the <a href="https://github.com/openzipkin/brave/releases/tag/4.7.1">brave release notes</a>, it’s stated that we need to use <code class="highlighter-rouge">create()</code> instead of <code class="highlighter-rouge">builder()</code></p>
 
+<div class="language-diff highlighter-rouge"><pre class="highlight"><code>
+   /** Configuration for how to buffer spans into messages for Zipkin */
+<span class="gd">-  @Bean Reporter&lt;Span&gt; reporter() {
+-    return AsyncReporter.builder(sender()).build();
+</span><span class="gi">+  @Bean Reporter&lt;Span&gt; spanReporter() {
++    return AsyncReporter.create(sender()).build();
+</span>   }
 </code></pre>
 </div>
 
-<p>If the microservice is an API gateway with Spring Cloud + Zuul like manager service in the workshop demo, an additional 
-dependency has to be included.</p>
-<div class="language-xml highlighter-rouge"><pre class="highlight"><code>    <span class="nt">&lt;dependency&gt;</span>
-      <span class="nt">&lt;groupId&gt;</span>io.servicecomb<span class="nt">&lt;/groupId&gt;</span>
-      <span class="nt">&lt;artifactId&gt;</span>spring-cloud-zuul-zipkin<span class="nt">&lt;/artifactId&gt;</span>
-    <span class="nt">&lt;/dependency&gt;</span>
+<p>But this will not work. In <code class="highlighter-rouge">zipkin2.Reporter</code>, the <code class="highlighter-rouge">create(sender)</code> is actually equivalent to <code class="highlighter-rouge">builder(sender).build()</code></p>
+
+<div class="language-java highlighter-rouge"><pre class="highlight"><code>  <span class="kd">public</span> <span class="kd">static</span> <span class="n">AsyncReporter</span><span class="o">&lt;</span><span class="n">Span</span><span class="o">&gt;</span> <span class="nf">create</span><span class="o">(</span><span class="n">Sender</span> <span class="n">sender</span><span class="o">)</span> <span class="o">{</span>
+    <span class="k">return</span> <span class="o">(</span><span class="k">new</span> <span class="n">AsyncReporter</span><span class="o">.</span><span class="na">Builder</span><span class="o">(</span><span class="n">sender</span><span class="o">)).</span><span class="na">build</span><span class="o">();</span>
+  <span class="o">}</span>
+  
+  <span class="kd">public</span> <span class="kd">static</span> <span class="n">AsyncReporter</span><span class="o">.</span><span class="na">Builder</span> <span class="nf">builder</span><span class="o">(</span><span class="n">Sender</span> <span class="n">sender</span><span class="o">)</span> <span class="o">{</span>
+    <span class="k">return</span> <span class="k">new</span> <span class="n">AsyncReporter</span><span class="o">.</span><span class="na">Builder</span><span class="o">(</span><span class="n">sender</span><span class="o">);</span>
+  <span class="o">}</span>
 </code></pre>
 </div>
 
-<h3 id="configuring-tracing-handlers-and-collector">Configuring Tracing Handlers And Collector</h3>
-<p>In the configuration file <code class="highlighter-rouge">microservice.yaml</code> , apply tracing handlers and add tracing collector address.</p>
-<div class="language-yaml highlighter-rouge"><pre class="highlight"><code><span class="s">cse</span><span class="pi">:</span>
-  <span class="s">handler</span><span class="pi">:</span>
-    <span class="s">chain</span><span class="pi">:</span>
-      <span class="s">Consumer</span><span class="pi">:</span>
-        <span class="s">default</span><span class="pi">:</span> <span class="s">tracing-consumer</span>
-      <span class="s">Provider</span><span class="pi">:</span>
-        <span class="s">default</span><span class="pi">:</span> <span class="s">tracing-provider</span>
-
-<span class="s">servicecomb</span><span class="pi">:</span>
-  <span class="s">tracing</span><span class="pi">:</span>
-    <span class="s">collector</span><span class="pi">:</span>
-      <span class="s">address</span><span class="pi">:</span> <span class="s">http://zipkin.servicecomb.io:9411</span>
+<h3 id="make-changes-according-to-the-changes-of-zipkinspan-and-zipkin2span">Make changes according to the changes of zipkin.Span and zipkin2.Span.</h3>
+
+<p>We do not use zipkin.Span in our production code, but we do use it in our tests. Those changes are quite straight forward, we just change the accessing of fields to calling methods as described in the What’s Changed section.</p>
+
+<div class="language-diff highlighter-rouge"><pre class="highlight"><code>tracing/tracing-zipkin/src/test/java/io/servicecomb/tracing/zipkin/ZipkinSpanAspectTest.java 
+<span class="gu">@@ -45,7 +45,7 @@
+</span> import io.servicecomb.tracing.zipkin.app.ZipkinSpanTestApplication;
+ import io.servicecomb.tracing.zipkin.app.ZipkinSpanTestApplication.CustomSpanTask;
+ import io.servicecomb.tracing.zipkin.app.ZipkinSpanTestApplication.SomeSlowTask;
+<span class="gd">-import zipkin.Span;
+</span><span class="gi">+import zipkin2.Span;
+</span> 
+ @RunWith(SpringRunner.class)
+ @SpringBootTest(classes = {ZipkinSpanTestApplication.class, TracingConfig.class})
+<span class="gu">@@ -74,8 +74,8 @@ public void reportedSpanContainsAnnotatedMethodInfo() throws Exception {
+</span> 
+     await().atMost(2, SECONDS).until(() -&gt; !spans.isEmpty());
+ 
+<span class="gd">-    zipkin.Span span = spans.poll();
+-    assertThat(span.name, is("crawl"));
+</span><span class="gi">+    zipkin2.Span span = spans.poll();
++    assertThat(span.name(), is("crawl"));
+</span>     assertThat(tracedValues(span), contains(SomeSlowTask.class.getMethod("crawl").toString()));
+   }
+   
+<span class="gu">@@ -84,17 +84,17 @@ public void reportCustomSpanInfomation() throws Exception {
+</span>     customSpanTask.invoke();
+     await().atMost(2, SECONDS).until(() -&gt; !spans.isEmpty());
+   
+<span class="gd">-    zipkin.Span span = spans.poll();
+-    assertThat(span.name, is("transaction1"));
+</span><span class="gi">+    zipkin2.Span span = spans.poll();
++    assertThat(span.name(), is("transaction1"));
+</span>     assertThat(tracedValues(span), contains("startA"));
+     
+   }
+ 
+<span class="gd">-  private List&lt;String&gt; tracedValues(zipkin.Span spans) {
+-    return spans.binaryAnnotations.stream()
+-        .filter(span -&gt; CALL_PATH.equals(span.key) || "error".equals(span.key))
+-        .filter(span -&gt; span.value != null)
+-        .map(annotation -&gt; new String(annotation.value))
+</span><span class="gi">+  private List&lt;String&gt; tracedValues(zipkin2.Span spans) {
++    return spans.tags().entrySet().stream()
++        .filter(span -&gt; CALL_PATH.equals(span.getKey()) || "error".equals(span.getKey()))
++        .filter(span -&gt; span.getValue() != null)
++        .map(annotation -&gt; new String(annotation.getValue()))
+</span>         .distinct()
+         .collect(Collectors.toList());
+   }
+<span class="gu">@@ -110,7 +110,7 @@ public void reportCustomSpanInfomation() throws Exception {
+</span>     Tracing tracing(Queue&lt;Span&gt; spans) {
+       return Tracing.newBuilder()
+           .currentTraceContext(new StrictCurrentTraceContext())
+<span class="gd">-          .reporter(spans::add)
+</span><span class="gi">+          .spanReporter(spans::add)
+</span>           .build();
+     }
+   }
 </code></pre>
 </div>
 
-<p>That's all! After two configuration additions and no change to a single line of code, distributed tracing with Zipkin is 
-enabled for microservices written with Java chassis.</p>
-
-<p><strong>Note</strong> If other dependencies in your project also include zipkin (e.g. Spring Cloud), it may cause runtime error due to
-conflict of incompatible zipkin versions. In such a case, you may need to explicitly declare the compatible zipkin version
-in your pom.</p>
-
-<h2 id="a-quick-demo">A Quick Demo</h2>
-<p>After enabled tracing in the workshop demo, we are able to showcase the tracing capability locally with docker.</p>
-<ol>
-  <li>
-    <p>Build all docker images of services in the workshop demo with command <code class="highlighter-rouge">mvn package -DskipTests -Pdocker</code> or <code class="highlighter-rouge">mvn package -DskipTests -Pdocker -Pdocker-machine</code>
-if you are using <a href="https://www.docker.com/products/docker-toolbox">Docker Toolbox</a></p>
-  </li>
-  <li>
-    <p>Run <code class="highlighter-rouge">docker-compose up</code> under workshop demo folder</p>
-  </li>
-  <li>
-    <p>Send requests to the demo application like what we did in the video below</p>
-  </li>
-  <li>
-    <p>Open Zipkin website in a browser, which is hosted in a docker container started at step 2, eg. http://docker.container.ip:9411</p>
-  </li>
-</ol>
+<h3 id="support-both-v1-and-v2-api-of-zipkin-server">Support both v1 and v2 api of zipkin server.</h3>
 
-<!-- Courtesy of embedresponsively.com //-->
-<div class="responsive-video-container">
+<p>Our customers may be still running a zipkin server prior to 1.31 which does not support the v2 http api. So we added an option to let them specify the server api version.</p>
 
-  <iframe src="https://player.youku.com/embed/XMjg1NzQ3NzUzNg" frameborder="0" allowfullscreen=""></iframe>
+<p>Supporting v1 api is built into zipkin2, so we do not need to rely on the v1 libraries. Just use the <code class="highlighter-rouge">SpanBytesEncoder.JSON_V1</code> when building reporter and change the sender api path.</p>
 
+<div class="language-java highlighter-rouge"><pre class="highlight"><code><span class="n">sender</span> <span class="o">=</span> <span class="n">URLConnectionSender</span><span class="o">.</span><span class="na">create</span><span class="o">(</span><span class="s">"http://localhost:9411/api/v1/spans"</span><span class="o">)</span>
+<span class="n">reporter</span> <span class="o">=</span> <span class="n">AsyncReporter</span><span class="o">.</span><span class="na">builder</span><span class="o">(</span><span class="n">sender</span><span class="o">)</span>
+                        <span class="o">.</span><span class="na">build</span><span class="o">(</span><span class="n">SpanBytesEncoder</span><span class="o">.</span><span class="na">JSON_V1</span><span class="o">);</span>
+</code></pre>
 </div>
 
-<p>Now we should be able to see Zipkin homepage with a few traced services.
-<img src="/assets/images/tracing.1.png" alt="zipkin homepage" class="align-center" /></p>
-
-<p>If we choose manager and click Find Traces button, some traces will be displayed. Please don't mind the system performance
-being not very good, since we are running so many services in docker on a laptop manufactured in 2012.
-<img src="/assets/images/tracing.2.png" alt="traces of manager service" class="align-center" /></p>
-
-<p>We are also able to see the spans of an individual trace by clicking on it.
-<img src="/assets/images/tracing.3.png" alt="trace spans of manager service" class="align-center" /></p>
-
-<p>A more detailed timing information will be displayed if we click on any span in the trace.
-<img src="/assets/images/tracing.4.png" alt="span details of manager service" class="align-center" /></p>
-
-<p>Dependency graph of services can be helpful to gain insight on request flow, if we click on the Dependencies menu.
-<img src="/assets/images/tracing.5.png" alt="service dependencies" class="align-center" /></p>
-
-<h2 id="summary">Summary</h2>
-<p>As we can see, adding distributed tracing capability to microservices using ServiceComb is as easy as following 2 simple 
-steps as shown in the instruction section above. Doing so, we leverage the powerful features provided by Zipkin, such as
-analyzing timing data to troubleshoot network latencies among our microservices and gaining insight on our service dependencies.</p>
+<p>That’s all, for the complete changes, please refer the <a href="https://github.com/apache/incubator-servicecomb-java-chassis/pull/488">pull request</a> for the complete changes.</p>
 
 <h2 id="references">References</h2>
+
 <ul>
-  <li>[1] <a href="http://zipkin.io/">Zipkin</a></li>
+  <li><a href="https://github.com/openzipkin/zipkin/releases/tag/2.0.0">Zipkin 2.0.0 release notes</a></li>
+  <li><a href="https://github.com/openzipkin/brave/releases/tag/4.7.1">Brave 4.7.1 release notes</a></li>
+  <li><a href="https://github.com/openzipkin/brave/tree/master/brave">Brave API V4</a></li>
 </ul>
 
         
@@ -503,10 +622,6 @@ analyzing timing data to troubleshoot network latencies among our microservices
     
       
       
-      <a href="/tags/#distributed-tracing" class="page__taxonomy-item" rel="tag">distributed tracing</a><span class="sep">, </span>
-    
-      
-      
       <a href="/tags/#zipkin" class="page__taxonomy-item" rel="tag">zipkin</a>
     
     </span>
@@ -519,7 +634,7 @@ analyzing timing data to troubleshoot network latencies among our microservices
         
           
             
-              <p class="page__date"><strong><i class="fa fa-fw fa-calendar" aria-hidden="true"></i> Updated:</strong> <time datetime="2017-07-17">July 17, 2017</time></p>
+              <p class="page__date"><strong><i class="fa fa-fw fa-calendar" aria-hidden="true"></i> Updated:</strong> <time datetime="2018-01-11">January 11, 2018</time></p>
             
           
         
@@ -530,25 +645,24 @@ analyzing timing data to troubleshoot network latencies among our microservices
     <h4 class="page__share-title">Share on</h4>
   
 
-  <a href="https://twitter.com/intent/tweet?via=ServiceComb&text=Distributed Tracing with ServiceComb and Zipkin /docs/tracing-with-servicecomb/" class="btn btn--twitter" title="Share on Twitter"><i class="fa fa-fw fa-twitter" aria-hidden="true"></i><span> Twitter</span></a>
+  <a href="https://twitter.com/intent/tweet?via=ServiceComb&text=Howto Upgrade to Zipkin2 /docs/howto-upgrade-topzipkin2/" class="btn btn--twitter" title="Share on Twitter"><i class="fa fa-fw fa-twitter" aria-hidden="true"></i><span> Twitter</span></a>
 
-  <a href="https://www.facebook.com/sharer/sharer.php?u=/docs/tracing-with-servicecomb/" class="btn btn--facebook" title="Share on Facebook"><i class="fa fa-fw fa-facebook" aria-hidden="true"></i><span> Facebook</span></a>
+  <a href="https://www.facebook.com/sharer/sharer.php?u=/docs/howto-upgrade-topzipkin2/" class="btn btn--facebook" title="Share on Facebook"><i class="fa fa-fw fa-facebook" aria-hidden="true"></i><span> Facebook</span></a>
 
-  <a href="https://plus.google.com/share?url=/docs/tracing-with-servicecomb/" class="btn btn--google-plus" title="Share on Google Plus"><i class="fa fa-fw fa-google-plus" aria-hidden="true"></i><span> Google+</span></a>
+  <a href="https://plus.google.com/share?url=/docs/howto-upgrade-topzipkin2/" class="btn btn--google-plus" title="Share on Google Plus"><i class="fa fa-fw fa-google-plus" aria-hidden="true"></i><span> Google+</span></a>
 
-  <a href="https://www.linkedin.com/shareArticle?mini=true&url=/docs/tracing-with-servicecomb/" class="btn btn--linkedin" title="Share on LinkedIn"><i class="fa fa-fw fa-linkedin" aria-hidden="true"></i><span> LinkedIn</span></a>
+  <a href="https://www.linkedin.com/shareArticle?mini=true&url=/docs/howto-upgrade-topzipkin2/" class="btn btn--linkedin" title="Share on LinkedIn"><i class="fa fa-fw fa-linkedin" aria-hidden="true"></i><span> LinkedIn</span></a>
 </section>
 
 
       
   <nav class="pagination">
     
-      <a href="/cn/docs/go-to-cloud/" class="pagination--pager" title="单体应用利用ServiceComb实现微服务化和云化之路
+      <a href="/docs/service-registry-refactor-proposal/" class="pagination--pager" title="Proposal for refactoring service registry module in Java Chassis
 ">Previous</a>
     
     
-      <a href="/cn/docs/tracing-with-servicecomb/" class="pagination--pager" title="基于 ServiceComb 和 Zipkin 的分布式调用链追踪
-">Next</a>
+      <a href="#" class="pagination--pager disabled">Next</a>
     
   </nav>
 
@@ -594,7 +708,7 @@ analyzing timing data to troubleshoot network latencies among our microservices
             <input type="url" id="comment-form-url" name="fields[url]" tabindex="4"/>
           </fieldset>
           <fieldset class="hidden" style="display: none;">
-            <input type="hidden" name="options[slug]" value="tracing-with-servicecomb">
+            <input type="hidden" name="options[slug]" value="howto-upgrade-to-zipkin-v2">
             <label for="comment-form-location">Not used. Leave blank if you are a human.</label>
             <input type="text" id="comment-form-location" name="fields[hidden]" autocomplete="off"/>
           </fieldset>
@@ -773,8 +887,8 @@ analyzing timing data to troubleshoot network latencies among our microservices
     <div class="col">
       <ul>
         <p class="header">Contribute</p>
-        <li><a href="https://github.com/apache/incubator-servicecomb-website/issues/new?title=Issue with _posts/2017-07-17-tracing-with-servicecomb.md">Report a Doc Issue</a></li>
-        <li><a href="https://github.com/apache/incubator-servicecomb-website/edit/master/_posts/2017-07-17-tracing-with-servicecomb.md">Edit This Page on Github</a></li>
+        <li><a href="https://github.com/apache/incubator-servicecomb-website/issues/new?title=Issue with _posts/2018-01-10-howto-upgrade-to-zipkin-v2.md">Report a Doc Issue</a></li>
+        <li><a href="https://github.com/apache/incubator-servicecomb-website/edit/master/_posts/2018-01-10-howto-upgrade-to-zipkin-v2.md">Edit This Page on Github</a></li>
         <li><a href="/developers/submit-codes/">Code Submit Guide</a></li>
       </ul>
     </div>
diff --git a/content/docs/linuxcon-workshop-demo/index.html b/content/docs/linuxcon-workshop-demo/index.html
index 05fe2f1..76bb5a4 100644
--- a/content/docs/linuxcon-workshop-demo/index.html
+++ b/content/docs/linuxcon-workshop-demo/index.html
@@ -1278,11 +1278,11 @@ DevOps在微服务开发中的实践。希望能对大家有所帮助。</p>
     
     <h2 class="archive__item-title" itemprop="headline">
       
-        <a href="/docs/service-registry-refactor-proposal/" rel="permalink">Proposal for refactoring service registry module in Java Chassis
+        <a href="/docs/howto-upgrade-topzipkin2/" rel="permalink">Howto Upgrade to Zipkin2
 </a>
       
     </h2>
-    <p class="archive__item-excerpt" itemprop="description">Analysis of service registry and propose a new architecture for it
+    <p class="archive__item-excerpt" itemprop="description">Changes between v1 and v2 of zipkin and how Java Chassis upgraded to zipkin2
 </p>
     
       <p class="page__meta"><i class="fa fa-clock-o" aria-hidden="true"></i> 
@@ -1290,7 +1290,7 @@ DevOps在微服务开发中的实践。希望能对大家有所帮助。</p>
 
 
 
-  2 minute read
+  4 minute read
 
 </p>
     
@@ -1307,11 +1307,11 @@ DevOps在微服务开发中的实践。希望能对大家有所帮助。</p>
     
     <h2 class="archive__item-title" itemprop="headline">
       
-        <a href="/cn/docs/jira_beginner_guide/" rel="permalink">老司机带你刷任务 - ServiceComb JIRA入门指南
+        <a href="/docs/service-registry-refactor-proposal/" rel="permalink">Proposal for refactoring service registry module in Java Chassis
 </a>
       
     </h2>
-    <p class="archive__item-excerpt" itemprop="description">ServiceComb JIRA入门指南
+    <p class="archive__item-excerpt" itemprop="description">Analysis of service registry and propose a new architecture for it
 </p>
     
       <p class="page__meta"><i class="fa fa-clock-o" aria-hidden="true"></i> 
@@ -1319,7 +1319,7 @@ DevOps在微服务开发中的实践。希望能对大家有所帮助。</p>
 
 
 
-  less than 1 minute read
+  2 minute read
 
 </p>
     
@@ -1336,11 +1336,11 @@ DevOps在微服务开发中的实践。希望能对大家有所帮助。</p>
     
     <h2 class="archive__item-title" itemprop="headline">
       
-        <a href="/docs/service-center-ui/" rel="permalink">Service-Center Management UI Console
+        <a href="/cn/docs/jira_beginner_guide/" rel="permalink">老司机带你刷任务 - ServiceComb JIRA入门指南
 </a>
       
     </h2>
-    <p class="archive__item-excerpt" itemprop="description">An introduction Service-Center Management Console
+    <p class="archive__item-excerpt" itemprop="description">ServiceComb JIRA入门指南
 </p>
     
       <p class="page__meta"><i class="fa fa-clock-o" aria-hidden="true"></i> 
@@ -1348,7 +1348,7 @@ DevOps在微服务开发中的实践。希望能对大家有所帮助。</p>
 
 
 
-  2 minute read
+  less than 1 minute read
 
 </p>
     
diff --git a/content/docs/seckill-development-journey-part-I/index.html b/content/docs/seckill-development-journey-part-I/index.html
index 41bd148..b7820f2 100644
--- a/content/docs/seckill-development-journey-part-I/index.html
+++ b/content/docs/seckill-development-journey-part-I/index.html
@@ -572,11 +572,11 @@
     
     <h2 class="archive__item-title" itemprop="headline">
       
-        <a href="/docs/service-registry-refactor-proposal/" rel="permalink">Proposal for refactoring service registry module in Java Chassis
+        <a href="/docs/howto-upgrade-topzipkin2/" rel="permalink">Howto Upgrade to Zipkin2
 </a>
       
     </h2>
-    <p class="archive__item-excerpt" itemprop="description">Analysis of service registry and propose a new architecture for it
+    <p class="archive__item-excerpt" itemprop="description">Changes between v1 and v2 of zipkin and how Java Chassis upgraded to zipkin2
 </p>
     
       <p class="page__meta"><i class="fa fa-clock-o" aria-hidden="true"></i> 
@@ -584,7 +584,7 @@
 
 
 
-  2 minute read
+  4 minute read
 
 </p>
     
@@ -601,11 +601,11 @@
     
     <h2 class="archive__item-title" itemprop="headline">
       
-        <a href="/cn/docs/jira_beginner_guide/" rel="permalink">老司机带你刷任务 - ServiceComb JIRA入门指南
+        <a href="/docs/service-registry-refactor-proposal/" rel="permalink">Proposal for refactoring service registry module in Java Chassis
 </a>
       
     </h2>
-    <p class="archive__item-excerpt" itemprop="description">ServiceComb JIRA入门指南
+    <p class="archive__item-excerpt" itemprop="description">Analysis of service registry and propose a new architecture for it
 </p>
     
       <p class="page__meta"><i class="fa fa-clock-o" aria-hidden="true"></i> 
@@ -613,7 +613,7 @@
 
 
 
-  less than 1 minute read
+  2 minute read
 
 </p>
     
@@ -630,11 +630,11 @@
     
     <h2 class="archive__item-title" itemprop="headline">
       
-        <a href="/docs/service-center-ui/" rel="permalink">Service-Center Management UI Console
+        <a href="/cn/docs/jira_beginner_guide/" rel="permalink">老司机带你刷任务 - ServiceComb JIRA入门指南
 </a>
       
     </h2>
-    <p class="archive__item-excerpt" itemprop="description">An introduction Service-Center Management Console
+    <p class="archive__item-excerpt" itemprop="description">ServiceComb JIRA入门指南
 </p>
     
       <p class="page__meta"><i class="fa fa-clock-o" aria-hidden="true"></i> 
@@ -642,7 +642,7 @@
 
 
 
-  2 minute read
+  less than 1 minute read
 
 </p>
     
diff --git a/content/docs/seckill-development-journey-part-II/index.html b/content/docs/seckill-development-journey-part-II/index.html
index 57332d8..2b51063 100644
--- a/content/docs/seckill-development-journey-part-II/index.html
+++ b/content/docs/seckill-development-journey-part-II/index.html
@@ -561,11 +561,11 @@
     
     <h2 class="archive__item-title" itemprop="headline">
       
-        <a href="/docs/service-registry-refactor-proposal/" rel="permalink">Proposal for refactoring service registry module in Java Chassis
+        <a href="/docs/howto-upgrade-topzipkin2/" rel="permalink">Howto Upgrade to Zipkin2
 </a>
       
     </h2>
-    <p class="archive__item-excerpt" itemprop="description">Analysis of service registry and propose a new architecture for it
+    <p class="archive__item-excerpt" itemprop="description">Changes between v1 and v2 of zipkin and how Java Chassis upgraded to zipkin2
 </p>
     
       <p class="page__meta"><i class="fa fa-clock-o" aria-hidden="true"></i> 
@@ -573,7 +573,7 @@
 
 
 
-  2 minute read
+  4 minute read
 
 </p>
     
@@ -590,11 +590,11 @@
     
     <h2 class="archive__item-title" itemprop="headline">
       
-        <a href="/cn/docs/jira_beginner_guide/" rel="permalink">老司机带你刷任务 - ServiceComb JIRA入门指南
+        <a href="/docs/service-registry-refactor-proposal/" rel="permalink">Proposal for refactoring service registry module in Java Chassis
 </a>
       
     </h2>
-    <p class="archive__item-excerpt" itemprop="description">ServiceComb JIRA入门指南
+    <p class="archive__item-excerpt" itemprop="description">Analysis of service registry and propose a new architecture for it
 </p>
     
       <p class="page__meta"><i class="fa fa-clock-o" aria-hidden="true"></i> 
@@ -602,7 +602,7 @@
 
 
 
-  less than 1 minute read
+  2 minute read
 
 </p>
     
@@ -619,11 +619,11 @@
     
     <h2 class="archive__item-title" itemprop="headline">
       
-        <a href="/docs/service-center-ui/" rel="permalink">Service-Center Management UI Console
+        <a href="/cn/docs/jira_beginner_guide/" rel="permalink">老司机带你刷任务 - ServiceComb JIRA入门指南
 </a>
       
     </h2>
-    <p class="archive__item-excerpt" itemprop="description">An introduction Service-Center Management Console
+    <p class="archive__item-excerpt" itemprop="description">ServiceComb JIRA入门指南
 </p>
     
       <p class="page__meta"><i class="fa fa-clock-o" aria-hidden="true"></i> 
@@ -631,7 +631,7 @@
 
 
 
-  2 minute read
+  less than 1 minute read
 
 </p>
     
diff --git a/content/docs/seckill-development-journey-part-III/index.html b/content/docs/seckill-development-journey-part-III/index.html
index 22d1412..656faa6 100644
--- a/content/docs/seckill-development-journey-part-III/index.html
+++ b/content/docs/seckill-development-journey-part-III/index.html
@@ -576,11 +576,11 @@
     
     <h2 class="archive__item-title" itemprop="headline">
       
-        <a href="/docs/service-registry-refactor-proposal/" rel="permalink">Proposal for refactoring service registry module in Java Chassis
+        <a href="/docs/howto-upgrade-topzipkin2/" rel="permalink">Howto Upgrade to Zipkin2
 </a>
       
     </h2>
-    <p class="archive__item-excerpt" itemprop="description">Analysis of service registry and propose a new architecture for it
+    <p class="archive__item-excerpt" itemprop="description">Changes between v1 and v2 of zipkin and how Java Chassis upgraded to zipkin2
 </p>
     
       <p class="page__meta"><i class="fa fa-clock-o" aria-hidden="true"></i> 
@@ -588,7 +588,7 @@
 
 
 
-  2 minute read
+  4 minute read
 
 </p>
     
@@ -605,11 +605,11 @@
     
     <h2 class="archive__item-title" itemprop="headline">
       
-        <a href="/cn/docs/jira_beginner_guide/" rel="permalink">老司机带你刷任务 - ServiceComb JIRA入门指南
+        <a href="/docs/service-registry-refactor-proposal/" rel="permalink">Proposal for refactoring service registry module in Java Chassis
 </a>
       
     </h2>
-    <p class="archive__item-excerpt" itemprop="description">ServiceComb JIRA入门指南
+    <p class="archive__item-excerpt" itemprop="description">Analysis of service registry and propose a new architecture for it
 </p>
     
       <p class="page__meta"><i class="fa fa-clock-o" aria-hidden="true"></i> 
@@ -617,7 +617,7 @@
 
 
 
-  less than 1 minute read
+  2 minute read
 
 </p>
     
@@ -634,11 +634,11 @@
     
     <h2 class="archive__item-title" itemprop="headline">
       
-        <a href="/docs/service-center-ui/" rel="permalink">Service-Center Management UI Console
+        <a href="/cn/docs/jira_beginner_guide/" rel="permalink">老司机带你刷任务 - ServiceComb JIRA入门指南
 </a>
       
     </h2>
-    <p class="archive__item-excerpt" itemprop="description">An introduction Service-Center Management Console
+    <p class="archive__item-excerpt" itemprop="description">ServiceComb JIRA入门指南
 </p>
     
       <p class="page__meta"><i class="fa fa-clock-o" aria-hidden="true"></i> 
@@ -646,7 +646,7 @@
 
 
 
-  2 minute read
+  less than 1 minute read
 
 </p>
     
diff --git a/content/docs/service-center-ui/index.html b/content/docs/service-center-ui/index.html
index e906b43..d6dadde 100644
--- a/content/docs/service-center-ui/index.html
+++ b/content/docs/service-center-ui/index.html
@@ -560,11 +560,11 @@ can also download the html client for their Schemas.</p>
     
     <h2 class="archive__item-title" itemprop="headline">
       
-        <a href="/docs/service-registry-refactor-proposal/" rel="permalink">Proposal for refactoring service registry module in Java Chassis
+        <a href="/docs/howto-upgrade-topzipkin2/" rel="permalink">Howto Upgrade to Zipkin2
 </a>
       
     </h2>
-    <p class="archive__item-excerpt" itemprop="description">Analysis of service registry and propose a new architecture for it
+    <p class="archive__item-excerpt" itemprop="description">Changes between v1 and v2 of zipkin and how Java Chassis upgraded to zipkin2
 </p>
     
       <p class="page__meta"><i class="fa fa-clock-o" aria-hidden="true"></i> 
@@ -572,7 +572,7 @@ can also download the html client for their Schemas.</p>
 
 
 
-  2 分钟 阅读
+  4 分钟 阅读
 
 </p>
     
@@ -589,11 +589,11 @@ can also download the html client for their Schemas.</p>
     
     <h2 class="archive__item-title" itemprop="headline">
       
-        <a href="/cn/docs/jira_beginner_guide/" rel="permalink">老司机带你刷任务 - ServiceComb JIRA入门指南
+        <a href="/docs/service-registry-refactor-proposal/" rel="permalink">Proposal for refactoring service registry module in Java Chassis
 </a>
       
     </h2>
-    <p class="archive__item-excerpt" itemprop="description">ServiceComb JIRA入门指南
+    <p class="archive__item-excerpt" itemprop="description">Analysis of service registry and propose a new architecture for it
 </p>
     
       <p class="page__meta"><i class="fa fa-clock-o" aria-hidden="true"></i> 
@@ -601,7 +601,7 @@ can also download the html client for their Schemas.</p>
 
 
 
-  少于 1 分钟 阅读
+  2 分钟 阅读
 
 </p>
     
@@ -618,11 +618,11 @@ can also download the html client for their Schemas.</p>
     
     <h2 class="archive__item-title" itemprop="headline">
       
-        <a href="/docs/service-center-ui/" rel="permalink">Service-Center Management UI Console
+        <a href="/cn/docs/jira_beginner_guide/" rel="permalink">老司机带你刷任务 - ServiceComb JIRA入门指南
 </a>
       
     </h2>
-    <p class="archive__item-excerpt" itemprop="description">An introduction Service-Center Management Console
+    <p class="archive__item-excerpt" itemprop="description">ServiceComb JIRA入门指南
 </p>
     
       <p class="page__meta"><i class="fa fa-clock-o" aria-hidden="true"></i> 
@@ -630,7 +630,7 @@ can also download the html client for their Schemas.</p>
 
 
 
-  2 分钟 阅读
+  少于 1 分钟 阅读
 
 </p>
     
@@ -647,11 +647,11 @@ can also download the html client for their Schemas.</p>
     
     <h2 class="archive__item-title" itemprop="headline">
       
-        <a href="/cn/docs/how-to-reform-a-legacy-system/" rel="permalink">最头疼的遗留系统该如何改造?
+        <a href="/docs/service-center-ui/" rel="permalink">Service-Center Management UI Console
 </a>
       
     </h2>
-    <p class="archive__item-excerpt" itemprop="description">微服务是否是业界期待已久的企业架构解决方案?在对遗留系统进行微服务的改造过程中存在怎样的困难和挑战,应该注意些什么?
+    <p class="archive__item-excerpt" itemprop="description">An introduction Service-Center Management Console
 </p>
     
       <p class="page__meta"><i class="fa fa-clock-o" aria-hidden="true"></i> 
@@ -659,7 +659,7 @@ can also download the html client for their Schemas.</p>
 
 
 
-  少于 1 分钟 阅读
+  2 分钟 阅读
 
 </p>
     
diff --git a/content/docs/service-registry-refactor-proposal/index.html b/content/docs/service-registry-refactor-proposal/index.html
index 4ae6050..523a93f 100644
--- a/content/docs/service-registry-refactor-proposal/index.html
+++ b/content/docs/service-registry-refactor-proposal/index.html
@@ -476,7 +476,8 @@
 ">Previous</a>
     
     
-      <a href="#" class="pagination--pager disabled">Next</a>
+      <a href="/docs/howto-upgrade-topzipkin2/" class="pagination--pager" title="Howto Upgrade to Zipkin2
+">Next</a>
     
   </nav>
 
@@ -559,11 +560,11 @@
     
     <h2 class="archive__item-title" itemprop="headline">
       
-        <a href="/cn/docs/jira_beginner_guide/" rel="permalink">老司机带你刷任务 - ServiceComb JIRA入门指南
+        <a href="/docs/howto-upgrade-topzipkin2/" rel="permalink">Howto Upgrade to Zipkin2
 </a>
       
     </h2>
-    <p class="archive__item-excerpt" itemprop="description">ServiceComb JIRA入门指南
+    <p class="archive__item-excerpt" itemprop="description">Changes between v1 and v2 of zipkin and how Java Chassis upgraded to zipkin2
 </p>
     
       <p class="page__meta"><i class="fa fa-clock-o" aria-hidden="true"></i> 
@@ -571,7 +572,7 @@
 
 
 
-  less than 1 minute read
+  4 minute read
 
 </p>
     
@@ -588,11 +589,11 @@
     
     <h2 class="archive__item-title" itemprop="headline">
       
-        <a href="/docs/service-center-ui/" rel="permalink">Service-Center Management UI Console
+        <a href="/cn/docs/jira_beginner_guide/" rel="permalink">老司机带你刷任务 - ServiceComb JIRA入门指南
 </a>
       
     </h2>
-    <p class="archive__item-excerpt" itemprop="description">An introduction Service-Center Management Console
+    <p class="archive__item-excerpt" itemprop="description">ServiceComb JIRA入门指南
 </p>
     
       <p class="page__meta"><i class="fa fa-clock-o" aria-hidden="true"></i> 
@@ -600,7 +601,7 @@
 
 
 
-  2 minute read
+  less than 1 minute read
 
 </p>
     
@@ -646,11 +647,11 @@
     
     <h2 class="archive__item-title" itemprop="headline">
       
-        <a href="/cn/docs/how-to-reform-a-legacy-system/" rel="permalink">最头疼的遗留系统该如何改造?
+        <a href="/docs/service-center-ui/" rel="permalink">Service-Center Management UI Console
 </a>
       
     </h2>
-    <p class="archive__item-excerpt" itemprop="description">微服务是否是业界期待已久的企业架构解决方案?在对遗留系统进行微服务的改造过程中存在怎样的困难和挑战,应该注意些什么?
+    <p class="archive__item-excerpt" itemprop="description">An introduction Service-Center Management Console
 </p>
     
       <p class="page__meta"><i class="fa fa-clock-o" aria-hidden="true"></i> 
@@ -658,7 +659,7 @@
 
 
 
-  less than 1 minute read
+  2 minute read
 
 </p>
     
diff --git a/content/docs/stress-test-on-company-with-jmeter-in-k8s/index.html b/content/docs/stress-test-on-company-with-jmeter-in-k8s/index.html
index 365c61f..f454ef1 100644
--- a/content/docs/stress-test-on-company-with-jmeter-in-k8s/index.html
+++ b/content/docs/stress-test-on-company-with-jmeter-in-k8s/index.html
@@ -670,11 +670,11 @@ fig-6 Memory Usage of different services</p>
     
     <h2 class="archive__item-title" itemprop="headline">
       
-        <a href="/docs/service-registry-refactor-proposal/" rel="permalink">Proposal for refactoring service registry module in Java Chassis
+        <a href="/docs/howto-upgrade-topzipkin2/" rel="permalink">Howto Upgrade to Zipkin2
 </a>
       
     </h2>
-    <p class="archive__item-excerpt" itemprop="description">Analysis of service registry and propose a new architecture for it
+    <p class="archive__item-excerpt" itemprop="description">Changes between v1 and v2 of zipkin and how Java Chassis upgraded to zipkin2
 </p>
     
       <p class="page__meta"><i class="fa fa-clock-o" aria-hidden="true"></i> 
@@ -682,7 +682,7 @@ fig-6 Memory Usage of different services</p>
 
 
 
-  2 minute read
+  4 minute read
 
 </p>
     
@@ -699,11 +699,11 @@ fig-6 Memory Usage of different services</p>
     
     <h2 class="archive__item-title" itemprop="headline">
       
-        <a href="/cn/docs/jira_beginner_guide/" rel="permalink">老司机带你刷任务 - ServiceComb JIRA入门指南
+        <a href="/docs/service-registry-refactor-proposal/" rel="permalink">Proposal for refactoring service registry module in Java Chassis
 </a>
       
     </h2>
-    <p class="archive__item-excerpt" itemprop="description">ServiceComb JIRA入门指南
+    <p class="archive__item-excerpt" itemprop="description">Analysis of service registry and propose a new architecture for it
 </p>
     
       <p class="page__meta"><i class="fa fa-clock-o" aria-hidden="true"></i> 
@@ -711,7 +711,7 @@ fig-6 Memory Usage of different services</p>
 
 
 
-  less than 1 minute read
+  2 minute read
 
 </p>
     
@@ -728,11 +728,11 @@ fig-6 Memory Usage of different services</p>
     
     <h2 class="archive__item-title" itemprop="headline">
       
-        <a href="/docs/service-center-ui/" rel="permalink">Service-Center Management UI Console
+        <a href="/cn/docs/jira_beginner_guide/" rel="permalink">老司机带你刷任务 - ServiceComb JIRA入门指南
 </a>
       
     </h2>
-    <p class="archive__item-excerpt" itemprop="description">An introduction Service-Center Management Console
+    <p class="archive__item-excerpt" itemprop="description">ServiceComb JIRA入门指南
 </p>
     
       <p class="page__meta"><i class="fa fa-clock-o" aria-hidden="true"></i> 
@@ -740,7 +740,7 @@ fig-6 Memory Usage of different services</p>
 
 
 
-  2 minute read
+  less than 1 minute read
 
 </p>
     
diff --git a/content/docs/tracing-with-servicecomb/index.html b/content/docs/tracing-with-servicecomb/index.html
index 6317998..b34ec96 100644
--- a/content/docs/tracing-with-servicecomb/index.html
+++ b/content/docs/tracing-with-servicecomb/index.html
@@ -631,11 +631,11 @@ analyzing timing data to troubleshoot network latencies among our microservices
     
     <h2 class="archive__item-title" itemprop="headline">
       
-        <a href="/docs/service-registry-refactor-proposal/" rel="permalink">Proposal for refactoring service registry module in Java Chassis
+        <a href="/docs/howto-upgrade-topzipkin2/" rel="permalink">Howto Upgrade to Zipkin2
 </a>
       
     </h2>
-    <p class="archive__item-excerpt" itemprop="description">Analysis of service registry and propose a new architecture for it
+    <p class="archive__item-excerpt" itemprop="description">Changes between v1 and v2 of zipkin and how Java Chassis upgraded to zipkin2
 </p>
     
       <p class="page__meta"><i class="fa fa-clock-o" aria-hidden="true"></i> 
@@ -643,7 +643,7 @@ analyzing timing data to troubleshoot network latencies among our microservices
 
 
 
-  2 minute read
+  4 minute read
 
 </p>
     
@@ -660,11 +660,11 @@ analyzing timing data to troubleshoot network latencies among our microservices
     
     <h2 class="archive__item-title" itemprop="headline">
       
-        <a href="/cn/docs/jira_beginner_guide/" rel="permalink">老司机带你刷任务 - ServiceComb JIRA入门指南
+        <a href="/docs/service-registry-refactor-proposal/" rel="permalink">Proposal for refactoring service registry module in Java Chassis
 </a>
       
     </h2>
-    <p class="archive__item-excerpt" itemprop="description">ServiceComb JIRA入门指南
+    <p class="archive__item-excerpt" itemprop="description">Analysis of service registry and propose a new architecture for it
 </p>
     
       <p class="page__meta"><i class="fa fa-clock-o" aria-hidden="true"></i> 
@@ -672,7 +672,7 @@ analyzing timing data to troubleshoot network latencies among our microservices
 
 
 
-  less than 1 minute read
+  2 minute read
 
 </p>
     
@@ -689,11 +689,11 @@ analyzing timing data to troubleshoot network latencies among our microservices
     
     <h2 class="archive__item-title" itemprop="headline">
       
-        <a href="/docs/service-center-ui/" rel="permalink">Service-Center Management UI Console
+        <a href="/cn/docs/jira_beginner_guide/" rel="permalink">老司机带你刷任务 - ServiceComb JIRA入门指南
 </a>
       
     </h2>
-    <p class="archive__item-excerpt" itemprop="description">An introduction Service-Center Management Console
+    <p class="archive__item-excerpt" itemprop="description">ServiceComb JIRA入门指南
 </p>
     
       <p class="page__meta"><i class="fa fa-clock-o" aria-hidden="true"></i> 
@@ -701,7 +701,7 @@ analyzing timing data to troubleshoot network latencies among our microservices
 
 
 
-  2 minute read
+  less than 1 minute read
 
 </p>
     
diff --git a/content/feed.xml b/content/feed.xml
index 4f5ba45..17ba4b3 100644
--- a/content/feed.xml
+++ b/content/feed.xml
@@ -1,4 +1,250 @@
-<?xml version="1.0" encoding="utf-8"?><feed xmlns="http://www.w3.org/2005/Atom" ><generator uri="https://jekyllrb.com/" version="3.4.3">Jekyll</generator><link href="/feed.xml" rel="self" type="application/atom+xml" /><link href="/" rel="alternate" type="text/html" /><updated>2018-01-04T11:26:12+08:00</updated><id>/</id><title type="html">Apache ServiceComb (incubating)</title><subtitle>The homepage of ServiceComb</subtitle><author><name>{&quot;name&quot;=&gt;nil, &quot;avatar&quot;=&gt; [...]
+<?xml version="1.0" encoding="utf-8"?><feed xmlns="http://www.w3.org/2005/Atom" ><generator uri="https://jekyllrb.com/" version="3.4.3">Jekyll</generator><link href="/feed.xml" rel="self" type="application/atom+xml" /><link href="/" rel="alternate" type="text/html" /><updated>2018-01-12T17:44:26+08:00</updated><id>/</id><title type="html">Apache ServiceComb (incubating)</title><subtitle>The homepage of ServiceComb</subtitle><author><name>{&quot;name&quot;=&gt;nil, &quot;avatar&quot;=&gt; [...]
+
+&lt;p&gt;Java Chassis uses zipkin as the default tracing implementation.&lt;/p&gt;
+
+&lt;p&gt;Zipkin introduced &lt;a href=&quot;http://zipkin.io/zipkin-api/#/&quot;&gt;v2 http api&lt;/a&gt; in version 1.31 which simplifies data types. There are also various other improvements and new features added to the zipkin libraries, so it seems a good time for us to follow the upstream and upgrade to zipkin2.&lt;/p&gt;
+
+&lt;h3 id=&quot;version-matrix&quot;&gt;Version matrix&lt;/h3&gt;
+
+&lt;table&gt;
+  &lt;thead&gt;
+    &lt;tr&gt;
+      &lt;th&gt;module&lt;/th&gt;
+      &lt;th&gt;current&lt;/th&gt;
+      &lt;th&gt;target&lt;/th&gt;
+      &lt;th&gt;supports v2 since&lt;/th&gt;
+    &lt;/tr&gt;
+  &lt;/thead&gt;
+  &lt;tbody&gt;
+    &lt;tr&gt;
+      &lt;td&gt;zipkin&lt;/td&gt;
+      &lt;td&gt;1.24.0&lt;/td&gt;
+      &lt;td&gt;2.4.2&lt;/td&gt;
+      &lt;td&gt;2.0.0&lt;/td&gt;
+    &lt;/tr&gt;
+    &lt;tr&gt;
+      &lt;td&gt;brave&lt;/td&gt;
+      &lt;td&gt;4.13.1&lt;/td&gt;
+      &lt;td&gt;4.13.1&lt;/td&gt;
+      &lt;td&gt;4.7.1&lt;/td&gt;
+    &lt;/tr&gt;
+    &lt;tr&gt;
+      &lt;td&gt;reporter&lt;/td&gt;
+      &lt;td&gt;0.10.0&lt;/td&gt;
+      &lt;td&gt;2.2.2&lt;/td&gt;
+      &lt;td&gt;2.0.0&lt;/td&gt;
+    &lt;/tr&gt;
+  &lt;/tbody&gt;
+&lt;/table&gt;
+
+&lt;h2 id=&quot;whats-changed&quot;&gt;What’s changed&lt;/h2&gt;
+
+&lt;p&gt;Zipkin did a very good job on maintaining backward compatibility. All the changes that breaks compatiblity are packaged into a new group(&lt;code class=&quot;highlighter-rouge&quot;&gt;io.zipkin.java&lt;/code&gt; -&amp;gt; &lt;code class=&quot;highlighter-rouge&quot;&gt;io.zipkin.zipkin2&lt;/code&gt;, &lt;code class=&quot;highlighter-rouge&quot;&gt;io.zipkin.reporter&lt;/code&gt; -&amp;gt; &lt;code class=&quot;highlighter-rouge&quot;&gt;io.zipkin.reporter2&lt;/code&gt;). And v1/ [...]
+
+&lt;p&gt;The zipkin2 library can use both v1 and v2 api to communicate with server.&lt;/p&gt;
+
+&lt;p&gt;The &lt;code class=&quot;highlighter-rouge&quot;&gt;zipkin2.Span&lt;/code&gt; class changed a bit from the old &lt;code class=&quot;highlighter-rouge&quot;&gt;zipkin.Span&lt;/code&gt; class. The public fields are refactored to methods. And the &lt;code class=&quot;highlighter-rouge&quot;&gt;BinaryAnnotation&lt;/code&gt; class is removed along with &lt;code class=&quot;highlighter-rouge&quot;&gt;zipkin.Span.binaryAnnotaions&lt;/code&gt; field. It’s functionality is replaced by &l [...]
+
+&lt;h2 id=&quot;upgrade-to-zipkin2-for-java-chassis&quot;&gt;Upgrade to zipkin2 for Java Chassis&lt;/h2&gt;
+
+&lt;h3 id=&quot;modify-the-maven-dependencies-to-use-the-target-version-of-related-libraries&quot;&gt;Modify the maven dependencies to use the target version of related libraries.&lt;/h3&gt;
+&lt;p&gt;Change the group &lt;code class=&quot;highlighter-rouge&quot;&gt;io.zipkin.java&lt;/code&gt; and &lt;code class=&quot;highlighter-rouge&quot;&gt;io.zipkin.reporter&lt;/code&gt; to &lt;code class=&quot;highlighter-rouge&quot;&gt;io.zipkin.zipkin2&lt;/code&gt; and &lt;code class=&quot;highlighter-rouge&quot;&gt;io.zipkin.reporter2&lt;/code&gt; respectively.&lt;/p&gt;
+
+&lt;div class=&quot;language-diff highlighter-rouge&quot;&gt;&lt;pre class=&quot;highlight&quot;&gt;&lt;code&gt;java-chassis-dependencies/pom.xml
+&lt;span class=&quot;gu&quot;&gt;@@ -50,8 +50,8 @@
+&lt;/span&gt;     &amp;lt;cxf.version&amp;gt;3.1.6&amp;lt;/cxf.version&amp;gt;
+     &amp;lt;logback.version&amp;gt;1.1.7&amp;lt;/logback.version&amp;gt;
+     &amp;lt;brave.version&amp;gt;4.13.1&amp;lt;/brave.version&amp;gt;
+&lt;span class=&quot;gd&quot;&gt;-    &amp;lt;zipkin.version&amp;gt;1.24.0&amp;lt;/zipkin.version&amp;gt;
+-    &amp;lt;zipkin-reporter.version&amp;gt;0.10.0&amp;lt;/zipkin-reporter.version&amp;gt;
+&lt;/span&gt;&lt;span class=&quot;gi&quot;&gt;+    &amp;lt;zipkin.version&amp;gt;2.4.2&amp;lt;/zipkin.version&amp;gt;
++    &amp;lt;zipkin-reporter.version&amp;gt;2.2.2&amp;lt;/zipkin-reporter.version&amp;gt;
+&lt;/span&gt;   &amp;lt;/properties&amp;gt;
+ 
+   &amp;lt;dependencyManagement&amp;gt;
+&lt;span class=&quot;gu&quot;&gt;@@ -646,7 +646,7 @@
+&lt;/span&gt; 
+       &amp;lt;!-- zipkin dependencies --&amp;gt;
+       &amp;lt;dependency&amp;gt;
+&lt;span class=&quot;gd&quot;&gt;-        &amp;lt;groupId&amp;gt;io.zipkin.java&amp;lt;/groupId&amp;gt;
+&lt;/span&gt;&lt;span class=&quot;gi&quot;&gt;+        &amp;lt;groupId&amp;gt;io.zipkin.zipkin2&amp;lt;/groupId&amp;gt;
+&lt;/span&gt;         &amp;lt;artifactId&amp;gt;zipkin&amp;lt;/artifactId&amp;gt;
+         &amp;lt;version&amp;gt;${zipkin.version}&amp;lt;/version&amp;gt;
+       &amp;lt;/dependency&amp;gt;
+&lt;span class=&quot;gu&quot;&gt;@@ -661,7 +661,7 @@
+&lt;/span&gt;         &amp;lt;version&amp;gt;${brave.version}&amp;lt;/version&amp;gt;
+       &amp;lt;/dependency&amp;gt;
+       &amp;lt;dependency&amp;gt;
+&lt;span class=&quot;gd&quot;&gt;-        &amp;lt;groupId&amp;gt;io.zipkin.reporter&amp;lt;/groupId&amp;gt;
+&lt;/span&gt;&lt;span class=&quot;gi&quot;&gt;+        &amp;lt;groupId&amp;gt;io.zipkin.reporter2&amp;lt;/groupId&amp;gt;
+&lt;/span&gt;         &amp;lt;artifactId&amp;gt;zipkin-sender-okhttp3&amp;lt;/artifactId&amp;gt;
+         &amp;lt;version&amp;gt;${zipkin-reporter.version}&amp;lt;/version&amp;gt;
+       &amp;lt;/dependency&amp;gt;
+
+handlers/handler-tracing-zipkin/pom.xml
+&lt;span class=&quot;gu&quot;&gt;@@ -50,7 +50,7 @@
+&lt;/span&gt;       &amp;lt;artifactId&amp;gt;brave&amp;lt;/artifactId&amp;gt;
+     &amp;lt;/dependency&amp;gt;
+     &amp;lt;dependency&amp;gt;
+&lt;span class=&quot;gd&quot;&gt;-      &amp;lt;groupId&amp;gt;io.zipkin.reporter&amp;lt;/groupId&amp;gt;
+&lt;/span&gt;&lt;span class=&quot;gi&quot;&gt;+      &amp;lt;groupId&amp;gt;io.zipkin.reporter2&amp;lt;/groupId&amp;gt;
+&lt;/span&gt;       &amp;lt;artifactId&amp;gt;zipkin-sender-okhttp3&amp;lt;/artifactId&amp;gt;
+     &amp;lt;/dependency&amp;gt;
+     &amp;lt;dependency&amp;gt;
+
+&lt;/code&gt;&lt;/pre&gt;
+&lt;/div&gt;
+
+&lt;h3 id=&quot;make-brave-to-use-zipkin2-instead-of-zipkin&quot;&gt;Make brave to use zipkin2 instead of zipkin&lt;/h3&gt;
+
+&lt;p&gt;Change the zipkin.xxx import to zipkin2.xxx on imports, and most importantly, use &lt;code class=&quot;highlighter-rouge&quot;&gt;spanReporter()&lt;/code&gt; instead of &lt;code class=&quot;highlighter-rouge&quot;&gt;reporter()&lt;/code&gt; for generating reporter for brave, change the api path to /api/v2/xxx when creating sender.&lt;/p&gt;
+
+&lt;div class=&quot;language-diff highlighter-rouge&quot;&gt;&lt;pre class=&quot;highlight&quot;&gt;&lt;code&gt;handlers/handler-tracing-zipkin/src/main/java/io/servicecomb/tracing/zipkin/TracingConfiguration.java
+&lt;span class=&quot;gu&quot;&gt;@@ -31,11 +31,11 @@
+&lt;/span&gt; import brave.http.HttpTracing;
+ import brave.propagation.CurrentTraceContext;
+ import io.servicecomb.config.DynamicProperties;
+&lt;span class=&quot;gd&quot;&gt;-import zipkin.Span;
+-import zipkin.reporter.AsyncReporter;
+-import zipkin.reporter.Reporter;
+-import zipkin.reporter.Sender;
+-import zipkin.reporter.okhttp3.OkHttpSender;
+&lt;/span&gt;&lt;span class=&quot;gi&quot;&gt;+import zipkin2.Span;
++import zipkin2.reporter.AsyncReporter;
++import zipkin2.reporter.Reporter;
++import zipkin2.reporter.Sender;
++import zipkin2.reporter.okhttp3.OkHttpSender;
+&lt;/span&gt; 
+ @Configuration
+ class TracingConfiguration {
+&lt;span class=&quot;gu&quot;&gt;@@ -56,14 +56,15 @@ Sender sender(DynamicProperties dynamicProperties) {
+&lt;/span&gt;     return AsyncReporter.builder(sender).build();
+   }
+ 
+&lt;span class=&quot;gi&quot;&gt;+
+&lt;/span&gt;   @Bean
+   Tracing tracing(Reporter&amp;lt;Span&amp;gt; reporter, DynamicProperties dynamicProperties,
+       CurrentTraceContext currentTraceContext) {
+     return Tracing.newBuilder()
+         .localServiceName(dynamicProperties.getStringProperty(CONFIG_QUALIFIED_MICROSERVICE_NAME_KEY,
+             DEFAULT_MICROSERVICE_NAME))
+         .currentTraceContext(currentTraceContext) // puts trace IDs into logs
+&lt;span class=&quot;gd&quot;&gt;-        .reporter(reporter)
+&lt;/span&gt;&lt;span class=&quot;gi&quot;&gt;+        .spanReporter(reporter)
+&lt;/span&gt;         .build();
+   }
+&lt;/code&gt;&lt;/pre&gt;
+&lt;/div&gt;
+
+&lt;p&gt;&lt;strong&gt;Note&lt;/strong&gt;:&lt;/p&gt;
+
+&lt;p&gt;In the &lt;a href=&quot;https://github.com/openzipkin/brave/releases/tag/4.7.1&quot;&gt;brave release notes&lt;/a&gt;, it’s stated that we need to use &lt;code class=&quot;highlighter-rouge&quot;&gt;create()&lt;/code&gt; instead of &lt;code class=&quot;highlighter-rouge&quot;&gt;builder()&lt;/code&gt;&lt;/p&gt;
+
+&lt;div class=&quot;language-diff highlighter-rouge&quot;&gt;&lt;pre class=&quot;highlight&quot;&gt;&lt;code&gt;
+   /** Configuration for how to buffer spans into messages for Zipkin */
+&lt;span class=&quot;gd&quot;&gt;-  @Bean Reporter&amp;lt;Span&amp;gt; reporter() {
+-    return AsyncReporter.builder(sender()).build();
+&lt;/span&gt;&lt;span class=&quot;gi&quot;&gt;+  @Bean Reporter&amp;lt;Span&amp;gt; spanReporter() {
++    return AsyncReporter.create(sender()).build();
+&lt;/span&gt;   }
+&lt;/code&gt;&lt;/pre&gt;
+&lt;/div&gt;
+
+&lt;p&gt;But this will not work. In &lt;code class=&quot;highlighter-rouge&quot;&gt;zipkin2.Reporter&lt;/code&gt;, the &lt;code class=&quot;highlighter-rouge&quot;&gt;create(sender)&lt;/code&gt; is actually equivalent to &lt;code class=&quot;highlighter-rouge&quot;&gt;builder(sender).build()&lt;/code&gt;&lt;/p&gt;
+
+&lt;div class=&quot;language-java highlighter-rouge&quot;&gt;&lt;pre class=&quot;highlight&quot;&gt;&lt;code&gt;  &lt;span class=&quot;kd&quot;&gt;public&lt;/span&gt; &lt;span class=&quot;kd&quot;&gt;static&lt;/span&gt; &lt;span class=&quot;n&quot;&gt;AsyncReporter&lt;/span&gt;&lt;span class=&quot;o&quot;&gt;&amp;lt;&lt;/span&gt;&lt;span class=&quot;n&quot;&gt;Span&lt;/span&gt;&lt;span class=&quot;o&quot;&gt;&amp;gt;&lt;/span&gt; &lt;span class=&quot;nf&quot;&gt;create&lt;/span&gt;&lt;sp [...]
+    &lt;span class=&quot;k&quot;&gt;return&lt;/span&gt; &lt;span class=&quot;o&quot;&gt;(&lt;/span&gt;&lt;span class=&quot;k&quot;&gt;new&lt;/span&gt; &lt;span class=&quot;n&quot;&gt;AsyncReporter&lt;/span&gt;&lt;span class=&quot;o&quot;&gt;.&lt;/span&gt;&lt;span class=&quot;na&quot;&gt;Builder&lt;/span&gt;&lt;span class=&quot;o&quot;&gt;(&lt;/span&gt;&lt;span class=&quot;n&quot;&gt;sender&lt;/span&gt;&lt;span class=&quot;o&quot;&gt;)).&lt;/span&gt;&lt;span class=&quot;na&quot;&gt;build& [...]
+  &lt;span class=&quot;o&quot;&gt;}&lt;/span&gt;
+  
+  &lt;span class=&quot;kd&quot;&gt;public&lt;/span&gt; &lt;span class=&quot;kd&quot;&gt;static&lt;/span&gt; &lt;span class=&quot;n&quot;&gt;AsyncReporter&lt;/span&gt;&lt;span class=&quot;o&quot;&gt;.&lt;/span&gt;&lt;span class=&quot;na&quot;&gt;Builder&lt;/span&gt; &lt;span class=&quot;nf&quot;&gt;builder&lt;/span&gt;&lt;span class=&quot;o&quot;&gt;(&lt;/span&gt;&lt;span class=&quot;n&quot;&gt;Sender&lt;/span&gt; &lt;span class=&quot;n&quot;&gt;sender&lt;/span&gt;&lt;span class=&quot;o&q [...]
+    &lt;span class=&quot;k&quot;&gt;return&lt;/span&gt; &lt;span class=&quot;k&quot;&gt;new&lt;/span&gt; &lt;span class=&quot;n&quot;&gt;AsyncReporter&lt;/span&gt;&lt;span class=&quot;o&quot;&gt;.&lt;/span&gt;&lt;span class=&quot;na&quot;&gt;Builder&lt;/span&gt;&lt;span class=&quot;o&quot;&gt;(&lt;/span&gt;&lt;span class=&quot;n&quot;&gt;sender&lt;/span&gt;&lt;span class=&quot;o&quot;&gt;);&lt;/span&gt;
+  &lt;span class=&quot;o&quot;&gt;}&lt;/span&gt;
+&lt;/code&gt;&lt;/pre&gt;
+&lt;/div&gt;
+
+&lt;h3 id=&quot;make-changes-according-to-the-changes-of-zipkinspan-and-zipkin2span&quot;&gt;Make changes according to the changes of zipkin.Span and zipkin2.Span.&lt;/h3&gt;
+
+&lt;p&gt;We do not use zipkin.Span in our production code, but we do use it in our tests. Those changes are quite straight forward, we just change the accessing of fields to calling methods as described in the What’s Changed section.&lt;/p&gt;
+
+&lt;div class=&quot;language-diff highlighter-rouge&quot;&gt;&lt;pre class=&quot;highlight&quot;&gt;&lt;code&gt;tracing/tracing-zipkin/src/test/java/io/servicecomb/tracing/zipkin/ZipkinSpanAspectTest.java 
+&lt;span class=&quot;gu&quot;&gt;@@ -45,7 +45,7 @@
+&lt;/span&gt; import io.servicecomb.tracing.zipkin.app.ZipkinSpanTestApplication;
+ import io.servicecomb.tracing.zipkin.app.ZipkinSpanTestApplication.CustomSpanTask;
+ import io.servicecomb.tracing.zipkin.app.ZipkinSpanTestApplication.SomeSlowTask;
+&lt;span class=&quot;gd&quot;&gt;-import zipkin.Span;
+&lt;/span&gt;&lt;span class=&quot;gi&quot;&gt;+import zipkin2.Span;
+&lt;/span&gt; 
+ @RunWith(SpringRunner.class)
+ @SpringBootTest(classes = {ZipkinSpanTestApplication.class, TracingConfig.class})
+&lt;span class=&quot;gu&quot;&gt;@@ -74,8 +74,8 @@ public void reportedSpanContainsAnnotatedMethodInfo() throws Exception {
+&lt;/span&gt; 
+     await().atMost(2, SECONDS).until(() -&amp;gt; !spans.isEmpty());
+ 
+&lt;span class=&quot;gd&quot;&gt;-    zipkin.Span span = spans.poll();
+-    assertThat(span.name, is(&quot;crawl&quot;));
+&lt;/span&gt;&lt;span class=&quot;gi&quot;&gt;+    zipkin2.Span span = spans.poll();
++    assertThat(span.name(), is(&quot;crawl&quot;));
+&lt;/span&gt;     assertThat(tracedValues(span), contains(SomeSlowTask.class.getMethod(&quot;crawl&quot;).toString()));
+   }
+   
+&lt;span class=&quot;gu&quot;&gt;@@ -84,17 +84,17 @@ public void reportCustomSpanInfomation() throws Exception {
+&lt;/span&gt;     customSpanTask.invoke();
+     await().atMost(2, SECONDS).until(() -&amp;gt; !spans.isEmpty());
+   
+&lt;span class=&quot;gd&quot;&gt;-    zipkin.Span span = spans.poll();
+-    assertThat(span.name, is(&quot;transaction1&quot;));
+&lt;/span&gt;&lt;span class=&quot;gi&quot;&gt;+    zipkin2.Span span = spans.poll();
++    assertThat(span.name(), is(&quot;transaction1&quot;));
+&lt;/span&gt;     assertThat(tracedValues(span), contains(&quot;startA&quot;));
+     
+   }
+ 
+&lt;span class=&quot;gd&quot;&gt;-  private List&amp;lt;String&amp;gt; tracedValues(zipkin.Span spans) {
+-    return spans.binaryAnnotations.stream()
+-        .filter(span -&amp;gt; CALL_PATH.equals(span.key) || &quot;error&quot;.equals(span.key))
+-        .filter(span -&amp;gt; span.value != null)
+-        .map(annotation -&amp;gt; new String(annotation.value))
+&lt;/span&gt;&lt;span class=&quot;gi&quot;&gt;+  private List&amp;lt;String&amp;gt; tracedValues(zipkin2.Span spans) {
++    return spans.tags().entrySet().stream()
++        .filter(span -&amp;gt; CALL_PATH.equals(span.getKey()) || &quot;error&quot;.equals(span.getKey()))
++        .filter(span -&amp;gt; span.getValue() != null)
++        .map(annotation -&amp;gt; new String(annotation.getValue()))
+&lt;/span&gt;         .distinct()
+         .collect(Collectors.toList());
+   }
+&lt;span class=&quot;gu&quot;&gt;@@ -110,7 +110,7 @@ public void reportCustomSpanInfomation() throws Exception {
+&lt;/span&gt;     Tracing tracing(Queue&amp;lt;Span&amp;gt; spans) {
+       return Tracing.newBuilder()
+           .currentTraceContext(new StrictCurrentTraceContext())
+&lt;span class=&quot;gd&quot;&gt;-          .reporter(spans::add)
+&lt;/span&gt;&lt;span class=&quot;gi&quot;&gt;+          .spanReporter(spans::add)
+&lt;/span&gt;           .build();
+     }
+   }
+&lt;/code&gt;&lt;/pre&gt;
+&lt;/div&gt;
+
+&lt;h3 id=&quot;support-both-v1-and-v2-api-of-zipkin-server&quot;&gt;Support both v1 and v2 api of zipkin server.&lt;/h3&gt;
+
+&lt;p&gt;Our customers may be still running a zipkin server prior to 1.31 which does not support the v2 http api. So we added an option to let them specify the server api version.&lt;/p&gt;
+
+&lt;p&gt;Supporting v1 api is built into zipkin2, so we do not need to rely on the v1 libraries. Just use the &lt;code class=&quot;highlighter-rouge&quot;&gt;SpanBytesEncoder.JSON_V1&lt;/code&gt; when building reporter and change the sender api path.&lt;/p&gt;
+
+&lt;div class=&quot;language-java highlighter-rouge&quot;&gt;&lt;pre class=&quot;highlight&quot;&gt;&lt;code&gt;&lt;span class=&quot;n&quot;&gt;sender&lt;/span&gt; &lt;span class=&quot;o&quot;&gt;=&lt;/span&gt; &lt;span class=&quot;n&quot;&gt;URLConnectionSender&lt;/span&gt;&lt;span class=&quot;o&quot;&gt;.&lt;/span&gt;&lt;span class=&quot;na&quot;&gt;create&lt;/span&gt;&lt;span class=&quot;o&quot;&gt;(&lt;/span&gt;&lt;span class=&quot;s&quot;&gt;&quot;http://localhost:9411/api/v1/spans& [...]
+&lt;span class=&quot;n&quot;&gt;reporter&lt;/span&gt; &lt;span class=&quot;o&quot;&gt;=&lt;/span&gt; &lt;span class=&quot;n&quot;&gt;AsyncReporter&lt;/span&gt;&lt;span class=&quot;o&quot;&gt;.&lt;/span&gt;&lt;span class=&quot;na&quot;&gt;builder&lt;/span&gt;&lt;span class=&quot;o&quot;&gt;(&lt;/span&gt;&lt;span class=&quot;n&quot;&gt;sender&lt;/span&gt;&lt;span class=&quot;o&quot;&gt;)&lt;/span&gt;
+                        &lt;span class=&quot;o&quot;&gt;.&lt;/span&gt;&lt;span class=&quot;na&quot;&gt;build&lt;/span&gt;&lt;span class=&quot;o&quot;&gt;(&lt;/span&gt;&lt;span class=&quot;n&quot;&gt;SpanBytesEncoder&lt;/span&gt;&lt;span class=&quot;o&quot;&gt;.&lt;/span&gt;&lt;span class=&quot;na&quot;&gt;JSON_V1&lt;/span&gt;&lt;span class=&quot;o&quot;&gt;);&lt;/span&gt;
+&lt;/code&gt;&lt;/pre&gt;
+&lt;/div&gt;
+
+&lt;p&gt;That’s all, for the complete changes, please refer the &lt;a href=&quot;https://github.com/apache/incubator-servicecomb-java-chassis/pull/488&quot;&gt;pull request&lt;/a&gt; for the complete changes.&lt;/p&gt;
+
+&lt;h2 id=&quot;references&quot;&gt;References&lt;/h2&gt;
+
+&lt;ul&gt;
+  &lt;li&gt;&lt;a href=&quot;https://github.com/openzipkin/zipkin/releases/tag/2.0.0&quot;&gt;Zipkin 2.0.0 release notes&lt;/a&gt;&lt;/li&gt;
+  &lt;li&gt;&lt;a href=&quot;https://github.com/openzipkin/brave/releases/tag/4.7.1&quot;&gt;Brave 4.7.1 release notes&lt;/a&gt;&lt;/li&gt;
+  &lt;li&gt;&lt;a href=&quot;https://github.com/openzipkin/brave/tree/master/brave&quot;&gt;Brave API V4&lt;/a&gt;&lt;/li&gt;
+&lt;/ul&gt;</content><author><name>Yang Bo</name><email>yangbo12@huawei.com</email></author><category term="zipkin" /><summary type="html">Changes between v1 and v2 of zipkin and how Java Chassis upgraded to zipkin2</summary></entry><entry xml:lang="en"><title type="html">Proposal for refactoring service registry module in Java Chassis</title><link href="/docs/service-registry-refactor-proposal/" rel="alternate" type="text/html" title="Proposal for refactoring service registry module in  [...]
 
 &lt;p&gt;The architecture of the &lt;code class=&quot;highlighter-rouge&quot;&gt;service registry&lt;/code&gt; module in Java Chassis is as follows.&lt;/p&gt;
 
@@ -1293,112 +1539,4 @@ Caitie McCaffrey在她的演讲&lt;a href=&quot;https://www.youtube.com/watch?v=
 &lt;h2 id=&quot;references&quot;&gt;References&lt;/h2&gt;
 &lt;ol&gt;
   &lt;li&gt;&lt;a href=&quot;https://www.cs.cornell.edu/andru/cs711/2002fa/reading/sagas.pdf&quot;&gt;Original Paper on Sagas&lt;/a&gt; by By Hector Garcia-Molina &amp;amp; Kenneth Salem&lt;/li&gt;
-&lt;/ol&gt;</content><author><name>Sean Yin</name><email>seanyinx@gmail.com</email><uri>http://seanyinx.github.io</uri></author><category term="事务一致性" /><summary type="html">ServiceComb中的分布式Saga设计</summary></entry><entry xml:lang="en"><title type="html">Eventual Data Consistency Solution in ServiceComb - part 2</title><link href="/docs/distributed_saga_2/" rel="alternate" type="text/html" title="Eventual Data Consistency Solution in ServiceComb - part 2" /><published>2017-09-16T00:00:00+ [...]
-be used to solve the data consistency issue of our trip planning application. Now let's gather the requirements to design
-a saga.&lt;/p&gt;
-
-&lt;h2 id=&quot;saga-log&quot;&gt;Saga Log&lt;/h2&gt;
-&lt;p&gt;Saga guarantees either all sub-transactions are committed or compensated for, but the saga system itself may crash. There
-are a few states that a saga may be in on crash:&lt;/p&gt;
-&lt;ul&gt;
-  &lt;li&gt;Saga received a request, but no transaction started yet. States of services involved in sub-transactions are not modified
-by saga, nothing has been done.&lt;/li&gt;
-  &lt;li&gt;Some sub-transactions were done. When restarted, saga has to resume from the last completed transaction.&lt;/li&gt;
-  &lt;li&gt;A sub-transaction was started, but not completed yet. Since we are not sure if the remote service completed the transaction, 
-failed the transaction, or the request to remote service timed out, saga has to redo the sub-transaction on restart. That also
-means sub-transactions have to be idempotent.&lt;/li&gt;
-  &lt;li&gt;A sub-transaction failed and its compensating transaction has not started yet. Saga has to resume from the compensating
-transaction on restart.&lt;/li&gt;
-  &lt;li&gt;A compensating transaction started but not completed yet. The solution is basically the same as the previous one. That means
-compensating transactions have to idempotent too.&lt;/li&gt;
-  &lt;li&gt;All sub-transactions or compensating transactions were done, which is the same as the first case.&lt;/li&gt;
-&lt;/ul&gt;
-
-&lt;p&gt;In order for saga to recover to the states mentioned above, we have to keep track of each step of sub-transactions and
-compensating transactions. We decided to achieve that by saving the following events in a persistent store called saga log:&lt;/p&gt;
-&lt;ul&gt;
-  &lt;li&gt;&lt;strong&gt;Saga started event&lt;/strong&gt; stores the entire saga request, which includes multiple transaction/compensation requests&lt;/li&gt;
-  &lt;li&gt;&lt;strong&gt;Transaction started event&lt;/strong&gt; stores individual transaction request&lt;/li&gt;
-  &lt;li&gt;&lt;strong&gt;Transaction ended event&lt;/strong&gt; stores individual transaction request and its response&lt;/li&gt;
-  &lt;li&gt;&lt;strong&gt;Transaction aborted event&lt;/strong&gt; stores individual transaction request and the cause of failure&lt;/li&gt;
-  &lt;li&gt;&lt;strong&gt;Transaction compensated event&lt;/strong&gt; stores individual compensation request and its response&lt;/li&gt;
-  &lt;li&gt;&lt;strong&gt;Saga ended event&lt;/strong&gt; marks the end of a saga request and stores nothing&lt;/li&gt;
-&lt;/ul&gt;
-
-&lt;p&gt;&lt;img src=&quot;/assets/images/saga.events.png&quot; alt=&quot;Events&quot; class=&quot;align-center&quot; /&gt;&lt;/p&gt;
-
-&lt;p&gt;By persisting these events in saga log, a crashed saga can be recovered to any states above.&lt;/p&gt;
-
-&lt;p&gt;Since saga only needs persistence of events and the event contents are stored as JSON, the implementation of the saga log 
-is very flexible. Databases (SQL or NoSQL), durable message queues, or even plain files can be used as event storage, but
-some are faster for saga to recover.&lt;/p&gt;
-
-&lt;h2 id=&quot;request-data-structure-of-saga&quot;&gt;Request Data Structure of Saga&lt;/h2&gt;
-&lt;p&gt;In our case, flight booking, car rental, and hotel reservation have no dependency among each other at all and they can be
-processed in parallel. However, it's more user friendly for our customers to only charge their credit cards once, when all 
-the bookings are done successfully. That means the transactions of the four services look like the graph below.&lt;/p&gt;
-
-&lt;p&gt;&lt;img src=&quot;/assets/images/saga.transactions.png&quot; alt=&quot;Transactions&quot; class=&quot;align-center&quot; /&gt;&lt;/p&gt;
-
-&lt;p&gt;It makes sense to implement the data structure of trip planning request as a &lt;a href=&quot;https://en.wikipedia.org/wiki/Directed_acyclic_graph&quot;&gt;Directed Acyclic Graph&lt;/a&gt;.
-The root of the graph is saga start task and the leaf is saga end task.&lt;/p&gt;
-
-&lt;p&gt;&lt;img src=&quot;/assets/images/saga.graph.png&quot; alt=&quot;Request Graph&quot; class=&quot;align-center&quot; /&gt;&lt;/p&gt;
-
-&lt;h2 id=&quot;parallel-saga&quot;&gt;Parallel Saga&lt;/h2&gt;
-&lt;p&gt;As mentioned above, flight booking, car rental, and hotel reservation can be processed in parallel. But doing so creates
-another problem: what if flight booking failed while car rental is being processed? We can't keep waiting for the response
-from car rental service, because we have no idea how long it will take.&lt;/p&gt;
-
-&lt;p&gt;THe best thing we can do is to send the car rental request again and hope we get a response so that we can continue our 
-backward recovery. If car rental service never responds, we may have to fallback with manual intervention.&lt;/p&gt;
-
-&lt;p&gt;The delayed booking request may still be received by the remote car rental service. When it does, the service has already
-processed the same booking and its cancellation request.&lt;/p&gt;
-
-&lt;p&gt;&lt;img src=&quot;/assets/images/saga.commutative.png&quot; alt=&quot;Network Latency&quot; class=&quot;align-center&quot; /&gt;&lt;/p&gt;
-
-&lt;p&gt;Therefore, services have to implement transactions and compensations in such a way that transaction request received after
-its compensation request takes no effect. Caitie McCaffrey called this &lt;strong&gt;commutative compensating request&lt;/strong&gt; in her talk 
-on &lt;a href=&quot;https://www.youtube.com/watch?v=1H6tounpnG8&quot;&gt;Distributed Sagas: A Protocol for Coordinating Microservices&lt;/a&gt;.&lt;/p&gt;
-
-&lt;h2 id=&quot;acid-and-saga&quot;&gt;ACID and Saga&lt;/h2&gt;
-&lt;p&gt;&lt;a href=&quot;https://en.wikipedia.org/wiki/ACID&quot;&gt;ACID&lt;/a&gt; is consistency model with the following properties:&lt;/p&gt;
-&lt;ul&gt;
-  &lt;li&gt;Atomicity&lt;/li&gt;
-  &lt;li&gt;Consistency&lt;/li&gt;
-  &lt;li&gt;Isolation&lt;/li&gt;
-  &lt;li&gt;Durability&lt;/li&gt;
-&lt;/ul&gt;
-
-&lt;p&gt;Saga does not provide ACID guarantee, because atomicity and isolation are not satisfied according to the &lt;a href=&quot;https://www.cs.cornell.edu/andru/cs711/2002fa/reading/sagas.pdf&quot;&gt;paper&lt;/a&gt;&lt;/p&gt;
-&lt;blockquote&gt;
-  &lt;p&gt;full atomicity is not provided. That is, sagas may view the partial results of other sagas [&lt;a href=&quot;https://www.cs.cornell.edu/andru/cs711/2002fa/reading/sagas.pdf&quot;&gt;1&lt;/a&gt;]&lt;/p&gt;
-&lt;/blockquote&gt;
-
-&lt;p&gt;With durable saga log, saga guarantees consistency and durability.&lt;/p&gt;
-
-&lt;h2 id=&quot;saga-architecture&quot;&gt;Saga Architecture&lt;/h2&gt;
-&lt;p&gt;Finally, the architecture of our saga looks like this&lt;/p&gt;
-
-&lt;p&gt;&lt;img src=&quot;/assets/images/saga.design.png&quot; alt=&quot;Saga Architecture&quot; class=&quot;align-center&quot; /&gt;&lt;/p&gt;
-
-&lt;ul&gt;
-  &lt;li&gt;Saga execution component parses the request JSON and builds a graph of requests&lt;/li&gt;
-  &lt;li&gt;TaskRunner ensures the execution order of requests with task queue&lt;/li&gt;
-  &lt;li&gt;TaskConsumer processes tasks to write events to saga log and send requests to remote services&lt;/li&gt;
-&lt;/ul&gt;
-
-&lt;h2 id=&quot;summary&quot;&gt;Summary&lt;/h2&gt;
-&lt;p&gt;In this article, we talked about how saga can be implemented with a saga log to persist transaction/compensation events 
-and request graph. A crashed saga can also be recovered from all the persisted events in saga log on restart. However,
-there are a few requirements on design of microservices to ensure saga consistency guarantee:&lt;/p&gt;
-&lt;ul&gt;
-  &lt;li&gt;transaction and compensation requests must be idempotent&lt;/li&gt;
-  &lt;li&gt;compensation requests must be commutative&lt;/li&gt;
-&lt;/ul&gt;
-
-&lt;h2 id=&quot;references&quot;&gt;References&lt;/h2&gt;
-&lt;ol&gt;
-  &lt;li&gt;&lt;a href=&quot;https://www.cs.cornell.edu/andru/cs711/2002fa/reading/sagas.pdf&quot;&gt;Original Paper on Sagas&lt;/a&gt; by By Hector Garcia-Molina &amp;amp; Kenneth Salem&lt;/li&gt;
-&lt;/ol&gt;</content><author><name>Sean Yin</name><email>seanyinx@gmail.com</email><uri>http://seanyinx.github.io</uri></author><category term="saga" /><summary type="html">The design of distributed saga in ServiceComb</summary></entry></feed>
\ No newline at end of file
+&lt;/ol&gt;</content><author><name>Sean Yin</name><email>seanyinx@gmail.com</email><uri>http://seanyinx.github.io</uri></author><category term="事务一致性" /><summary type="html">ServiceComb中的分布式Saga设计</summary></entry></feed>
\ No newline at end of file
diff --git a/content/sitemap.xml b/content/sitemap.xml
index ce819f3..6843d64 100644
--- a/content/sitemap.xml
+++ b/content/sitemap.xml
@@ -137,6 +137,10 @@
 <lastmod>2017-12-19T09:18:43+08:00</lastmod>
 </url>
 <url>
+<loc>/docs/howto-upgrade-topzipkin2/</loc>
+<lastmod>2018-01-11T10:26:28+08:00</lastmod>
+</url>
+<url>
 <loc>/slides/</loc>
 </url>
 <url>
@@ -151,15 +155,11 @@
 <lastmod>2017-08-16T03:01:43+08:00</lastmod>
 </url>
 <url>
-<loc>/users/communicate-protocol/</loc>
-<lastmod>2017-08-16T03:01:43+08:00</lastmod>
-</url>
-<url>
 <loc>/cn/users/communicate-protocol/</loc>
 <lastmod>2017-08-16T03:01:43+08:00</lastmod>
 </url>
 <url>
-<loc>/cn/users/customized-tracing/</loc>
+<loc>/users/communicate-protocol/</loc>
 <lastmod>2017-08-16T03:01:43+08:00</lastmod>
 </url>
 <url>
@@ -167,7 +167,7 @@
 <lastmod>2017-08-16T03:01:43+08:00</lastmod>
 </url>
 <url>
-<loc>/cn/users/service-contract/</loc>
+<loc>/cn/users/customized-tracing/</loc>
 <lastmod>2017-08-16T03:01:43+08:00</lastmod>
 </url>
 <url>
@@ -175,23 +175,23 @@
 <lastmod>2017-08-16T03:01:43+08:00</lastmod>
 </url>
 <url>
-<loc>/cn/users/run-mode/</loc>
-<lastmod>2017-06-06T22:01:43+08:00</lastmod>
+<loc>/cn/users/service-contract/</loc>
+<lastmod>2017-08-16T03:01:43+08:00</lastmod>
 </url>
 <url>
 <loc>/users/run-mode/</loc>
 <lastmod>2017-06-06T22:01:43+08:00</lastmod>
 </url>
 <url>
-<loc>/users/develop-with-jax-rs/</loc>
-<lastmod>2017-08-16T03:01:43+08:00</lastmod>
+<loc>/cn/users/run-mode/</loc>
+<lastmod>2017-06-06T22:01:43+08:00</lastmod>
 </url>
 <url>
-<loc>/cn/users/develop-with-jax-rs/</loc>
+<loc>/users/develop-with-jax-rs/</loc>
 <lastmod>2017-08-16T03:01:43+08:00</lastmod>
 </url>
 <url>
-<loc>/cn/users/develop-with-rest-template/</loc>
+<loc>/cn/users/develop-with-jax-rs/</loc>
 <lastmod>2017-08-16T03:01:43+08:00</lastmod>
 </url>
 <url>
@@ -199,7 +199,7 @@
 <lastmod>2017-08-16T03:01:43+08:00</lastmod>
 </url>
 <url>
-<loc>/users/develop-with-rpc/</loc>
+<loc>/cn/users/develop-with-rest-template/</loc>
 <lastmod>2017-08-16T03:01:43+08:00</lastmod>
 </url>
 <url>
@@ -207,7 +207,7 @@
 <lastmod>2017-08-16T03:01:43+08:00</lastmod>
 </url>
 <url>
-<loc>/users/develop-with-springmvc/</loc>
+<loc>/users/develop-with-rpc/</loc>
 <lastmod>2017-08-16T03:01:43+08:00</lastmod>
 </url>
 <url>
@@ -215,6 +215,10 @@
 <lastmod>2017-08-16T03:01:43+08:00</lastmod>
 </url>
 <url>
+<loc>/users/develop-with-springmvc/</loc>
+<lastmod>2017-08-16T03:01:43+08:00</lastmod>
+</url>
+<url>
 <loc>/users/develop-with-transparent-rpc/</loc>
 <lastmod>2017-08-16T03:01:43+08:00</lastmod>
 </url>
@@ -223,23 +227,19 @@
 <lastmod>2017-08-16T03:01:43+08:00</lastmod>
 </url>
 <url>
-<loc>/developers/</loc>
+<loc>/cn/developers/</loc>
 <lastmod>2017-06-24T19:18:43+08:00</lastmod>
 </url>
 <url>
-<loc>/cn/developers/</loc>
+<loc>/developers/</loc>
 <lastmod>2017-06-24T19:18:43+08:00</lastmod>
 </url>
 <url>
-<loc>/cn/users/distributed-tracing/</loc>
+<loc>/users/distributed-tracing/</loc>
 <lastmod>2017-08-16T03:01:43+08:00</lastmod>
 </url>
 <url>
-<loc>/cn/docs/quick-start-advance/distributed-tracing/</loc>
-<lastmod>2017-09-03T22:01:43+08:00</lastmod>
-</url>
-<url>
-<loc>/users/distributed-tracing/</loc>
+<loc>/cn/users/distributed-tracing/</loc>
 <lastmod>2017-08-16T03:01:43+08:00</lastmod>
 </url>
 <url>
@@ -247,18 +247,22 @@
 <lastmod>2017-09-03T22:01:43+08:00</lastmod>
 </url>
 <url>
-<loc>/cn/faqs/</loc>
-<lastmod>2017-10-30T03:01:43+08:00</lastmod>
+<loc>/cn/docs/quick-start-advance/distributed-tracing/</loc>
+<lastmod>2017-09-03T22:01:43+08:00</lastmod>
 </url>
 <url>
-<loc>/faqs/</loc>
-<lastmod>2017-10-29T22:01:43+08:00</lastmod>
+<loc>/cn/faqs/</loc>
+<lastmod>2017-10-30T03:01:43+08:00</lastmod>
 </url>
 <url>
 <loc>/users/faq/</loc>
 <lastmod>2017-06-06T22:01:43+08:00</lastmod>
 </url>
 <url>
+<loc>/faqs/</loc>
+<lastmod>2017-10-29T22:01:43+08:00</lastmod>
+</url>
+<url>
 <loc>/docs/quick-start-advance/flow-control/</loc>
 <lastmod>2017-09-03T22:01:43+08:00</lastmod>
 </url>
@@ -267,20 +271,20 @@
 <lastmod>2017-09-03T22:01:43+08:00</lastmod>
 </url>
 <url>
-<loc>/cn/</loc>
-</url>
-<url>
 <loc>/</loc>
 </url>
 <url>
-<loc>/cn/faqs/faqs-huawei-cloud/</loc>
-<lastmod>2017-10-30T03:01:43+08:00</lastmod>
+<loc>/cn/</loc>
 </url>
 <url>
 <loc>/users/huawei-cloud-faq/</loc>
 <lastmod>2017-06-06T22:01:43+08:00</lastmod>
 </url>
 <url>
+<loc>/cn/faqs/faqs-huawei-cloud/</loc>
+<lastmod>2017-10-30T03:01:43+08:00</lastmod>
+</url>
+<url>
 <loc>/faqs/faqs-huawei-cloud/</loc>
 <lastmod>2017-10-29T22:01:43+08:00</lastmod>
 </url>
@@ -297,19 +301,19 @@
 <lastmod>2017-06-07T14:28:13+08:00</lastmod>
 </url>
 <url>
-<loc>/cn/docs/quick-start-advance/load-balance/</loc>
+<loc>/docs/quick-start-advance/load-balance/</loc>
 <lastmod>2017-09-03T22:01:43+08:00</lastmod>
 </url>
 <url>
-<loc>/docs/quick-start-advance/load-balance/</loc>
+<loc>/cn/docs/quick-start-advance/load-balance/</loc>
 <lastmod>2017-09-03T22:01:43+08:00</lastmod>
 </url>
 <url>
-<loc>/users/local-develop-test/</loc>
+<loc>/cn/users/local-develop-test/</loc>
 <lastmod>2017-08-16T03:01:43+08:00</lastmod>
 </url>
 <url>
-<loc>/cn/users/local-develop-test/</loc>
+<loc>/users/local-develop-test/</loc>
 <lastmod>2017-08-16T03:01:43+08:00</lastmod>
 </url>
 <url>
@@ -321,6 +325,14 @@
 <lastmod>2017-12-30T22:01:43+08:00</lastmod>
 </url>
 <url>
+<loc>/users/metrics-in-1.0.0-m1/</loc>
+<lastmod>2017-12-30T22:01:43+08:00</lastmod>
+</url>
+<url>
+<loc>/users/metrics-integration-with-prometheus-in-1.0.0-m1/</loc>
+<lastmod>2018-01-02T22:01:43+08:00</lastmod>
+</url>
+<url>
 <loc>/cn/users/metrics-integration-with-prometheus-in-1.0.0-m1/</loc>
 <lastmod>2018-01-02T22:01:43+08:00</lastmod>
 </url>
@@ -337,22 +349,22 @@
 <lastmod>2017-08-16T03:01:43+08:00</lastmod>
 </url>
 <url>
-<loc>/cn/docs/quick-start-advance/</loc>
-<lastmod>2017-09-03T22:01:43+08:00</lastmod>
-</url>
-<url>
 <loc>/docs/quick-start-advance/</loc>
 <lastmod>2017-09-03T22:01:43+08:00</lastmod>
 </url>
 <url>
-<loc>/docs/quick-start-bmi/</loc>
-<lastmod>2017-09-06T08:50:00+08:00</lastmod>
+<loc>/cn/docs/quick-start-advance/</loc>
+<lastmod>2017-09-03T22:01:43+08:00</lastmod>
 </url>
 <url>
 <loc>/cn/docs/quick-start-bmi/</loc>
 <lastmod>2017-09-04T22:01:43+08:00</lastmod>
 </url>
 <url>
+<loc>/docs/quick-start-bmi/</loc>
+<lastmod>2017-09-06T08:50:00+08:00</lastmod>
+</url>
+<url>
 <loc>/docs/quick-start-dataconsistency/</loc>
 <lastmod>2017-09-03T22:01:43+08:00</lastmod>
 </url>
@@ -377,19 +389,19 @@
 <lastmod>2017-08-16T03:01:43+08:00</lastmod>
 </url>
 <url>
-<loc>/cn/users/service-definition/</loc>
+<loc>/users/service-definition/</loc>
 <lastmod>2017-08-16T03:01:43+08:00</lastmod>
 </url>
 <url>
-<loc>/users/service-definition/</loc>
+<loc>/cn/users/service-definition/</loc>
 <lastmod>2017-08-16T03:01:43+08:00</lastmod>
 </url>
 <url>
-<loc>/users/service-heartbeat/</loc>
+<loc>/cn/users/service-heartbeat/</loc>
 <lastmod>2017-08-16T03:01:43+08:00</lastmod>
 </url>
 <url>
-<loc>/cn/users/service-heartbeat/</loc>
+<loc>/users/service-heartbeat/</loc>
 <lastmod>2017-08-16T03:01:43+08:00</lastmod>
 </url>
 <url>
@@ -401,11 +413,11 @@
 <lastmod>2017-08-16T03:01:43+08:00</lastmod>
 </url>
 <url>
-<loc>/cn/docs/quick-start-advance/service-management/</loc>
+<loc>/docs/quick-start-advance/service-management/</loc>
 <lastmod>2017-09-03T22:01:43+08:00</lastmod>
 </url>
 <url>
-<loc>/docs/quick-start-advance/service-management/</loc>
+<loc>/cn/docs/quick-start-advance/service-management/</loc>
 <lastmod>2017-09-03T22:01:43+08:00</lastmod>
 </url>
 <url>
@@ -425,42 +437,38 @@
 <lastmod>2017-12-22T22:49:00+08:00</lastmod>
 </url>
 <url>
-<loc>/developers/setup-develop-environment/</loc>
+<loc>/cn/developers/setup-develop-environment/</loc>
 <lastmod>2017-06-24T18:48:43+08:00</lastmod>
 </url>
 <url>
-<loc>/cn/developers/setup-develop-environment/</loc>
+<loc>/developers/setup-develop-environment/</loc>
 <lastmod>2017-06-24T18:48:43+08:00</lastmod>
 </url>
 <url>
-<loc>/cn/users/setup-environment/</loc>
+<loc>/users/setup-environment/</loc>
 <lastmod>2017-09-03T22:01:43+08:00</lastmod>
 </url>
 <url>
-<loc>/users/setup-environment/</loc>
+<loc>/cn/users/setup-environment/</loc>
 <lastmod>2017-09-03T22:01:43+08:00</lastmod>
 </url>
 <url>
 <loc>/sitemap/</loc>
 </url>
 <url>
-<loc>/cn/developers/submit-codes/</loc>
-<lastmod>2017-09-10T01:12:43+08:00</lastmod>
-</url>
-<url>
 <loc>/developers/submit-codes/</loc>
 <lastmod>2017-09-10T01:12:43+08:00</lastmod>
 </url>
 <url>
-<loc>/users/use-service-contract/</loc>
-<lastmod>2017-08-16T03:01:43+08:00</lastmod>
+<loc>/cn/developers/submit-codes/</loc>
+<lastmod>2017-09-10T01:12:43+08:00</lastmod>
 </url>
 <url>
 <loc>/cn/users/use-service-contract/</loc>
 <lastmod>2017-08-16T03:01:43+08:00</lastmod>
 </url>
 <url>
-<loc>/users/use-servicecomb-in-spring-boot/</loc>
+<loc>/users/use-service-contract/</loc>
 <lastmod>2017-08-16T03:01:43+08:00</lastmod>
 </url>
 <url>
@@ -468,7 +476,7 @@
 <lastmod>2017-08-16T03:01:43+08:00</lastmod>
 </url>
 <url>
-<loc>/cn/users/use-tls/</loc>
+<loc>/users/use-servicecomb-in-spring-boot/</loc>
 <lastmod>2017-08-16T03:01:43+08:00</lastmod>
 </url>
 <url>
@@ -476,6 +484,10 @@
 <lastmod>2017-08-16T03:01:43+08:00</lastmod>
 </url>
 <url>
+<loc>/cn/users/use-tls/</loc>
+<lastmod>2017-08-16T03:01:43+08:00</lastmod>
+</url>
+<url>
 <loc>/year-archive/</loc>
 </url>
 <url>
@@ -529,4 +541,8 @@
 <loc>/assets/slides/20171221/data.consistency.live.pdf</loc>
 <lastmod>2017-12-22T14:18:20+08:00</lastmod>
 </url>
+<url>
+<loc>/assets/slides/20180111/ServiceComb_Metrics_Introduction.pdf</loc>
+<lastmod>2018-01-12T17:44:04+08:00</lastmod>
+</url>
 </urlset>
diff --git a/content/sitemap/index.html b/content/sitemap/index.html
index 4d9f095..cac0cba 100644
--- a/content/sitemap/index.html
+++ b/content/sitemap/index.html
@@ -346,6 +346,8 @@
 
 <link rel="alternate" hreflang="en" href="/docs/service-registry-refactor-proposal/" />
 
+<link rel="alternate" hreflang="en" href="/docs/howto-upgrade-topzipkin2/" />
+
 
   </div>
 </div>
diff --git a/content/slides/index.html b/content/slides/index.html
index ab89ac3..6560048 100644
--- a/content/slides/index.html
+++ b/content/slides/index.html
@@ -316,6 +316,11 @@
   <li><a href="/assets/slides/20171221/data.consistency.live.pdf">ServiceComb's Data Consistency Solution</a></li>
 </ul>
 
+<h2 id="servicecomb-live-streaming-phase-vii-20180111"><a href="http://www.itdks.com/liveevent/detail/9543">ServiceComb live streaming phase VII</a>, 20180111</h2>
+<ul>
+  <li><a href="/assets/slides/20180111/ServiceComb_Metrics_Introduction.pdf">ServiceComb Metrics Introduction</a></li>
+</ul>
+
         
       </section>
 
diff --git a/content/users/application-boot-process/index.html b/content/users/application-boot-process/index.html
index 459c7a3..2b3cf5b 100644
--- a/content/users/application-boot-process/index.html
+++ b/content/users/application-boot-process/index.html
@@ -484,6 +484,34 @@
     
       <li>
         
+          <span class="nav__sub-title">Monitor</span>
+        
+
+        
+        <ul>
+          
+            
+            
+
+            
+            
+
+            <li><a href="/users/metrics-in-1.0.0-m1/" class="">Metrics-in-1.0.0-m1</a></li>
+          
+            
+            
+
+            
+            
+
+            <li><a href="/users/metrics-integration-with-prometheus-in-1.0.0-m1/" class="">Metrics-integration-with-prometheus-in-1.0.0-m1</a></li>
+          
+        </ul>
+        
+      </li>
+    
+      <li>
+        
           <span class="nav__sub-title">Deployment</span>
         
 
diff --git a/content/users/communicate-protocol/index.html b/content/users/communicate-protocol/index.html
index 76688c0..ecba037 100644
--- a/content/users/communicate-protocol/index.html
+++ b/content/users/communicate-protocol/index.html
@@ -484,6 +484,34 @@
     
       <li>
         
+          <span class="nav__sub-title">Monitor</span>
+        
+
+        
+        <ul>
+          
+            
+            
+
+            
+            
+
+            <li><a href="/users/metrics-in-1.0.0-m1/" class="">Metrics-in-1.0.0-m1</a></li>
+          
+            
+            
+
+            
+            
+
+            <li><a href="/users/metrics-integration-with-prometheus-in-1.0.0-m1/" class="">Metrics-integration-with-prometheus-in-1.0.0-m1</a></li>
+          
+        </ul>
+        
+      </li>
+    
+      <li>
+        
           <span class="nav__sub-title">Deployment</span>
         
 
diff --git a/content/users/customized-tracing/index.html b/content/users/customized-tracing/index.html
index 9818e56..129663a 100644
--- a/content/users/customized-tracing/index.html
+++ b/content/users/customized-tracing/index.html
@@ -484,6 +484,34 @@
     
       <li>
         
+          <span class="nav__sub-title">Monitor</span>
+        
+
+        
+        <ul>
+          
+            
+            
+
+            
+            
+
+            <li><a href="/users/metrics-in-1.0.0-m1/" class="">Metrics-in-1.0.0-m1</a></li>
+          
+            
+            
+
+            
+            
+
+            <li><a href="/users/metrics-integration-with-prometheus-in-1.0.0-m1/" class="">Metrics-integration-with-prometheus-in-1.0.0-m1</a></li>
+          
+        </ul>
+        
+      </li>
+    
+      <li>
+        
           <span class="nav__sub-title">Deployment</span>
         
 
diff --git a/content/users/develop-with-jax-rs/index.html b/content/users/develop-with-jax-rs/index.html
index 718e7b2..b2ff2cc 100644
--- a/content/users/develop-with-jax-rs/index.html
+++ b/content/users/develop-with-jax-rs/index.html
@@ -484,6 +484,34 @@
     
       <li>
         
+          <span class="nav__sub-title">Monitor</span>
+        
+
+        
+        <ul>
+          
+            
+            
+
+            
+            
+
+            <li><a href="/users/metrics-in-1.0.0-m1/" class="">Metrics-in-1.0.0-m1</a></li>
+          
+            
+            
+
+            
+            
+
+            <li><a href="/users/metrics-integration-with-prometheus-in-1.0.0-m1/" class="">Metrics-integration-with-prometheus-in-1.0.0-m1</a></li>
+          
+        </ul>
+        
+      </li>
+    
+      <li>
+        
           <span class="nav__sub-title">Deployment</span>
         
 
diff --git a/content/users/develop-with-rest-template/index.html b/content/users/develop-with-rest-template/index.html
index f588f39..a2cd4d4 100644
--- a/content/users/develop-with-rest-template/index.html
+++ b/content/users/develop-with-rest-template/index.html
@@ -484,6 +484,34 @@
     
       <li>
         
+          <span class="nav__sub-title">Monitor</span>
+        
+
+        
+        <ul>
+          
+            
+            
+
+            
+            
+
+            <li><a href="/users/metrics-in-1.0.0-m1/" class="">Metrics-in-1.0.0-m1</a></li>
+          
+            
+            
+
+            
+            
+
+            <li><a href="/users/metrics-integration-with-prometheus-in-1.0.0-m1/" class="">Metrics-integration-with-prometheus-in-1.0.0-m1</a></li>
+          
+        </ul>
+        
+      </li>
+    
+      <li>
+        
           <span class="nav__sub-title">Deployment</span>
         
 
diff --git a/content/users/develop-with-rpc/index.html b/content/users/develop-with-rpc/index.html
index bc39d6d..4314bfb 100644
--- a/content/users/develop-with-rpc/index.html
+++ b/content/users/develop-with-rpc/index.html
@@ -484,6 +484,34 @@
     
       <li>
         
+          <span class="nav__sub-title">Monitor</span>
+        
+
+        
+        <ul>
+          
+            
+            
+
+            
+            
+
+            <li><a href="/users/metrics-in-1.0.0-m1/" class="">Metrics-in-1.0.0-m1</a></li>
+          
+            
+            
+
+            
+            
+
+            <li><a href="/users/metrics-integration-with-prometheus-in-1.0.0-m1/" class="">Metrics-integration-with-prometheus-in-1.0.0-m1</a></li>
+          
+        </ul>
+        
+      </li>
+    
+      <li>
+        
           <span class="nav__sub-title">Deployment</span>
         
 
diff --git a/content/users/develop-with-springmvc/index.html b/content/users/develop-with-springmvc/index.html
index dc367eb..d905710 100644
--- a/content/users/develop-with-springmvc/index.html
+++ b/content/users/develop-with-springmvc/index.html
@@ -484,6 +484,34 @@
     
       <li>
         
+          <span class="nav__sub-title">Monitor</span>
+        
+
+        
+        <ul>
+          
+            
+            
+
+            
+            
+
+            <li><a href="/users/metrics-in-1.0.0-m1/" class="">Metrics-in-1.0.0-m1</a></li>
+          
+            
+            
+
+            
+            
+
+            <li><a href="/users/metrics-integration-with-prometheus-in-1.0.0-m1/" class="">Metrics-integration-with-prometheus-in-1.0.0-m1</a></li>
+          
+        </ul>
+        
+      </li>
+    
+      <li>
+        
           <span class="nav__sub-title">Deployment</span>
         
 
diff --git a/content/users/develop-with-transparent-rpc/index.html b/content/users/develop-with-transparent-rpc/index.html
index 61ebdd8..4853d05 100644
--- a/content/users/develop-with-transparent-rpc/index.html
+++ b/content/users/develop-with-transparent-rpc/index.html
@@ -484,6 +484,34 @@
     
       <li>
         
+          <span class="nav__sub-title">Monitor</span>
+        
+
+        
+        <ul>
+          
+            
+            
+
+            
+            
+
+            <li><a href="/users/metrics-in-1.0.0-m1/" class="">Metrics-in-1.0.0-m1</a></li>
+          
+            
+            
+
+            
+            
+
+            <li><a href="/users/metrics-integration-with-prometheus-in-1.0.0-m1/" class="">Metrics-integration-with-prometheus-in-1.0.0-m1</a></li>
+          
+        </ul>
+        
+      </li>
+    
+      <li>
+        
           <span class="nav__sub-title">Deployment</span>
         
 
diff --git a/content/users/distributed-tracing/index.html b/content/users/distributed-tracing/index.html
index 94a5012..eb9ab2b 100644
--- a/content/users/distributed-tracing/index.html
+++ b/content/users/distributed-tracing/index.html
@@ -484,6 +484,34 @@
     
       <li>
         
+          <span class="nav__sub-title">Monitor</span>
+        
+
+        
+        <ul>
+          
+            
+            
+
+            
+            
+
+            <li><a href="/users/metrics-in-1.0.0-m1/" class="">Metrics-in-1.0.0-m1</a></li>
+          
+            
+            
+
+            
+            
+
+            <li><a href="/users/metrics-integration-with-prometheus-in-1.0.0-m1/" class="">Metrics-integration-with-prometheus-in-1.0.0-m1</a></li>
+          
+        </ul>
+        
+      </li>
+    
+      <li>
+        
           <span class="nav__sub-title">Deployment</span>
         
 
diff --git a/content/users/edging-service/nginx/index.html b/content/users/edging-service/nginx/index.html
index ca77cf5..ad63ffb 100644
--- a/content/users/edging-service/nginx/index.html
+++ b/content/users/edging-service/nginx/index.html
@@ -484,6 +484,34 @@
     
       <li>
         
+          <span class="nav__sub-title">Monitor</span>
+        
+
+        
+        <ul>
+          
+            
+            
+
+            
+            
+
+            <li><a href="/users/metrics-in-1.0.0-m1/" class="">Metrics-in-1.0.0-m1</a></li>
+          
+            
+            
+
+            
+            
+
+            <li><a href="/users/metrics-integration-with-prometheus-in-1.0.0-m1/" class="">Metrics-integration-with-prometheus-in-1.0.0-m1</a></li>
+          
+        </ul>
+        
+      </li>
+    
+      <li>
+        
           <span class="nav__sub-title">Deployment</span>
         
 
diff --git a/content/users/edging-service/zuul/index.html b/content/users/edging-service/zuul/index.html
index f690db3..67360a7 100644
--- a/content/users/edging-service/zuul/index.html
+++ b/content/users/edging-service/zuul/index.html
@@ -484,6 +484,34 @@
     
       <li>
         
+          <span class="nav__sub-title">Monitor</span>
+        
+
+        
+        <ul>
+          
+            
+            
+
+            
+            
+
+            <li><a href="/users/metrics-in-1.0.0-m1/" class="">Metrics-in-1.0.0-m1</a></li>
+          
+            
+            
+
+            
+            
+
+            <li><a href="/users/metrics-integration-with-prometheus-in-1.0.0-m1/" class="">Metrics-integration-with-prometheus-in-1.0.0-m1</a></li>
+          
+        </ul>
+        
+      </li>
+    
+      <li>
+        
           <span class="nav__sub-title">Deployment</span>
         
 
diff --git a/content/users/faq/index.html b/content/users/faq/index.html
index 3e2e196..7ce06f5 100644
--- a/content/users/faq/index.html
+++ b/content/users/faq/index.html
@@ -484,6 +484,34 @@
     
       <li>
         
+          <span class="nav__sub-title">Monitor</span>
+        
+
+        
+        <ul>
+          
+            
+            
+
+            
+            
+
+            <li><a href="/users/metrics-in-1.0.0-m1/" class="">Metrics-in-1.0.0-m1</a></li>
+          
+            
+            
+
+            
+            
+
+            <li><a href="/users/metrics-integration-with-prometheus-in-1.0.0-m1/" class="">Metrics-integration-with-prometheus-in-1.0.0-m1</a></li>
+          
+        </ul>
+        
+      </li>
+    
+      <li>
+        
           <span class="nav__sub-title">Deployment</span>
         
 
diff --git a/content/users/huawei-cloud-faq/index.html b/content/users/huawei-cloud-faq/index.html
index c2d0548..b027205 100644
--- a/content/users/huawei-cloud-faq/index.html
+++ b/content/users/huawei-cloud-faq/index.html
@@ -484,6 +484,34 @@
     
       <li>
         
+          <span class="nav__sub-title">Monitor</span>
+        
+
+        
+        <ul>
+          
+            
+            
+
+            
+            
+
+            <li><a href="/users/metrics-in-1.0.0-m1/" class="">Metrics-in-1.0.0-m1</a></li>
+          
+            
+            
+
+            
+            
+
+            <li><a href="/users/metrics-integration-with-prometheus-in-1.0.0-m1/" class="">Metrics-integration-with-prometheus-in-1.0.0-m1</a></li>
+          
+        </ul>
+        
+      </li>
+    
+      <li>
+        
           <span class="nav__sub-title">Deployment</span>
         
 
diff --git a/content/users/index.html b/content/users/index.html
index 03f4108..0c3f337 100644
--- a/content/users/index.html
+++ b/content/users/index.html
@@ -484,6 +484,34 @@
     
       <li>
         
+          <span class="nav__sub-title">Monitor</span>
+        
+
+        
+        <ul>
+          
+            
+            
+
+            
+            
+
+            <li><a href="/users/metrics-in-1.0.0-m1/" class="">Metrics-in-1.0.0-m1</a></li>
+          
+            
+            
+
+            
+            
+
+            <li><a href="/users/metrics-integration-with-prometheus-in-1.0.0-m1/" class="">Metrics-integration-with-prometheus-in-1.0.0-m1</a></li>
+          
+        </ul>
+        
+      </li>
+    
+      <li>
+        
           <span class="nav__sub-title">Deployment</span>
         
 
diff --git a/content/users/invoke-control/index.html b/content/users/invoke-control/index.html
index 3f061a1..714dde8 100644
--- a/content/users/invoke-control/index.html
+++ b/content/users/invoke-control/index.html
@@ -484,6 +484,34 @@
     
       <li>
         
+          <span class="nav__sub-title">Monitor</span>
+        
+
+        
+        <ul>
+          
+            
+            
+
+            
+            
+
+            <li><a href="/users/metrics-in-1.0.0-m1/" class="">Metrics-in-1.0.0-m1</a></li>
+          
+            
+            
+
+            
+            
+
+            <li><a href="/users/metrics-integration-with-prometheus-in-1.0.0-m1/" class="">Metrics-integration-with-prometheus-in-1.0.0-m1</a></li>
+          
+        </ul>
+        
+      </li>
+    
+      <li>
+        
           <span class="nav__sub-title">Deployment</span>
         
 
diff --git a/content/users/local-develop-test/index.html b/content/users/local-develop-test/index.html
index c8fe679..9c656d9 100644
--- a/content/users/local-develop-test/index.html
+++ b/content/users/local-develop-test/index.html
@@ -484,6 +484,34 @@
     
       <li>
         
+          <span class="nav__sub-title">Monitor</span>
+        
+
+        
+        <ul>
+          
+            
+            
+
+            
+            
+
+            <li><a href="/users/metrics-in-1.0.0-m1/" class="">Metrics-in-1.0.0-m1</a></li>
+          
+            
+            
+
+            
+            
+
+            <li><a href="/users/metrics-integration-with-prometheus-in-1.0.0-m1/" class="">Metrics-integration-with-prometheus-in-1.0.0-m1</a></li>
+          
+        </ul>
+        
+      </li>
+    
+      <li>
+        
           <span class="nav__sub-title">Deployment</span>
         
 
diff --git a/content/cn/users/metrics-in-1.0.0-m1/index.html b/content/users/metrics-in-1.0.0-m1/index.html
similarity index 60%
copy from content/cn/users/metrics-in-1.0.0-m1/index.html
copy to content/users/metrics-in-1.0.0-m1/index.html
index 37ab76c..1826ddb 100644
--- a/content/cn/users/metrics-in-1.0.0-m1/index.html
+++ b/content/users/metrics-in-1.0.0-m1/index.html
@@ -5,7 +5,7 @@
   Free for personal and commercial use under the MIT license
   https://github.com/mmistakes/minimal-mistakes/blob/master/LICENSE.txt
 -->
-<html lang="cn" class="no-js">
+<html lang="en" class="no-js">
   <head>
     <meta charset="utf-8">
 
@@ -19,35 +19,35 @@
 
 
 
-<title>1.0.0-m1版本中的监控 - Apache ServiceComb (incubating)</title>
+<title>Metrics in 1.0.0-m1 - Apache ServiceComb (incubating)</title>
 
 
 
 
-<meta name="description" content="1.0.0-m1版本中的监控">
+<meta name="description" content="Metrics in 1.0.0-m1">
 
 
 
 
 <meta name="author" content="">
 
-<meta property="og:locale" content="cn">
+<meta property="og:locale" content="en">
 <meta property="og:site_name" content="Apache ServiceComb (incubating)">
-<meta property="og:title" content="1.0.0-m1版本中的监控">
+<meta property="og:title" content="Metrics in 1.0.0-m1">
 
 
-  <link rel="canonical" href="http://github.com/pages/apache/incubator-servicecomb-website/cn/users/metrics-in-1.0.0-m1/">
-  <meta property="og:url" content="http://github.com/pages/apache/incubator-servicecomb-website/cn/users/metrics-in-1.0.0-m1/">
+  <link rel="canonical" href="http://github.com/pages/apache/incubator-servicecomb-website/users/metrics-in-1.0.0-m1/">
+  <meta property="og:url" content="http://github.com/pages/apache/incubator-servicecomb-website/users/metrics-in-1.0.0-m1/">
 
 
 
-  <meta property="og:description" content="1.0.0-m1版本中的监控">
+  <meta property="og:description" content="Metrics in 1.0.0-m1">
 
 
 
   <meta name="twitter:site" content="@ServiceComb">
-  <meta name="twitter:title" content="1.0.0-m1版本中的监控">
-  <meta name="twitter:description" content="1.0.0-m1版本中的监控">
+  <meta name="twitter:title" content="Metrics in 1.0.0-m1">
+  <meta name="twitter:description" content="Metrics in 1.0.0-m1">
   <meta name="twitter:url" content="">
 
   
@@ -156,7 +156,7 @@
     <div class="masthead__menu">
       <nav id="site-nav" class="greedy-nav">
 	      
-          <a class="site-title active" href="/cn"><img src="/assets/images/ServiceComb-logo-1.png"></a>
+          <a class="site-title active" href="/"><img src="/assets/images/ServiceComb-logo-1.png"></a>
 	      
         <ul class="visible-links">
           
@@ -165,7 +165,7 @@
               
               
               
-                <a href="/cn/docs/quick-start/">快速入门</a>
+                <a href="/docs/quick-start/">Quick Start</a>
               
             </li>
           
@@ -174,7 +174,7 @@
               
               
               
-                <a class="active" href="/cn/users/">用户手册</a>
+                <a class="active" href="/users/">Users</a>
               
             </li>
           
@@ -183,7 +183,7 @@
               
               
               
-                <a href="/cn/developers/">开发者手册</a>
+                <a href="/developers/">Developers</a>
               
             </li>
           
@@ -192,7 +192,7 @@
               
               
               
-                <a href="/cn/year-archive/">博文</a>
+                <a href="/year-archive/">Blogs</a>
               
             </li>
           
@@ -201,7 +201,7 @@
               
               
               
-                <a href="/cn/faqs/">常见问题</a>
+                <a href="/faqs/">FAQ</a>
               
             </li>
           
@@ -211,8 +211,7 @@
         <div class="nav-lang">
           
             
-            
-            <a href=/users/metrics-in-1.0.0-m1/>English</a>
+            <a href=/cn/users/metrics-in-1.0.0-m1/>中文</a>
           
         </div>
       </nav>
@@ -229,7 +228,7 @@
   
   <div class="sidebar sticky">
       
-      <div class="back-to-home">首页 > <a href="/cn/">ServiceComb</a></div>
+      <div class="back-to-home">Home > <a href="/">ServiceComb</a></div>
       
   
   
@@ -244,12 +243,12 @@
 <nav class="nav__list">
   
   <input id="ac-toc" name="accordion-toc" type="checkbox" />
-  <label for="ac-toc">切换菜单</label>
+  <label for="ac-toc">Toggle Menu</label>
   <ul class="nav__items">
     
       <li>
         
-          <span class="nav__sub-title">用户手册</span>
+          <span class="nav__sub-title">User Guide</span>
         
 
         
@@ -261,7 +260,7 @@
             
             
 
-            <li><a href="/cn/users/" class="">Java Chassis系统架构</a></li>
+            <li><a href="/users/" class="">Java Chassis Architecture</a></li>
           
             
             
@@ -269,7 +268,7 @@
             
             
 
-            <li><a href="/cn/users/setup-environment/" class="">环境配置</a></li>
+            <li><a href="/users/setup-environment/" class="">Setup Environment</a></li>
           
         </ul>
         
@@ -277,7 +276,7 @@
     
       <li>
         
-          <span class="nav__sub-title">开发服务提供者</span>
+          <span class="nav__sub-title">Develop Service Provider</span>
         
 
         
@@ -289,7 +288,7 @@
             
             
 
-            <li><a href="/cn/users/service-definition/" class="">服务定义</a></li>
+            <li><a href="/users/service-definition/" class="">Service Definition</a></li>
           
             
             
@@ -297,7 +296,7 @@
             
             
 
-            <li><a href="/cn/users/service-contract/" class="">服务契约</a></li>
+            <li><a href="/users/service-contract/" class="">Service Contract</a></li>
           
             
             
@@ -305,7 +304,7 @@
             
             
 
-            <li><a href="/cn/users/develop-with-springmvc/" class="">用SpringMVC开发微服务</a></li>
+            <li><a href="/users/develop-with-springmvc/" class="">Develop Microservice with SpringMVC</a></li>
           
             
             
@@ -313,7 +312,7 @@
             
             
 
-            <li><a href="/cn/users/develop-with-jax-rs/" class="">用JAX-RS开发微服务</a></li>
+            <li><a href="/users/develop-with-jax-rs/" class="">Develop Microservice with JAX-RS</a></li>
           
             
             
@@ -321,7 +320,7 @@
             
             
 
-            <li><a href="/cn/users/develop-with-transparent-rpc/" class="">用透明RPC开发微服务</a></li>
+            <li><a href="/users/develop-with-transparent-rpc/" class="">Develop Microservice with Transparent RPC</a></li>
           
             
             
@@ -329,7 +328,7 @@
             
             
 
-            <li><a href="/cn/users/service-interface-constraints/" class="">服务接口约束</a></li>
+            <li><a href="/users/service-interface-constraints/" class="">Service Interface Constraints</a></li>
           
             
             
@@ -337,7 +336,7 @@
             
             
 
-            <li><a href="/cn/users/service-configurations/" class="">服务配置</a></li>
+            <li><a href="/users/service-configurations/" class="">Service Configurations</a></li>
           
             
             
@@ -345,7 +344,7 @@
             
             
 
-            <li><a href="/cn/users/communicate-protocol/" class="">通信协议</a></li>
+            <li><a href="/users/communicate-protocol/" class="">Communicate Protocol</a></li>
           
             
             
@@ -353,7 +352,7 @@
             
             
 
-            <li><a href="/cn/users/application-boot-process/" class="">程序启动逻辑</a></li>
+            <li><a href="/users/application-boot-process/" class="">Application Boot Up Process</a></li>
           
             
             
@@ -361,7 +360,7 @@
             
             
 
-            <li><a href="/cn/users/service-heartbeat/" class="">服务心跳</a></li>
+            <li><a href="/users/service-heartbeat/" class="">Service Heartbeat</a></li>
           
         </ul>
         
@@ -369,7 +368,7 @@
     
       <li>
         
-          <span class="nav__sub-title">开发服务消费者</span>
+          <span class="nav__sub-title">Develop Service Consumer</span>
         
 
         
@@ -381,7 +380,7 @@
             
             
 
-            <li><a href="/cn/users/develop-with-rest-template/" class="">使用Rest Template方式开发</a></li>
+            <li><a href="/users/develop-with-rest-template/" class="">Develop with Rest Template</a></li>
           
             
             
@@ -389,7 +388,7 @@
             
             
 
-            <li><a href="/cn/users/develop-with-rpc/" class="">使用RPC方式开发</a></li>
+            <li><a href="/users/develop-with-rpc/" class="">Develop with Transparent RPC</a></li>
           
             
             
@@ -397,7 +396,7 @@
             
             
 
-            <li><a href="/cn/users/use-service-contract/" class="">使用服务契约</a></li>
+            <li><a href="/users/use-service-contract/" class="">Use Service Contract</a></li>
           
             
             
@@ -405,7 +404,7 @@
             
             
 
-            <li><a href="/cn/users/invoke-control/" class="">调用控制</a></li>
+            <li><a href="/users/invoke-control/" class="">Invoke Control</a></li>
           
         </ul>
         
@@ -413,7 +412,7 @@
     
       <li>
         
-          <span class="nav__sub-title">通用开发</span>
+          <span class="nav__sub-title">General Development</span>
         
 
         
@@ -425,7 +424,7 @@
             
             
 
-            <li><a href="/cn/users/local-develop-test/" class="">本地开发与测试</a></li>
+            <li><a href="/users/local-develop-test/" class="">Develop and Test in Local Environment</a></li>
           
             
             
@@ -433,7 +432,7 @@
             
             
 
-            <li><a href="/cn/users/use-servicecomb-in-spring-boot/" class="">在Spring Boot中使用ServiceComb</a></li>
+            <li><a href="/users/use-servicecomb-in-spring-boot/" class="">Use ServiceComb in Spring Boot</a></li>
           
             
             
@@ -441,7 +440,7 @@
             
             
 
-            <li><a href="/cn/users/distributed-tracing/" class="">分布式调用链追踪</a></li>
+            <li><a href="/users/distributed-tracing/" class="">Distributed Tracing</a></li>
           
             
             
@@ -449,7 +448,7 @@
             
             
 
-            <li><a href="/cn/users/customized-tracing/" class="">自定义调用链打点</a></li>
+            <li><a href="/users/customized-tracing/" class="">Customized Tracing</a></li>
           
         </ul>
         
@@ -457,7 +456,7 @@
     
       <li>
         
-          <span class="nav__sub-title">服务能力开放</span>
+          <span class="nav__sub-title">Edging Service</span>
         
 
         
@@ -469,7 +468,7 @@
             
             
 
-            <li><a href="/cn/users/edging-service/nginx/" class="">使用confd和Nginx做边缘服务</a></li>
+            <li><a href="/users/edging-service/nginx/" class="">confd and Nginx</a></li>
           
             
             
@@ -477,7 +476,7 @@
             
             
 
-            <li><a href="/cn/users/edging-service/zuul/" class="">使用Zuul做边缘服务</a></li>
+            <li><a href="/users/edging-service/zuul/" class="">Zuul</a></li>
           
         </ul>
         
@@ -485,7 +484,7 @@
     
       <li>
         
-          <span class="nav__sub-title">监控</span>
+          <span class="nav__sub-title">Monitor</span>
         
 
         
@@ -497,23 +496,7 @@
             
             
 
-            <li><a href="/cn/users/metrics-in-0.5.0/" class="">0.5.0版本中的监控</a></li>
-          
-            
-            
-
-            
-            
-
-            <li><a href="/cn/users/metrics-in-1.0.0-m1/" class="active">1.0.0-m1版本中的监控</a></li>
-          
-            
-            
-
-            
-            
-
-            <li><a href="/cn/users/metrics-write-file-extension-and-sample-in-1.0.0-m1/" class="">1.0.0-m1版本写文件扩展和示例</a></li>
+            <li><a href="/users/metrics-in-1.0.0-m1/" class="active">Metrics-in-1.0.0-m1</a></li>
           
             
             
@@ -521,7 +504,7 @@
             
             
 
-            <li><a href="/cn/users/metrics-integration-with-prometheus-in-1.0.0-m1/" class="">1.0.0-m1版本中的监控如何集成普罗米修斯</a></li>
+            <li><a href="/users/metrics-integration-with-prometheus-in-1.0.0-m1/" class="">Metrics-integration-with-prometheus-in-1.0.0-m1</a></li>
           
         </ul>
         
@@ -529,7 +512,7 @@
     
       <li>
         
-          <span class="nav__sub-title">部署</span>
+          <span class="nav__sub-title">Deployment</span>
         
 
         
@@ -541,7 +524,7 @@
             
             
 
-            <li><a href="/cn/users/run-mode/" class="">运行模式</a></li>
+            <li><a href="/users/run-mode/" class="">Run Mode</a></li>
           
         </ul>
         
@@ -549,7 +532,7 @@
     
       <li>
         
-          <span class="nav__sub-title">微服务安全</span>
+          <span class="nav__sub-title">Security</span>
         
 
         
@@ -561,7 +544,7 @@
             
             
 
-            <li><a href="/cn/users/use-tls/" class="">使用TLS通信</a></li>
+            <li><a href="/users/use-tls/" class="">Use TLS</a></li>
           
         </ul>
         
@@ -577,8 +560,8 @@
 
 
   <article class="page" itemscope itemtype="http://schema.org/CreativeWork">
-    <meta itemprop="headline" content="1.0.0-m1版本中的监控">
-    <meta itemprop="description" content="1.0.0-m1版本中的监控">
+    <meta itemprop="headline" content="Metrics in 1.0.0-m1">
+    <meta itemprop="description" content="Metrics in 1.0.0-m1">
     
     <meta itemprop="dateModified" content="December 30, 2017">
 
@@ -586,7 +569,7 @@
       
         
           <header>
-            <h1 class="page__title" itemprop="headline">1.0.0-m1版本中的监控
+            <h1 class="page__title" itemprop="headline">Metrics in 1.0.0-m1
 </h1>
             
           </header>
@@ -596,163 +579,165 @@
       <section class="page__content" itemprop="text">
         <aside class="sidebar__right">
 <nav class="toc">
-    <!-- <header><h4 class="nav__title"><i class="fa fa-file-text"></i> 在本页上</h4></header> -->
+    <!-- <header><h4 class="nav__title"><i class="fa fa-file-text"></i> On This Page</h4></header> -->
 <ul class="toc__menu" id="markdown-toc">
-  <li><a href="#背景" id="markdown-toc-背景">背景</a></li>
-  <li><a href="#1000-m1版本原理" id="markdown-toc-1000-m1版本原理">1.0.00-m1版本原理</a>    <ul>
-      <li><a href="#数据采集不再依赖hystrixhandler-bizkeeper使用事件埋点收集与调用相关的所有数据" id="markdown-toc-数据采集不再依赖hystrixhandler-bizkeeper使用事件埋点收集与调用相关的所有数据">数据采集不再依赖Hystrix(handler-bizkeeper),使用事件埋点收集与调用相关的所有数据</a></li>
-      <li><a href="#使用netflix-servo作为metric的计数器" id="markdown-toc-使用netflix-servo作为metric的计数器">使用Netflix Servo作为Metric的计数器</a></li>
-      <li><a href="#周期设置" id="markdown-toc-周期设置">周期设置</a></li>
+  <li><a href="#background" id="markdown-toc-background">Background</a></li>
+  <li><a href="#1000-m1-principles" id="markdown-toc-1000-m1-principles">1.0.00-m1 Principles</a>    <ul>
+      <li><a href="#use-event-collect-invocation-datanot-from-hystrixhandler-bizkeeperany-more" id="markdown-toc-use-event-collect-invocation-datanot-from-hystrixhandler-bizkeeperany-more">Use event collect invocation data,not from Hystrix(handler-bizkeeper)any more</a></li>
+      <li><a href="#use-netflix-servo-as-monitor-of-metric" id="markdown-toc-use-netflix-servo-as-monitor-of-metric">Use Netflix Servo as Monitor of Metric</a></li>
+      <li><a href="#window-timealso-may-called-polling-interval-or-step-cycle" id="markdown-toc-window-timealso-may-called-polling-interval-or-step-cycle">Window Time(also may called ‘Polling Interval’ or ‘Step Cycle’)</a></li>
     </ul>
   </li>
-  <li><a href="#metric列表" id="markdown-toc-metric列表">Metric列表</a></li>
-  <li><a href="#如何配置" id="markdown-toc-如何配置">如何配置</a>    <ul>
-      <li><a href="#全局配置" id="markdown-toc-全局配置">全局配置</a></li>
-      <li><a href="#依赖配置" id="markdown-toc-依赖配置">依赖配置</a></li>
+  <li><a href="#metric-list" id="markdown-toc-metric-list">Metric List</a></li>
+  <li><a href="#how-configuration" id="markdown-toc-how-configuration">How Configuration</a>    <ul>
+      <li><a href="#global-configuration" id="markdown-toc-global-configuration">Global Configuration</a></li>
+      <li><a href="#maven-configuration" id="markdown-toc-maven-configuration">Maven Configuration</a></li>
     </ul>
   </li>
-  <li><a href="#数据发布" id="markdown-toc-数据发布">数据发布</a>    <ul>
-      <li><a href="#内置的发布接口" id="markdown-toc-内置的发布接口">内置的发布接口</a></li>
-      <li><a href="#直接代码获取" id="markdown-toc-直接代码获取">直接代码获取</a></li>
+  <li><a href="#metrics-publish" id="markdown-toc-metrics-publish">Metrics Publish</a>    <ul>
+      <li><a href="#embedded-publish-interface" id="markdown-toc-embedded-publish-interface">Embedded publish interface</a></li>
+      <li><a href="#direct-programming-get" id="markdown-toc-direct-programming-get">Direct programming get</a></li>
     </ul>
   </li>
-  <li><a href="#参考示例" id="markdown-toc-参考示例">参考示例</a></li>
+  <li><a href="#other-reference" id="markdown-toc-other-reference">Other Reference</a></li>
 </ul>
 
   </nav>
 </aside>
 
-<p>微服务框架从0.5.0版本开始支持监控功能Metrics,1.0.0-m1版本正式发布,我们会继续追加新特性新功能,订阅ServiceComb邮件列表(dev-subscribe@servicecomb.incubator.apache.org)以持续获取最新信息。</p>
+<p>Metrics had supported from Java chassis version 0.5.0,in version 1.0.0-m1,we had reconstruction it and add some more features,please checkout the user guide and <a href="https://github.com/apache/incubator-servicecomb-java-chassis/releases">release note</a> for more information.Also subscribe ServiceComb mail-list(dev-subscribe@servicecomb.incubator.apache.org) and join discussion is welcome.</p>
 
-<h2 id="背景">背景</h2>
-<p>将系统微服务化是技术潮流和趋势,但是它解决了很多问题的同时也带来了新的问题。</p>
+<h2 id="background">Background</h2>
+<p>Microservice is trend of technology,it resolve many problems also follows new problem.</p>
 
 <p><img src="/assets/images/MonolithicArch.png" alt="MonolithicArch" /></p>
 
-<p>这是传统单体系统架构图,对运维人员友好,但是对开发人员不友好,系统维护升级困难。</p>
+<p>This is traditional software architecture always called ‘Monolithic’,it’s difficult for developer maintain the code or add new feature because of tight coupling,but it’s easy for operation engineer deploy and maintenance(only one system process).</p>
 
 <p><img src="/assets/images/MicroserviceArch.png" alt="MicroserviceArch" /></p>
 
-<p>这是微服务化后的系统架构图,经过功能切分,开发人员得到解脱,拥有了极致的CI/CD,但是运维人员却需要维护海量的微服务实例,所以如果不进行性能监控,就无法定位时延高的微服务,也无法制定弹性伸缩策略。</p>
+<p>This is microservice system architecture,after split ‘Monolithic’ into many small services,developer obtain many benefits such as architecture independent and more agility etc,but operation engineer need to maintenance a whole lot of microservice instances.If don’t import metrics,when system  is abnormal or user experience getting worse,it’s very difficult to dentifying where the problem is and make some strategy in order to prevent it.</p>
 
-<h2 id="1000-m1版本原理">1.0.00-m1版本原理</h2>
-<p>在0.5.0版本的实现介绍<a href="/cn/users/metrics-in-0.5.0/">0.5.0版本中的监控</a>中,存在一些问题:</p>
+<h2 id="1000-m1-principles">1.0.00-m1 Principles</h2>
+<p>In previous version(0.5.0),implementation of metrics had some imperfections:</p>
 <ol>
-  <li>metrics在foundation-metrics模块中实现,并且包含了一些具体的定制代码;</li>
-  <li>使用ThreadLocal变量收集和汇总数据,虽然性能很高,但是存在内存泄漏的风险;</li>
-  <li>Metrics的输出为固定的文本,而不是独立的数值,数据使用起来很不方便;</li>
-  <li>没有提供通用数据发布接口,难以和更多的第三方监控系统做集成;</li>
-  <li>由于foundation-metrics模块过于底层,用户无法以可选的方式决定是否启用;</li>
+  <li>Metrics code written in foundation-metrics module,it’s a low level module,and include some customized function;</li>
+  <li>Use ThreadLocal variable collect and statistics data,performance hight but has memory leak risk;</li>
+  <li>Output data of metrics is joined text not dependent number,difficult to reuse;</li>
+  <li>Not support publish,unable integration with other monitor system;</li>
+  <li>Because foundation-metrics is a low level module and certainly be loaded,user can’t exclude it if unnecessary.</li>
 </ol>
 
-<p>因此,从0.5.0版本升级到1.0.0-m1版本,我们进行了一次全面的重构,重构后的Metrics将分为三个模块</p>
+<p>So,upgrading from 0.5.0 to 1.0.0-m1,we had done a fully reconstruction,now it’s include this modules:</p>
 
 <table>
   <thead>
     <tr>
-      <th style="text-align: left">Module名</th>
-      <th style="text-align: left">描述</th>
+      <th style="text-align: left">Module Name</th>
+      <th style="text-align: left">Description</th>
     </tr>
   </thead>
   <tbody>
     <tr>
       <td style="text-align: left">metrics-core</td>
-      <td style="text-align: left">Metric核心模块,引入后即启用Metrics数据收集功能</td>
+      <td style="text-align: left">Metrics core module,work immediately after imported</td>
     </tr>
     <tr>
       <td style="text-align: left">metrics-common</td>
-      <td style="text-align: left">Metric通用模块,主要包含Metric DTO用于数据发布</td>
+      <td style="text-align: left">Metrics common module,include DTO classes</td>
     </tr>
     <tr>
       <td style="text-align: left">metrics-extension</td>
-      <td style="text-align: left">包含Metric的一些扩展功能</td>
+      <td style="text-align: left">Include some metrics extension module</td>
     </tr>
     <tr>
       <td style="text-align: left">metrics-integration</td>
-      <td style="text-align: left">包含Metric与其它三方系统集成</td>
-    </tr>
-    <tr>
-      <td style="text-align: left">metrics-sample</td>
-      <td style="text-align: left">包含Metric的一些示例</td>
+      <td style="text-align: left">Include metrics Integration with other monitor system</td>
     </tr>
   </tbody>
 </table>
 
-<p>它们的依赖关系如下图所示:
+<p>The dependency of this modules is:
 <img src="/assets/images/MetricsDependency.png" alt="MetricsDependency.png" /></p>
 
-<h3 id="数据采集不再依赖hystrixhandler-bizkeeper使用事件埋点收集与调用相关的所有数据">数据采集不再依赖Hystrix(handler-bizkeeper),使用事件埋点收集与调用相关的所有数据</h3>
-<p>1.0.0-m1版本不再从Hystrix获取调用的TPS和Latency,避免了不配置Java Chassis Bizkeeper Handler就不会输出这两项数据的问题;使用foundation-common中的EventBus作为事件总线,metrics-core中的DefaultEventListenerManager初始化后会立即注入三个事件监听处理类:</p>
+<h3 id="use-event-collect-invocation-datanot-from-hystrixhandler-bizkeeperany-more">Use event collect invocation data,not from Hystrix(handler-bizkeeper)any more</h3>
+<p>From 1.0.0-m1 invocation data such as TPS and latency are collected from invocation event,not from Hystrix(handler-bizkeeper) any more,so you don’t need add Java Chassis Bizkeeper Handler only for metrics.we use EventBus in foundation-common,when DefaultEventListenerManager in metrics-core had initialized,three event listener class will be auto registered:</p>
 
 <table>
   <thead>
     <tr>
-      <th style="text-align: left">事件监听处理类名</th>
-      <th style="text-align: left">功能</th>
+      <th style="text-align: left">Event Listener Name</th>
+      <th style="text-align: left">Description</th>
     </tr>
   </thead>
   <tbody>
     <tr>
       <td style="text-align: left">InvocationStartedEventListener</td>
-      <td style="text-align: left">Consumer调用或Producer接收开始</td>
+      <td style="text-align: left">Trigger when consumer or producer called</td>
     </tr>
     <tr>
       <td style="text-align: left">InvocationStartProcessingEventListener</td>
-      <td style="text-align: left">Producer从队列中取出调用开始处理</td>
+      <td style="text-align: left">Trigger when producer fetch invocation from queue and start process</td>
     </tr>
     <tr>
       <td style="text-align: left">InvocationFinishedEventListener</td>
-      <td style="text-align: left">Consumer调用返回或Producer处理完毕</td>
+      <td style="text-align: left">Trigger when consumer call returned or producer process finished</td>
     </tr>
   </tbody>
 </table>
 
-<p><em>特别说明,Java Chassis的Reactor框架基于Vertx,微服务Producer端收到Invocation后,并不会马上同步处理请求,而是将它放入一个处理队列中,Invocation在队列中的时间称为LifeTimeInQueue,队列的长度称为waitInQueue,这是衡量微服务压力的两个重要指标,可以参考操作系统磁盘读写队列的概念;Consumer端并不会有队列,因此永远不会触发InvocationStartProcessingEvent。</em></p>
+<p><em>ServiceComb java chassis had used <a href="http://vertx.io/">Vertx</a> as Reactor framework,in synchronous call mode when producer received invocation from consumer,it won’t start process immediately but put it into a queue,this queue called invocation queue(like disk queue in operation system),time waiting in the queue called <strong>LifeTimeInQueue</strong>,the length of the queue called <strong>waitInQueue</strong>,this two metrics are very important for measure stress of the m [...]
 
-<p>事件触发的代码广泛分布在Java Chassis的RestInvocation、HighwayServerInvoke、HighwayClient和VertxHttpMethod中,如果微服务没有启用Metrics,EventBus中不会注入事件监听处理类,因此对性能的影响微乎其微。</p>
+<p>The code for trigger event write in RestInvocation,HighwayServerInvoke and InvokerUtils,if microservice don’t import metrics,event listener of metrics won’t be registered,the impact on performance is little.</p>
 
-<h3 id="使用netflix-servo作为metric的计数器">使用Netflix Servo作为Metric的计数器</h3>
-<p>Netflix Servo具有性能极高的计数器(Monitor),我们使用了四种:</p>
+<h3 id="use-netflix-servo-as-monitor-of-metric">Use Netflix Servo as Monitor of Metric</h3>
+<p><a href="https://github.com/Netflix/servo">Netflix Servo</a> had implement a collection of high performance monitor,we had used four of them:</p>
 
 <table>
   <thead>
     <tr>
-      <th style="text-align: left">Monitor名</th>
-      <th style="text-align: left">描述</th>
+      <th style="text-align: left">Monitor Name</th>
+      <th style="text-align: left">Description</th>
     </tr>
   </thead>
   <tbody>
     <tr>
       <td style="text-align: left">BasicCounter</td>
-      <td style="text-align: left">基本累积计数器(永续累加)</td>
+      <td style="text-align: left">As name of it,always increment</td>
     </tr>
     <tr>
       <td style="text-align: left">StepCounter</td>
-      <td style="text-align: left">周期累加计数器</td>
+      <td style="text-align: left">Called ‘ResettableCounter’ before</td>
     </tr>
     <tr>
       <td style="text-align: left">MinGauge</td>
-      <td style="text-align: left">周期最小值计数器</td>
+      <td style="text-align: left">Mark min value in step</td>
     </tr>
     <tr>
       <td style="text-align: left">MaxGauge</td>
-      <td style="text-align: left">周期最大值计数器</td>
+      <td style="text-align: left">Mark max value in step</td>
     </tr>
   </tbody>
 </table>
 
-<p><em>依赖的Servo版本为0.10.1</em></p>
+<p><em>The version of Servo we used is 0.10.1</em></p>
 
-<h3 id="周期设置">周期设置</h3>
-<p>Metric可以分为两大类:</p>
+<h3 id="window-timealso-may-called-polling-interval-or-step-cycle">Window Time(also may called ‘Polling Interval’ or ‘Step Cycle’)</h3>
+<p>Metrics had many classifications,we can divided them into two major types by how get value:</p>
 <ol>
-  <li>时间无关型(直接取值):诸如调用总次数、资源使用状况等等,Consumer无论何时获取Metric,总返回当前最新值;</li>
-  <li>时间相关型(统计取值):只有经过一个固定的周期时间才能够获取结果值,例如最大、最小、平均值等等,固定周期一般可以称为“统计时间窗”,在Servo中,这个时间被称为<a href="https://github.com/Netflix/servo/wiki/Getting-Started">“Polling Intervals”</a>。<br />
-从1.0.0-m1开始,通过servicecomb.metrics.window_time设置周期,效果与servo.pollers一致。</li>
+  <li>Direct get<br />
+  You can direct get newest value anytime,such as system resource usage include cpu load rate,running thread count,heap size and call count,queue length,etc.</li>
+  <li>From statistics<br />
+  After a ‘certain time’ passed can counting the value,this time we called ‘Window Time’,include:<br />
+  a) Take one from many,like Max、Min、Median; <br />
+  b) Time-related,like TPS(transaction per second);  <br />
+  c) Count-related,like average,variance.  <br />
+  If get value of this type,the result returned is the last ‘Step Cycle’ counted.in Servo,this time called <a href="https://github.com/Netflix/servo/wiki/Getting-Started">‘Polling Intervals’</a>.
+  From 1.0.0-m1,can set <strong>servicecomb.metrics.window_time</strong> in microservice.yaml,it has same effect as set <strong>servo.pollers</strong>.</li>
 </ol>
 
-<h2 id="metric列表">Metric列表</h2>
-<p>从1.0.0-m1开始,支持微服务Operation级别的Metric输出,列表如下:</p>
+<h2 id="metric-list">Metric List</h2>
+<p>From 1.0.0-m1,start support output metrics of operation level:</p>
 
 <table>
   <thead>
@@ -837,119 +822,119 @@
     </tr>
     <tr>
       <td style="text-align: left">servicecomb</td>
-      <td style="text-align: left">instance/operationName</td>
+      <td style="text-align: left">instance | operationName</td>
       <td style="text-align: left">producer</td>
       <td style="text-align: left">waitInQueue</td>
       <td style="text-align: left">count</td>
     </tr>
     <tr>
       <td style="text-align: left">servicecomb</td>
-      <td style="text-align: left">instance/operationName</td>
+      <td style="text-align: left">instance | operationName</td>
       <td style="text-align: left">producer</td>
       <td style="text-align: left">lifeTimeInQueue</td>
       <td style="text-align: left">average</td>
     </tr>
     <tr>
       <td style="text-align: left">servicecomb</td>
-      <td style="text-align: left">instance/operationName</td>
+      <td style="text-align: left">instance | operationName</td>
       <td style="text-align: left">producer</td>
       <td style="text-align: left">lifeTimeInQueue</td>
       <td style="text-align: left">max</td>
     </tr>
     <tr>
       <td style="text-align: left">servicecomb</td>
-      <td style="text-align: left">instance/operationName</td>
+      <td style="text-align: left">instance | operationName</td>
       <td style="text-align: left">producer</td>
       <td style="text-align: left">lifeTimeInQueue</td>
       <td style="text-align: left">min</td>
     </tr>
     <tr>
       <td style="text-align: left">servicecomb</td>
-      <td style="text-align: left">instance/operationName</td>
+      <td style="text-align: left">instance | operationName</td>
       <td style="text-align: left">producer</td>
       <td style="text-align: left">executionTime</td>
       <td style="text-align: left">average</td>
     </tr>
     <tr>
       <td style="text-align: left">servicecomb</td>
-      <td style="text-align: left">instance/operationName</td>
+      <td style="text-align: left">instance | operationName</td>
       <td style="text-align: left">producer</td>
       <td style="text-align: left">executionTime</td>
       <td style="text-align: left">max</td>
     </tr>
     <tr>
       <td style="text-align: left">servicecomb</td>
-      <td style="text-align: left">instance/operationName</td>
+      <td style="text-align: left">instance | operationName</td>
       <td style="text-align: left">producer</td>
       <td style="text-align: left">executionTime</td>
       <td style="text-align: left">min</td>
     </tr>
     <tr>
       <td style="text-align: left">servicecomb</td>
-      <td style="text-align: left">instance/operationName</td>
+      <td style="text-align: left">instance | operationName</td>
       <td style="text-align: left">producer</td>
       <td style="text-align: left">producerLatency</td>
       <td style="text-align: left">average</td>
     </tr>
     <tr>
       <td style="text-align: left">servicecomb</td>
-      <td style="text-align: left">instance/operationName</td>
+      <td style="text-align: left">instance | operationName</td>
       <td style="text-align: left">producer</td>
       <td style="text-align: left">producerLatency</td>
       <td style="text-align: left">max</td>
     </tr>
     <tr>
       <td style="text-align: left">servicecomb</td>
-      <td style="text-align: left">instance/operationName</td>
+      <td style="text-align: left">instance | operationName</td>
       <td style="text-align: left">producer</td>
       <td style="text-align: left">producerLatency</td>
       <td style="text-align: left">min</td>
     </tr>
     <tr>
       <td style="text-align: left">servicecomb</td>
-      <td style="text-align: left">instance/operationName</td>
+      <td style="text-align: left">instance | operationName</td>
       <td style="text-align: left">producer</td>
       <td style="text-align: left">producerCall</td>
       <td style="text-align: left">total</td>
     </tr>
     <tr>
       <td style="text-align: left">servicecomb</td>
-      <td style="text-align: left">instance/operationName</td>
+      <td style="text-align: left">instance | operationName</td>
       <td style="text-align: left">producer</td>
       <td style="text-align: left">producerCall</td>
       <td style="text-align: left">tps</td>
     </tr>
     <tr>
       <td style="text-align: left">servicecomb</td>
-      <td style="text-align: left">instance/operationName</td>
+      <td style="text-align: left">instance | operationName</td>
       <td style="text-align: left">consumer</td>
       <td style="text-align: left">consumerLatency</td>
       <td style="text-align: left">average</td>
     </tr>
     <tr>
       <td style="text-align: left">servicecomb</td>
-      <td style="text-align: left">instance/operationName</td>
+      <td style="text-align: left">instance | operationName</td>
       <td style="text-align: left">consumer</td>
       <td style="text-align: left">consumerLatency</td>
       <td style="text-align: left">max</td>
     </tr>
     <tr>
       <td style="text-align: left">servicecomb</td>
-      <td style="text-align: left">instance/operationName</td>
+      <td style="text-align: left">instance | operationName</td>
       <td style="text-align: left">consumer</td>
       <td style="text-align: left">consumerLatency</td>
       <td style="text-align: left">min</td>
     </tr>
     <tr>
       <td style="text-align: left">servicecomb</td>
-      <td style="text-align: left">instance/operationName</td>
+      <td style="text-align: left">instance | operationName</td>
       <td style="text-align: left">consumer</td>
       <td style="text-align: left">consumerCall</td>
       <td style="text-align: left">total</td>
     </tr>
     <tr>
       <td style="text-align: left">servicecomb</td>
-      <td style="text-align: left">instance/operationName</td>
+      <td style="text-align: left">instance | operationName</td>
       <td style="text-align: left">consumer</td>
       <td style="text-align: left">consumerCall</td>
       <td style="text-align: left">tps</td>
@@ -957,11 +942,11 @@
   </tbody>
 </table>
 
-<p><em>operationName代表微服务Operation的全名,使用的是Java Chassis MicroserviceQualifiedName,它是微服务名.SchemaID.操作方法名的组合。</em></p>
+<p><strong>When the value of Level is ‘instance’,it’s means microservice instance metric,otherwise specific operation metric,operationName same as Java Chassis MicroserviceQualifiedName,it’s joined with microservice appId.SchemaID.methodName.</strong></p>
 
-<h2 id="如何配置">如何配置</h2>
-<h3 id="全局配置">全局配置</h3>
-<p>请在microservice.yaml中添加如下配置项:</p>
+<h2 id="how-configuration">How Configuration</h2>
+<h3 id="global-configuration">Global Configuration</h3>
+<p>Please add window time config in microservice.yaml:</p>
 <div class="language-yaml highlighter-rouge"><pre class="highlight"><code><span class="s">APPLICATION_ID</span><span class="pi">:</span> <span class="s">demo</span>
 <span class="s">service_description</span><span class="pi">:</span>
   <span class="s">name</span><span class="pi">:</span> <span class="s">demoService</span>
@@ -969,17 +954,18 @@
 
 <span class="s">servicecomb</span><span class="pi">:</span>
   <span class="s">metrics</span><span class="pi">:</span>
-    <span class="c1">#时间窗间隔,与servo.pollers设置效果一致,单位毫秒</span>
-    <span class="c1">#支持多个时间窗间隔,使用逗号(,)将多个分隔开,例如5000,10000,代表设置两个时间窗</span>
+    <span class="c1">#window time,same as servo.pollers,unit is millisecond</span>
+    <span class="c1">#support multi window time and use ',' split them,like 5000,10000</span>
     <span class="s">window_time</span><span class="pi">:</span> <span class="s">5000,10000</span>
 </code></pre>
 </div>
-<p><em>时间窗设置对于统计结果获取的影响,附上代码中包含的一段注释如下:</em></p>
+
+<p><em>The setting of window time is very important to getting value of metrics,here is a comment show how it effect</em></p>
 
 <p><img src="/assets/images/TimeWindowComment.png" alt="TimeWindowComment.png" /></p>
 
-<h3 id="依赖配置">依赖配置</h3>
-<p>只需要添加metrics-core依赖即可:</p>
+<h3 id="maven-configuration">Maven Configuration</h3>
+<p>We just only need add metrics-core dependency:</p>
 <div class="language-xml highlighter-rouge"><pre class="highlight"><code>    <span class="nt">&lt;dependency&gt;</span>
       <span class="nt">&lt;groupId&gt;</span>io.servicecomb<span class="nt">&lt;/groupId&gt;</span>
       <span class="nt">&lt;artifactId&gt;</span>metrics-core<span class="nt">&lt;/artifactId&gt;</span>
@@ -988,10 +974,10 @@
 </code></pre>
 </div>
 
-<h2 id="数据发布">数据发布</h2>
-<p>配置好Metrics后,你可以通过如下两种方式获取Metrics数据:</p>
-<h3 id="内置的发布接口">内置的发布接口</h3>
-<p>当微服务启动后,metrics-core会自动以Springmvc的方式发布服务:</p>
+<h2 id="metrics-publish">Metrics Publish</h2>
+<p>After configuration completed,you can get collected metrics data via this method:</p>
+<h3 id="embedded-publish-interface">Embedded publish interface</h3>
+<p>When microservice start-up,metrics-core will auto publish data service using Springmvc provider:</p>
 <div class="language-java highlighter-rouge"><pre class="highlight"><code><span class="nd">@RestSchema</span><span class="o">(</span><span class="n">schemaId</span> <span class="o">=</span> <span class="s">"metricsEndpoint"</span><span class="o">)</span>
 <span class="nd">@RequestMapping</span><span class="o">(</span><span class="n">path</span> <span class="o">=</span> <span class="s">"/metrics"</span><span class="o">)</span>
 <span class="kd">public</span> <span class="kd">class</span> <span class="nc">DefaultMetricsPublisher</span> <span class="kd">implements</span> <span class="n">MetricsPublisher</span> <span class="o">{</span>
@@ -1028,7 +1014,7 @@
 <span class="o">}</span>
 </code></pre>
 </div>
-<p>因此,如果你在microservice.yaml中配置了rest provider,例如:</p>
+<p>So,if you had config rest provider in microservice.yaml,like:</p>
 <div class="language-yaml highlighter-rouge"><pre class="highlight"><code><span class="s">cse</span><span class="pi">:</span>
   <span class="s">service</span><span class="pi">:</span>
     <span class="s">registry</span><span class="pi">:</span>
@@ -1037,19 +1023,19 @@
     <span class="s">address</span><span class="pi">:</span> <span class="s">0.0.0.0:8080</span>
 </code></pre>
 </div>
-<p>你就可以通过http://localhost:8080/metrics 直接获取到数据,打开浏览器输入此URL就可以看到返回结果。</p>
-<h3 id="直接代码获取">直接代码获取</h3>
-<p>从上面的代码可以看到,数据提供Bean接口是io.servicecomb.metrics.core.publish.DataSource,因此如果你希望自己开发数据发布程序,只需要注入它即可。</p>
+<p>You can open a browser and input http://localhost:8080/metrics direct get metrics data.</p>
+<h3 id="direct-programming-get">Direct programming get</h3>
+<p>From above code you can known,the interface of data provider bean is io.servicecomb.metrics.core.publish.DataSource,so if you want develop your own metrics publisher,autowired it is enough.</p>
 <div class="language-java highlighter-rouge"><pre class="highlight"><code><span class="nd">@Autowired</span>
 <span class="kd">private</span> <span class="n">DataSource</span> <span class="n">dataSource</span><span class="o">;</span>
 </code></pre>
 </div>
 
-<h2 id="参考示例">参考示例</h2>
-<p>我们已经开发完成了两个使用场景可以作为参考:</p>
+<h2 id="other-reference">Other Reference</h2>
+<p>We had developed two use case for reference:</p>
 <ol>
-  <li>metrics-wirte-file:将Metrics数据写入文件,代码在metrics-extension中;</li>
-  <li>metrics-prometheus:将Metrics发布为prometheus Producer。</li>
+  <li>metrics-wirte-file:ouput metrics data into files,code is at metrics-extension;</li>
+  <li>metrics-prometheus:integration with prometheus,publish metrics as prometheus producer.</li>
 </ol>
 
         
@@ -1096,26 +1082,26 @@
     
     <div class="col">
       <ul>
-        <p class="header">资源</p>
-        <li><a href="/cn/docs/quick-start/">快速入门</a></li>
-        <li><a href="/cn/users/user-guide/">用户指南</a></li>
-        <li><a href="/cn/slides/">资料</a></li>
-        <li><a href="/cn/users/faq/">常见问题</a></li>
+        <p class="header">Resources</p>
+        <li><a href="/docs/quick-start/">Quick Start</a></li>
+        <li><a href="/users/user-guide/">User Guide</a></li>
+        <li><a href="/slides/">Slides</a></li>
+        <li><a href="/users/faq/">Common Questions</a></li>
       </ul>
     </div>
     <div class="col">
       <ul>
-        <p class="header">贡献</p>
-        <li><a href="https://github.com/apache/incubator-servicecomb-website/issues/new?title=Issue with _users/cn/metrics-in-1.0.0-m1.md">报告本网页问题</a></li>
-        <li><a href="https://github.com/apache/incubator-servicecomb-website/edit/master/_users/cn/metrics-in-1.0.0-m1.md">在Github上编辑此页</a></li>
-        <li><a href="/cn/developers/submit-codes/">代码提交指南</a></li>
+        <p class="header">Contribute</p>
+        <li><a href="https://github.com/apache/incubator-servicecomb-website/issues/new?title=Issue with _users/metrics-in-1.0.0-m1.md">Report a Doc Issue</a></li>
+        <li><a href="https://github.com/apache/incubator-servicecomb-website/edit/master/_users/metrics-in-1.0.0-m1.md">Edit This Page on Github</a></li>
+        <li><a href="/developers/submit-codes/">Code Submit Guide</a></li>
       </ul>
     </div>
     <div class="col">
       <ul class="social-icons">
-        <p class="header">社区</p>
+        <p class="header">Community</p>
         <li>
-            <a href="mailto:dev-subscribe@servicecomb.incubator.apache.org" rel="nofollow"><span class="mail">邮件列表</span></a>
+            <a href="mailto:dev-subscribe@servicecomb.incubator.apache.org" rel="nofollow"><span class="mail">Mailing List</span></a>
         </li>
         <li>
             <a href="http://github.com/ServiceComb" target="_blank"><span class="github">Github</span></a>
@@ -1131,7 +1117,7 @@
   </div>
 </div>
 <div class="page__footer-bottom">
-  <div>&copy; 2018 Apache ServiceComb (incubating). 技术来自于 <a href="http://jekyllrb.com" rel="nofollow">Jekyll</a> &amp; <a href="https://mademistakes.com/work/minimal-mistakes-jekyll-theme/" rel="nofollow">Minimal Mistakes</a>.</div>
+  <div>&copy; 2018 Apache ServiceComb (incubating). Powered by <a href="http://jekyllrb.com" rel="nofollow">Jekyll</a> &amp; <a href="https://mademistakes.com/work/minimal-mistakes-jekyll-theme/" rel="nofollow">Minimal Mistakes</a>.</div>
 </div>
 
       </footer>
diff --git a/content/cn/users/metrics-integration-with-prometheus-in-1.0.0-m1/index.html b/content/users/metrics-integration-with-prometheus-in-1.0.0-m1/index.html
similarity index 68%
copy from content/cn/users/metrics-integration-with-prometheus-in-1.0.0-m1/index.html
copy to content/users/metrics-integration-with-prometheus-in-1.0.0-m1/index.html
index bf889ba..35dee6b 100644
--- a/content/cn/users/metrics-integration-with-prometheus-in-1.0.0-m1/index.html
+++ b/content/users/metrics-integration-with-prometheus-in-1.0.0-m1/index.html
@@ -5,7 +5,7 @@
   Free for personal and commercial use under the MIT license
   https://github.com/mmistakes/minimal-mistakes/blob/master/LICENSE.txt
 -->
-<html lang="cn" class="no-js">
+<html lang="en" class="no-js">
   <head>
     <meta charset="utf-8">
 
@@ -19,35 +19,35 @@
 
 
 
-<title>1.0.0-m1版本中的监控如何集成普罗米修斯 - Apache ServiceComb (incubating)</title>
+<title>Metrics how integration with prometheus in 1.0.0-m1 - Apache ServiceComb (incubating)</title>
 
 
 
 
-<meta name="description" content="1.0.0-m1版本中的监控如何集成普罗米修斯">
+<meta name="description" content="Metrics how integration with prometheus in 1.0.0-m1">
 
 
 
 
 <meta name="author" content="">
 
-<meta property="og:locale" content="cn">
+<meta property="og:locale" content="en">
 <meta property="og:site_name" content="Apache ServiceComb (incubating)">
-<meta property="og:title" content="1.0.0-m1版本中的监控如何集成普罗米修斯">
+<meta property="og:title" content="Metrics how integration with prometheus in 1.0.0-m1">
 
 
-  <link rel="canonical" href="http://github.com/pages/apache/incubator-servicecomb-website/cn/users/metrics-integration-with-prometheus-in-1.0.0-m1/">
-  <meta property="og:url" content="http://github.com/pages/apache/incubator-servicecomb-website/cn/users/metrics-integration-with-prometheus-in-1.0.0-m1/">
+  <link rel="canonical" href="http://github.com/pages/apache/incubator-servicecomb-website/users/metrics-integration-with-prometheus-in-1.0.0-m1/">
+  <meta property="og:url" content="http://github.com/pages/apache/incubator-servicecomb-website/users/metrics-integration-with-prometheus-in-1.0.0-m1/">
 
 
 
-  <meta property="og:description" content="1.0.0-m1版本中的监控如何集成普罗米修斯">
+  <meta property="og:description" content="Metrics how integration with prometheus in 1.0.0-m1">
 
 
 
   <meta name="twitter:site" content="@ServiceComb">
-  <meta name="twitter:title" content="1.0.0-m1版本中的监控如何集成普罗米修斯">
-  <meta name="twitter:description" content="1.0.0-m1版本中的监控如何集成普罗米修斯">
+  <meta name="twitter:title" content="Metrics how integration with prometheus in 1.0.0-m1">
+  <meta name="twitter:description" content="Metrics how integration with prometheus in 1.0.0-m1">
   <meta name="twitter:url" content="">
 
   
@@ -156,7 +156,7 @@
     <div class="masthead__menu">
       <nav id="site-nav" class="greedy-nav">
 	      
-          <a class="site-title active" href="/cn"><img src="/assets/images/ServiceComb-logo-1.png"></a>
+          <a class="site-title active" href="/"><img src="/assets/images/ServiceComb-logo-1.png"></a>
 	      
         <ul class="visible-links">
           
@@ -165,7 +165,7 @@
               
               
               
-                <a href="/cn/docs/quick-start/">快速入门</a>
+                <a href="/docs/quick-start/">Quick Start</a>
               
             </li>
           
@@ -174,7 +174,7 @@
               
               
               
-                <a class="active" href="/cn/users/">用户手册</a>
+                <a class="active" href="/users/">Users</a>
               
             </li>
           
@@ -183,7 +183,7 @@
               
               
               
-                <a href="/cn/developers/">开发者手册</a>
+                <a href="/developers/">Developers</a>
               
             </li>
           
@@ -192,7 +192,7 @@
               
               
               
-                <a href="/cn/year-archive/">博文</a>
+                <a href="/year-archive/">Blogs</a>
               
             </li>
           
@@ -201,7 +201,7 @@
               
               
               
-                <a href="/cn/faqs/">常见问题</a>
+                <a href="/faqs/">FAQ</a>
               
             </li>
           
@@ -211,8 +211,7 @@
         <div class="nav-lang">
           
             
-            
-            <a href=/users/metrics-integration-with-prometheus-in-1.0.0-m1/>English</a>
+            <a href=/cn/users/metrics-integration-with-prometheus-in-1.0.0-m1/>中文</a>
           
         </div>
       </nav>
@@ -229,7 +228,7 @@
   
   <div class="sidebar sticky">
       
-      <div class="back-to-home">首页 > <a href="/cn/">ServiceComb</a></div>
+      <div class="back-to-home">Home > <a href="/">ServiceComb</a></div>
       
   
   
@@ -244,12 +243,12 @@
 <nav class="nav__list">
   
   <input id="ac-toc" name="accordion-toc" type="checkbox" />
-  <label for="ac-toc">切换菜单</label>
+  <label for="ac-toc">Toggle Menu</label>
   <ul class="nav__items">
     
       <li>
         
-          <span class="nav__sub-title">用户手册</span>
+          <span class="nav__sub-title">User Guide</span>
         
 
         
@@ -261,7 +260,7 @@
             
             
 
-            <li><a href="/cn/users/" class="">Java Chassis系统架构</a></li>
+            <li><a href="/users/" class="">Java Chassis Architecture</a></li>
           
             
             
@@ -269,7 +268,7 @@
             
             
 
-            <li><a href="/cn/users/setup-environment/" class="">环境配置</a></li>
+            <li><a href="/users/setup-environment/" class="">Setup Environment</a></li>
           
         </ul>
         
@@ -277,7 +276,7 @@
     
       <li>
         
-          <span class="nav__sub-title">开发服务提供者</span>
+          <span class="nav__sub-title">Develop Service Provider</span>
         
 
         
@@ -289,7 +288,7 @@
             
             
 
-            <li><a href="/cn/users/service-definition/" class="">服务定义</a></li>
+            <li><a href="/users/service-definition/" class="">Service Definition</a></li>
           
             
             
@@ -297,7 +296,7 @@
             
             
 
-            <li><a href="/cn/users/service-contract/" class="">服务契约</a></li>
+            <li><a href="/users/service-contract/" class="">Service Contract</a></li>
           
             
             
@@ -305,7 +304,7 @@
             
             
 
-            <li><a href="/cn/users/develop-with-springmvc/" class="">用SpringMVC开发微服务</a></li>
+            <li><a href="/users/develop-with-springmvc/" class="">Develop Microservice with SpringMVC</a></li>
           
             
             
@@ -313,7 +312,7 @@
             
             
 
-            <li><a href="/cn/users/develop-with-jax-rs/" class="">用JAX-RS开发微服务</a></li>
+            <li><a href="/users/develop-with-jax-rs/" class="">Develop Microservice with JAX-RS</a></li>
           
             
             
@@ -321,7 +320,7 @@
             
             
 
-            <li><a href="/cn/users/develop-with-transparent-rpc/" class="">用透明RPC开发微服务</a></li>
+            <li><a href="/users/develop-with-transparent-rpc/" class="">Develop Microservice with Transparent RPC</a></li>
           
             
             
@@ -329,7 +328,7 @@
             
             
 
-            <li><a href="/cn/users/service-interface-constraints/" class="">服务接口约束</a></li>
+            <li><a href="/users/service-interface-constraints/" class="">Service Interface Constraints</a></li>
           
             
             
@@ -337,7 +336,7 @@
             
             
 
-            <li><a href="/cn/users/service-configurations/" class="">服务配置</a></li>
+            <li><a href="/users/service-configurations/" class="">Service Configurations</a></li>
           
             
             
@@ -345,7 +344,7 @@
             
             
 
-            <li><a href="/cn/users/communicate-protocol/" class="">通信协议</a></li>
+            <li><a href="/users/communicate-protocol/" class="">Communicate Protocol</a></li>
           
             
             
@@ -353,7 +352,7 @@
             
             
 
-            <li><a href="/cn/users/application-boot-process/" class="">程序启动逻辑</a></li>
+            <li><a href="/users/application-boot-process/" class="">Application Boot Up Process</a></li>
           
             
             
@@ -361,7 +360,7 @@
             
             
 
-            <li><a href="/cn/users/service-heartbeat/" class="">服务心跳</a></li>
+            <li><a href="/users/service-heartbeat/" class="">Service Heartbeat</a></li>
           
         </ul>
         
@@ -369,7 +368,7 @@
     
       <li>
         
-          <span class="nav__sub-title">开发服务消费者</span>
+          <span class="nav__sub-title">Develop Service Consumer</span>
         
 
         
@@ -381,7 +380,7 @@
             
             
 
-            <li><a href="/cn/users/develop-with-rest-template/" class="">使用Rest Template方式开发</a></li>
+            <li><a href="/users/develop-with-rest-template/" class="">Develop with Rest Template</a></li>
           
             
             
@@ -389,7 +388,7 @@
             
             
 
-            <li><a href="/cn/users/develop-with-rpc/" class="">使用RPC方式开发</a></li>
+            <li><a href="/users/develop-with-rpc/" class="">Develop with Transparent RPC</a></li>
           
             
             
@@ -397,7 +396,7 @@
             
             
 
-            <li><a href="/cn/users/use-service-contract/" class="">使用服务契约</a></li>
+            <li><a href="/users/use-service-contract/" class="">Use Service Contract</a></li>
           
             
             
@@ -405,7 +404,7 @@
             
             
 
-            <li><a href="/cn/users/invoke-control/" class="">调用控制</a></li>
+            <li><a href="/users/invoke-control/" class="">Invoke Control</a></li>
           
         </ul>
         
@@ -413,7 +412,7 @@
     
       <li>
         
-          <span class="nav__sub-title">通用开发</span>
+          <span class="nav__sub-title">General Development</span>
         
 
         
@@ -425,7 +424,7 @@
             
             
 
-            <li><a href="/cn/users/local-develop-test/" class="">本地开发与测试</a></li>
+            <li><a href="/users/local-develop-test/" class="">Develop and Test in Local Environment</a></li>
           
             
             
@@ -433,7 +432,7 @@
             
             
 
-            <li><a href="/cn/users/use-servicecomb-in-spring-boot/" class="">在Spring Boot中使用ServiceComb</a></li>
+            <li><a href="/users/use-servicecomb-in-spring-boot/" class="">Use ServiceComb in Spring Boot</a></li>
           
             
             
@@ -441,7 +440,7 @@
             
             
 
-            <li><a href="/cn/users/distributed-tracing/" class="">分布式调用链追踪</a></li>
+            <li><a href="/users/distributed-tracing/" class="">Distributed Tracing</a></li>
           
             
             
@@ -449,7 +448,7 @@
             
             
 
-            <li><a href="/cn/users/customized-tracing/" class="">自定义调用链打点</a></li>
+            <li><a href="/users/customized-tracing/" class="">Customized Tracing</a></li>
           
         </ul>
         
@@ -457,7 +456,7 @@
     
       <li>
         
-          <span class="nav__sub-title">服务能力开放</span>
+          <span class="nav__sub-title">Edging Service</span>
         
 
         
@@ -469,7 +468,7 @@
             
             
 
-            <li><a href="/cn/users/edging-service/nginx/" class="">使用confd和Nginx做边缘服务</a></li>
+            <li><a href="/users/edging-service/nginx/" class="">confd and Nginx</a></li>
           
             
             
@@ -477,7 +476,7 @@
             
             
 
-            <li><a href="/cn/users/edging-service/zuul/" class="">使用Zuul做边缘服务</a></li>
+            <li><a href="/users/edging-service/zuul/" class="">Zuul</a></li>
           
         </ul>
         
@@ -485,7 +484,7 @@
     
       <li>
         
-          <span class="nav__sub-title">监控</span>
+          <span class="nav__sub-title">Monitor</span>
         
 
         
@@ -497,23 +496,7 @@
             
             
 
-            <li><a href="/cn/users/metrics-in-0.5.0/" class="">0.5.0版本中的监控</a></li>
-          
-            
-            
-
-            
-            
-
-            <li><a href="/cn/users/metrics-in-1.0.0-m1/" class="">1.0.0-m1版本中的监控</a></li>
-          
-            
-            
-
-            
-            
-
-            <li><a href="/cn/users/metrics-write-file-extension-and-sample-in-1.0.0-m1/" class="">1.0.0-m1版本写文件扩展和示例</a></li>
+            <li><a href="/users/metrics-in-1.0.0-m1/" class="">Metrics-in-1.0.0-m1</a></li>
           
             
             
@@ -521,7 +504,7 @@
             
             
 
-            <li><a href="/cn/users/metrics-integration-with-prometheus-in-1.0.0-m1/" class="active">1.0.0-m1版本中的监控如何集成普罗米修斯</a></li>
+            <li><a href="/users/metrics-integration-with-prometheus-in-1.0.0-m1/" class="active">Metrics-integration-with-prometheus-in-1.0.0-m1</a></li>
           
         </ul>
         
@@ -529,7 +512,7 @@
     
       <li>
         
-          <span class="nav__sub-title">部署</span>
+          <span class="nav__sub-title">Deployment</span>
         
 
         
@@ -541,7 +524,7 @@
             
             
 
-            <li><a href="/cn/users/run-mode/" class="">运行模式</a></li>
+            <li><a href="/users/run-mode/" class="">Run Mode</a></li>
           
         </ul>
         
@@ -549,7 +532,7 @@
     
       <li>
         
-          <span class="nav__sub-title">微服务安全</span>
+          <span class="nav__sub-title">Security</span>
         
 
         
@@ -561,7 +544,7 @@
             
             
 
-            <li><a href="/cn/users/use-tls/" class="">使用TLS通信</a></li>
+            <li><a href="/users/use-tls/" class="">Use TLS</a></li>
           
         </ul>
         
@@ -577,8 +560,8 @@
 
 
   <article class="page" itemscope itemtype="http://schema.org/CreativeWork">
-    <meta itemprop="headline" content="1.0.0-m1版本中的监控如何集成普罗米修斯">
-    <meta itemprop="description" content="1.0.0-m1版本中的监控如何集成普罗米修斯">
+    <meta itemprop="headline" content="Metrics how integration with prometheus in 1.0.0-m1">
+    <meta itemprop="description" content="Metrics how integration with prometheus in 1.0.0-m1">
     
     <meta itemprop="dateModified" content="January 02, 2018">
 
@@ -586,7 +569,7 @@
       
         
           <header>
-            <h1 class="page__title" itemprop="headline">1.0.0-m1版本中的监控如何集成普罗米修斯
+            <h1 class="page__title" itemprop="headline">Metrics how integration with prometheus in 1.0.0-m1
 </h1>
             
           </header>
@@ -596,35 +579,35 @@
       <section class="page__content" itemprop="text">
         <aside class="sidebar__right">
 <nav class="toc">
-    <!-- <header><h4 class="nav__title"><i class="fa fa-file-text"></i> 在本页上</h4></header> -->
+    <!-- <header><h4 class="nav__title"><i class="fa fa-file-text"></i> On This Page</h4></header> -->
 <ul class="toc__menu" id="markdown-toc">
-  <li><a href="#背景" id="markdown-toc-背景">背景</a></li>
-  <li><a href="#对接原理" id="markdown-toc-对接原理">对接原理</a>    <ul>
-      <li><a href="#与metrics-core-publish的关系" id="markdown-toc-与metrics-core-publish的关系">与metrics-core Publish的关系</a></li>
+  <li><a href="#background" id="markdown-toc-background">Background</a></li>
+  <li><a href="#integration-principles" id="markdown-toc-integration-principles">Integration Principles</a>    <ul>
+      <li><a href="#relation-between-metrics-core-publish" id="markdown-toc-relation-between-metrics-core-publish">Relation between metrics-core Publish</a></li>
     </ul>
   </li>
-  <li><a href="#如何配置" id="markdown-toc-如何配置">如何配置</a>    <ul>
-      <li><a href="#全局配置" id="markdown-toc-全局配置">全局配置</a></li>
-      <li><a href="#依赖配置" id="markdown-toc-依赖配置">依赖配置</a></li>
-      <li><a href="#配置prometheus的prometheusyml" id="markdown-toc-配置prometheus的prometheusyml">配置Prometheus的prometheus.yml</a></li>
-      <li><a href="#配置grafana可选" id="markdown-toc-配置grafana可选">配置Grafana(可选)</a></li>
+  <li><a href="#how-configuration" id="markdown-toc-how-configuration">How Configuration</a>    <ul>
+      <li><a href="#global-configuration" id="markdown-toc-global-configuration">Global Configuration</a></li>
+      <li><a href="#maven-configuration" id="markdown-toc-maven-configuration">Maven Configuration</a></li>
+      <li><a href="#config-prometheusyml-in-prometheus" id="markdown-toc-config-prometheusyml-in-prometheus">Config prometheus.yml in Prometheus</a></li>
+      <li><a href="#config-grafanaoptional" id="markdown-toc-config-grafanaoptional">Config Grafana(optional)</a></li>
     </ul>
   </li>
-  <li><a href="#运行效果" id="markdown-toc-运行效果">运行效果</a></li>
+  <li><a href="#effect-show" id="markdown-toc-effect-show">Effect Show</a></li>
 </ul>
 
   </nav>
 </aside>
 
-<p>微服务框架从0.5.0版本开始支持监控功能Metrics,1.0.0-m1版本正式发布,我们会继续追加新特性新功能,订阅ServiceComb邮件列表(dev-subscribe@servicecomb.incubator.apache.org)以持续获取最新信息。</p>
+<p>Metrics had supported from Java chassis version 0.5.0,in version 1.0.0-m1,we had reconstruction it and add some more features,please checkout the user guide and <a href="https://github.com/apache/incubator-servicecomb-java-chassis/releases">release note</a> for more information.Also subscribe ServiceComb mail-list(dev-subscribe@servicecomb.incubator.apache.org) and join discussion is welcome.</p>
 
-<h2 id="背景">背景</h2>
-<p><a href="http://www.prometheus.io/">普罗米修斯</a>是相似于Google Borgmon的一个开源监控系统,也是<a href="https://www.cncf.io/">CNCF</a>的成员之一,目前社区非常活跃,Java Chassis Metrics在1.0.0-m1中支持对接普罗米修斯,并进一步实现使用<a href="https://grafana.com/">Grafana</a>查询Metrics数据。</p>
+<h2 id="background">Background</h2>
+<p><a href="http://www.prometheus.io/">Prometheus</a> is a opensource open-source monitoring solution like Google Borgmon,also member of <a href="https://www.cncf.io/">CNCF</a>,community is very active.Java chassis metrics support integration with prometheus in 1.0.0-m1,and can use <a href="https://grafana.com/">Grafana</a> to query metrics data further.</p>
 
-<h2 id="对接原理">对接原理</h2>
-<p>由于Java Chassis由Java语言开发,我们使用<a href="https://github.com/prometheus/client_java">prometheus java client</a>中的Simple Client作为对接SDK,版本为0.1.0。<br />
-Prometheus推荐Pull模式拉取Metrics数据,被监控微服务作为Producer发布数据provider接口,我们采用Simple Http Server发布微服务采集到的Metrics数据。<br />
-作为一个集成(可选)模块,代码在metrics-integration/metrics-prometheus中,你可以看到它依赖:</p>
+<h2 id="integration-principles">Integration Principles</h2>
+<p>We known Java chassis developed by Java,so we use Simple Client in  <a href="https://github.com/prometheus/client_java">prometheus java client</a> as SDK,the version we use is 0.1.0.<br />
+Prometheus use pull mode collect metrics data,microservice act as producer,we use Simple HTTP Server(also in client java SDK) publish them;<br />
+As an integration(optional) module,the implementation code is in metrics-integration/metrics-prometheus,you can get it’s dependency:</p>
 <div class="language-xml highlighter-rouge"><pre class="highlight"><code>  <span class="nt">&lt;dependency&gt;</span>
     <span class="nt">&lt;groupId&gt;</span>io.prometheus<span class="nt">&lt;/groupId&gt;</span>
     <span class="nt">&lt;artifactId&gt;</span>simpleclient<span class="nt">&lt;/artifactId&gt;</span>
@@ -640,9 +623,9 @@ Prometheus推荐Pull模式拉取Metrics数据,被监控微服务作为Producer
   <span class="nt">&lt;/dependency&gt;</span>
 </code></pre>
 </div>
-<p>因此一旦集成Prometheus引入了metrics-prometheus依赖后,不再需要添加metrics-core的依赖。</p>
-<h3 id="与metrics-core-publish的关系">与metrics-core Publish的关系</h3>
-<p>文档<a href="/cn/users/metrics-in-1.0.0-m1/">1.0.0-m1版本中的监控</a>中已经提到,metrics-core会伴随微服务启动内置的数据发布,如果你在microservice.yaml中配置了rest provider,例如:</p>
+<p>So if we import metrics-prometheus,no longer need to add metrics-core dependence.</p>
+<h3 id="relation-between-metrics-core-publish">Relation between metrics-core Publish</h3>
+<p><a href="/users/metrics-in-1.0.0-m1/">Metrics in 1.0.0-m1</a> had already been mentioned,metrics-core will auto start up a embedded publish interface,so if you had configured rest provider in microservice.yaml like:</p>
 <div class="language-yaml highlighter-rouge"><pre class="highlight"><code><span class="s">cse</span><span class="pi">:</span>
   <span class="s">service</span><span class="pi">:</span>
     <span class="s">registry</span><span class="pi">:</span>
@@ -651,7 +634,7 @@ Prometheus推荐Pull模式拉取Metrics数据,被监控微服务作为Producer
     <span class="s">address</span><span class="pi">:</span> <span class="s">0.0.0.0:8080</span>
 </code></pre>
 </div>
-<p>你就可以通过http://localhost:8080/metrics 直接获取到Metrics数据,它返回的是io.servicecomb.metrics.common.RegistryMetric实体对象,输出格式为:</p>
+<p>You can direct get metrics data at http://localhost:8080/metrics ,it will return a entity of io.servicecomb.metrics.common.RegistryMetric,the output is:</p>
 <div class="language-json highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="nt">"instanceMetric"</span><span class="p">:{</span><span class="w">
 </span><span class="nt">"systemMetric"</span><span class="p">:{</span><span class="nt">"cpuLoad"</span><span class="p">:</span><span class="mf">10.0</span><span class="p">,</span><span class="nt">"cpuRunningThreads"</span><span class="p">:</span><span class="mi">39</span><span class="p">,</span><span class="nt">"heapInit"</span><span class="p">:</span><span class="mi">266338304</span><span class="p">,</span><span class="nt">"heapMax"</span><span class="p">:</span><span class="mi">3786407 [...]
 </span><span class="nt">"consumerMetric"</span><span class="p">:{</span><span class="nt">"operationName"</span><span class="p">:</span><span class="s2">"instance"</span><span class="p">,</span><span class="nt">"prefix"</span><span class="p">:</span><span class="s2">"servicecomb.instance.consumer"</span><span class="p">,</span><span class="nt">"consumerLatency"</span><span class="p">:{</span><span class="nt">"total"</span><span class="p">:</span><span class="mi">0</span><span class="p">,< [...]
@@ -661,7 +644,7 @@ Prometheus推荐Pull模式拉取Metrics数据,被监控微服务作为Producer
 </span><span class="p">}}</span><span class="w">
 </span></code></pre>
 </div>
-<p>但使用Prometheus Simple Http Server接口发布的数据是Prometheus采集的标准格式:</p>
+<p>But use Prometheus Simple HTTP Server provider interface will publish the standard format which prometheus needed:</p>
 <div class="language-text highlighter-rouge"><pre class="highlight"><code># HELP Instance Level Instance Level Metrics
 # TYPE Instance Level untyped
 servicecomb_instance_producer_producerLatency_average 0.0
@@ -681,16 +664,15 @@ servicecomb_calculator_metricsEndpoint_metrics_producer_waitInQueue_count 0.0
 servicecomb_calculator_metricsEndpoint_metrics_producer_lifeTimeInQueue_count 0.0
 </code></pre>
 </div>
-<p>所以它们两个是完全独立各有用途的,取决你如何使用。</p>
-
-<p><em>Prometheus Simple Http Server同样使用/metrics作为默认URL,metrics-prometheus会使用9696作为默认端口,因此微服务启动后你可以使用http://localhost:9696/metrics 访问它。</em></p>
+<p>So they are two independent,different for use.</p>
 
-<p>我们可以看到在Prometheus的Metric命名统一使用下划线代替了点,因为需要遵守它的<a href="https://prometheus.io/docs/practices/naming/">命名规则</a>。</p>
+<p><em>Prometheus Simple HTTP Server also use /metrics as default URL,metrics-prometheus will use 9696 as default port,after microservice start up you can get metrics data at http://localhost:9696/metrics .</em>  <br />
+The metrics name in prometheus we replace all dot with underline,because we must follow its <a href="https://prometheus.io/docs/practices/naming/">naming rules</a>.</p>
 
-<h2 id="如何配置">如何配置</h2>
-<p>开启对接普罗米修斯非常简单:</p>
-<h3 id="全局配置">全局配置</h3>
-<p>microservice.yaml中有如下配置项:</p>
+<h2 id="how-configuration">How Configuration</h2>
+<p>Enable prometheus integration is very easy:</p>
+<h3 id="global-configuration">Global Configuration</h3>
+<p>Please add prometheus port config in microservice.yaml:</p>
 <div class="language-yaml highlighter-rouge"><pre class="highlight"><code><span class="s">APPLICATION_ID</span><span class="pi">:</span> <span class="s">demo</span>
 <span class="s">service_description</span><span class="pi">:</span>
   <span class="s">name</span><span class="pi">:</span> <span class="s">demoService</span>
@@ -699,13 +681,13 @@ servicecomb_calculator_metricsEndpoint_metrics_producer_lifeTimeInQueue_count 0.
 <span class="s">servicecomb</span><span class="pi">:</span>
   <span class="s">metrics</span><span class="pi">:</span>
     <span class="s">prometheus</span><span class="pi">:</span>
-      <span class="c1">#prometheus provider的端口</span>
+      <span class="c1">#prometheus provider port</span>
       <span class="s">port</span><span class="pi">:</span> <span class="s">9696</span>
 </code></pre>
 </div>
-<p><em>如果不做配置,默认端口为9696</em></p>
-<h3 id="依赖配置">依赖配置</h3>
-<p>只需要添加metrics-prometheus依赖即可:</p>
+<p><em>If do not config,default value is 9696</em></p>
+<h3 id="maven-configuration">Maven Configuration</h3>
+<p>We just only need add metrics-prometheus dependency:</p>
 <div class="language-xml highlighter-rouge"><pre class="highlight"><code>    <span class="nt">&lt;dependency&gt;</span>
       <span class="nt">&lt;groupId&gt;</span>io.servicecomb<span class="nt">&lt;/groupId&gt;</span>
       <span class="nt">&lt;artifactId&gt;</span>metrics-prometheus<span class="nt">&lt;/artifactId&gt;</span>
@@ -713,8 +695,8 @@ servicecomb_calculator_metricsEndpoint_metrics_producer_lifeTimeInQueue_count 0.
     <span class="nt">&lt;/dependency&gt;</span>
 </code></pre>
 </div>
-<h3 id="配置prometheus的prometheusyml">配置Prometheus的prometheus.yml</h3>
-<p>你需要在prometheus.yml中配置数据采集job,例如</p>
+<h3 id="config-prometheusyml-in-prometheus">Config prometheus.yml in Prometheus</h3>
+<p>You need add job in prometheus.yml,like:</p>
 <div class="language-yaml highlighter-rouge"><pre class="highlight"><code><span class="s">scrape_configs</span><span class="pi">:</span>
   <span class="c1"># The job name is added as a label `job=&lt;job_name&gt;` to any timeseries scraped from this config.</span>
   <span class="pi">-</span> <span class="s">job_name</span><span class="pi">:</span> <span class="s1">'</span><span class="s">prometheus'</span>
@@ -734,16 +716,16 @@ servicecomb_calculator_metricsEndpoint_metrics_producer_lifeTimeInQueue_count 0.
       <span class="pi">-</span> <span class="s">targets</span><span class="pi">:</span> <span class="pi">[</span><span class="s1">'</span><span class="s">localhost:9696'</span><span class="pi">]</span>
 </code></pre>
 </div>
-<p>其中job_name: ‘servicecomb’即自定义的job配置,目标是本地微服务localhost:9696,关于prometheus.yml的配置更多信息可以参考<a href="https://prometheus.io/docs/prometheus/latest/configuration/configuration/">这篇文章</a>。</p>
-<h3 id="配置grafana可选">配置Grafana(可选)</h3>
-<p>如何在Grafana中添加Prometheus作为数据源请参考<a href="https://prometheus.io/docs/visualization/grafana/">这篇文章</a>。</p>
-<h2 id="运行效果">运行效果</h2>
-<p>配置好并启动了微服务、Prometheus之后,就可以打开Prometheus Web界面(默认地址是http://localhost:9090/ ),在Metrics列表中看到ServiceComb开头的Java Chassis Metrics,如下图所示:
-<img src="/assets/images/MetricsInPrometheus.png" alt="MetricsInPrometheus" /></p>
+<p>The job_name: ‘servicecomb’ is our custom job,it will collect metrics data from local microservice localhost:9696,more information about configuration of prometheus can found <a href="https://prometheus.io/docs/prometheus/latest/configuration/configuration/">here</a>.</p>
 
-<p>为了能够达到更好的查询效果,在Grafana中添加Prometheus作为数据源,通过Grafana查询数据如下图示:</p>
+<h3 id="config-grafanaoptional">Config Grafana(optional)</h3>
+<p>How add prometheus as a datasource in grafana can found <a href="https://prometheus.io/docs/visualization/grafana/">here</a>.</p>
+<h2 id="effect-show">Effect Show</h2>
+<p>After complete prometheus config and start up microservice,we can open prometheus web site(default address is http://localhost:9090/),in metrics list java chassis metrics with prefix ‘servicecomb’ can be seen:
+<img src="/assets/images/MetricsInPrometheus.png" alt="MetricsInPrometheus" /></p>
 
-<p><img src="/assets/images/MetricsInGrafana.png" alt="MetricsInGrafana" /></p>
+<p>For get more better data query experience,add prometheus as a datasource in grafana then query metrics data by it:<br />
+<img src="/assets/images/MetricsInGrafana.png" alt="MetricsInGrafana" /></p>
 
         
       </section>
@@ -789,26 +771,26 @@ servicecomb_calculator_metricsEndpoint_metrics_producer_lifeTimeInQueue_count 0.
     
     <div class="col">
       <ul>
-        <p class="header">资源</p>
-        <li><a href="/cn/docs/quick-start/">快速入门</a></li>
-        <li><a href="/cn/users/user-guide/">用户指南</a></li>
-        <li><a href="/cn/slides/">资料</a></li>
-        <li><a href="/cn/users/faq/">常见问题</a></li>
+        <p class="header">Resources</p>
+        <li><a href="/docs/quick-start/">Quick Start</a></li>
+        <li><a href="/users/user-guide/">User Guide</a></li>
+        <li><a href="/slides/">Slides</a></li>
+        <li><a href="/users/faq/">Common Questions</a></li>
       </ul>
     </div>
     <div class="col">
       <ul>
-        <p class="header">贡献</p>
-        <li><a href="https://github.com/apache/incubator-servicecomb-website/issues/new?title=Issue with _users/cn/metrics-integration-with-prometheus-in-1.0.0-m1.md">报告本网页问题</a></li>
-        <li><a href="https://github.com/apache/incubator-servicecomb-website/edit/master/_users/cn/metrics-integration-with-prometheus-in-1.0.0-m1.md">在Github上编辑此页</a></li>
-        <li><a href="/cn/developers/submit-codes/">代码提交指南</a></li>
+        <p class="header">Contribute</p>
+        <li><a href="https://github.com/apache/incubator-servicecomb-website/issues/new?title=Issue with _users/metrics-integration-with-prometheus-in-1.0.0-m1.md">Report a Doc Issue</a></li>
+        <li><a href="https://github.com/apache/incubator-servicecomb-website/edit/master/_users/metrics-integration-with-prometheus-in-1.0.0-m1.md">Edit This Page on Github</a></li>
+        <li><a href="/developers/submit-codes/">Code Submit Guide</a></li>
       </ul>
     </div>
     <div class="col">
       <ul class="social-icons">
-        <p class="header">社区</p>
+        <p class="header">Community</p>
         <li>
-            <a href="mailto:dev-subscribe@servicecomb.incubator.apache.org" rel="nofollow"><span class="mail">邮件列表</span></a>
+            <a href="mailto:dev-subscribe@servicecomb.incubator.apache.org" rel="nofollow"><span class="mail">Mailing List</span></a>
         </li>
         <li>
             <a href="http://github.com/ServiceComb" target="_blank"><span class="github">Github</span></a>
@@ -824,7 +806,7 @@ servicecomb_calculator_metricsEndpoint_metrics_producer_lifeTimeInQueue_count 0.
   </div>
 </div>
 <div class="page__footer-bottom">
-  <div>&copy; 2018 Apache ServiceComb (incubating). 技术来自于 <a href="http://jekyllrb.com" rel="nofollow">Jekyll</a> &amp; <a href="https://mademistakes.com/work/minimal-mistakes-jekyll-theme/" rel="nofollow">Minimal Mistakes</a>.</div>
+  <div>&copy; 2018 Apache ServiceComb (incubating). Powered by <a href="http://jekyllrb.com" rel="nofollow">Jekyll</a> &amp; <a href="https://mademistakes.com/work/minimal-mistakes-jekyll-theme/" rel="nofollow">Minimal Mistakes</a>.</div>
 </div>
 
       </footer>
diff --git a/content/users/run-mode/index.html b/content/users/run-mode/index.html
index f39338a..c30a0d1 100644
--- a/content/users/run-mode/index.html
+++ b/content/users/run-mode/index.html
@@ -484,6 +484,34 @@
     
       <li>
         
+          <span class="nav__sub-title">Monitor</span>
+        
+
+        
+        <ul>
+          
+            
+            
+
+            
+            
+
+            <li><a href="/users/metrics-in-1.0.0-m1/" class="">Metrics-in-1.0.0-m1</a></li>
+          
+            
+            
+
+            
+            
+
+            <li><a href="/users/metrics-integration-with-prometheus-in-1.0.0-m1/" class="">Metrics-integration-with-prometheus-in-1.0.0-m1</a></li>
+          
+        </ul>
+        
+      </li>
+    
+      <li>
+        
           <span class="nav__sub-title">Deployment</span>
         
 
diff --git a/content/users/service-configurations/index.html b/content/users/service-configurations/index.html
index 5b1a5ff..7da4543 100644
--- a/content/users/service-configurations/index.html
+++ b/content/users/service-configurations/index.html
@@ -484,6 +484,34 @@
     
       <li>
         
+          <span class="nav__sub-title">Monitor</span>
+        
+
+        
+        <ul>
+          
+            
+            
+
+            
+            
+
+            <li><a href="/users/metrics-in-1.0.0-m1/" class="">Metrics-in-1.0.0-m1</a></li>
+          
+            
+            
+
+            
+            
+
+            <li><a href="/users/metrics-integration-with-prometheus-in-1.0.0-m1/" class="">Metrics-integration-with-prometheus-in-1.0.0-m1</a></li>
+          
+        </ul>
+        
+      </li>
+    
+      <li>
+        
           <span class="nav__sub-title">Deployment</span>
         
 
diff --git a/content/users/service-contract/index.html b/content/users/service-contract/index.html
index 26e85fb..9fa50db 100644
--- a/content/users/service-contract/index.html
+++ b/content/users/service-contract/index.html
@@ -484,6 +484,34 @@
     
       <li>
         
+          <span class="nav__sub-title">Monitor</span>
+        
+
+        
+        <ul>
+          
+            
+            
+
+            
+            
+
+            <li><a href="/users/metrics-in-1.0.0-m1/" class="">Metrics-in-1.0.0-m1</a></li>
+          
+            
+            
+
+            
+            
+
+            <li><a href="/users/metrics-integration-with-prometheus-in-1.0.0-m1/" class="">Metrics-integration-with-prometheus-in-1.0.0-m1</a></li>
+          
+        </ul>
+        
+      </li>
+    
+      <li>
+        
           <span class="nav__sub-title">Deployment</span>
         
 
diff --git a/content/users/service-definition/index.html b/content/users/service-definition/index.html
index 141a8d5..e2f20af 100644
--- a/content/users/service-definition/index.html
+++ b/content/users/service-definition/index.html
@@ -484,6 +484,34 @@
     
       <li>
         
+          <span class="nav__sub-title">Monitor</span>
+        
+
+        
+        <ul>
+          
+            
+            
+
+            
+            
+
+            <li><a href="/users/metrics-in-1.0.0-m1/" class="">Metrics-in-1.0.0-m1</a></li>
+          
+            
+            
+
+            
+            
+
+            <li><a href="/users/metrics-integration-with-prometheus-in-1.0.0-m1/" class="">Metrics-integration-with-prometheus-in-1.0.0-m1</a></li>
+          
+        </ul>
+        
+      </li>
+    
+      <li>
+        
           <span class="nav__sub-title">Deployment</span>
         
 
diff --git a/content/users/service-heartbeat/index.html b/content/users/service-heartbeat/index.html
index c5ce6d0..1a080d9 100644
--- a/content/users/service-heartbeat/index.html
+++ b/content/users/service-heartbeat/index.html
@@ -484,6 +484,34 @@
     
       <li>
         
+          <span class="nav__sub-title">Monitor</span>
+        
+
+        
+        <ul>
+          
+            
+            
+
+            
+            
+
+            <li><a href="/users/metrics-in-1.0.0-m1/" class="">Metrics-in-1.0.0-m1</a></li>
+          
+            
+            
+
+            
+            
+
+            <li><a href="/users/metrics-integration-with-prometheus-in-1.0.0-m1/" class="">Metrics-integration-with-prometheus-in-1.0.0-m1</a></li>
+          
+        </ul>
+        
+      </li>
+    
+      <li>
+        
           <span class="nav__sub-title">Deployment</span>
         
 
diff --git a/content/users/service-interface-constraints/index.html b/content/users/service-interface-constraints/index.html
index 4b7662b..4c0708d 100644
--- a/content/users/service-interface-constraints/index.html
+++ b/content/users/service-interface-constraints/index.html
@@ -484,6 +484,34 @@
     
       <li>
         
+          <span class="nav__sub-title">Monitor</span>
+        
+
+        
+        <ul>
+          
+            
+            
+
+            
+            
+
+            <li><a href="/users/metrics-in-1.0.0-m1/" class="">Metrics-in-1.0.0-m1</a></li>
+          
+            
+            
+
+            
+            
+
+            <li><a href="/users/metrics-integration-with-prometheus-in-1.0.0-m1/" class="">Metrics-integration-with-prometheus-in-1.0.0-m1</a></li>
+          
+        </ul>
+        
+      </li>
+    
+      <li>
+        
           <span class="nav__sub-title">Deployment</span>
         
 
diff --git a/content/users/setup-environment/index.html b/content/users/setup-environment/index.html
index f0cd1f6..1da9a66 100644
--- a/content/users/setup-environment/index.html
+++ b/content/users/setup-environment/index.html
@@ -484,6 +484,34 @@
     
       <li>
         
+          <span class="nav__sub-title">Monitor</span>
+        
+
+        
+        <ul>
+          
+            
+            
+
+            
+            
+
+            <li><a href="/users/metrics-in-1.0.0-m1/" class="">Metrics-in-1.0.0-m1</a></li>
+          
+            
+            
+
+            
+            
+
+            <li><a href="/users/metrics-integration-with-prometheus-in-1.0.0-m1/" class="">Metrics-integration-with-prometheus-in-1.0.0-m1</a></li>
+          
+        </ul>
+        
+      </li>
+    
+      <li>
+        
           <span class="nav__sub-title">Deployment</span>
         
 
diff --git a/content/users/use-service-contract/index.html b/content/users/use-service-contract/index.html
index 72d8bf4..31c21ce 100644
--- a/content/users/use-service-contract/index.html
+++ b/content/users/use-service-contract/index.html
@@ -484,6 +484,34 @@
     
       <li>
         
+          <span class="nav__sub-title">Monitor</span>
+        
+
+        
+        <ul>
+          
+            
+            
+
+            
+            
+
+            <li><a href="/users/metrics-in-1.0.0-m1/" class="">Metrics-in-1.0.0-m1</a></li>
+          
+            
+            
+
+            
+            
+
+            <li><a href="/users/metrics-integration-with-prometheus-in-1.0.0-m1/" class="">Metrics-integration-with-prometheus-in-1.0.0-m1</a></li>
+          
+        </ul>
+        
+      </li>
+    
+      <li>
+        
           <span class="nav__sub-title">Deployment</span>
         
 
diff --git a/content/users/use-servicecomb-in-spring-boot/index.html b/content/users/use-servicecomb-in-spring-boot/index.html
index 4810f34..d4add10 100644
--- a/content/users/use-servicecomb-in-spring-boot/index.html
+++ b/content/users/use-servicecomb-in-spring-boot/index.html
@@ -484,6 +484,34 @@
     
       <li>
         
+          <span class="nav__sub-title">Monitor</span>
+        
+
+        
+        <ul>
+          
+            
+            
+
+            
+            
+
+            <li><a href="/users/metrics-in-1.0.0-m1/" class="">Metrics-in-1.0.0-m1</a></li>
+          
+            
+            
+
+            
+            
+
+            <li><a href="/users/metrics-integration-with-prometheus-in-1.0.0-m1/" class="">Metrics-integration-with-prometheus-in-1.0.0-m1</a></li>
+          
+        </ul>
+        
+      </li>
+    
+      <li>
+        
           <span class="nav__sub-title">Deployment</span>
         
 
diff --git a/content/users/use-tls/index.html b/content/users/use-tls/index.html
index 0276759..b7cced6 100644
--- a/content/users/use-tls/index.html
+++ b/content/users/use-tls/index.html
@@ -484,6 +484,34 @@
     
       <li>
         
+          <span class="nav__sub-title">Monitor</span>
+        
+
+        
+        <ul>
+          
+            
+            
+
+            
+            
+
+            <li><a href="/users/metrics-in-1.0.0-m1/" class="">Metrics-in-1.0.0-m1</a></li>
+          
+            
+            
+
+            
+            
+
+            <li><a href="/users/metrics-integration-with-prometheus-in-1.0.0-m1/" class="">Metrics-integration-with-prometheus-in-1.0.0-m1</a></li>
+          
+        </ul>
+        
+      </li>
+    
+      <li>
+        
           <span class="nav__sub-title">Deployment</span>
         
 
diff --git a/content/year-archive/index.html b/content/year-archive/index.html
index cc71d8a..57cd5f6 100644
--- a/content/year-archive/index.html
+++ b/content/year-archive/index.html
@@ -374,6 +374,40 @@
         
           
           
+            <h2 id="2018" class="archive__subtitle">2018</h2>
+            
+          
+          
+
+
+
+<div class="list__item">
+  <article class="archive__item" itemscope itemtype="http://schema.org/CreativeWork">
+    
+    <h2 class="archive__item-title" itemprop="headline">
+      
+        <a href="/docs/howto-upgrade-topzipkin2/" rel="permalink">Howto Upgrade to Zipkin2
+</a>
+      
+    </h2>
+    <p class="archive__item-excerpt" itemprop="description">Changes between v1 and v2 of zipkin and how Java Chassis upgraded to zipkin2
+</p>
+    
+      <p class="page__meta"><i class="fa fa-clock-o" aria-hidden="true"></i> 
+
+
+
+
+  3 minute read
+
+</p>
+    
+  </article>
+</div>
+
+        
+          
+          
             <h2 id="2017" class="archive__subtitle">2017</h2>
             
           
@@ -1073,6 +1107,12 @@
 
 
 
+<!-- If not equal to previous then it must be unique as sorted -->
+
+
+
+
+
 
 <!-- group_items -->
 
@@ -1805,6 +1845,35 @@
     
     <h2 class="archive__item-title" itemprop="headline">
       
+        <a href="/docs/howto-upgrade-topzipkin2/" rel="permalink">Howto Upgrade to Zipkin2
+</a>
+      
+    </h2>
+    <p class="archive__item-excerpt" itemprop="description">Changes between v1 and v2 of zipkin and how Java Chassis upgraded to zipkin2
+</p>
+    
+      <p class="page__meta"><i class="fa fa-clock-o" aria-hidden="true"></i> 
+
+
+
+
+  3 minute read
+
+</p>
+    
+  </article>
+</div>
+
+          
+            
+
+
+
+<div class="list__item">
+  <article class="archive__item" itemscope itemtype="http://schema.org/CreativeWork">
+    
+    <h2 class="archive__item-title" itemprop="headline">
+      
         <a href="/docs/tracing-with-servicecomb/" rel="permalink">Distributed Tracing with ServiceComb and Zipkin
 </a>
       

-- 
To stop receiving notification emails like this one, please contact
"commits@servicecomb.apache.org" <co...@servicecomb.apache.org>.