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 2021/06/30 13:00:32 UTC

[skywalking] branch master updated (dcefc69 -> 0975809)

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

wusheng pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/skywalking.git.


    from dcefc69  Doc: update doc to declare that zookeeper 3.5+ is required in cluster coordinator (#7212)
     add 0975809  Add an agent plugin for ShardingSphere 5.0.0-beta (#7171)

No new revisions were added by this update.

Summary of changes:
 .github/workflows/plugins-test.2.yaml              |   1 +
 CHANGES.md                                         |   1 +
 apm-sniffer/apm-sdk-plugin/pom.xml                 |   1 +
 .../pom.xml                                        |  12 +-
 .../plugin/shardingsphere/v500beta}/Constant.java  |   2 +-
 .../v500beta}/ExecuteInterceptor.java              |  17 +--
 .../v500beta}/JDBCRootInvokeInterceptor.java       |  12 +-
 .../shardingsphere/v500beta}/ParseInterceptor.java |   9 +-
 .../v500beta}/ProxyRootInvokeInterceptor.java      |  12 +-
 .../v500beta/RewriteInterceptor.java}              |  20 ++--
 .../shardingsphere/v500beta/RouteInterceptor.java} |  20 ++--
 ...ractShardingSphereV500BetaInstrumentation.java} |   9 +-
 .../v500beta}/define/ExecuteInstrumentation.java   |  19 ++--
 .../define/JDBCRootInvokeInstrumentation.java}     |  55 ++++++----
 .../v500beta}/define/ParseInstrumentation.java     |  17 ++-
 .../define/ProxyRootInvokeInstrumentation.java     |  15 ++-
 .../v500beta/define/RewriteInstrumentation.java}   |  48 ++++----
 .../v500beta/define/RouteInstrumentation.java}     |  48 ++++----
 .../src/main}/resources/skywalking-plugin.def      |   8 +-
 .../shardingsphere/v500beta}/InterceptorTest.java  |  66 +++++++++--
 .../setup/service-agent/java-agent/Plugin-list.md  |   1 +
 .../service-agent/java-agent/Supported-list.md     |   2 +-
 .../bin/startup.sh                                 |   2 +-
 .../config/expectedData.yaml                       | 121 +++++++++++++++------
 .../configuration.yml                              |   6 +-
 .../pom.xml                                        |  40 ++-----
 .../src/main/assembly/assembly.xml                 |   2 +-
 .../apm/testcase/shardingsphere/Application.java   |   1 -
 .../shardingsphere/controller/CaseController.java  |   0
 .../shardingsphere/service/api/entity/Order.java   |   0
 .../service/api/entity/OrderItem.java              |   0
 .../service/api/repository/CommonRepository.java   |   0
 .../api/repository/OrderItemRepository.java        |   0
 .../service/api/repository/OrderRepository.java    |   0
 .../service/api/service/CommonService.java         |   0
 .../service/api/service/CommonServiceImpl.java     |   0
 ...dingDatabasesAndTablesConfigurationPrecise.java |  94 ++++++++++++++++
 .../jdbc/JDBCOrderItemRepositoryImpl.java          |   0
 .../repository/jdbc/JDBCOrderRepositoryImpl.java   |   0
 .../service/repository/service/RawPojoService.java |   0
 .../service/utility/config/DataSourceUtil.java     |   0
 .../utility/config/ExampleConfiguration.java       |   2 -
 .../src/main/resources/application.properties      |   2 +-
 .../support-version.list                           |   3 +-
 44 files changed, 420 insertions(+), 248 deletions(-)
 copy apm-sniffer/apm-sdk-plugin/{sharding-sphere-4.x-RC3-plugin => shardingsphere-5.0.0-beta-plugin}/pom.xml (86%)
 copy apm-sniffer/apm-sdk-plugin/{sharding-sphere-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/v4 => shardingsphere-5.0.0-beta-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/v500beta}/Constant.java (93%)
 copy apm-sniffer/apm-sdk-plugin/{sharding-sphere-4.1.0-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/v41 => shardingsphere-5.0.0-beta-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/v500beta}/ExecuteInterceptor.java (84%)
 copy apm-sniffer/apm-sdk-plugin/{sharding-sphere-4.1.0-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/v41 => shardingsphere-5.0.0-beta-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/v500beta}/JDBCRootInvokeInterceptor.java (86%)
 copy apm-sniffer/apm-sdk-plugin/{sharding-sphere-4.1.0-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/v41 => shardingsphere-5.0.0-beta-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/v500beta}/ParseInterceptor.java (91%)
 copy apm-sniffer/apm-sdk-plugin/{sharding-sphere-4.1.0-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/v41 => shardingsphere-5.0.0-beta-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/v500beta}/ProxyRootInvokeInterceptor.java (86%)
 copy apm-sniffer/apm-sdk-plugin/{mariadb-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mariadb/v2/SetCatalogInterceptor.java => shardingsphere-5.0.0-beta-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/v500beta/RewriteInterceptor.java} (77%)
 copy apm-sniffer/apm-sdk-plugin/{mariadb-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mariadb/v2/SetCatalogInterceptor.java => shardingsphere-5.0.0-beta-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/v500beta/RouteInterceptor.java} (77%)
 copy apm-sniffer/apm-sdk-plugin/{okhttp-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/okhttp/v3/define/AbstractOkhttpInstrumentation.java => shardingsphere-5.0.0-beta-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/v500beta/define/AbstractShardingSphereV500BetaInstrumentation.java} (77%)
 copy apm-sniffer/apm-sdk-plugin/{sharding-sphere-4.x-RC3-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/v4rc3 => shardingsphere-5.0.0-beta-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/v500beta}/define/ExecuteInstrumentation.java (80%)
 copy apm-sniffer/apm-sdk-plugin/{elastic-job-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/elasticjob/define/ElasticJobExecutorInstrumentation.java => shardingsphere-5.0.0-beta-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/v500beta/define/JDBCRootInvokeInstrumentation.java} (52%)
 copy apm-sniffer/apm-sdk-plugin/{sharding-sphere-4.0.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/v40 => shardingsphere-5.0.0-beta-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/v500beta}/define/ParseInstrumentation.java (83%)
 copy apm-sniffer/apm-sdk-plugin/{sharding-sphere-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/v4 => shardingsphere-5.0.0-beta-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/v500beta}/define/ProxyRootInvokeInstrumentation.java (83%)
 copy apm-sniffer/apm-sdk-plugin/{jsonrpc4j-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jsonrpc4j/define/JsonServiceExporterInstrumentation.java => shardingsphere-5.0.0-beta-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/v500beta/define/RewriteInstrumentation.java} (73%)
 copy apm-sniffer/apm-sdk-plugin/{jsonrpc4j-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jsonrpc4j/define/JsonServiceExporterInstrumentation.java => shardingsphere-5.0.0-beta-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/v500beta/define/RouteInstrumentation.java} (73%)
 copy apm-sniffer/{apm-agent-core/src/test => apm-sdk-plugin/shardingsphere-5.0.0-beta-plugin/src/main}/resources/skywalking-plugin.def (53%)
 copy apm-sniffer/apm-sdk-plugin/{sharding-sphere-3.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/shardingsphere => shardingsphere-5.0.0-beta-plugin/src/test/java/org/apache/skywalking/apm/plugin/shardingsphere/v500beta}/InterceptorTest.java (71%)
 copy test/plugin/scenarios/{armeria-0.96plus-scenario => shardingsphere-5.0.0-beta-scenario}/bin/startup.sh (91%)
 copy test/plugin/scenarios/{shardingsphere-4.x-RC3-scenario => shardingsphere-5.0.0-beta-scenario}/config/expectedData.yaml (62%)
 copy test/plugin/{archetypes/jvm/src/main/resources/archetype-resources => scenarios/shardingsphere-5.0.0-beta-scenario}/configuration.yml (82%)
 copy test/plugin/scenarios/{shardingsphere-4.x-scenario => shardingsphere-5.0.0-beta-scenario}/pom.xml (75%)
 copy test/plugin/scenarios/{asynchttpclient-scenario => shardingsphere-5.0.0-beta-scenario}/src/main/assembly/assembly.xml (94%)
 copy test/plugin/scenarios/{shardingsphere-4.x-RC1-RC2-scenario => shardingsphere-5.0.0-beta-scenario}/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/Application.java (99%)
 copy test/plugin/scenarios/{shardingsphere-4.x-scenario => shardingsphere-5.0.0-beta-scenario}/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/controller/CaseController.java (100%)
 copy test/plugin/scenarios/{shardingsphere-4.x-scenario => shardingsphere-5.0.0-beta-scenario}/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/api/entity/Order.java (100%)
 copy test/plugin/scenarios/{shardingsphere-4.x-scenario => shardingsphere-5.0.0-beta-scenario}/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/api/entity/OrderItem.java (100%)
 copy test/plugin/scenarios/{shardingsphere-4.x-scenario => shardingsphere-5.0.0-beta-scenario}/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/api/repository/CommonRepository.java (100%)
 copy test/plugin/scenarios/{shardingsphere-4.x-scenario => shardingsphere-5.0.0-beta-scenario}/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/api/repository/OrderItemRepository.java (100%)
 copy test/plugin/scenarios/{shardingsphere-4.x-scenario => shardingsphere-5.0.0-beta-scenario}/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/api/repository/OrderRepository.java (100%)
 copy test/plugin/scenarios/{shardingsphere-4.x-scenario => shardingsphere-5.0.0-beta-scenario}/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/api/service/CommonService.java (100%)
 copy test/plugin/scenarios/{shardingsphere-4.x-scenario => shardingsphere-5.0.0-beta-scenario}/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/api/service/CommonServiceImpl.java (100%)
 create mode 100644 test/plugin/scenarios/shardingsphere-5.0.0-beta-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/config/ShardingDatabasesAndTablesConfigurationPrecise.java
 copy test/plugin/scenarios/{shardingsphere-4.x-scenario => shardingsphere-5.0.0-beta-scenario}/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/repository/jdbc/JDBCOrderItemRepositoryImpl.java (100%)
 copy test/plugin/scenarios/{shardingsphere-4.x-scenario => shardingsphere-5.0.0-beta-scenario}/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/repository/jdbc/JDBCOrderRepositoryImpl.java (100%)
 copy test/plugin/scenarios/{shardingsphere-4.x-scenario => shardingsphere-5.0.0-beta-scenario}/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/repository/service/RawPojoService.java (100%)
 copy test/plugin/scenarios/{shardingsphere-4.x-scenario => shardingsphere-5.0.0-beta-scenario}/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/utility/config/DataSourceUtil.java (100%)
 copy test/plugin/scenarios/{shardingsphere-4.x-RC1-RC2-scenario => shardingsphere-5.0.0-beta-scenario}/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/utility/config/ExampleConfiguration.java (96%)
 copy test/plugin/scenarios/{jetty-scenario/jettyclient-scenario => shardingsphere-5.0.0-beta-scenario}/src/main/resources/application.properties (93%)
 copy test/plugin/scenarios/{dubbo-2.5.x-scenario => shardingsphere-5.0.0-beta-scenario}/support-version.list (98%)