You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@skywalking.apache.org by wu...@apache.org on 2018/01/16 12:54:53 UTC
[incubator-skywalking] 01/01: Merge branch 'master' into DISCLAIMER
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch DISCLAIMER
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking.git
commit 7e3f41200cff798a9737589a4a8b6b5e91b35b36
Merge: b81fc91 dcd7460
Author: 吴晟 Wu Sheng <wu...@foxmail.com>
AuthorDate: Tue Jan 16 20:54:48 2018 +0800
Merge branch 'master' into DISCLAIMER
.github/ISSUE_TEMPLATE | 26 +--
.github/PULL_REQUEST_TEMPLATE | 18 +++
README.md | 4 +-
README_ZH.md | 4 +-
.../worker/segment/SegmentCostSpanListener.java | 3 +-
.../provider/register/IdAutoIncrement.java | 18 ++-
.../register/IdAutoIncrementTestCase.java} | 38 +++--
.../storage/table/segment/SegmentCost.java | 9 +-
.../network/trace/component/ComponentsDefine.java | 4 +-
.../src/main/resources/ui-graphql/alarm.graphqls | 17 +-
.../ui-graphql/application-layer.graphqls | 16 +-
.../src/main/resources/ui-graphql/common.graphqls | 30 +++-
.../src/main/resources/ui-graphql/config.graphqls | 38 +++++
.../resources/ui-graphql/overview-layer.graphqls | 6 +-
.../resources/ui-graphql/server-layer.graphqls | 21 +--
.../resources/ui-graphql/service-layer.graphqls | 2 +-
.../src/main/resources/ui-graphql/trace.graphqls | 34 ++--
.../apm/ui/protocol/GraphQLScriptTest.java | 1 +
.../apm/agent/core/context/tag/Tags.java | 10 ++
.../httpasyncclient-4.x-plugin/pom.xml | 71 ++++++++
.../httpasyncclient/v4/ConnectIterceptor.java | 62 +++++++
.../v4/DefaultConnectingIOReactorIterceptor.java | 61 +++++++
.../v4/HttpAsyncResponseConsumerInterceptor.java | 66 ++++++++
.../httpasyncclient/v4/HttpHostInterceptor.java | 66 ++++++++
.../v4/ProcessResponseInterceptor.java | 66 ++++++++
.../v4/SessionRequestImplIterceptor.java | 54 +++++++
.../httpasyncclient/v4/SetResponseInterceptor.java | 63 ++++++++
.../httpasyncclient/v4/StateInterceptor.java | 84 ++++++++++
.../httpasyncclient/v4/SuccessInterceptor.java | 61 +++++++
.../define/AbstractNIOConnPoolInstrumentation.java | 76 +++++++++
.../DefaultConnectingIOReactorInstrumentation.java | 91 +++++++++++
.../v4/define/ExecuteInstrumentation.java | 92 +++++++++++
.../v4/define/ProcessResponseInstrumentation.java | 74 +++++++++
.../define/SessionRequestImplInstrumentation.java | 74 +++++++++
.../v4/define/StateInstrumentation.java | 92 +++++++++++
.../src/main/resources/skywalking-plugin.def | 8 +
.../httpasyncclient/v4/StateInterceptorTest.java | 179 +++++++++++++++++++++
.../plugin/httpasyncclient/v4/TestException.java | 160 ++++++++++++++++++
apm-sniffer/apm-sdk-plugin/pom.xml | 1 +
.../plugin/rocketMQ/v4/MessageSendInterceptor.java | 7 +-
.../rocketMQ/v4/MessageSendInterceptorTest.java | 6 +-
41 files changed, 1720 insertions(+), 93 deletions(-)
--
To stop receiving notification emails like this one, please contact
"commits@skywalking.apache.org" <co...@skywalking.apache.org>.