You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@skywalking.apache.org by pe...@apache.org on 2018/03/18 16:24:35 UTC
[incubator-skywalking] branch asf/5.0-alpha/release updated
(528e94f -> 7f48643)
This is an automated email from the ASF dual-hosted git repository.
pengys pushed a change to branch asf/5.0-alpha/release
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking.git.
from 528e94f Merge branches 'asf/5.0-alpha/release' and 'asf/5.0-alpha/release' of https://github.com/apache/incubator-skywalking into asf/5.0-alpha/release
add 0826761 Prepare beta iteratoration (#944)
add af16ece [Agent] fix trace can't finished when the StatusLine isn't set (#945)
add cf98cbb Remove some description (#946)
add 5bf79f3 Rename location (#953)
add 41f41d1 Support zk namespace (#955)
add e9147a6 remove repotoken (#957)
new 7f48643 Merge branch 'master' into asf/5.0-alpha/release
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:
README.md | 4 ++--
README_ZH.md | 4 ++--
.../apm-toolkit-log4j-1.x/pom.xml | 6 ++---
.../apm-toolkit-log4j-2.x/pom.xml | 6 ++---
.../apm-toolkit-logback-1.x/pom.xml | 6 ++---
.../apm-toolkit-opentracing/pom.xml | 6 ++---
apm-application-toolkit/apm-toolkit-trace/pom.xml | 6 ++---
apm-application-toolkit/pom.xml | 5 ++---
apm-checkstyle/pom.xml | 6 ++---
.../agent-grpc/agent-grpc-define/pom.xml | 6 ++---
.../agent-grpc/agent-grpc-provider/pom.xml | 6 ++---
.../apm-collector-agent/agent-grpc/pom.xml | 6 ++---
.../agent-jetty/agent-jetty-define/pom.xml | 6 ++---
.../agent-jetty/agent-jetty-provider/pom.xml | 6 ++---
.../apm-collector-agent/agent-jetty/pom.xml | 6 ++---
apm-collector/apm-collector-agent/pom.xml | 6 ++---
.../analysis-alarm/alarm-define/pom.xml | 6 ++---
.../analysis-alarm/alarm-provider/pom.xml | 6 ++---
.../apm-collector-analysis/analysis-alarm/pom.xml | 6 ++---
.../baseline-computing-define/pom.xml | 6 ++---
.../baseline-computing-provider/pom.xml | 6 ++---
.../analysis-baseline/pom.xml | 6 ++---
.../analysis-jvm/jvm-define/pom.xml | 6 ++---
.../analysis-jvm/jvm-provider/pom.xml | 6 ++---
.../apm-collector-analysis/analysis-jvm/pom.xml | 6 ++---
.../analysis-metric/metric-define/pom.xml | 6 ++---
.../analysis-metric/metric-provider/pom.xml | 6 ++---
.../apm-collector-analysis/analysis-metric/pom.xml | 6 ++---
.../analysis-register/pom.xml | 6 ++---
.../analysis-register/register-define/pom.xml | 6 ++---
.../analysis-register/register-provider/pom.xml | 6 ++---
.../analysis-segment-parser/pom.xml | 6 ++---
.../segment-parser-define/pom.xml | 6 ++---
.../segment-parser-provider/pom.xml | 6 ++---
.../analysis-worker-model/pom.xml | 8 +++----
apm-collector/apm-collector-analysis/pom.xml | 6 ++---
apm-collector/apm-collector-boot/pom.xml | 6 ++---
.../collector-cache-define/pom.xml | 6 ++---
.../collector-cache-guava-provider/pom.xml | 6 ++---
apm-collector/apm-collector-cache/pom.xml | 6 ++---
.../collector-cluster-define/pom.xml | 6 ++---
.../apm/collector/cluster/DataMonitor.java | 4 ++--
.../collector-cluster-redis-provider/pom.xml | 6 ++---
.../collector-cluster-standalone-provider/pom.xml | 6 ++---
.../standalone/ClusterStandaloneDataMonitor.java | 10 ++++++---
.../collector-cluster-zookeeper-provider/pom.xml | 11 +++++----
.../zookeeper/ClusterModuleZookeeperProvider.java | 12 +++++-----
.../cluster/zookeeper/ClusterZKDataMonitor.java | 26 ++++++++++++++--------
apm-collector/apm-collector-cluster/pom.xml | 6 ++---
.../client-component/pom.xml | 6 ++---
apm-collector/apm-collector-component/pom.xml | 6 ++---
.../server-component/pom.xml | 6 ++---
.../collector-configuration-define/pom.xml | 6 ++---
.../configuration/ConfigurationModule.java | 2 ++
...eAlarmRuleConfig.java => ICollectorConfig.java} | 15 +++++--------
.../collector-configuration-provider/pom.xml | 6 ++---
.../configuration/ConfigurationModuleProvider.java | 6 ++++-
.../service/CollectorConfigService.java} | 18 +++++++--------
apm-collector/apm-collector-configuration/pom.xml | 6 ++---
apm-collector/apm-collector-core/pom.xml | 6 ++---
.../collector-grpc-manager-define/pom.xml | 6 ++---
.../collector-grpc-manager-provider/pom.xml | 6 ++---
apm-collector/apm-collector-grpc-manager/pom.xml | 6 ++---
apm-collector/apm-collector-instrument/pom.xml | 6 ++---
.../collector-jetty-manager-define/pom.xml | 6 ++---
.../collector-jetty-manager-provider/pom.xml | 6 ++---
apm-collector/apm-collector-jetty-manager/pom.xml | 6 ++---
.../collector-naming-define/pom.xml | 6 ++---
.../collector-naming-jetty-provider/pom.xml | 6 ++---
apm-collector/apm-collector-naming/pom.xml | 6 ++---
.../collector-remote-define/pom.xml | 6 ++---
.../collector-remote-grpc-provider/pom.xml | 6 ++---
.../collector-remote-kafka-provider/pom.xml | 6 ++---
apm-collector/apm-collector-remote/pom.xml | 6 ++---
.../collector-storage-define/pom.xml | 6 ++---
.../collector-storage-es-provider/pom.xml | 6 ++---
.../collector-storage-h2-provider/pom.xml | 6 ++---
apm-collector/apm-collector-storage/pom.xml | 6 ++---
.../apm-collector-ui/collector-ui-define/pom.xml | 6 ++---
.../apm-collector-ui/collector-ui-graphql/pom.xml | 6 ++---
.../collector-ui-jetty-provider/pom.xml | 6 ++---
apm-collector/apm-collector-ui/pom.xml | 6 ++---
apm-collector/pom.xml | 6 ++---
apm-commons/apm-datacarrier/pom.xml | 6 ++---
apm-commons/apm-util/pom.xml | 5 ++---
apm-commons/pom.xml | 5 ++---
apm-dist/pom.xml | 2 +-
apm-protocol/apm-network/pom.xml | 6 ++---
apm-protocol/apm-ui-protocol/pom.xml | 6 ++---
apm-protocol/pom.xml | 6 ++---
apm-sniffer/apm-agent-core/pom.xml | 10 ++++-----
apm-sniffer/apm-agent/pom.xml | 20 +++++++----------
apm-sniffer/apm-sdk-plugin/dubbo-plugin/pom.xml | 5 ++---
.../apm-sdk-plugin/elastic-job-2.x-plugin/pom.xml | 6 ++---
.../feign-default-http-9.x-plugin/pom.xml | 6 ++---
apm-sniffer/apm-sdk-plugin/grpc-1.x-plugin/pom.xml | 6 ++---
apm-sniffer/apm-sdk-plugin/h2-1.x-plugin/pom.xml | 5 ++---
.../apm-sdk-plugin/httpClient-4.x-plugin/pom.xml | 6 ++---
.../v4/HttpClientExecuteInterceptor.java | 15 ++++++++-----
.../httpasyncclient-4.x-plugin/pom.xml | 6 ++---
.../apm-sdk-plugin/hystrix-1.x-plugin/pom.xml | 2 +-
apm-sniffer/apm-sdk-plugin/jdbc-commons/pom.xml | 5 ++---
.../apm-sdk-plugin/jedis-2.x-plugin/pom.xml | 6 ++---
.../jetty-plugin/jetty-client-9.0-plugin/pom.xml | 5 ++---
.../jetty-plugin/jetty-client-9.x-plugin/pom.xml | 5 ++---
.../jetty-plugin/jetty-server-9.x-plugin/pom.xml | 5 ++---
apm-sniffer/apm-sdk-plugin/jetty-plugin/pom.xml | 5 ++---
apm-sniffer/apm-sdk-plugin/kafka-v1-plugin/pom.xml | 6 ++---
.../apm-sdk-plugin/mongodb-2.x-plugin/pom.xml | 6 ++---
.../apm-sdk-plugin/mongodb-3.x-plugin/pom.xml | 5 ++---
apm-sniffer/apm-sdk-plugin/motan-plugin/pom.xml | 5 ++---
.../apm-sdk-plugin/mysql-5.x-plugin/pom.xml | 5 ++---
.../nutz-plugins/http-1.x-plugin/pom.xml | 5 ++---
.../nutz-plugins/mvc-annotation-1.x-plugin/pom.xml | 5 ++---
apm-sniffer/apm-sdk-plugin/nutz-plugins/pom.xml | 5 ++---
.../apm-sdk-plugin/okhttp-3.x-plugin/pom.xml | 6 ++---
apm-sniffer/apm-sdk-plugin/pom.xml | 20 ++++++-----------
.../apm-sdk-plugin/postgresql-8.x-plugin/pom.xml | 5 ++---
.../apm-sdk-plugin/rocketMQ-3.x-plugin/pom.xml | 6 ++---
.../apm-sdk-plugin/rocketMQ-4.x-plugin/pom.xml | 6 ++---
.../apm-sdk-plugin/servicecomb-plugin/pom.xml | 2 +-
.../servicecomb-java-chassis-0.x-plugin/pom.xml | 2 +-
.../sharding-jdbc-1.5.x-plugin/pom.xml | 6 ++---
.../concurrent-util-4.x-plugin/pom.xml | 5 ++---
.../spring-plugins/core-patch/pom.xml | 6 ++---
.../mvc-annotation-3.x-plugin/pom.xml | 5 ++---
.../mvc-annotation-4.x-plugin/pom.xml | 5 ++---
.../spring-plugins/mvc-annotation-commons/pom.xml | 5 ++---
apm-sniffer/apm-sdk-plugin/spring-plugins/pom.xml | 5 ++---
.../spring-plugins/resttemplate-4.x-plugin/pom.xml | 5 ++---
.../spring-cloud/netflix-plugins/pom.xml | 5 ++---
.../spring-cloud-feign-1.x-plugin/pom.xml | 5 ++---
.../spring-plugins/spring-cloud/pom.xml | 5 ++---
.../apm-sdk-plugin/spymemcached-2.x-plugin/pom.xml | 6 ++---
.../apm-sdk-plugin/struts2-2.x-plugin/pom.xml | 5 ++---
.../apm-sdk-plugin/tomcat-7.x-8.x-plugin/pom.xml | 5 ++---
.../apm-sdk-plugin/xmemcached-2.x-plugin/pom.xml | 6 ++---
apm-sniffer/apm-test-tools/pom.xml | 5 ++---
.../apm-toolkit-log4j-1.x-activation/pom.xml | 6 ++---
.../apm-toolkit-log4j-2.x-activation/pom.xml | 6 ++---
.../apm-toolkit-logback-1.x-activation/pom.xml | 6 ++---
.../apm-toolkit-opentracing-activation/pom.xml | 6 ++---
.../apm-toolkit-trace-activation/pom.xml | 6 ++---
apm-sniffer/apm-toolkit-activation/pom.xml | 16 +++++--------
.../optional-spring-plugins/pom.xml | 6 ++---
.../spring-annotation-plugin/pom.xml | 6 ++---
apm-sniffer/optional-plugins/pom.xml | 19 +++++-----------
apm-sniffer/pom.xml | 6 ++---
apm-webapp/pom.xml | 2 +-
pom.xml | 6 ++---
150 files changed, 368 insertions(+), 595 deletions(-)
copy apm-collector/apm-collector-configuration/collector-configuration-define/src/main/java/org/apache/skywalking/apm/collector/configuration/service/{IServiceAlarmRuleConfig.java => ICollectorConfig.java} (78%)
copy apm-collector/apm-collector-configuration/{collector-configuration-define/src/main/java/org/apache/skywalking/apm/collector/configuration/service/IServiceAlarmRuleConfig.java => collector-configuration-provider/src/main/java/org/apache/skywalking/apm/collector/configuration/service/CollectorConfigService.java} (73%)
--
To stop receiving notification emails like this one, please contact
pengys@apache.org.
[incubator-skywalking] 01/01: Merge branch 'master' into
asf/5.0-alpha/release
Posted by pe...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
pengys pushed a commit to branch asf/5.0-alpha/release
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking.git
commit 7f48643264614825e298c85e661848638b1f3e03
Merge: 528e94f e9147a6
Author: 彭勇升 pengys <80...@qq.com>
AuthorDate: Mon Mar 19 00:24:31 2018 +0800
Merge branch 'master' into asf/5.0-alpha/release
README.md | 4 ++--
README_ZH.md | 4 ++--
.../apm-toolkit-log4j-1.x/pom.xml | 6 ++---
.../apm-toolkit-log4j-2.x/pom.xml | 6 ++---
.../apm-toolkit-logback-1.x/pom.xml | 6 ++---
.../apm-toolkit-opentracing/pom.xml | 6 ++---
apm-application-toolkit/apm-toolkit-trace/pom.xml | 6 ++---
apm-application-toolkit/pom.xml | 5 ++--
apm-checkstyle/pom.xml | 6 ++---
.../agent-grpc/agent-grpc-define/pom.xml | 6 ++---
.../agent-grpc/agent-grpc-provider/pom.xml | 6 ++---
.../apm-collector-agent/agent-grpc/pom.xml | 6 ++---
.../agent-jetty/agent-jetty-define/pom.xml | 6 ++---
.../agent-jetty/agent-jetty-provider/pom.xml | 6 ++---
.../apm-collector-agent/agent-jetty/pom.xml | 6 ++---
apm-collector/apm-collector-agent/pom.xml | 6 ++---
.../analysis-alarm/alarm-define/pom.xml | 6 ++---
.../analysis-alarm/alarm-provider/pom.xml | 6 ++---
.../apm-collector-analysis/analysis-alarm/pom.xml | 6 ++---
.../baseline-computing-define/pom.xml | 6 ++---
.../baseline-computing-provider/pom.xml | 6 ++---
.../analysis-baseline/pom.xml | 6 ++---
.../analysis-jvm/jvm-define/pom.xml | 6 ++---
.../analysis-jvm/jvm-provider/pom.xml | 6 ++---
.../apm-collector-analysis/analysis-jvm/pom.xml | 6 ++---
.../analysis-metric/metric-define/pom.xml | 6 ++---
.../analysis-metric/metric-provider/pom.xml | 6 ++---
.../apm-collector-analysis/analysis-metric/pom.xml | 6 ++---
.../analysis-register/pom.xml | 6 ++---
.../analysis-register/register-define/pom.xml | 6 ++---
.../analysis-register/register-provider/pom.xml | 6 ++---
.../analysis-segment-parser/pom.xml | 6 ++---
.../segment-parser-define/pom.xml | 6 ++---
.../segment-parser-provider/pom.xml | 6 ++---
.../analysis-worker-model/pom.xml | 8 +++----
apm-collector/apm-collector-analysis/pom.xml | 6 ++---
apm-collector/apm-collector-boot/pom.xml | 6 ++---
.../collector-cache-define/pom.xml | 6 ++---
.../collector-cache-guava-provider/pom.xml | 6 ++---
apm-collector/apm-collector-cache/pom.xml | 6 ++---
.../collector-cluster-define/pom.xml | 6 ++---
.../apm/collector/cluster/DataMonitor.java | 4 ++--
.../collector-cluster-redis-provider/pom.xml | 6 ++---
.../collector-cluster-standalone-provider/pom.xml | 6 ++---
.../standalone/ClusterStandaloneDataMonitor.java | 10 +++++---
.../collector-cluster-zookeeper-provider/pom.xml | 11 +++++----
.../zookeeper/ClusterModuleZookeeperProvider.java | 12 ++++++----
.../cluster/zookeeper/ClusterZKDataMonitor.java | 26 +++++++++++++-------
apm-collector/apm-collector-cluster/pom.xml | 6 ++---
.../client-component/pom.xml | 6 ++---
apm-collector/apm-collector-component/pom.xml | 6 ++---
.../server-component/pom.xml | 6 ++---
.../collector-configuration-define/pom.xml | 6 ++---
.../configuration/ConfigurationModule.java | 2 ++
.../configuration/service/ICollectorConfig.java} | 27 +++++++--------------
.../collector-configuration-provider/pom.xml | 6 ++---
.../configuration/ConfigurationModuleProvider.java | 6 ++++-
.../service/CollectorConfigService.java} | 28 ++++++++--------------
apm-collector/apm-collector-configuration/pom.xml | 6 ++---
apm-collector/apm-collector-core/pom.xml | 6 ++---
.../collector-grpc-manager-define/pom.xml | 6 ++---
.../collector-grpc-manager-provider/pom.xml | 6 ++---
apm-collector/apm-collector-grpc-manager/pom.xml | 6 ++---
apm-collector/apm-collector-instrument/pom.xml | 6 ++---
.../collector-jetty-manager-define/pom.xml | 6 ++---
.../collector-jetty-manager-provider/pom.xml | 6 ++---
apm-collector/apm-collector-jetty-manager/pom.xml | 6 ++---
.../collector-naming-define/pom.xml | 6 ++---
.../collector-naming-jetty-provider/pom.xml | 6 ++---
apm-collector/apm-collector-naming/pom.xml | 6 ++---
.../collector-remote-define/pom.xml | 6 ++---
.../collector-remote-grpc-provider/pom.xml | 6 ++---
.../collector-remote-kafka-provider/pom.xml | 6 ++---
apm-collector/apm-collector-remote/pom.xml | 6 ++---
.../collector-storage-define/pom.xml | 6 ++---
.../collector-storage-es-provider/pom.xml | 6 ++---
.../collector-storage-h2-provider/pom.xml | 6 ++---
apm-collector/apm-collector-storage/pom.xml | 6 ++---
.../apm-collector-ui/collector-ui-define/pom.xml | 6 ++---
.../apm-collector-ui/collector-ui-graphql/pom.xml | 6 ++---
.../collector-ui-jetty-provider/pom.xml | 6 ++---
apm-collector/apm-collector-ui/pom.xml | 6 ++---
apm-collector/pom.xml | 6 ++---
apm-commons/apm-datacarrier/pom.xml | 6 ++---
apm-commons/apm-util/pom.xml | 5 ++--
apm-commons/pom.xml | 5 ++--
apm-dist/pom.xml | 2 +-
apm-protocol/apm-network/pom.xml | 6 ++---
apm-protocol/apm-ui-protocol/pom.xml | 6 ++---
apm-protocol/pom.xml | 6 ++---
apm-sniffer/apm-agent-core/pom.xml | 10 ++++----
apm-sniffer/apm-agent/pom.xml | 20 +++++++---------
apm-sniffer/apm-sdk-plugin/dubbo-plugin/pom.xml | 5 ++--
.../apm-sdk-plugin/elastic-job-2.x-plugin/pom.xml | 6 ++---
.../feign-default-http-9.x-plugin/pom.xml | 6 ++---
apm-sniffer/apm-sdk-plugin/grpc-1.x-plugin/pom.xml | 6 ++---
apm-sniffer/apm-sdk-plugin/h2-1.x-plugin/pom.xml | 5 ++--
.../apm-sdk-plugin/httpClient-4.x-plugin/pom.xml | 6 ++---
.../v4/HttpClientExecuteInterceptor.java | 15 +++++++-----
.../httpasyncclient-4.x-plugin/pom.xml | 6 ++---
.../apm-sdk-plugin/hystrix-1.x-plugin/pom.xml | 2 +-
apm-sniffer/apm-sdk-plugin/jdbc-commons/pom.xml | 5 ++--
.../apm-sdk-plugin/jedis-2.x-plugin/pom.xml | 6 ++---
.../jetty-plugin/jetty-client-9.0-plugin/pom.xml | 5 ++--
.../jetty-plugin/jetty-client-9.x-plugin/pom.xml | 5 ++--
.../jetty-plugin/jetty-server-9.x-plugin/pom.xml | 5 ++--
apm-sniffer/apm-sdk-plugin/jetty-plugin/pom.xml | 5 ++--
apm-sniffer/apm-sdk-plugin/kafka-v1-plugin/pom.xml | 6 ++---
.../apm-sdk-plugin/mongodb-2.x-plugin/pom.xml | 6 ++---
.../apm-sdk-plugin/mongodb-3.x-plugin/pom.xml | 5 ++--
apm-sniffer/apm-sdk-plugin/motan-plugin/pom.xml | 5 ++--
.../apm-sdk-plugin/mysql-5.x-plugin/pom.xml | 5 ++--
.../nutz-plugins/http-1.x-plugin/pom.xml | 5 ++--
.../nutz-plugins/mvc-annotation-1.x-plugin/pom.xml | 5 ++--
apm-sniffer/apm-sdk-plugin/nutz-plugins/pom.xml | 5 ++--
.../apm-sdk-plugin/okhttp-3.x-plugin/pom.xml | 6 ++---
apm-sniffer/apm-sdk-plugin/pom.xml | 20 ++++++----------
.../apm-sdk-plugin/postgresql-8.x-plugin/pom.xml | 5 ++--
.../apm-sdk-plugin/rocketMQ-3.x-plugin/pom.xml | 6 ++---
.../apm-sdk-plugin/rocketMQ-4.x-plugin/pom.xml | 6 ++---
.../apm-sdk-plugin/servicecomb-plugin/pom.xml | 2 +-
.../servicecomb-java-chassis-0.x-plugin/pom.xml | 2 +-
.../sharding-jdbc-1.5.x-plugin/pom.xml | 6 ++---
.../concurrent-util-4.x-plugin/pom.xml | 5 ++--
.../spring-plugins/core-patch/pom.xml | 6 ++---
.../mvc-annotation-3.x-plugin/pom.xml | 5 ++--
.../mvc-annotation-4.x-plugin/pom.xml | 5 ++--
.../spring-plugins/mvc-annotation-commons/pom.xml | 5 ++--
apm-sniffer/apm-sdk-plugin/spring-plugins/pom.xml | 5 ++--
.../spring-plugins/resttemplate-4.x-plugin/pom.xml | 5 ++--
.../spring-cloud/netflix-plugins/pom.xml | 5 ++--
.../spring-cloud-feign-1.x-plugin/pom.xml | 5 ++--
.../spring-plugins/spring-cloud/pom.xml | 5 ++--
.../apm-sdk-plugin/spymemcached-2.x-plugin/pom.xml | 6 ++---
.../apm-sdk-plugin/struts2-2.x-plugin/pom.xml | 5 ++--
.../apm-sdk-plugin/tomcat-7.x-8.x-plugin/pom.xml | 5 ++--
.../apm-sdk-plugin/xmemcached-2.x-plugin/pom.xml | 6 ++---
apm-sniffer/apm-test-tools/pom.xml | 5 ++--
.../apm-toolkit-log4j-1.x-activation/pom.xml | 6 ++---
.../apm-toolkit-log4j-2.x-activation/pom.xml | 6 ++---
.../apm-toolkit-logback-1.x-activation/pom.xml | 6 ++---
.../apm-toolkit-opentracing-activation/pom.xml | 6 ++---
.../apm-toolkit-trace-activation/pom.xml | 6 ++---
apm-sniffer/apm-toolkit-activation/pom.xml | 16 +++++--------
.../optional-spring-plugins/pom.xml | 6 ++---
.../spring-annotation-plugin/pom.xml | 6 ++---
apm-sniffer/optional-plugins/pom.xml | 19 +++++----------
apm-sniffer/pom.xml | 6 ++---
apm-webapp/pom.xml | 2 +-
pom.xml | 6 ++---
150 files changed, 371 insertions(+), 614 deletions(-)
--
To stop receiving notification emails like this one, please contact
pengys@apache.org.