[skywalking] branch master updated (bf6491f -> ba192a9)

[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 bf6491f  [Feature] Provide Java Agent for Apache HttpClient 3.x (#4111)
     add ba192a9  [test/plugin] immigrate test servicecomb scenario (#4109)

No new revisions were added by this update.

Summary of changes:
 .github/workflows/plugins-test.yaml                |  6 +-
 .../service-agent/java-agent/Supported-list.md     |  4 +-
 .../servicecomb-0.x-scenario}/bin/startup.sh       |  2 +-
 .../config/expectedData.yaml                       | 48 +++++++-------
 .../configuration.yml                              |  6 +-
 .../pom.xml                                        | 60 ++++++++++-------
 .../src/main/assembly/assembly.xml                 |  2 +-
 .../apm/testcase/servicecomb/CodeFirstMain.java    | 52 +++++++++++++++
 .../consumer/CodeFirstPojoConsumerHelloImpl.java   | 50 ++++++++++++++
 .../provider/CodeFirstJaxrsHelloImpl.java          | 39 +++++------
 .../provider/CodeFirstPojoHelloProviderImpl.java   | 32 +++------
 .../provider/CodeFirstSpringmvcHelloImpl.java      | 47 +++++++++++++
 .../apm/testcase/servicecomb/schema/Hello.java     | 12 ++--
 .../testcase/servicecomb/schema/models/Person.java | 21 +++---
 .../main/resources/META-INF/spring/pojo.bean.xml   | 23 +++----
 .../main/resources/config/log4j.demo.properties}   |  6 +-
 .../src/main/resources/microservice.yaml           | 19 ++++--
 .../support-version.list                           |  6 +-
 .../servicecomb-1.x-scenario}/bin/startup.sh       |  2 +-
 .../config/expectedData.yaml                       | 48 +++++++-------
 .../configuration.yml                              |  6 +-
 .../pom.xml                                        | 76 ++++++++++++----------
 .../src/main/assembly/assembly.xml                 |  2 +-
 .../apm/testcase/servicecomb/CodeFirstMain.java    | 52 +++++++++++++++
 .../consumer/CodeFirstPojoConsumerHelloImpl.java   | 50 ++++++++++++++
 .../provider/CodeFirstJaxrsHelloImpl.java          | 40 ++++++------
 .../provider/CodeFirstPojoHelloProviderImpl.java   | 32 +++------
 .../provider/CodeFirstSpringmvcHelloImpl.java      | 47 +++++++++++++
 .../apm/testcase/servicecomb/schema/Hello.java     | 12 ++--
 .../testcase/servicecomb/schema/models/Person.java | 21 +++---
 .../main/resources/META-INF/spring/pojo.bean.xml   | 23 +++----
 .../main/resources/config/log4j.demo.properties}   |  6 +-
 .../src/main/resources/microservice.yaml           | 19 ++++--
 .../support-version.list                           |  8 +--
 34 files changed, 594 insertions(+), 285 deletions(-)
 copy test/plugin/{archetypes/jvm/src/main/resources/archetype-resources => scenarios/servicecomb-0.x-scenario}/bin/startup.sh (92%)
 copy test/plugin/scenarios/{armeria-0.96minus-scenario => servicecomb-0.x-scenario}/config/expectedData.yaml (62%)
 copy test/plugin/scenarios/{okhttp-scenario => servicecomb-0.x-scenario}/configuration.yml (84%)
 copy test/plugin/scenarios/{jedis-scenario => servicecomb-0.x-scenario}/pom.xml (73%)
 copy test/plugin/scenarios/{httpasyncclient-scenario => servicecomb-0.x-scenario}/src/main/assembly/assembly.xml (96%)
 create mode 100644 test/plugin/scenarios/servicecomb-0.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/servicecomb/CodeFirstMain.java
 create mode 100644 test/plugin/scenarios/servicecomb-0.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/servicecomb/consumer/CodeFirstPojoConsumerHelloImpl.java
 copy apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/trace/NoopExitSpan.java => test/plugin/scenarios/servicecomb-0.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/servicecomb/provider/CodeFirstJaxrsHelloImpl.java (52%)
 copy apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/trace/NoopExitSpan.java => test/plugin/scenarios/servicecomb-0.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/servicecomb/provider/CodeFirstPojoHelloProviderImpl.java (61%)
 create mode 100644 test/plugin/scenarios/servicecomb-0.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/servicecomb/provider/CodeFirstSpringmvcHelloImpl.java
 copy apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/logging/core/Converter.java => test/plugin/scenarios/servicecomb-0.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/servicecomb/schema/Hello.java (77%)
 copy oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/entity/Node.java => test/plugin/scenarios/servicecomb-0.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/servicecomb/schema/models/Person.java (78%)
 copy apm-protocol/pom.xml => test/plugin/scenarios/servicecomb-0.x-scenario/src/main/resources/META-INF/spring/pojo.bean.xml (60%)
 copy test/plugin/{mock-collector/src/main/resources/config.properties => scenarios/servicecomb-0.x-scenario/src/main/resources/config/log4j.demo.properties} (94%)
 copy apm-sniffer/optional-plugins/customize-enhance-plugin/src/main/resources/META-INF/services/org.apache.skywalking.apm.agent.core.plugin.loader.InstrumentationLoader => test/plugin/scenarios/servicecomb-0.x-scenario/src/main/resources/microservice.yaml (70%)
 mode change 100755 => 100644
 copy test/plugin/scenarios/{jdk-http-scenario => servicecomb-0.x-scenario}/support-version.list (96%)
 copy test/plugin/{archetypes/jvm/src/main/resources/archetype-resources => scenarios/servicecomb-1.x-scenario}/bin/startup.sh (92%)
 copy test/plugin/scenarios/{armeria-0.96minus-scenario => servicecomb-1.x-scenario}/config/expectedData.yaml (62%)
 copy test/plugin/scenarios/{grpc-scenario => servicecomb-1.x-scenario}/configuration.yml (82%)
 copy test/plugin/scenarios/{cassandra-java-driver-3.x-scenario => servicecomb-1.x-scenario}/pom.xml (67%)
 copy test/plugin/scenarios/{httpasyncclient-scenario => servicecomb-1.x-scenario}/src/main/assembly/assembly.xml (96%)
 create mode 100644 test/plugin/scenarios/servicecomb-1.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/servicecomb/CodeFirstMain.java
 create mode 100644 test/plugin/scenarios/servicecomb-1.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/servicecomb/consumer/CodeFirstPojoConsumerHelloImpl.java
 copy apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/trace/NoopExitSpan.java => test/plugin/scenarios/servicecomb-1.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/servicecomb/provider/CodeFirstJaxrsHelloImpl.java (52%)
 copy apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/trace/NoopExitSpan.java => test/plugin/scenarios/servicecomb-1.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/servicecomb/provider/CodeFirstPojoHelloProviderImpl.java (61%)
 create mode 100644 test/plugin/scenarios/servicecomb-1.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/servicecomb/provider/CodeFirstSpringmvcHelloImpl.java
 copy apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/logging/core/Converter.java => test/plugin/scenarios/servicecomb-1.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/servicecomb/schema/Hello.java (77%)
 copy oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/entity/Node.java => test/plugin/scenarios/servicecomb-1.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/servicecomb/schema/models/Person.java (78%)
 copy apm-protocol/pom.xml => test/plugin/scenarios/servicecomb-1.x-scenario/src/main/resources/META-INF/spring/pojo.bean.xml (60%)
 copy test/plugin/{mock-collector/src/main/resources/config.properties => scenarios/servicecomb-1.x-scenario/src/main/resources/config/log4j.demo.properties} (94%)
 copy apm-sniffer/optional-plugins/customize-enhance-plugin/src/main/resources/META-INF/services/org.apache.skywalking.apm.agent.core.plugin.loader.InstrumentationLoader => test/plugin/scenarios/servicecomb-1.x-scenario/src/main/resources/microservice.yaml (70%)
 mode change 100755 => 100644
 copy test/plugin/scenarios/{canal-scenario => servicecomb-1.x-scenario}/support-version.list (96%)