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:52 UTC
[incubator-skywalking] branch DISCLAIMER updated (b81fc91 ->
7e3f412)
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a change to branch DISCLAIMER
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking.git.
from b81fc91 Create DISCLAIMER
add fc431d3 Missing change about boolean to integer.
add bd32554 Merge branch 'master' into fixed/storage_bug
add b04b06a Fixed the id auto increment bug, when there is just one record that id = -1, the expected value is 1, but actual return -1.
add adceb77 Merge branch 'master' into fixed/id_increment_bug
add fa9f7e4 Merge pull request #754 from peng-yongsheng/fixed/id_increment_bug
add 05efadc Merge branch 'master' into fixed/storage_bug
add b8d66bd Merge pull request #755 from peng-yongsheng/fixed/storage_bug
add c5bedc5 New badges about github stars and twitter followers.
add 7a8afc5 Change layout.
add bcffa44 Update badges.
add 3f59c05 Merge pull request #756 from apache/document/star-twitter
add c8ca51a [Agent] Provide plugins for Apache httpcomponent AsyncClient 4.1 #588
add d730e17 Make the nodes of Topology nullable. And elements in it are not null.
add 06b9f5f 1. Add set/get `DataTTLConfigs` and set/get `AlarmThreshold` mutation service. 2. All empty arrays are represented by `[]`, not `null`. 3. Add Mutation type, represents for all modification operations. 4. Support **Pagination** in some query. 5. Seperate alarm into to title and content
add e7a5fd6 no message
add b2706cf Make the user node as an extend of Node, rather then an attribute of ApplicationNode.
add 50e0985 add constant values
add eaef6f1 Fix a compile issue
add 225903a Fix missing parts.
add 41d7b5c Add a query service
add 8f260f8 Update trace type.
add ca22483 Merge branch 'master' into fix/graphql/node-nullable
add 691fb78 Add `isAlarm` for ApplicationNode.
add 315a6f0 Merge branch 'master' into fix/graphql/node-nullable
add ab38da5 Merge pull request #732 from apache/fix/graphql/node-nullable
add f58ecdb Merge remote-tracking branch 'upstream/master' into develop
add 4a0a210 Modify ComponentsDefine.java
add b525e1e Lowercase the IPv4 and IPv6 attributes, because of there have a java style check that regulate the first letter must be lowercase.
add 4f2c781 Merge branch 'master' into feature/graphql
add ba9c5af Merge pull request #757 from peng-yongsheng/feature/graphql
add bcac37b Merge branch 'master' into develop
add aeb0478 [Agent] Add Topic and Borker tags
add 6b7a429 Merge pull request #759 from ascrutae/mq-tags
add fcc3aa7 Merge branch 'master' into develop
add 50b1d05 Merge pull request #758 from lytscu/develop
add b482463 Add parentSpanId for Span
add dfa88e2 Merge pull request #760 from apache/fix/graphql-parentSpanId
add b4ceba6 Add new GitHub template
add dcd7460 Merge pull request #761 from apache/new-templete
new 7e3f412 Merge branch 'master' into DISCLAIMER
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.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 +
.../pom.xml | 30 +-
.../httpasyncclient/v4/ConnectIterceptor.java} | 121 +++----
.../v4/DefaultConnectingIOReactorIterceptor.java} | 126 ++++----
.../v4/HttpAsyncResponseConsumerInterceptor.java} | 131 ++++----
.../httpasyncclient/v4/HttpHostInterceptor.java} | 131 ++++----
.../v4/ProcessResponseInterceptor.java} | 125 ++++----
.../v4/SessionRequestImplIterceptor.java} | 101 +++---
.../v4/SetResponseInterceptor.java} | 122 +++----
.../httpasyncclient/v4/StateInterceptor.java} | 181 +++++------
.../httpasyncclient/v4/SuccessInterceptor.java} | 120 +++----
.../AbstractNIOConnPoolInstrumentation.java} | 156 +++++----
...DefaultConnectingIOReactorInstrumentation.java} | 179 ++++++-----
.../v4/define/ExecuteInstrumentation.java} | 180 ++++++-----
.../v4/define/ProcessResponseInstrumentation.java} | 154 +++++----
.../define/SessionRequestImplInstrumentation.java} | 148 ++++-----
.../v4/define/StateInstrumentation.java} | 180 ++++++-----
.../src/main/resources/skywalking-plugin.def | 8 +
.../httpasyncclient/v4/StateInterceptorTest.java} | 110 +++----
.../plugin/httpasyncclient/v4/TestException.java} | 353 ++++++++++-----------
apm-sniffer/apm-sdk-plugin/pom.xml | 1 +
.../plugin/rocketMQ/v4/MessageSendInterceptor.java | 7 +-
.../rocketMQ/v4/MessageSendInterceptorTest.java | 6 +-
41 files changed, 1531 insertions(+), 1438 deletions(-)
create mode 100644 .github/PULL_REQUEST_TEMPLATE
copy apm-collector/apm-collector-analysis/analysis-register/register-provider/src/{main/java/org/apache/skywalking/apm/collector/analysis/register/provider/register/IdAutoIncrement.java => test/java/org/apache/skywalking/apm/collector/analysis/register/provider/register/IdAutoIncrementTestCase.java} (60%)
create mode 100644 apm-protocol/apm-ui-protocol/src/main/resources/ui-graphql/config.graphqls
copy apm-sniffer/apm-sdk-plugin/{resin-3.x-plugin => httpasyncclient-4.x-plugin}/pom.xml (74%)
copy apm-sniffer/apm-sdk-plugin/{jedis-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jedis/v2/JedisMethodInterceptor.java => httpasyncclient-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/httpasyncclient/v4/ConnectIterceptor.java} (65%)
copy apm-sniffer/apm-sdk-plugin/{xmemcached-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/xmemcached/v2/XMemcachedMethodInterceptor.java => httpasyncclient-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/httpasyncclient/v4/DefaultConnectingIOReactorIterceptor.java} (65%)
copy apm-sniffer/apm-sdk-plugin/{xmemcached-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/xmemcached/v2/XMemcachedMethodInterceptor.java => httpasyncclient-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/httpasyncclient/v4/HttpAsyncResponseConsumerInterceptor.java} (65%)
copy apm-sniffer/apm-sdk-plugin/{xmemcached-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/xmemcached/v2/XMemcachedMethodInterceptor.java => httpasyncclient-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/httpasyncclient/v4/HttpHostInterceptor.java} (68%)
copy apm-sniffer/apm-sdk-plugin/{jedis-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jedis/v2/JedisMethodInterceptor.java => httpasyncclient-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/httpasyncclient/v4/ProcessResponseInterceptor.java} (68%)
copy apm-sniffer/{apm-toolkit-activation/apm-toolkit-opentracing-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/opentracing/continuation/ActivateInterceptor.java => apm-sdk-plugin/httpasyncclient-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/httpasyncclient/v4/SessionRequestImplIterceptor.java} (74%)
copy apm-sniffer/apm-sdk-plugin/{jedis-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jedis/v2/JedisMethodInterceptor.java => httpasyncclient-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/httpasyncclient/v4/SetResponseInterceptor.java} (71%)
copy apm-sniffer/apm-sdk-plugin/{httpClient-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/httpClient/v4/HttpClientExecuteInterceptor.java => httpasyncclient-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/httpasyncclient/v4/StateInterceptor.java} (67%)
copy apm-sniffer/apm-sdk-plugin/{jedis-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jedis/v2/JedisMethodInterceptor.java => httpasyncclient-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/httpasyncclient/v4/SuccessInterceptor.java} (67%)
copy apm-sniffer/apm-sdk-plugin/{resin-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/resin/v4/define/ResinV4Instrumentation.java => httpasyncclient-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/httpasyncclient/v4/define/AbstractNIOConnPoolInstrumentation.java} (69%)
copy apm-sniffer/apm-sdk-plugin/{spring-plugins/concurrent-util-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/concurrent/define/ListenableFutureCallbackInstrumentation.java => httpasyncclient-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/httpasyncclient/v4/define/DefaultConnectingIOReactorInstrumentation.java} (67%)
copy apm-sniffer/apm-sdk-plugin/{spring-plugins/concurrent-util-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/concurrent/define/ListenableFutureCallbackInstrumentation.java => httpasyncclient-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/httpasyncclient/v4/define/ExecuteInstrumentation.java} (61%)
copy apm-sniffer/apm-sdk-plugin/{resin-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/resin/v4/define/ResinV4Instrumentation.java => httpasyncclient-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/httpasyncclient/v4/define/ProcessResponseInstrumentation.java} (69%)
copy apm-sniffer/apm-sdk-plugin/{dubbo-plugin/src/main/java/org/apache/skywalking/apm/plugin/dubbo/DubboInstrumentation.java => httpasyncclient-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/httpasyncclient/v4/define/SessionRequestImplInstrumentation.java} (72%)
copy apm-sniffer/apm-sdk-plugin/{spring-plugins/concurrent-util-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/concurrent/define/ListenableFutureCallbackInstrumentation.java => httpasyncclient-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/httpasyncclient/v4/define/StateInstrumentation.java} (67%)
create mode 100644 apm-sniffer/apm-sdk-plugin/httpasyncclient-4.x-plugin/src/main/resources/skywalking-plugin.def
copy apm-sniffer/apm-sdk-plugin/{httpClient-4.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/httpClient/v4/HttpClientExecuteInterceptorTest.java => httpasyncclient-4.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/httpasyncclient/v4/StateInterceptorTest.java} (63%)
copy apm-sniffer/apm-sdk-plugin/{httpClient-4.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/httpClient/v4/HttpClientExecuteInterceptorTest.java => httpasyncclient-4.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/httpasyncclient/v4/TestException.java} (61%)
--
To stop receiving notification emails like this one, please contact
['"commits@skywalking.apache.org" <co...@skywalking.apache.org>'].
[incubator-skywalking] 01/01: Merge branch 'master' into DISCLAIMER
Posted by wu...@apache.org.
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>.