[skywalking] branch master updated (77019ba -> 33d2962)

[wu...@apache.org]

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 77019ba  Rabbitmq instrument consumer class correctly to get duration reported accurately (#3761)
     add 33d2962  [test/plugin] add elasticsearch 7.x plugin test scenario. (#3868)

No new revisions were added by this update.

Summary of changes:
 Jenkinsfile-Agent-Test-4                           |  8 +-
 docs/en/guides/Plugin-test.md                      |  3 +-
 .../service-agent/java-agent/Supported-list.md     |  1 +
 .../elasticsearch-5.x-scenario/configuration.yml   |  6 +-
 .../elasticsearch-6.x-scenario/configuration.yml   |  8 +-
 .../elasticsearch/controller/CaseController.java   |  4 +-
 .../bin/startup.sh                                 |  3 +-
 .../config/expectedData.yaml                       | 96 +++++++++++-----------
 .../configuration.yml                              | 24 ++++--
 .../pom.xml                                        | 42 ++++++----
 .../src/main/assembly/assembly.xml                 |  2 +-
 .../apm/testcase/elasticsearch/Application.java    |  5 +-
 .../elasticsearch/config/ElasticsearchConfig.java  |  0
 .../elasticsearch/controller/CaseController.java   | 28 ++++---
 .../src/main/resources/application.yaml            |  2 +-
 .../src/main/resources/log4j2.xml                  |  0
 .../support-version.list                           | 12 ++-
 17 files changed, 140 insertions(+), 104 deletions(-)
 copy test/plugin/scenarios/{elasticsearch-6.x-scenario => elasticsearch-7.x-scenario}/bin/startup.sh (93%)
 copy test/plugin/scenarios/{mongodb-3.x-scenario => elasticsearch-7.x-scenario}/config/expectedData.yaml (55%)
 copy test/plugin/scenarios/{redisson-scenario => elasticsearch-7.x-scenario}/configuration.yml (60%)
 copy test/plugin/scenarios/{feign-scenario => elasticsearch-7.x-scenario}/pom.xml (80%)
 copy test/plugin/scenarios/{elasticsearch-5.x-scenario => elasticsearch-7.x-scenario}/src/main/assembly/assembly.xml (96%)
 copy test/plugin/scenarios/{elasticsearch-6.x-scenario => elasticsearch-7.x-scenario}/src/main/java/org/apache/skywalking/apm/testcase/elasticsearch/Application.java (94%)
 copy test/plugin/scenarios/{elasticsearch-6.x-scenario => elasticsearch-7.x-scenario}/src/main/java/org/apache/skywalking/apm/testcase/elasticsearch/config/ElasticsearchConfig.java (100%)
 copy test/plugin/scenarios/{elasticsearch-6.x-scenario => elasticsearch-7.x-scenario}/src/main/java/org/apache/skywalking/apm/testcase/elasticsearch/controller/CaseController.java (93%)
 copy test/plugin/scenarios/{feign-scenario => elasticsearch-7.x-scenario}/src/main/resources/application.yaml (95%)
 copy test/plugin/scenarios/{feign-scenario => elasticsearch-7.x-scenario}/src/main/resources/log4j2.xml (100%)
 copy test/plugin/{archetypes/jvm/src/main/resources/archetype-resources => scenarios/elasticsearch-7.x-scenario}/support-version.list (92%)