From 7631c54cdd2d962d338ffa130766671788bca8b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=B4=E6=99=9F=20Wu=20Sheng?= Date: Fri, 28 Jul 2017 16:59:32 +0800 Subject: [PATCH 01/19] Update README.md New readme for 3.2 --- README.md | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 8e3bd8200..8274bb79d 100644 --- a/README.md +++ b/README.md @@ -13,10 +13,9 @@ Sky Walking | [中文](https://github.com/wu-sheng/sky-walking/wiki/sky-walking- [![OpenTracing-1.0 Badge](https://img.shields.io/badge/OpenTracing--1.0-enabled-blue.svg)](http://opentracing.io) -* Auto-instrumentation mechanism, **no need to CHANGE any application source code**. [Supported middlewares, frameworks and libraries](https://github.com/wu-sheng/sky-walking/wiki/3.0-supported-list). -* Explicit-instrumentation, as an [OpenTracing supported tracer](http://opentracing.io/documentation/pages/supported-tracers). -* Pure Java server implementation, with RESTful Web service. -* High performance streaming analysis. +* Auto instrumentation java agent, **no need to CHANGE any application source code**. [Supported middlewares, frameworks and libraries](https://github.com/wu-sheng/sky-walking/wiki/3.0-supported-list). +* Manual instrumentation, as an [OpenTracing supported tracer](http://opentracing.io/documentation/pages/supported-tracers) or using **@Trace** annotation. +* Pure Java server implementation, provide RESTful and gRPC services. Compatibility with other language agents/SDKs by following sky-walking protocol. * The UI released on [wu-sheng/sky-walking-ui](https://github.com/wu-sheng/sky-walking-ui) @@ -47,6 +46,10 @@ This project adheres to the Contributor Covenant [code of conduct](CODE_OF_CONDU - Span detail. +# Test reports +- [Automatic integration test reports](https://github.com/sky-walking/agent-integration-test-report) +- Performance test reports + - [Java Agent test report]() # Document * [WIKI](https://github.com/wu-sheng/sky-walking/wiki) From fdbd07ce3cc2a60f80a6a1cdb82c53c32613148c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=B4=E6=99=9F=20Wu=20Sheng?= Date: Sat, 29 Jul 2017 14:18:10 +0800 Subject: [PATCH 02/19] Update README.md --- README.md | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 8274bb79d..e57685516 100644 --- a/README.md +++ b/README.md @@ -13,9 +13,13 @@ Sky Walking | [中文](https://github.com/wu-sheng/sky-walking/wiki/sky-walking- [![OpenTracing-1.0 Badge](https://img.shields.io/badge/OpenTracing--1.0-enabled-blue.svg)](http://opentracing.io) -* Auto instrumentation java agent, **no need to CHANGE any application source code**. [Supported middlewares, frameworks and libraries](https://github.com/wu-sheng/sky-walking/wiki/3.0-supported-list). -* Manual instrumentation, as an [OpenTracing supported tracer](http://opentracing.io/documentation/pages/supported-tracers) or using **@Trace** annotation. -* Pure Java server implementation, provide RESTful and gRPC services. Compatibility with other language agents/SDKs by following sky-walking protocol. +* Auto instrumentation java agent, **no need to CHANGE any application source code**. + * [Supported middlewares, frameworks and libraries](https://github.com/wu-sheng/sky-walking/wiki/3.0-supported-list). +* Manual instrumentation + * As an [OpenTracing supported tracer](http://opentracing.io/documentation/pages/supported-tracers) + * Use **@Trace** annotation for any methods you want to trace. +* Pure Java server implementation, provide RESTful and gRPC services. Compatibility with other language agents/SDKs. + * [How to uplink metrics and traces to collector?]() * The UI released on [wu-sheng/sky-walking-ui](https://github.com/wu-sheng/sky-walking-ui) @@ -25,7 +29,7 @@ _In chronological order_ * 张鑫 [**PMC Member**] [@ascrutae](https://github.com/ascrutae) * 谭真 [@mircoteam](https://github.com/mircoteam) Advanced R&D Engineers, Creative & Interactive Group. * 徐妍 [@TastySummer](https://github.com/TastySummer) -* 彭勇升 [**PMC Member**] [@pengys5](https://github.com/pengys5) Technical Specialist, OneAPM. +* 彭勇升 [**PMC Member**] [@pengys5](https://github.com/pengys5) * 戴文 * 柏杨 [@bai-yang](https://github.com/bai-yang) Senior Engineer, Alibaba Group. * 陈凤 [@trey03](https://github.com/trey03) From b73426b2ccf98a837c7c4b9c51f4901d000a83b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=B4=E6=99=9F=20Wu=20Sheng?= Date: Wed, 9 Aug 2017 11:36:17 +0800 Subject: [PATCH 03/19] Update README.md --- README.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index e57685516..360cee96b 100644 --- a/README.md +++ b/README.md @@ -13,7 +13,7 @@ Sky Walking | [中文](https://github.com/wu-sheng/sky-walking/wiki/sky-walking- [![OpenTracing-1.0 Badge](https://img.shields.io/badge/OpenTracing--1.0-enabled-blue.svg)](http://opentracing.io) -* Auto instrumentation java agent, **no need to CHANGE any application source code**. +* Auto instrumentation by javaagent, **no need to CHANGE any application source code**. * [Supported middlewares, frameworks and libraries](https://github.com/wu-sheng/sky-walking/wiki/3.0-supported-list). * Manual instrumentation * As an [OpenTracing supported tracer](http://opentracing.io/documentation/pages/supported-tracers) @@ -51,7 +51,8 @@ This project adheres to the Contributor Covenant [code of conduct](CODE_OF_CONDU # Test reports -- [Automatic integration test reports](https://github.com/sky-walking/agent-integration-test-report) +- Automatic integration test reports + - [Java Agent test report](https://github.com/sky-walking/agent-integration-test-report) - Performance test reports - [Java Agent test report]() From 8dae33cc5b01b36987187112cb954fc50c551045 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=B4=E6=99=9F=20Wu=20Sheng?= Date: Wed, 16 Aug 2017 08:35:48 +0800 Subject: [PATCH 04/19] Update README.md --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 360cee96b..74901fc5c 100644 --- a/README.md +++ b/README.md @@ -14,6 +14,7 @@ Sky Walking | [中文](https://github.com/wu-sheng/sky-walking/wiki/sky-walking- * Auto instrumentation by javaagent, **no need to CHANGE any application source code**. + * High performance agent. Only cost 12% (Total:400%) cpu in 4000 tps application. * [Supported middlewares, frameworks and libraries](https://github.com/wu-sheng/sky-walking/wiki/3.0-supported-list). * Manual instrumentation * As an [OpenTracing supported tracer](http://opentracing.io/documentation/pages/supported-tracers) @@ -54,7 +55,7 @@ This project adheres to the Contributor Covenant [code of conduct](CODE_OF_CONDU - Automatic integration test reports - [Java Agent test report](https://github.com/sky-walking/agent-integration-test-report) - Performance test reports - - [Java Agent test report]() + - [Java Agent test report](https://github.com/sky-walking/Agent-Benchmarks#benchmarks) # Document * [WIKI](https://github.com/wu-sheng/sky-walking/wiki) From 0a4a2b43777944de44316d113ac315ef4fa8cc30 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=B4=E6=99=9F=20Wu=20Sheng?= Date: Wed, 16 Aug 2017 10:56:53 +0800 Subject: [PATCH 05/19] Update README.md --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 74901fc5c..54189f545 100644 --- a/README.md +++ b/README.md @@ -13,8 +13,8 @@ Sky Walking | [中文](https://github.com/wu-sheng/sky-walking/wiki/sky-walking- [![OpenTracing-1.0 Badge](https://img.shields.io/badge/OpenTracing--1.0-enabled-blue.svg)](http://opentracing.io) -* Auto instrumentation by javaagent, **no need to CHANGE any application source code**. - * High performance agent. Only cost 12% (Total:400%) cpu in 4000 tps application. +* Auto instrumentation by javaagent, **no need to CHANGE any application source code**. +  * High performance agent. Only cost 12% (Total:400%) cpu in 4000 tps application, [check test reports](#test-reports). * [Supported middlewares, frameworks and libraries](https://github.com/wu-sheng/sky-walking/wiki/3.0-supported-list). * Manual instrumentation * As an [OpenTracing supported tracer](http://opentracing.io/documentation/pages/supported-tracers) From 7158e73be48815177cbb443aea534f87f9c62f51 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=B4=E6=99=9F=20Wu=20Sheng?= Date: Wed, 16 Aug 2017 10:57:16 +0800 Subject: [PATCH 06/19] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 54189f545..755891f5e 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,7 @@ Sky Walking | [中文](https://github.com/wu-sheng/sky-walking/wiki/sky-walking- * Auto instrumentation by javaagent, **no need to CHANGE any application source code**. -  * High performance agent. Only cost 12% (Total:400%) cpu in 4000 tps application, [check test reports](#test-reports). + * High performance agent. Only cost 12% (Total:400%) cpu in 4000 tps application, [check test reports](#test-reports). * [Supported middlewares, frameworks and libraries](https://github.com/wu-sheng/sky-walking/wiki/3.0-supported-list). * Manual instrumentation * As an [OpenTracing supported tracer](http://opentracing.io/documentation/pages/supported-tracers) From 1d5b998d42a9edceee416ce6664245f35094abc0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=B4=E6=99=9F=20Wu=20Sheng?= Date: Wed, 16 Aug 2017 14:49:07 +0800 Subject: [PATCH 07/19] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 755891f5e..d3068c83d 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,7 @@ Sky Walking | [中文](https://github.com/wu-sheng/sky-walking/wiki/sky-walking- * Auto instrumentation by javaagent, **no need to CHANGE any application source code**. - * High performance agent. Only cost 12% (Total:400%) cpu in 4000 tps application, [check test reports](#test-reports). + * High performance agent. Only cost **12%** (Total:400%) cpu in 4000 tps application, even **do not open sampling mechanism**, [check test reports](#test-reports). * [Supported middlewares, frameworks and libraries](https://github.com/wu-sheng/sky-walking/wiki/3.0-supported-list). * Manual instrumentation * As an [OpenTracing supported tracer](http://opentracing.io/documentation/pages/supported-tracers) From bd0ae0b9bf9663b578bc747f5c65b523661830c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=B4=E6=99=9F=20Wu=20Sheng?= Date: Thu, 17 Aug 2017 17:38:19 +0800 Subject: [PATCH 08/19] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index d3068c83d..112c0c92f 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,7 @@ Sky Walking | [中文](https://github.com/wu-sheng/sky-walking/wiki/sky-walking- * Auto instrumentation by javaagent, **no need to CHANGE any application source code**. - * High performance agent. Only cost **12%** (Total:400%) cpu in 4000 tps application, even **do not open sampling mechanism**, [check test reports](#test-reports). + * High performance agent. Only incrase extra **10%** cpu cost in 5000+ tps application, even **do not need open sampling mechanism**, [check test reports](#test-reports). * [Supported middlewares, frameworks and libraries](https://github.com/wu-sheng/sky-walking/wiki/3.0-supported-list). * Manual instrumentation * As an [OpenTracing supported tracer](http://opentracing.io/documentation/pages/supported-tracers) From 48afbd100835f83a9924164182fb0543f47c5ef0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=B4=E6=99=9F=20Wu=20Sheng?= Date: Thu, 17 Aug 2017 17:39:20 +0800 Subject: [PATCH 09/19] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 112c0c92f..837497fa5 100644 --- a/README.md +++ b/README.md @@ -55,7 +55,7 @@ This project adheres to the Contributor Covenant [code of conduct](CODE_OF_CONDU - Automatic integration test reports - [Java Agent test report](https://github.com/sky-walking/agent-integration-test-report) - Performance test reports - - [Java Agent test report](https://github.com/sky-walking/Agent-Benchmarks#benchmarks) + - [Java Agent test report](https://sky-walking.github.io/Agent-Benchmarks/) # Document * [WIKI](https://github.com/wu-sheng/sky-walking/wiki) From 46415d9078163881cd5576ceb61b70e1d6217602 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=B4=E6=99=9F=20Wu=20Sheng?= Date: Mon, 21 Aug 2017 17:51:14 +0800 Subject: [PATCH 10/19] Update README.md --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 837497fa5..c806a88cf 100644 --- a/README.md +++ b/README.md @@ -14,11 +14,12 @@ Sky Walking | [中文](https://github.com/wu-sheng/sky-walking/wiki/sky-walking- * Auto instrumentation by javaagent, **no need to CHANGE any application source code**. - * High performance agent. Only incrase extra **10%** cpu cost in 5000+ tps application, even **do not need open sampling mechanism**, [check test reports](#test-reports). + * High performance agent. Only incrase extra **10%** cpu cost in 5000+ tps application, even **do not need use sampling mechanism**, [check test reports](#test-reports). * [Supported middlewares, frameworks and libraries](https://github.com/wu-sheng/sky-walking/wiki/3.0-supported-list). * Manual instrumentation * As an [OpenTracing supported tracer](http://opentracing.io/documentation/pages/supported-tracers) * Use **@Trace** annotation for any methods you want to trace. +  * Integrate traceId into logs for log4j, log4j2 and logback. * Pure Java server implementation, provide RESTful and gRPC services. Compatibility with other language agents/SDKs. * [How to uplink metrics and traces to collector?]() * The UI released on [wu-sheng/sky-walking-ui](https://github.com/wu-sheng/sky-walking-ui) From 27d4deb764cad3c2d0e3a4a17e5c1bb132a28d67 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=B4=E6=99=9F=20Wu=20Sheng?= Date: Mon, 21 Aug 2017 17:51:35 +0800 Subject: [PATCH 11/19] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index c806a88cf..4bce8211f 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ Sky Walking | [中文](https://github.com/wu-sheng/sky-walking/wiki/sky-walking- * Manual instrumentation * As an [OpenTracing supported tracer](http://opentracing.io/documentation/pages/supported-tracers) * Use **@Trace** annotation for any methods you want to trace. -  * Integrate traceId into logs for log4j, log4j2 and logback. + * Integrate traceId into logs for log4j, log4j2 and logback. * Pure Java server implementation, provide RESTful and gRPC services. Compatibility with other language agents/SDKs. * [How to uplink metrics and traces to collector?]() * The UI released on [wu-sheng/sky-walking-ui](https://github.com/wu-sheng/sky-walking-ui) From dd187a58414ed4adf1db5847d9c4656ccd2a07e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=B4=E6=99=9F=20Wu=20Sheng?= Date: Fri, 25 Aug 2017 10:53:29 +0800 Subject: [PATCH 12/19] Create README_ZH.md --- README_ZH.md | 64 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 64 insertions(+) create mode 100644 README_ZH.md diff --git a/README_ZH.md b/README_ZH.md new file mode 100644 index 000000000..5101f53d7 --- /dev/null +++ b/README_ZH.md @@ -0,0 +1,64 @@ +Sky Walking | [Engligh](README.md) +========== + +Sky Walking logo + +**SkyWalking 3**: 针对分布式系统的APM系统，也被称为分布式追踪系统 + +[![Build Status](https://travis-ci.org/wu-sheng/sky-walking.svg?branch=master)](https://travis-ci.org/wu-sheng/sky-walking) +[![Coverage Status](https://coveralls.io/repos/github/wu-sheng/sky-walking/badge.svg?branch=master&forceUpdate=2)](https://coveralls.io/github/wu-sheng/sky-walking?branch=master) +![license](https://img.shields.io/aur/license/yaourt.svg) +[![codebeat badge](https://codebeat.co/badges/579e4dce-1dc7-4f32-a163-c164eafa1335)](https://codebeat.co/projects/github-com-wu-sheng-sky-walking) +[![Join the chat at https://gitter.im/sky-walking/Lobby](https://badges.gitter.im/sky-walking/Lobby.svg)](https://gitter.im/sky-walking/Lobby?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) +[![OpenTracing-1.0 Badge](https://img.shields.io/badge/OpenTracing--1.0-enabled-blue.svg)](http://opentracing.io) + + +* 自动java探针，**不需要修改应用程序源代码** + * 高性能探针，针对单实例5000tps的应用，在**不需要采样的情况下**，只增加**10%**的CPU开销。 + * [中间件，框架与类库支持列表](https://github.com/wu-sheng/sky-walking/wiki/3.2-supported-list). +* 手动探针 + * [使用OpenTracing手动探针API](http://opentracing.io/documentation/pages/supported-tracers) + * 使用 **@Trace** 标注追踪业务方法 + * 将 traceId 集成到 log4j, log4j2 或 logback这些日志组件中 +* 纯Java后端Collector实现，提供RESTful和gRPC接口。兼容接受其他语言探针发送数据 + * [如何将探针的Metric和Trace数据上传到Collector？]() +* UI工程请查看 [wu-sheng/sky-walking-ui](https://github.com/wu-sheng/sky-walking-ui) +* 中文QQ群：392443393 + + +# Contributors +_按首次加入时间排序_ +* 吴晟 [**PMC Member**] [@wu-sheng](https://github.com/wu-sheng) Principle Engineer, 2012 Lab, Huawei. +* 张鑫 [**PMC Member**] [@ascrutae](https://github.com/ascrutae) +* 谭真 [@mircoteam](https://github.com/mircoteam) Advanced R&D Engineers, Creative & Interactive Group. +* 徐妍 [@TastySummer](https://github.com/TastySummer) +* 彭勇升 [**PMC Member**] [@pengys5](https://github.com/pengys5) +* 戴文 +* 柏杨 [@bai-yang](https://github.com/bai-yang) Senior Engineer, Alibaba Group. +* 陈凤 [@trey03](https://github.com/trey03) +* [其他贡献者](https://github.com/wu-sheng/sky-walking/graphs/contributors) + +This project adheres to the Contributor Covenant [code of conduct](CODE_OF_CONDUCT.md). By participating, you are expected to uphold this code. Please report unacceptable behavior to wu.sheng@foxmail.com. + +# Screenshots +- 追踪基于Spring Cloud的分布式系统，生成的拓扑截图 + + +- 追踪基于 dubbox 和 [motan](https://github.com/weibocom/motan)的分布式系统，生成的拓扑截图 + + +- 调用链查询 + + +- Span信息查询 + + +# Test reports +- 自动化集成测试报告 + - [Java探针测试报告](https://github.com/sky-walking/agent-integration-test-report) +- 性能测试报告 + - [Java探针测试报告](https://sky-walking.github.io/Agent-Benchmarks/) + +# Document +* [WIKI](https://github.com/wu-sheng/sky-walking/wiki) + From 2ac6f1757b6365e9610937e80588f0299cb3fe0a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=B4=E6=99=9F=20Wu=20Sheng?= Date: Fri, 25 Aug 2017 10:53:49 +0800 Subject: [PATCH 13/19] Update README.md --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 4bce8211f..66210ba99 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -Sky Walking | [中文](https://github.com/wu-sheng/sky-walking/wiki/sky-walking-documents-zh-contents) +Sky Walking | [中文](README_ZH.md) ========== Sky Walking logo @@ -15,7 +15,7 @@ Sky Walking | [中文](https://github.com/wu-sheng/sky-walking/wiki/sky-walking- * Auto instrumentation by javaagent, **no need to CHANGE any application source code**. * High performance agent. Only incrase extra **10%** cpu cost in 5000+ tps application, even **do not need use sampling mechanism**, [check test reports](#test-reports). - * [Supported middlewares, frameworks and libraries](https://github.com/wu-sheng/sky-walking/wiki/3.0-supported-list). + * [Supported middlewares, frameworks and libraries](https://github.com/wu-sheng/sky-walking/wiki/3.2-supported-list). * Manual instrumentation * As an [OpenTracing supported tracer](http://opentracing.io/documentation/pages/supported-tracers) * Use **@Trace** annotation for any methods you want to trace. From 0018fe8ac24cede7bdb166f6eb8ec5db8d0d119c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=B4=E6=99=9F=20Wu=20Sheng?= Date: Mon, 4 Sep 2017 09:45:44 +0800 Subject: [PATCH 14/19] Update README.md --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 66210ba99..eddcb2d6e 100644 --- a/README.md +++ b/README.md @@ -14,12 +14,12 @@ Sky Walking | [中文](README_ZH.md) * Auto instrumentation by javaagent, **no need to CHANGE any application source code**. - * High performance agent. Only incrase extra **10%** cpu cost in 5000+ tps application, even **do not need use sampling mechanism**, [check test reports](#test-reports). + * High performance agent. Only increase extra **10%** cpu cost in 5000+ tps application, even **do not need to use sampling mechanism**, [check test reports](#test-reports). * [Supported middlewares, frameworks and libraries](https://github.com/wu-sheng/sky-walking/wiki/3.2-supported-list). * Manual instrumentation * As an [OpenTracing supported tracer](http://opentracing.io/documentation/pages/supported-tracers) * Use **@Trace** annotation for any methods you want to trace. - * Integrate traceId into logs for log4j, log4j2 and logback. + * Integrate traceId, spanId into logs for log4j, log4j2 and logback. * Pure Java server implementation, provide RESTful and gRPC services. Compatibility with other language agents/SDKs. * [How to uplink metrics and traces to collector?]() * The UI released on [wu-sheng/sky-walking-ui](https://github.com/wu-sheng/sky-walking-ui) From 3c79bfd9c25104018044af036f057547a6403a67 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=B4=E6=99=9F=20Wu=20Sheng?= Date: Mon, 4 Sep 2017 09:46:24 +0800 Subject: [PATCH 15/19] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index eddcb2d6e..1fec63eec 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ Sky Walking | [中文](README_ZH.md) * Manual instrumentation * As an [OpenTracing supported tracer](http://opentracing.io/documentation/pages/supported-tracers) * Use **@Trace** annotation for any methods you want to trace. - * Integrate traceId, spanId into logs for log4j, log4j2 and logback. + * Integrate traceId into logs for log4j, log4j2 and logback. * Pure Java server implementation, provide RESTful and gRPC services. Compatibility with other language agents/SDKs. * [How to uplink metrics and traces to collector?]() * The UI released on [wu-sheng/sky-walking-ui](https://github.com/wu-sheng/sky-walking-ui) From 0a49d9892ea56f8c0be206b2464c907e5bb5237f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=B4=E6=99=9F=20Wu=20Sheng?= Date: Mon, 4 Sep 2017 11:39:30 +0800 Subject: [PATCH 16/19] Update README_ZH.md --- README_ZH.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README_ZH.md b/README_ZH.md index 5101f53d7..e7ce7f19f 100644 --- a/README_ZH.md +++ b/README_ZH.md @@ -10,7 +10,7 @@ Sky Walking | [Engligh](README.md) ![license](https://img.shields.io/aur/license/yaourt.svg) [![codebeat badge](https://codebeat.co/badges/579e4dce-1dc7-4f32-a163-c164eafa1335)](https://codebeat.co/projects/github-com-wu-sheng-sky-walking) [![Join the chat at https://gitter.im/sky-walking/Lobby](https://badges.gitter.im/sky-walking/Lobby.svg)](https://gitter.im/sky-walking/Lobby?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) -[![OpenTracing-1.0 Badge](https://img.shields.io/badge/OpenTracing--1.0-enabled-blue.svg)](http://opentracing.io) +[![OpenTracing-1.x Badge](https://img.shields.io/badge/OpenTracing--1.x-enabled-blue.svg)](http://opentracing.io) * 自动java探针，**不需要修改应用程序源代码** From 0808b57144691e0a004bc3e6381c584073076dfd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=B4=E6=99=9F=20Wu=20Sheng?= Date: Mon, 4 Sep 2017 11:39:33 +0800 Subject: [PATCH 17/19] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 1fec63eec..316a70d04 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ Sky Walking | [中文](README_ZH.md) ![license](https://img.shields.io/aur/license/yaourt.svg) [![codebeat badge](https://codebeat.co/badges/579e4dce-1dc7-4f32-a163-c164eafa1335)](https://codebeat.co/projects/github-com-wu-sheng-sky-walking) [![Join the chat at https://gitter.im/sky-walking/Lobby](https://badges.gitter.im/sky-walking/Lobby.svg)](https://gitter.im/sky-walking/Lobby?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) -[![OpenTracing-1.0 Badge](https://img.shields.io/badge/OpenTracing--1.0-enabled-blue.svg)](http://opentracing.io) +[![OpenTracing-1.x Badge](https://img.shields.io/badge/OpenTracing--1.x-enabled-blue.svg)](http://opentracing.io) * Auto instrumentation by javaagent, **no need to CHANGE any application source code**. From 5d5440b02b6a5fb9ef895a9549d4572cf20517c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=B4=E6=99=9F=20Wu=20Sheng?= Date: Mon, 4 Sep 2017 22:10:53 +0800 Subject: [PATCH 18/19] Update README.md --- README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.md b/README.md index 316a70d04..1a5daa09b 100644 --- a/README.md +++ b/README.md @@ -39,6 +39,10 @@ _In chronological order_ This project adheres to the Contributor Covenant [code of conduct](CODE_OF_CONDUCT.md). By participating, you are expected to uphold this code. Please report unacceptable behavior to wu.sheng@foxmail.com. +# Architecture +* Architecture graph for 3.2+ + + # Screenshots - Topological graph of application clusters based on Spring Cloud. From c410fc598eba48659cf0dec46234dbc1507d88ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=B4=E6=99=9F=20Wu=20Sheng?= Date: Mon, 4 Sep 2017 22:11:26 +0800 Subject: [PATCH 19/19] Update README_ZH.md --- README_ZH.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/README_ZH.md b/README_ZH.md index e7ce7f19f..a230519c0 100644 --- a/README_ZH.md +++ b/README_ZH.md @@ -40,6 +40,11 @@ _按首次加入时间排序_ This project adheres to the Contributor Covenant [code of conduct](CODE_OF_CONDUCT.md). By participating, you are expected to uphold this code. Please report unacceptable behavior to wu.sheng@foxmail.com. + +# Architecture +* 3.2+版本架构图 + + # Screenshots - 追踪基于Spring Cloud的分布式系统，生成的拓扑截图