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/15 13:17:14 UTC
[skywalking] branch blocking-queue updated (777ce51 -> 3bb14ea)
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a change to branch blocking-queue
in repository https://gitbox.apache.org/repos/asf/skywalking.git.
from 777ce51 Merge branch 'master' into blocking-queue
add a0306ca UI Sync: multiple metrics compare and topology interaction (#3852)
add db0b748 fix component-libraries.yml miss component:rest-high-level-client (#3859)
add 41bb3b5 [hotfix] Make socketio-plugin test case stable (#3861)
add 5f8ee25 [test/plugin] immigrate test feign scenario. (#3838)
add d0a1cdd Rabbitmq plugin test migration (#3788)
add b2d1460 make words be consistent in the context.& fix typo (#3865)
add e8f6789 Make kafka-scenario stable (#3866)
add 3bb14ea Merge branch 'master' into blocking-queue
No new revisions were added by this update.
Summary of changes:
Jenkinsfile-Agent-Test | 15 +-
docs/en/guides/Plugin-test.md | 14 +-
.../src/test/resources/component-libraries.yml | 6 +-
skywalking-ui | 2 +-
test/plugin/containers/jvm-container/docker/run.sh | 2 +-
.../containers/tomcat-container/docker/catalina.sh | 2 +-
.../feign-scenario}/bin/startup.sh | 2 +-
.../feign-scenario/config/expectedData.yaml | 202 +++++++++++++++++++++
.../feign-scenario}/configuration.yml | 6 +-
.../feign-scenario}/pom.xml | 39 +++-
.../src/main/assembly/assembly.xml | 2 +-
.../apm/testcase/feign}/Application.java | 3 +-
.../testcase/feign}/controller/CaseController.java | 34 ++--
.../testcase/feign/controller/RestController.java} | 30 ++-
.../apm/testcase/feign/controller/RestRequest.java | 57 ++++++
.../apm/testcase/feign}/entity/User.java | 2 +-
.../src/main/resources/application.yaml | 4 +-
.../feign-scenario}/src/main/resources/log4j2.xml | 0
.../feign-scenario}/support-version.list | 10 +-
.../scenarios/kafka-scenario/configuration.yml | 1 +
.../apm/testcase/netty/socketio/CaseServlet.java | 38 +++-
.../testcase/netty/socketio/ContextListener.java | 45 -----
.../netty/socketio/HealthCheckServlet.java | 6 +-
.../testcase/netty/socketio/SocketIOStarter.java | 47 ++---
.../bin/startup.sh | 3 +-
.../rabbitmq-scenario/config/expectedData.yaml | 83 +++++++++
.../configuration.yml | 26 +--
.../pom.xml | 56 +++---
.../src/main/assembly/assembly.xml | 2 +-
.../apm/testcase/rabbitmq}/Application.java | 3 +-
.../rabbitmq/controller/CaseController.java | 152 ++++++++++++++++
.../src/main/resources/application.properties | 2 +-
.../src/main/resources/log4j2.xml | 0
.../rabbitmq-scenario}/support-version.list | 13 +-
34 files changed, 713 insertions(+), 196 deletions(-)
copy test/plugin/{archetypes/jvm/src/main/resources/archetype-resources => scenarios/feign-scenario}/bin/startup.sh (93%)
create mode 100644 test/plugin/scenarios/feign-scenario/config/expectedData.yaml
copy test/plugin/{archetypes/jvm/src/main/resources/archetype-resources => scenarios/feign-scenario}/configuration.yml (81%)
copy test/plugin/{archetypes/jvm/src/main/resources/archetype-resources => scenarios/feign-scenario}/pom.xml (76%)
copy test/plugin/scenarios/{kafka-scenario => feign-scenario}/src/main/assembly/assembly.xml (96%)
copy test/plugin/{archetypes/jvm/src/main/resources/archetype-resources/src/main/java => scenarios/feign-scenario/src/main/java/org/apache/skywalking/apm/testcase/feign}/Application.java (95%)
copy test/plugin/{archetypes/jvm/src/main/resources/archetype-resources/src/main/java => scenarios/feign-scenario/src/main/java/org/apache/skywalking/apm/testcase/feign}/controller/CaseController.java (59%)
copy test/plugin/scenarios/{spring-4.3.x-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/restapi/RestCaseController.java => feign-scenario/src/main/java/org/apache/skywalking/apm/testcase/feign/controller/RestController.java} (78%)
create mode 100644 test/plugin/scenarios/feign-scenario/src/main/java/org/apache/skywalking/apm/testcase/feign/controller/RestRequest.java
copy test/plugin/scenarios/{spring-4.1.x-scenario/src/main/java/test/org/apache/skywalking/apm/testcase => feign-scenario/src/main/java/org/apache/skywalking/apm/testcase/feign}/entity/User.java (95%)
copy test/plugin/{archetypes/jvm/src/main/resources/archetype-resources => scenarios/feign-scenario}/src/main/resources/application.yaml (92%)
copy test/plugin/{archetypes/tomcat/src/main/resources/archetype-resources => scenarios/feign-scenario}/src/main/resources/log4j2.xml (100%)
copy test/plugin/{archetypes/tomcat/src/main/resources/archetype-resources => scenarios/feign-scenario}/support-version.list (94%)
delete mode 100644 test/plugin/scenarios/netty-socketio-scenario/src/main/java/org/apache/skywalking/apm/testcase/netty/socketio/ContextListener.java
copy test/plugin/scenarios/{sofarpc-scenario => rabbitmq-scenario}/bin/startup.sh (92%)
create mode 100644 test/plugin/scenarios/rabbitmq-scenario/config/expectedData.yaml
copy test/plugin/scenarios/{postgresql-scenario => rabbitmq-scenario}/configuration.yml (66%)
copy test/plugin/scenarios/{postgresql-scenario => rabbitmq-scenario}/pom.xml (84%)
copy test/plugin/scenarios/{redisson-scenario => rabbitmq-scenario}/src/main/assembly/assembly.xml (96%)
copy test/plugin/{archetypes/jvm/src/main/resources/archetype-resources/src/main/java => scenarios/rabbitmq-scenario/src/main/java/org/apache/skywalking/apm/testcase/rabbitmq}/Application.java (95%)
create mode 100644 test/plugin/scenarios/rabbitmq-scenario/src/main/java/org/apache/skywalking/apm/testcase/rabbitmq/controller/CaseController.java
copy test/plugin/scenarios/{canal-scenario => rabbitmq-scenario}/src/main/resources/application.properties (94%)
copy test/plugin/scenarios/{mongodb-3.x-scenario => rabbitmq-scenario}/src/main/resources/log4j2.xml (100%)
copy test/plugin/{archetypes/jvm/src/main/resources/archetype-resources => scenarios/rabbitmq-scenario}/support-version.list (91%)