This is an automated email from the ASF dual-hosted git repository. wusheng pushed a commit to branch feature/ui-protocol in repository https://gitbox.apache.org/repos/asf/incubator-skywalking.git
commit b1f47389b7728c90cfa042293b3318acf6186aa7 Merge: 20973f5 6b42196 Author: 吴晟 Wu Sheng <wu.sh...@foxmail.com> AuthorDate: Sat Dec 30 22:33:08 2017 +0800 Merge branch 'master' into feature/ui-protocol README.md | 7 +- README_ZH.md | 10 +- apm-sniffer/apm-agent-core/pom.xml | 2 +- .../apm/agent/core/logging/api/ILog.java | 2 + .../apm/agent/core/logging/api/NoopLogger.java | 10 +- .../apm/agent/core/logging/core/EasyLogger.java | 6 + .../apm/agent/core/plugin/PluginFinder.java | 3 +- .../core/plugin/match/ProtectiveShieldMatcher.java | 53 ++++ .../mongodb/v3/MongoDBMethodInterceptor.java | 2 +- .../mongodb/v3/MongoDBMethodInterceptorTest.java | 2 +- ...eInterceptor.java => AsyncCallInterceptor.java} | 40 ++- .../apm/plugin/okhttp/v3/EnhanceRequiredInfo.java | 47 ++++ .../apm/plugin/okhttp/v3/EnqueueInterceptor.java | 52 ++-- .../apm/plugin/okhttp/v3/OnFailureInterceptor.java | 6 +- .../plugin/okhttp/v3/OnResponseInterceptor.java | 17 +- .../v3/define/AsyncCallInstrumentation.java} | 38 +-- .../src/main/resources/skywalking-plugin.def | 1 + .../define/FailureCallbackInstrumentation.java | 2 +- .../define/SuccessCallbackInstrumentation.java | 2 +- docs/README.md | 8 +- docs/README_ZH.md | 8 +- docs/cn/Application-toolkit-log4j-1.x-CN.md | 1 - docs/cn/Application-toolkit-log4j-2.x-CN.md | 1 - docs/cn/Application-toolkit-logback-1.x-CN.md | 1 - docs/cn/Application-toolkit-trace-CN.md | 1 - docs/cn/How-to-build-CN.md | 6 +- docs/cn/Plugin-Development-Guide-CN.md | 71 ++--- ...-Process-Propagation-Headers-Protocol-CN-v1.md} | 8 +- ...e-collector-CN.md => Trace-Data-Protocol-CN.md} | 90 ++++--- docs/en/Application-toolkit-log4j-1.x.md | 1 - docs/en/Application-toolkit-log4j-2.x.md | 1 - docs/en/Application-toolkit-logback-1.x.md | 1 - docs/en/Application-toolkit-trace.md | 1 - docs/en/Deploy-skywalking-agent.md | 4 +- docs/en/How-to-build.md | 14 + docs/en/Plugin-Development-Guide.md | 290 +++++++++++++++++++++ ...oss-Process-Propagation-Headers-Protocol-v1.md} | 8 +- travis/push_image.sh | 34 --- 38 files changed, 627 insertions(+), 224 deletions(-) -- To stop receiving notification emails like this one, please contact "commits@skywalking.apache.org" <commits@skywalking.apache.org>.