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 7e889d3 fix: spring annotation inheritance problem #3847 (#3886)
add a2dce71 [test/plugin] immigrate test hystrix scenario. (#3887)
No new revisions were added by this update.
Summary of changes:
Jenkinsfile-Agent-Test-3 | 8 +-
docs/en/guides/Plugin-test.md | 3 +-
.../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 ++++-
14 files changed, 367 insertions(+), 16 deletions(-)
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%)
