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/11/19 08:39:41 UTC
[skywalking] branch top_period updated (d24886b -> e4a505b)
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a change to branch top_period
in repository https://gitbox.apache.org/repos/asf/skywalking.git.
from d24886b make topN worker report period configurable.
add fe98490 Fix Istio architecture link (#3885)
add 70f94d5 make sql statement more semantic. (#3882)
add 96a3e34 Add componentId for apache servicecomb. (#3676)
add 1b433da Add documentation link - illustrate module hierarchy and call flow (#3888)
add 6ffd927 Support spring-tx in optional plugin (#3857)
add 7e889d3 fix: spring annotation inheritance problem #3847 (#3886)
add a2dce71 [test/plugin] immigrate test hystrix scenario. (#3887)
add e4a505b Merge branch 'master' into top_period
No new revisions were added by this update.
Summary of changes:
Jenkinsfile-Agent-Test-2 | 8 +-
Jenkinsfile-Agent-Test-3 | 8 +-
.../network/trace/component/ComponentsDefine.java | 2 +
.../skywalking/apm/agent/core/conf/Config.java | 8 +
.../RequestMappingMethodInterceptor.java | 5 +-
.../interceptor/RestMappingMethodInterceptor.java | 11 +-
.../optional-spring-plugins/pom.xml | 1 +
.../pom.xml | 8 +-
.../EndTransactionMethodInterceptor.java} | 32 ++--
.../GetTransactionMethodInterceptor.java} | 65 ++++----
.../spring/transaction/context/Constants.java | 35 +++++
...PlatformTransactionManagerInstrumentation.java} | 39 ++---
.../src/main/resources/skywalking-plugin.def | 2 +-
docs/README.md | 1 +
docs/en/concepts-and-designs/service-mesh-probe.md | 2 +-
docs/en/guides/Plugin-test.md | 6 +-
docs/en/setup/service-agent/java-agent/README.md | 2 +
.../service-agent/java-agent/Supported-list.md | 1 +
.../src/test/resources/component-libraries.yml | 3 +
.../listener/endpoint/MultiScopesSpanListener.java | 34 +++--
.../src/main/resources/component-libraries.yml | 12 ++
.../bin/startup.sh | 2 +-
.../hystrix-scenario/config/expectedData.yaml | 98 ++++++++++++
.../hystrix-scenario}/configuration.yml | 6 +-
.../hystrix-scenario}/pom.xml | 22 ++-
.../src/main/assembly/assembly.xml | 2 +-
.../apm/testcase/hystrix}/Application.java | 2 +-
.../hystrix/controller/CaseController.java | 92 +++++++++++
.../testcase/hystrix/controller/TestACommand.java | 61 ++++++++
.../testcase/hystrix/controller/TestBCommand.java | 64 ++++++++
.../src/main/resources/application.yaml | 2 +-
.../src/main/resources/log4j2.xml | 0
.../hystrix-scenario}/support-version.list | 21 ++-
.../spring-tx-scenario}/bin/startup.sh | 2 +-
.../spring-tx-scenario/config/expectedData.yaml | 168 +++++++++++++++++++++
.../configuration.yml | 21 ++-
.../pom.xml | 22 +--
.../src/main/assembly/assembly.xml | 2 +-
.../testcase/spring/transaction}/Application.java | 6 +-
.../spring/transaction/config/JdbcConfig.java} | 46 +++---
.../transaction/config/TransactionConfig.java | 24 +--
.../transaction}/controller/CaseController.java | 52 +++----
.../testcase/spring/transaction/dao/DemoDao.java | 13 +-
.../spring/transaction/dao/impl/DemoDaoImpl.java} | 27 ++--
.../spring/transaction/service/DemoService.java | 13 +-
.../transaction/service/impl/DemoServiceImpl.java} | 25 +--
.../src/main/resources/application.properties | 3 +-
.../spring-tx-scenario}/support-version.list | 11 +-
48 files changed, 849 insertions(+), 243 deletions(-)
copy apm-sniffer/optional-plugins/optional-spring-plugins/{spring-annotation-plugin => spring-tx-plugin}/pom.xml (85%)
copy apm-sniffer/optional-plugins/{lettuce-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/lettuce/v5/AsyncCommandMethodInterceptor.java => optional-spring-plugins/spring-tx-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/transaction/EndTransactionMethodInterceptor.java} (64%)
copy apm-sniffer/{apm-sdk-plugin/kafka-plugin/src/main/java/org/apache/skywalking/apm/plugin/kafka/CallbackInterceptor.java => optional-plugins/optional-spring-plugins/spring-tx-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/transaction/GetTransactionMethodInterceptor.java} (51%)
create mode 100644 apm-sniffer/optional-plugins/optional-spring-plugins/spring-tx-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/transaction/context/Constants.java
copy apm-sniffer/{apm-sdk-plugin/spring-plugins/webflux-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/webflux/v5/define/DispatcherHandlerInstrumentation.java => optional-plugins/optional-spring-plugins/spring-tx-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/transaction/define/AbstractPlatformTransactionManagerInstrumentation.java} (67%)
copy apm-sniffer/{apm-sdk-plugin/dubbo-conflict-patch => optional-plugins/optional-spring-plugins/spring-tx-plugin}/src/main/resources/skywalking-plugin.def (86%)
copy test/plugin/scenarios/{feign-scenario => hystrix-scenario}/bin/startup.sh (93%)
create mode 100644 test/plugin/scenarios/hystrix-scenario/config/expectedData.yaml
copy test/plugin/{archetypes/jvm/src/main/resources/archetype-resources => scenarios/hystrix-scenario}/configuration.yml (82%)
copy test/plugin/{archetypes/jvm/src/main/resources/archetype-resources => scenarios/hystrix-scenario}/pom.xml (86%)
copy test/plugin/{archetypes/jvm/src/main/resources/archetype-resources => scenarios/hystrix-scenario}/src/main/assembly/assembly.xml (96%)
copy test/plugin/scenarios/{jedis-scenario/src/main/java/org/apache/skywalking/apm/testcase/jedis => hystrix-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/hystrix}/Application.java (95%)
create mode 100644 test/plugin/scenarios/hystrix-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/hystrix/controller/CaseController.java
create mode 100644 test/plugin/scenarios/hystrix-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/hystrix/controller/TestACommand.java
create mode 100644 test/plugin/scenarios/hystrix-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/hystrix/controller/TestBCommand.java
copy test/plugin/scenarios/{feign-scenario => hystrix-scenario}/src/main/resources/application.yaml (95%)
copy test/plugin/scenarios/{spring-4.3.x-scenario => hystrix-scenario}/src/main/resources/log4j2.xml (100%)
copy test/plugin/{archetypes/jvm/src/main/resources/archetype-resources => scenarios/hystrix-scenario}/support-version.list (85%)
copy test/plugin/{archetypes/jvm/src/main/resources/archetype-resources => scenarios/spring-tx-scenario}/bin/startup.sh (82%)
create mode 100644 test/plugin/scenarios/spring-tx-scenario/config/expectedData.yaml
copy test/plugin/scenarios/{redisson-scenario => spring-tx-scenario}/configuration.yml (68%)
copy test/plugin/scenarios/{redisson-scenario => spring-tx-scenario}/pom.xml (86%)
copy test/plugin/scenarios/{solrj-7.x-scenario => spring-tx-scenario}/src/main/assembly/assembly.xml (96%)
copy test/plugin/scenarios/{redisson-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/redisson => spring-tx-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/spring/transaction}/Application.java (86%)
copy test/plugin/scenarios/{postgresql-above9.4.1207-scenario/src/main/java/org/apache/skywalking/apm/testcase/postgresql/controller/PostgresqlConfig.java => spring-tx-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/spring/transaction/config/JdbcConfig.java} (50%)
copy apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/util/PeerFormat.java => test/plugin/scenarios/spring-tx-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/spring/transaction/config/TransactionConfig.java (60%)
copy test/plugin/scenarios/{redisson-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/redisson => spring-tx-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/spring/transaction}/controller/CaseController.java (58%)
copy apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/logging/core/LogOutput.java => test/plugin/scenarios/spring-tx-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/spring/transaction/dao/DemoDao.java (84%)
copy test/plugin/scenarios/{spring-3.1.x-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/spring3/service/TestServiceBean.java => spring-tx-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/spring/transaction/dao/impl/DemoDaoImpl.java} (61%)
copy apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/logging/core/LogOutput.java => test/plugin/scenarios/spring-tx-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/spring/transaction/service/DemoService.java (84%)
copy test/plugin/scenarios/{spring-3.0.x-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/spring3/service/TestServiceBean.java => spring-tx-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/spring/transaction/service/impl/DemoServiceImpl.java} (63%)
copy test/plugin/scenarios/{canal-scenario => spring-tx-scenario}/src/main/resources/application.properties (90%)
copy test/plugin/{archetypes/jvm/src/main/resources/archetype-resources => scenarios/spring-tx-scenario}/support-version.list (84%)