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/08/24 00:18:11 UTC
[incubator-skywalking] branch RC-changelog updated (d4bf910 ->
d42c417)
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a change to branch RC-changelog
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking.git.
from d4bf910 Update CHANGES.md
add d0b9516 Moves to Maven wrapper to stabilize the version in use (#1569)
add b395920 [Agent] Provide plugin for Elasticsearch 5.x (#1500)
add 15fed8c Remove jar from source (#1574)
add 26f88ba Re-adds maven wrapper downloader so users won't crash if wget is missing (#1576)
add 31e4ceb change the agent log level to millisecond (#1580)
add 59fdc3b Submodule/ui (#1581)
add 999762e Moved hardcoded dependency versions to properties tag in pom.xml (#1582)
new d42c417 Merge branch 'master' into RC-changelog
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:
.gitignore | 1 +
.mvn/wrapper/MavenWrapperDownloader.java | 110 ++++++++
.mvn/wrapper/maven-wrapper.properties | 1 +
.travis.yml | 4 +-
.../apm-toolkit-log4j-1.x/pom.xml | 22 --
.../apm-toolkit-log4j-2.x/pom.xml | 23 --
.../apm-toolkit-logback-1.x/pom.xml | 22 --
apm-application-toolkit/apm-toolkit-trace/pom.xml | 22 --
apm-collector/apm-collector-boot/pom.xml | 11 -
.../src/main/resources/component-libraries.yml | 9 +-
apm-collector/apm-collector-instrument/pom.xml | 2 -
.../collector-remote-grpc-provider/pom.xml | 8 -
apm-dist/pom.xml | 2 -
apm-protocol/apm-network/pom.xml | 8 -
.../network/trace/component/ComponentsDefine.java | 7 +-
apm-sniffer/apm-agent-core/pom.xml | 11 -
.../skywalking/apm/agent/core/conf/Config.java | 5 +
.../apm/agent/core/logging/core/EasyLogger.java | 2 +-
apm-sniffer/apm-agent/pom.xml | 3 -
.../apm-sdk-plugin/activemq-5.x-plugin/pom.xml | 19 --
apm-sniffer/apm-sdk-plugin/dubbo-plugin/pom.xml | 19 --
.../apm-sdk-plugin/elastic-job-2.x-plugin/pom.xml | 15 --
.../pom.xml | 34 +--
.../v5/ActionRequestBuilderInterceptor.java | 65 +++++
.../apm/plugin/elasticsearch/v5/Constants.java | 41 ++-
.../elasticsearch/v5/ElasticSearchEnhanceInfo.java | 98 +++++++
.../PlainListenableActionFutureInterceptor.java} | 59 ++---
.../v5/TransportActionNodeProxyInterceptor.java | 77 ++++++
.../v5/TransportProxyClientInterceptor.java | 156 +++++++++++
.../apm/plugin/elasticsearch/v5/Util.java | 21 +-
.../ActionRequestBuilderInstrumentation.java} | 51 ++--
...lainListenableActionFutureInstrumentation.java} | 29 ++-
.../TransportActionNodeProxyInstrumentation.java} | 29 ++-
.../TransportProxyClientInstrumentation.java} | 37 +--
.../src/main/resources/skywalking-plugin.def | 6 +-
apm-sniffer/apm-sdk-plugin/grpc-1.x-plugin/pom.xml | 13 -
apm-sniffer/apm-sdk-plugin/h2-1.x-plugin/pom.xml | 16 --
.../apm-sdk-plugin/httpClient-4.x-plugin/pom.xml | 12 -
.../httpasyncclient-4.x-plugin/pom.xml | 18 --
apm-sniffer/apm-sdk-plugin/jdbc-commons/pom.xml | 16 --
.../apm-sdk-plugin/jedis-2.x-plugin/pom.xml | 13 -
.../apm-sdk-plugin/mongodb-2.x-plugin/pom.xml | 19 --
.../apm-sdk-plugin/mongodb-3.x-plugin/pom.xml | 20 --
.../apm-sdk-plugin/mysql-5.x-plugin/pom.xml | 16 --
.../apm-sdk-plugin/oracle-10.x-plugin/pom.xml | 16 --
apm-sniffer/apm-sdk-plugin/pom.xml | 27 +-
.../apm-sdk-plugin/postgresql-8.x-plugin/pom.xml | 16 --
.../apm-sdk-plugin/resin-3.x-plugin/pom.xml | 20 --
.../apm-sdk-plugin/resin-4.x-plugin/pom.xml | 21 --
.../apm-sdk-plugin/rocketMQ-3.x-plugin/pom.xml | 15 --
.../apm-sdk-plugin/rocketMQ-4.x-plugin/pom.xml | 15 --
.../servicecomb-java-chassis-0.x-plugin/pom.xml | 19 --
.../servicecomb-java-chassis-1.x-plugin/pom.xml | 19 --
.../sharding-jdbc-1.5.x-plugin/pom.xml | 16 --
apm-sniffer/apm-sdk-plugin/sofarpc-plugin/pom.xml | 20 --
.../apm-sdk-plugin/struts2-2.x-plugin/pom.xml | 19 --
apm-sniffer/apm-toolkit-activation/pom.xml | 3 -
apm-sniffer/optional-plugins/pom.xml | 3 -
.../optional-plugins/trace-ignore-plugin/pom.xml | 1 -
apm-webapp/pom.xml | 1 -
docs/Supported-list.md | 2 +
docs/cn/How-to-build-CN.md | 14 +-
docs/en/How-to-build.md | 10 +-
docs/en/How-to-release.md | 10 +-
mvnw | 286 +++++++++++++++++++++
mvnw.cmd | 161 ++++++++++++
pom.xml | 119 +++++++--
skywalking-ui | 2 +-
68 files changed, 1248 insertions(+), 759 deletions(-)
create mode 100755 .mvn/wrapper/MavenWrapperDownloader.java
create mode 100755 .mvn/wrapper/maven-wrapper.properties
copy apm-sniffer/apm-sdk-plugin/{spymemcached-2.x-plugin => elasticsearch-5.x-plugin}/pom.xml (64%)
create mode 100644 apm-sniffer/apm-sdk-plugin/elasticsearch-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/elasticsearch/v5/ActionRequestBuilderInterceptor.java
copy apm-commons/apm-datacarrier/src/test/java/org/apache/skywalking/apm/commons/datacarrier/consumer/SampleConsumer.java => apm-sniffer/apm-sdk-plugin/elasticsearch-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/elasticsearch/v5/Constants.java (55%)
create mode 100644 apm-sniffer/apm-sdk-plugin/elasticsearch-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/elasticsearch/v5/ElasticSearchEnhanceInfo.java
copy apm-sniffer/{apm-toolkit-activation/apm-toolkit-opentracing-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/opentracing/tracer/SkywalkingTracerExtractInterceptor.java => apm-sdk-plugin/elasticsearch-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/elasticsearch/v5/PlainListenableActionFutureInterceptor.java} (54%)
create mode 100644 apm-sniffer/apm-sdk-plugin/elasticsearch-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/elasticsearch/v5/TransportActionNodeProxyInterceptor.java
create mode 100644 apm-sniffer/apm-sdk-plugin/elasticsearch-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/elasticsearch/v5/TransportProxyClientInterceptor.java
copy apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/table/alarm/AlarmType.java => apm-sniffer/apm-sdk-plugin/elasticsearch-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/elasticsearch/v5/Util.java (75%)
copy apm-sniffer/apm-sdk-plugin/{dubbo-plugin/src/main/java/org/apache/skywalking/apm/plugin/dubbo/DubboInstrumentation.java => elasticsearch-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/elasticsearch/v5/define/ActionRequestBuilderInstrumentation.java} (62%)
copy apm-sniffer/apm-sdk-plugin/{resin-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/resin/v4/define/ResinV4Instrumentation.java => elasticsearch-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/elasticsearch/v5/define/PlainListenableActionFutureInstrumentation.java} (72%)
copy apm-sniffer/apm-sdk-plugin/{resin-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/resin/v4/define/ResinV4Instrumentation.java => elasticsearch-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/elasticsearch/v5/define/TransportActionNodeProxyInstrumentation.java} (72%)
copy apm-sniffer/apm-sdk-plugin/{nutz-plugins/mvc-annotation-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/nutz/mvc/define/ActionInstrumentation.java => elasticsearch-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/elasticsearch/v5/define/TransportProxyClientInstrumentation.java} (70%)
copy apm-sniffer/apm-sdk-plugin/{activemq-5.x-plugin => elasticsearch-5.x-plugin}/src/main/resources/skywalking-plugin.def (63%)
create mode 100755 mvnw
create mode 100755 mvnw.cmd
[incubator-skywalking] 01/01: Merge branch 'master' into
RC-changelog
Posted by wu...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch RC-changelog
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking.git
commit d42c417246e3eb2cad5f4caac90b3dbf68f149f9
Merge: d4bf910 999762e
Author: 吴晟 Wu Sheng <wu...@foxmail.com>
AuthorDate: Fri Aug 24 08:18:08 2018 +0800
Merge branch 'master' into RC-changelog
.gitignore | 1 +
.mvn/wrapper/MavenWrapperDownloader.java | 110 ++++++++
.mvn/wrapper/maven-wrapper.properties | 1 +
.travis.yml | 4 +-
.../apm-toolkit-log4j-1.x/pom.xml | 22 --
.../apm-toolkit-log4j-2.x/pom.xml | 23 --
.../apm-toolkit-logback-1.x/pom.xml | 22 --
apm-application-toolkit/apm-toolkit-trace/pom.xml | 22 --
apm-collector/apm-collector-boot/pom.xml | 11 -
.../src/main/resources/component-libraries.yml | 9 +-
apm-collector/apm-collector-instrument/pom.xml | 2 -
.../collector-remote-grpc-provider/pom.xml | 8 -
apm-dist/pom.xml | 2 -
apm-protocol/apm-network/pom.xml | 8 -
.../network/trace/component/ComponentsDefine.java | 7 +-
apm-sniffer/apm-agent-core/pom.xml | 11 -
.../skywalking/apm/agent/core/conf/Config.java | 5 +
.../apm/agent/core/logging/core/EasyLogger.java | 2 +-
apm-sniffer/apm-agent/pom.xml | 3 -
.../apm-sdk-plugin/activemq-5.x-plugin/pom.xml | 19 --
apm-sniffer/apm-sdk-plugin/dubbo-plugin/pom.xml | 19 --
.../apm-sdk-plugin/elastic-job-2.x-plugin/pom.xml | 15 --
.../pom.xml | 38 ++-
.../v5/ActionRequestBuilderInterceptor.java | 65 +++++
.../apm/plugin/elasticsearch/v5/Constants.java | 46 ++++
.../elasticsearch/v5/ElasticSearchEnhanceInfo.java | 98 +++++++
.../v5/PlainListenableActionFutureInterceptor.java | 70 +++++
.../v5/TransportActionNodeProxyInterceptor.java | 77 ++++++
.../v5/TransportProxyClientInterceptor.java | 156 +++++++++++
.../apm/plugin/elasticsearch/v5/Util.java | 35 +++
.../ActionRequestBuilderInstrumentation.java | 64 +++++
...PlainListenableActionFutureInstrumentation.java | 73 ++++++
.../TransportActionNodeProxyInstrumentation.java | 73 ++++++
.../TransportProxyClientInstrumentation.java | 88 +++++++
.../src/main/resources/skywalking-plugin.def | 20 ++
apm-sniffer/apm-sdk-plugin/grpc-1.x-plugin/pom.xml | 13 -
apm-sniffer/apm-sdk-plugin/h2-1.x-plugin/pom.xml | 16 --
.../apm-sdk-plugin/httpClient-4.x-plugin/pom.xml | 12 -
.../httpasyncclient-4.x-plugin/pom.xml | 18 --
apm-sniffer/apm-sdk-plugin/jdbc-commons/pom.xml | 16 --
.../apm-sdk-plugin/jedis-2.x-plugin/pom.xml | 13 -
.../apm-sdk-plugin/mongodb-2.x-plugin/pom.xml | 19 --
.../apm-sdk-plugin/mongodb-3.x-plugin/pom.xml | 20 --
.../apm-sdk-plugin/mysql-5.x-plugin/pom.xml | 16 --
.../apm-sdk-plugin/oracle-10.x-plugin/pom.xml | 16 --
apm-sniffer/apm-sdk-plugin/pom.xml | 27 +-
.../apm-sdk-plugin/postgresql-8.x-plugin/pom.xml | 16 --
.../apm-sdk-plugin/resin-3.x-plugin/pom.xml | 20 --
.../apm-sdk-plugin/resin-4.x-plugin/pom.xml | 21 --
.../apm-sdk-plugin/rocketMQ-3.x-plugin/pom.xml | 15 --
.../apm-sdk-plugin/rocketMQ-4.x-plugin/pom.xml | 15 --
.../servicecomb-java-chassis-0.x-plugin/pom.xml | 19 --
.../servicecomb-java-chassis-1.x-plugin/pom.xml | 19 --
.../sharding-jdbc-1.5.x-plugin/pom.xml | 16 --
apm-sniffer/apm-sdk-plugin/sofarpc-plugin/pom.xml | 20 --
.../apm-sdk-plugin/struts2-2.x-plugin/pom.xml | 19 --
apm-sniffer/apm-toolkit-activation/pom.xml | 3 -
apm-sniffer/optional-plugins/pom.xml | 3 -
.../optional-plugins/trace-ignore-plugin/pom.xml | 1 -
apm-webapp/pom.xml | 1 -
docs/Supported-list.md | 2 +
docs/cn/How-to-build-CN.md | 14 +-
docs/en/How-to-build.md | 10 +-
docs/en/How-to-release.md | 10 +-
mvnw | 286 +++++++++++++++++++++
mvnw.cmd | 161 ++++++++++++
pom.xml | 119 +++++++--
skywalking-ui | 2 +-
68 files changed, 1583 insertions(+), 624 deletions(-)