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/04/27 14:41:37 UTC
[skywalking] branch wu-sheng-patch-1 updated (2177d22 -> 551e5fc)
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a change to branch wu-sheng-patch-1
in repository https://gitbox.apache.org/repos/asf/skywalking.git.
from 2177d22 Update README.md
add 36c61fc Add an optional agent plugin to support mybatis. (#6838)
add 551e5fc Merge branch 'master' into wu-sheng-patch-1
No new revisions were added by this update.
Summary of changes:
CHANGES.md | 1 +
.../network/trace/component/ComponentsDefine.java | 2 +
.../apm/agent/core/context/tag/Tags.java | 2 +
.../apm/agent/core/context/trace/AbstractSpan.java | 2 +
.../core/context/trace/AbstractTracingSpan.java | 5 +
.../apm/agent/core/context/trace/NoopSpan.java | 5 +
.../pom.xml | 13 +--
.../apm/plugin/mybatis/MyBatisMethodMatch.java} | 22 ++--
.../mybatis/SqlSessionOperationInterceptor.java} | 48 ++++----
.../mybatis/define/MyBatisInstrumentation.java} | 15 +--
.../define/MyBatisSpringInstrumentation.java} | 15 +--
.../src/main}/resources/skywalking-plugin.def | 3 +-
apm-sniffer/optional-plugins/pom.xml | 1 +
.../setup/service-agent/java-agent/Plugin-list.md | 1 +
docs/en/setup/service-agent/java-agent/README.md | 1 +
.../service-agent/java-agent/Supported-list.md | 2 +
.../src/main/resources/component-libraries.yml | 3 +
.../bin/startup.sh | 2 +-
.../mybatis-3.x-scenario/config/expectedData.yaml | 128 +++++++++++++++++++++
.../configuration.yml | 6 +-
.../pom.xml | 28 ++++-
.../src/main/assembly/assembly.xml | 2 +-
.../apm/testcase/mybatis}/Application.java | 5 +-
.../apm/testcase/mybatis}/config/JdbcConfig.java | 2 +-
.../mybatis}/controller/CaseController.java | 8 +-
.../apm/testcase/mybatis/mapper/DemoMapper.java | 11 +-
.../apm/testcase/mybatis}/service/DemoService.java | 2 +-
.../mybatis}/service/impl/DemoServiceImpl.java | 14 +--
.../src/main/resources/application.properties | 10 +-
.../src/main/resources/mapper/DemoMapper.xml | 54 +++++----
.../support-version.list | 3 +-
31 files changed, 301 insertions(+), 115 deletions(-)
copy apm-sniffer/optional-plugins/{quartz-scheduler-2.x-plugin => mybatis-3.x-plugin}/pom.xml (81%)
copy apm-sniffer/{apm-agent-core/src/test/java/org/apache/skywalking/apm/agent/core/plugin/bytebuddy/ReturnTypeNameMatchTest.java => optional-plugins/mybatis-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/mybatis/MyBatisMethodMatch.java} (62%)
copy apm-sniffer/{apm-sdk-plugin/vertx-plugins/vertx-core-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/vertx3/HttpContextHandleDispatchResponseInterceptor.java => optional-plugins/mybatis-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/mybatis/SqlSessionOperationInterceptor.java} (56%)
copy apm-sniffer/optional-plugins/{optional-spring-plugins/spring-webflux-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/webflux/v5/define/DispatcherHandlerInstrumentation.java => mybatis-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/mybatis/define/MyBatisInstrumentation.java} (80%)
copy apm-sniffer/optional-plugins/{optional-spring-plugins/spring-webflux-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/webflux/v5/define/DispatcherHandlerInstrumentation.java => mybatis-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/mybatis/define/MyBatisSpringInstrumentation.java} (80%)
copy apm-sniffer/{apm-agent-core/src/test => optional-plugins/mybatis-3.x-plugin/src/main}/resources/skywalking-plugin.def (82%)
copy test/plugin/scenarios/{apm-toolkit-trace-scenario => mybatis-3.x-scenario}/bin/startup.sh (89%)
create mode 100644 test/plugin/scenarios/mybatis-3.x-scenario/config/expectedData.yaml
copy test/plugin/scenarios/{spring-tx-scenario => mybatis-3.x-scenario}/configuration.yml (84%)
copy test/plugin/scenarios/{spring-tx-scenario => mybatis-3.x-scenario}/pom.xml (82%)
copy test/plugin/scenarios/{graphql-8.x-scenario => mybatis-3.x-scenario}/src/main/assembly/assembly.xml (96%)
copy test/plugin/scenarios/{apm-toolkit-trace-scenario/src/main/java/test/apache/skywalking/apm/testcase/toolkit => mybatis-3.x-scenario/src/main/java/test/apache/skywalking/apm/testcase/mybatis}/Application.java (86%)
copy test/plugin/scenarios/{spring-tx-scenario/src/main/java/test/apache/skywalking/apm/testcase/spring/transaction => mybatis-3.x-scenario/src/main/java/test/apache/skywalking/apm/testcase/mybatis}/config/JdbcConfig.java (96%)
copy test/plugin/scenarios/{spring-tx-scenario/src/main/java/test/apache/skywalking/apm/testcase/spring/transaction => mybatis-3.x-scenario/src/main/java/test/apache/skywalking/apm/testcase/mybatis}/controller/CaseController.java (89%)
copy oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/provider/LALConfig.java => test/plugin/scenarios/mybatis-3.x-scenario/src/main/java/test/apache/skywalking/apm/testcase/mybatis/mapper/DemoMapper.java (81%)
copy test/plugin/scenarios/{spring-tx-scenario/src/main/java/test/apache/skywalking/apm/testcase/spring/transaction => mybatis-3.x-scenario/src/main/java/test/apache/skywalking/apm/testcase/mybatis}/service/DemoService.java (92%)
copy test/plugin/scenarios/{spring-tx-scenario/src/main/java/test/apache/skywalking/apm/testcase/spring/transaction => mybatis-3.x-scenario/src/main/java/test/apache/skywalking/apm/testcase/mybatis}/service/impl/DemoServiceImpl.java (72%)
copy test/plugin/scenarios/{canal-scenario => mybatis-3.x-scenario}/src/main/resources/application.properties (67%)
copy apm-checkstyle/importControl.xml => test/plugin/scenarios/mybatis-3.x-scenario/src/main/resources/mapper/DemoMapper.xml (68%)
copy test/plugin/scenarios/{apm-toolkit-trace-scenario => mybatis-3.x-scenario}/support-version.list (98%)