You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@skywalking.apache.org by wu...@apache.org on 2019/05/15 13:33:01 UTC

[skywalking] branch envoy-access-log updated (dd2caca -> a4cc025)

This is an automated email from the ASF dual-hosted git repository.

wusheng pushed a change to branch envoy-access-log
in repository https://gitbox.apache.org/repos/asf/skywalking.git.


    from dd2caca  Merge branch 'master' into envoy-access-log
     add b4ee1f1   update dependencyManagement (#2660)
     add 91ffae2  support Nacos cluster (#2640)
     add c7c1774  Provide plugin for ShardingSphere (#1934)
     add 1b6bd5f  study sharding sphere (#2679)
     add a4cc025  Merge branch 'master' into envoy-access-log

No new revisions were added by this update.

Summary of changes:
 apm-dist/release-docs/LICENSE                      |   2 +
 apm-dist/release-docs/NOTICE                       |  38 ++++++
 ...ENSE-consul-client.txt => LICENSE-fastjson.txt} |   4 +-
 .../network/trace/component/ComponentsDefine.java  |   5 +-
 apm-sniffer/apm-sdk-plugin/pom.xml                 |   1 +
 .../pom.xml                                        |  20 ++-
 .../apm/plugin/shardingsphere/Constant.java}       |   8 +-
 .../plugin/shardingsphere/ExecuteInterceptor.java} |  44 ++++---
 .../shardingsphere/JDBCRootInvokeInterceptor.java} |  39 +++---
 .../plugin/shardingsphere/ParseInterceptor.java}   |  38 +++---
 .../ProxyRootInvokeInterceptor.java}               |  39 +++---
 .../define/ExecuteInstrumentation.java}            |  48 ++++----
 .../define/JDBCRootInvokeInstrumentation.java}     |  48 ++++----
 .../define/ParseInstrumentation.java}              |  49 ++++----
 .../define/ProxyRootInvokeInstrumentation.java}    |  48 ++++----
 .../src/main/resources/skywalking-plugin.def       |   6 +-
 .../plugin/shardingsphere/InterceptorTest.java}    |  92 ++++++++------
 docker/config/application.yml                      |   3 +
 docker/config/component-libraries.yml              |   3 +
 docs/en/setup/backend/backend-cluster.md           |  17 ++-
 .../service-agent/java-agent/Supported-list.md     |   1 +
 oap-server/pom.xml                                 |  36 ++++++
 .../pom.xml                                        |  58 +++++----
 .../plugin/nacos/ClusterModuleNacosConfig.java}    |  11 +-
 .../plugin/nacos/ClusterModuleNacosProvider.java   |  84 +++++++++++++
 .../cluster/plugin/nacos/NacosCoordinator.java     |  79 ++++++++++++
 ...alking.oap.server.library.module.ModuleProvider |   2 +-
 .../nacos/ClusterModuleNacosProviderTest.java      | 106 ++++++++++++++++
 .../cluster/plugin/nacos/NacosCoordinatorTest.java | 134 +++++++++++++++++++++
 oap-server/server-cluster-plugin/pom.xml           |   1 +
 ...erException.java => ServiceQueryException.java} |   8 +-
 .../src/test/resources/component-libraries.yml     |   3 +
 oap-server/server-starter/pom.xml                  |   5 +
 .../src/main/assembly/application.yml              |   3 +
 .../src/main/resources/application.yml             |   3 +
 .../src/main/resources/component-libraries.yml     |   3 +
 36 files changed, 813 insertions(+), 276 deletions(-)
 copy apm-dist/release-docs/licenses/{LICENSE-consul-client.txt => LICENSE-fastjson.txt} (78%)
 copy apm-sniffer/apm-sdk-plugin/{sharding-jdbc-1.5.x-plugin => sharding-sphere-3.x-plugin}/pom.xml (75%)
 copy apm-sniffer/{apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/logging/core/IWriter.java => apm-sdk-plugin/sharding-sphere-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/Constant.java} (83%)
 copy apm-sniffer/apm-sdk-plugin/{httpasyncclient-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/httpasyncclient/v4/SessionRequestCompleteInterceptor.java => sharding-sphere-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/ExecuteInterceptor.java} (61%)
 copy apm-sniffer/{optional-plugins/gson-2.8.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/gson/GsonFromJsonInterceptor.java => apm-sdk-plugin/sharding-sphere-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/JDBCRootInvokeInterceptor.java} (64%)
 copy apm-sniffer/{optional-plugins/gson-2.8.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/gson/GsonFromJsonInterceptor.java => apm-sdk-plugin/sharding-sphere-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/ParseInterceptor.java} (67%)
 copy apm-sniffer/{optional-plugins/gson-2.8.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/gson/GsonFromJsonInterceptor.java => apm-sdk-plugin/sharding-sphere-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/ProxyRootInvokeInterceptor.java} (64%)
 copy apm-sniffer/apm-sdk-plugin/{sofarpc-plugin/src/main/java/org/apache/skywalking/apm/plugin/sofarpc/SofaRpcProviderInstrumentation.java => sharding-sphere-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/define/ExecuteInstrumentation.java} (72%)
 copy apm-sniffer/apm-sdk-plugin/{sofarpc-plugin/src/main/java/org/apache/skywalking/apm/plugin/sofarpc/SofaRpcProviderInstrumentation.java => sharding-sphere-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/define/JDBCRootInvokeInstrumentation.java} (70%)
 copy apm-sniffer/apm-sdk-plugin/{dubbo-2.7.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/asf/dubbo/DubboInstrumentation.java => sharding-sphere-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/define/ParseInstrumentation.java} (72%)
 copy apm-sniffer/apm-sdk-plugin/{sofarpc-plugin/src/main/java/org/apache/skywalking/apm/plugin/sofarpc/SofaRpcConsumerInstrumentation.java => sharding-sphere-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/define/ProxyRootInvokeInstrumentation.java} (72%)
 copy apm-sniffer/apm-sdk-plugin/{activemq-5.x-plugin => sharding-sphere-3.x-plugin}/src/main/resources/skywalking-plugin.def (65%)
 copy apm-sniffer/apm-sdk-plugin/{elastic-job-2.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/esjob/JobExecutorInterceptorTest.java => sharding-sphere-3.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/shardingsphere/InterceptorTest.java} (51%)
 copy oap-server/server-cluster-plugin/{cluster-zookeeper-plugin => cluster-nacos-plugin}/pom.xml (57%)
 copy oap-server/server-cluster-plugin/{cluster-consul-plugin/src/main/java/org/apache/skywalking/oap/server/cluster/plugin/consul/ClusterModuleConsulConfig.java => cluster-nacos-plugin/src/main/java/org/apache/skywalking/oap/server/cluster/plugin/nacos/ClusterModuleNacosConfig.java} (78%)
 create mode 100644 oap-server/server-cluster-plugin/cluster-nacos-plugin/src/main/java/org/apache/skywalking/oap/server/cluster/plugin/nacos/ClusterModuleNacosProvider.java
 create mode 100644 oap-server/server-cluster-plugin/cluster-nacos-plugin/src/main/java/org/apache/skywalking/oap/server/cluster/plugin/nacos/NacosCoordinator.java
 copy oap-server/{exporter => server-cluster-plugin/cluster-nacos-plugin}/src/main/resources/META-INF/services/org.apache.skywalking.oap.server.library.module.ModuleProvider (90%)
 create mode 100644 oap-server/server-cluster-plugin/cluster-nacos-plugin/src/test/java/org/apache/skywalking/oap/server/cluster/plugin/nacos/ClusterModuleNacosProviderTest.java
 create mode 100644 oap-server/server-cluster-plugin/cluster-nacos-plugin/src/test/java/org/apache/skywalking/oap/server/cluster/plugin/nacos/NacosCoordinatorTest.java
 copy oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/cluster/{ServiceRegisterException.java => ServiceQueryException.java} (85%)