You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@skywalking.apache.org by ha...@apache.org on 2019/01/03 00:44:37 UTC
[incubator-skywalking] 03/04: Merge branch 'master' of
https://github.com/apache/incubator-skywalking
This is an automated email from the ASF dual-hosted git repository.
hanahmily pushed a commit to branch submodule/ui
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking.git
commit db33e814245b2b92c4fcc9abfa8ecdb86d2a82d0
Merge: 6c95206 840f8aa
Author: Gao Hongtao <ha...@gmail.com>
AuthorDate: Thu Jan 3 08:41:23 2019 +0800
Merge branch 'master' of https://github.com/apache/incubator-skywalking
NOTICE | 2 +-
README.md | 4 +-
.../apm-toolkit-log4j-1.x/pom.xml | 2 +-
.../apm-toolkit-log4j-2.x/pom.xml | 2 +-
.../apm-toolkit-logback-1.x/pom.xml | 2 +-
.../apm-toolkit-opentracing/pom.xml | 2 +-
.../toolkit/opentracing/SkywalkingSpanBuilder.java | 2 +-
apm-application-toolkit/apm-toolkit-trace/pom.xml | 2 +-
apm-application-toolkit/pom.xml | 2 +-
apm-checkstyle/pom.xml | 2 +-
apm-commons/apm-datacarrier/pom.xml | 2 +-
apm-commons/apm-util/pom.xml | 2 +-
apm-commons/pom.xml | 2 +-
apm-dist/pom.xml | 2 +-
apm-dist/release-docs/LICENSE | 60 +++--
apm-dist/release-docs/NOTICE | 2 +-
.../licenses/ui-licenses/LICENSE-d3-contour | 27 ++
.../licenses/ui-licenses/LICENSE-d3-geo | 48 ++++
.../licenses/ui-licenses/LICENSE-d3-scale | 27 ++
.../ui-licenses/LICENSE-d3-scale-chromatic | 44 +++
.../licenses/ui-licenses/LICENSE-d3-tip | 8 +
apm-protocol/apm-network/pom.xml | 2 +-
.../network/trace/component/ComponentsDefine.java | 5 +-
apm-protocol/pom.xml | 2 +-
apm-sniffer/apm-agent-core/pom.xml | 2 +-
apm-sniffer/apm-agent/pom.xml | 2 +-
.../apm-sdk-plugin/activemq-5.x-plugin/pom.xml | 2 +-
.../{grpc-1.x-plugin => canal-1.x-plugin}/pom.xml | 18 +-
.../plugin/canal/CanalConstructorInterceptor.java | 44 +++
.../apm/plugin/canal/CanalEnhanceInfo.java | 35 ++-
.../apm/plugin/canal/CanalInterceptor.java | 85 ++++++
.../canal/ClusterNodeConstructInterceptor.java | 61 +++++
.../plugin/canal/define/CanalInstrumentation.java | 81 ++++++
.../canal/define/ClusterNodeInstrumentation.java | 63 +++++
.../src/main/resources/skywalking-plugin.def | 18 ++
.../apm/plugin/canal/CanalInterceptorTest.java | 115 ++++++++
.../{dubbo-plugin => dubbo-conflict-patch}/pom.xml | 24 +-
.../plugin/dubbo/patch/MakeWrapperInterceptor.java | 275 +++++++++++++++++++
.../plugin/dubbo/patch/WrapperInstrumentation.java | 61 +++++
.../src/main/resources/skywalking-plugin.def | 17 ++
apm-sniffer/apm-sdk-plugin/dubbo-plugin/pom.xml | 2 +-
.../apm-sdk-plugin/elastic-job-2.x-plugin/pom.xml | 2 +-
.../elasticsearch-5.x-plugin/pom.xml | 2 +-
.../feign-default-http-9.x-plugin/pom.xml | 2 +-
apm-sniffer/apm-sdk-plugin/grpc-1.x-plugin/pom.xml | 2 +-
apm-sniffer/apm-sdk-plugin/h2-1.x-plugin/pom.xml | 2 +-
.../apm-sdk-plugin/httpClient-4.x-plugin/pom.xml | 2 +-
.../httpasyncclient-4.x-plugin/pom.xml | 2 +-
.../apm-sdk-plugin/hystrix-1.x-plugin/pom.xml | 2 +-
apm-sniffer/apm-sdk-plugin/jdbc-commons/pom.xml | 2 +-
.../apm-sdk-plugin/jedis-2.x-plugin/pom.xml | 2 +-
.../jetty-plugin/jetty-client-9.0-plugin/pom.xml | 2 +-
.../jetty-plugin/jetty-client-9.x-plugin/pom.xml | 2 +-
.../jetty-plugin/jetty-server-9.x-plugin/pom.xml | 2 +-
apm-sniffer/apm-sdk-plugin/jetty-plugin/pom.xml | 2 +-
apm-sniffer/apm-sdk-plugin/kafka-v1-plugin/pom.xml | 2 +-
.../apm-sdk-plugin/mongodb-2.x-plugin/pom.xml | 2 +-
.../apm-sdk-plugin/mongodb-3.x-plugin/pom.xml | 2 +-
apm-sniffer/apm-sdk-plugin/motan-plugin/pom.xml | 2 +-
.../apm-sdk-plugin/mysql-5.x-plugin/pom.xml | 2 +-
.../nutz-plugins/http-1.x-plugin/pom.xml | 2 +-
.../nutz-plugins/mvc-annotation-1.x-plugin/pom.xml | 2 +-
apm-sniffer/apm-sdk-plugin/nutz-plugins/pom.xml | 2 +-
.../apm-sdk-plugin/okhttp-3.x-plugin/pom.xml | 2 +-
apm-sniffer/apm-sdk-plugin/pom.xml | 4 +-
.../apm-sdk-plugin/postgresql-8.x-plugin/pom.xml | 2 +-
.../apm-sdk-plugin/rabbitmq-5.x-plugin/pom.xml | 2 +-
.../apm-sdk-plugin/rocketMQ-3.x-plugin/pom.xml | 2 +-
.../apm-sdk-plugin/rocketMQ-4.x-plugin/pom.xml | 2 +-
.../apm-sdk-plugin/servicecomb-plugin/pom.xml | 2 +-
.../servicecomb-java-chassis-0.x-plugin/pom.xml | 2 +-
.../servicecomb-java-chassis-1.x-plugin/pom.xml | 2 +-
.../sharding-jdbc-1.5.x-plugin/pom.xml | 2 +-
apm-sniffer/apm-sdk-plugin/sofarpc-plugin/pom.xml | 2 +-
.../concurrent-util-4.x-plugin/pom.xml | 2 +-
.../spring-plugins/core-patch/pom.xml | 2 +-
.../mvc-annotation-3.x-plugin/pom.xml | 2 +-
.../mvc-annotation-4.x-plugin/pom.xml | 2 +-
.../mvc-annotation-5.x-plugin/pom.xml | 2 +-
.../spring-plugins/mvc-annotation-commons/pom.xml | 2 +-
apm-sniffer/apm-sdk-plugin/spring-plugins/pom.xml | 2 +-
.../spring-plugins/resttemplate-4.x-plugin/pom.xml | 2 +-
.../spring-cloud/netflix-plugins/pom.xml | 2 +-
.../spring-cloud-feign-1.x-plugin/pom.xml | 2 +-
.../spring-plugins/spring-cloud/pom.xml | 2 +-
.../spring-plugins/spring-commons/pom.xml | 2 +-
.../spring-plugins/webflux-5.x-plugin/pom.xml | 2 +-
.../apm-sdk-plugin/spymemcached-2.x-plugin/pom.xml | 2 +-
.../apm-sdk-plugin/struts2-2.x-plugin/pom.xml | 2 +-
.../apm-sdk-plugin/tomcat-7.x-8.x-plugin/pom.xml | 2 +-
.../apm-sdk-plugin/undertow-plugins/pom.xml | 2 +-
.../undertow-plugins/undertow-2.x-plugin/pom.xml | 2 +-
.../apm-sdk-plugin/xmemcached-2.x-plugin/pom.xml | 2 +-
apm-sniffer/apm-test-tools/pom.xml | 2 +-
.../apm-toolkit-log4j-1.x-activation/pom.xml | 2 +-
.../apm-toolkit-log4j-2.x-activation/pom.xml | 2 +-
.../apm-toolkit-logback-1.x-activation/pom.xml | 2 +-
.../apm-toolkit-opentracing-activation/pom.xml | 2 +-
.../apm-toolkit-trace-activation/pom.xml | 2 +-
apm-sniffer/apm-toolkit-activation/pom.xml | 2 +-
.../optional-spring-plugins/pom.xml | 2 +-
.../spring-annotation-plugin/pom.xml | 2 +-
apm-sniffer/optional-plugins/pom.xml | 2 +-
.../optional-plugins/trace-ignore-plugin/pom.xml | 2 +-
.../trace/ignore/matcher/AntPathMatcher.java | 2 +-
apm-sniffer/pom.xml | 2 +-
apm-webapp/pom.xml | 2 +-
docker/config/application.yml | 1 +
docker/config/component-libraries.yml | 3 +
docker/config/datasource-settings.properties | 31 +++
docs/en/concepts-and-designs/README.md | 2 +-
docs/en/concepts-and-designs/backend-overview.md | 4 +-
docs/en/concepts-and-designs/query-oap.md | 38 ---
docs/en/guides/How-to-build.md | 6 +-
docs/en/guides/How-to-release.md | 51 +++-
docs/en/guides/README.md | 9 +-
docs/en/guides/backend-oal-scripts.md | 5 +-
docs/en/protocols/README.md | 63 ++++-
docs/en/setup/service-agent/java-agent/README.md | 8 +-
.../service-agent/java-agent/Supported-list.md | 1 +
docs/others/cn/concepts-and-designs/README.md | 20 +-
.../cn/concepts-and-designs/backend-overview-cn.md | 25 ++
.../cn/concepts-and-designs/manual-sdk-cn.md | 2 +
docs/others/cn/concepts-and-designs/oal-cn.md | 2 +
docs/others/cn/concepts-and-designs/overview-cn.md | 2 +
.../concepts-and-designs/probe-introduction-cn.md | 2 +
.../cn/concepts-and-designs/project-goals-cn.md | 2 +
.../others/cn/concepts-and-designs/query-oap-cn.md | 2 +
.../cn/concepts-and-designs/service-agent-cn.md | 2 +
.../concepts-and-designs/service-mesh-probe-cn.md | 2 +
.../cn/concepts-and-designs/ui-overview-cn.md | 2 +
.../others/cn/guides/Component-library-settings.md | 62 +++++
docs/others/cn/guides/How-to-build.md | 106 ++++++++
docs/{en => others/cn}/guides/How-to-release.md | 175 ++++++------
.../cn/guides/Java-Plugin-Development-Guide.md | 299 +++++++++++++++++++++
docs/others/cn/guides/README.md | 45 +++-
docs/others/cn/guides/backend-oal-scripts.md | 11 +
docs/others/cn/guides/storage-extention.md | 41 +++
docs/others/cn/guides/write-oal.md | 15 ++
docs/powered-by.md | 8 +-
oap-server/generate-tool/pom.xml | 2 +-
oap-server/generated-analysis/pom.xml | 2 +-
oap-server/pom.xml | 2 +-
oap-server/server-alarm-plugin/pom.xml | 2 +-
.../cluster-consul-plugin/pom.xml | 2 +-
.../cluster-kubernetes-plugin/pom.xml | 2 +-
.../cluster-standalone-plugin/pom.xml | 2 +-
.../cluster-zookeeper-plugin/pom.xml | 2 +-
oap-server/server-cluster-plugin/pom.xml | 2 +-
oap-server/server-core/pom.xml | 2 +-
.../server/core/query/MetadataQueryService.java | 9 +-
.../core/register/NetworkAddressInventory.java | 22 +-
.../oap/server/core/register/NodeType.java | 98 +++++++
.../oap/server/core/register/ServiceInventory.java | 16 ++
.../service/INetworkAddressInventoryRegister.java | 3 +-
.../service/NetworkAddressInventoryRegister.java | 41 ++-
.../register/worker/RegisterPersistentWorker.java | 4 +-
.../oap/server/core/storage/IRegisterDAO.java | 9 +-
.../core/storage/query/IMetadataQueryDAO.java | 2 +-
oap-server/server-library/library-buffer/pom.xml | 2 +-
oap-server/server-library/library-client/pom.xml | 2 +-
oap-server/server-library/library-module/pom.xml | 2 +-
oap-server/server-library/library-server/pom.xml | 2 +-
oap-server/server-library/library-util/pom.xml | 2 +-
oap-server/server-library/pom.xml | 2 +-
oap-server/server-query-plugin/pom.xml | 2 +-
.../query-graphql-plugin/pom.xml | 2 +-
oap-server/server-receiver-plugin/pom.xml | 2 +-
.../pom.xml | 2 +-
.../skywalking-jvm-receiver-plugin/pom.xml | 2 +-
.../skywalking-mesh-receiver-plugin/pom.xml | 2 +-
.../skywalking-register-receiver-plugin/pom.xml | 2 +-
.../skywalking-trace-receiver-plugin/pom.xml | 2 +-
.../parser/standardization/SpanIdExchanger.java | 5 +-
.../zipkin-receiver-plugin/pom.xml | 2 +-
oap-server/server-starter/pom.xml | 2 +-
.../src/main/resources/component-libraries.yml | 4 +
oap-server/server-storage-plugin/pom.xml | 2 +-
.../storage-elasticsearch-plugin/pom.xml | 2 +-
.../plugin/elasticsearch/base/RegisterEsDAO.java | 7 +-
.../elasticsearch/query/MetadataQueryEsDAO.java | 6 +-
.../storage-jdbc-hikaricp-plugin/pom.xml | 2 +-
.../plugin/jdbc/h2/dao/H2MetadataQueryDAO.java | 8 +-
.../storage/plugin/jdbc/h2/dao/H2RegisterDAO.java | 7 +-
oap-server/server-testing/pom.xml | 2 +-
pom.xml | 2 +-
skywalking-ui | 2 +-
187 files changed, 2280 insertions(+), 366 deletions(-)