You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@skywalking.apache.org by ke...@apache.org on 2021/05/06 04:21:00 UTC

[skywalking] branch feature/envoy-tcp-log updated (d8c1f3c -> 8701355)

This is an automated email from the ASF dual-hosted git repository.

kezhenxu94 pushed a change to branch feature/envoy-tcp-log
in repository https://gitbox.apache.org/repos/asf/skywalking.git.


 discard d8c1f3c  Revert dispatcher class cache and enhance oal definition class to allow customized dispatcher package name
 discard 0f963a3  Separate an individual OAL file for TCP, and cache the dispatcher class to avoid defining them twice
 discard 0a8dc72  Add TCP throughput and some basic metrics, will add more
 discard 8349b80  Polish the status and add todo item
 discard b033dbe  feature: Envoy access log receiver supports TCP logs
     add 1aa5f26  feature:Support alarm to WeLink (#6794)
     add 9de3724  feat: add enhance pulsar MessageListener instance (#6774)
     add dfd7ebd  Add shasum verification to Codecov Bash Uploader (#6843)
     add afe4cb0  fix: Some incompatibles check codes didn't work  in `PercentileFunction combine` (#6851)
     add a0dd4d5  Refine README.md and backend-oal-scripts.md (#6849)
     add 09cbfe2  Exit when failed to validate the shasum (#6852)
     add d85f131  sync ui (#6856)
     add 36c61fc  Add an optional agent plugin to support mybatis. (#6838)
     add ea0390e  Enhance reconnection mechanism of agent kafka reporter plugin. (#6855)
     add b850e5c  Bump up Jetty version to fix cve (#6861)
     add 1ff0e42  Fix a missing part about tag in the alarm doc and be clear about JDK versions of agent (#6859)
     add d98b8ee  fix spelling errors(rebootName -> robotName) in WeLinkAlarm. (#6860)
     add 88f40a6  Refine backend-profile-export.md (#6865)
     add b117689  sync ui (#6868)
     add db1d655  Fix: MAL function would miss samples name after creating new samples. (#6864)
     add 10ddf0c  fix a bug that spring-mvc set an error endpoint name  (#6783)
     add e9fc6bc  Fix #6835 Add compatibility with Kafka client version 2.8.x (#6837)
     add 4ecf7ff  Refine backend-profile.md (#6873)
     add 83757da  perf: use iterator.remove() to remove modulesWithoutProvider (#6874)
     add 684e59c  Refine source-extension.md (#6879)
     add 6e8a748  Refine alarm.md (#6882)
     add f3175ec  sync ui (#6883)
     add 63ea62f  Refine storage-extention.md (#6885)
     add edc154c  Add spring cloud gateway 3.x plugin (#6881)
     add 17fffe8  Refine committer.md (#6890)
     add a7fd97c  feature: Envoy access log receiver supports TCP logs
     add fe21652  Polish the status and add todo item
     add 285af63  Add TCP throughput and some basic metrics, will add more
     add 0a552a1  Separate an individual OAL file for TCP, and cache the dispatcher class to avoid defining them twice
     add f5c2398  Revert dispatcher class cache and enhance oal definition class to allow customized dispatcher package name
     add a27359a  Backup
     add 6f7cab4  Revert metrics and get topology ready
     add 8701355  Add tcp service into E2E

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (d8c1f3c)
            \
             N -- N -- N   refs/heads/feature/envoy-tcp-log (8701355)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

No new revisions were added by this update.

Summary of changes:
 .github/workflows/e2e.istio.yaml                   |   8 +-
 .github/workflows/plugins-test.3.yaml              |   1 +
 CHANGES.md                                         |  13 +
 .../network/trace/component/ComponentsDefine.java  |   2 +
 .../apm/agent/core/context/tag/Tags.java           |   2 +
 .../apm/agent/core/context/trace/AbstractSpan.java |   2 +
 .../core/context/trace/AbstractTracingSpan.java    |   5 +
 .../apm/agent/core/context/trace/NoopSpan.java     |   5 +
 ...java => AbstractConstructorInterceptPoint.java} |  17 +-
 ...nstructorWithConsumerConfigInterceptPoint.java} |  22 +-
 .../kafka/ConstructorWithMapInterceptPoint.java    |  53 ++
 .../kafka/define/KafkaConsumerInstrumentation.java |  20 +-
 ...uctorWithConsumerConfigInterceptPointTest.java} |  14 +-
 ...a => ConstructorWithMapInterceptPointTest.java} |  20 +-
 .../pulsar/ConsumerConstructorInterceptor.java     |   1 +
 .../plugin/pulsar/ConsumerEnhanceRequiredInfo.java |  13 +
 .../pulsar/MessageConstructorInterceptor.java}     |  22 +-
 ...edInfo.java => MessageEnhanceRequiredInfo.java} |  32 +-
 .../plugin/pulsar/PulsarConsumerInterceptor.java   |  16 +-
 ...java => PulsarConsumerListenerInterceptor.java} |  69 ++-
 .../pulsar/define/MessageInstrumentation.java      |  71 +++
 .../PulsarConsumerListenerInstrumentation.java     |  76 +++
 .../src/main/resources/skywalking-plugin.def       |   4 +-
 .../pulsar/ConsumerConstructorInterceptorTest.java |   9 +
 .../skywalking/apm/plugin/pulsar/MockConsumer.java | 181 +++++++
 .../skywalking/apm/plugin/pulsar/MockMessage.java  |  15 +-
 .../pulsar/PulsarConsumerInterceptorTest.java      |  33 +-
 ... => PulsarConsumerListenerInterceptorTest.java} |  94 +++-
 .../mvc/v3/ControllerConstructorInterceptor.java   |   3 +-
 .../mvc/v4/ControllerConstructorInterceptor.java   |   3 +-
 ...trollerForLowVersionConstructorInterceptor.java |   3 +-
 .../mvc/v5/ControllerConstructorInterceptor.java   |   3 +-
 .../RequestMappingMethodInterceptor.java           |   6 +-
 .../pom.xml                                        |  28 +-
 .../apm/plugin/mybatis/MyBatisMethodMatch.java     |  27 +-
 .../mybatis/SqlSessionOperationInterceptor.java    |  72 +++
 .../mybatis/define/MyBatisInstrumentation.java     |  64 +++
 .../define/MyBatisSpringInstrumentation.java       |  64 +++
 .../src/main/resources/skywalking-plugin.def       |  11 +-
 .../gateway-3.x-plugin/pom.xml                     |  80 +++
 .../HttpClientFinalizerConstructorInterceptor.java |  43 ++
 ...ientFinalizerResponseConnectionInterceptor.java |  77 +++
 .../v3x/HttpClientFinalizerSendInterceptor.java    | 105 ++++
 .../v3x/HttpClientFinalizerUriInterceptor.java     |  52 ++
 .../gateway/v3x/NettyRoutingFilterInterceptor.java |  76 +++
 .../AbstractGatewayV3EnhancePluginDefine.java      |  32 ++
 .../define/DispatcherHandlerInstrumentation.java   |  26 +-
 .../gateway/v3x/define/EnhanceObjectCache.java     |  54 ++
 .../define/HttpClientFinalizerInstrumentation.java | 121 +++++
 .../define/NettyRoutingFilterInstrumentation.java  |  75 +++
 .../define/ServerWebExchangeInstrumentation.java   |  26 +-
 .../src/main/resources/skywalking-plugin.def       |   7 +-
 ...pClientFinalizerConstructorInterceptorTest.java |  70 +++
 .../v3x/HttpClientFinalizerInterceptorTest.java    | 171 +++++++
 .../cloud/gateway/v3x/MockCliengRequest.java       | 125 +++++
 .../cloud/gateway/v3x/MockClientResponse.java      | 104 ++++
 .../v3x/NettyRoutingFilterInterceptorTest.java     | 104 ++++
 .../optional-spring-cloud/pom.xml                  |   1 +
 apm-sniffer/optional-plugins/pom.xml               |   1 +
 .../apm/agent/core/kafka/KafkaProducerManager.java |   1 +
 dist-material/release-docs/LICENSE                 |   2 +-
 docs/en/guides/README.md                           | 126 +++--
 docs/en/guides/asf/committer.md                    |  29 +-
 docs/en/guides/backend-oal-scripts.md              |  14 +-
 docs/en/guides/backend-profile-export.md           |  24 +-
 docs/en/guides/backend-profile.md                  |  32 +-
 docs/en/guides/source-extension.md                 |  49 +-
 docs/en/guides/storage-extention.md                |  17 +-
 docs/en/setup/backend/backend-alarm.md             |  23 +-
 .../setup/service-agent/java-agent/Plugin-list.md  |   2 +
 docs/en/setup/service-agent/java-agent/README.md   |   3 +-
 .../service-agent/java-agent/Supported-list.md     |   6 +-
 .../oap/meter/analyzer/dsl/SampleFamily.java       |  11 +-
 .../oap/meter/analyzer/dsl/AggregationTest.java    |  95 ++--
 .../oap/meter/analyzer/dsl/AnalyzerTest.java       |  20 +-
 .../oap/meter/analyzer/dsl/ArithmeticTest.java     | 372 +++++++++-----
 .../oap/meter/analyzer/dsl/BasicTest.java          |   4 +-
 .../oap/meter/analyzer/dsl/FunctionTest.java       |  52 +-
 .../oap/meter/analyzer/dsl/IncreaseTest.java       |  96 ++--
 .../oap/meter/analyzer/dsl/K8sTagTest.java         |  12 +
 .../oap/meter/analyzer/dsl/ScopeTest.java          | 136 ++---
 .../oap/meter/analyzer/dsl/TagFilterTest.java      |   4 +-
 .../oap/meter/analyzer/dsl/ValueFilterTest.java    |  60 +--
 oap-server/pom.xml                                 |   2 +-
 .../core/alarm/provider/AlarmRulesWatcher.java     |   4 +
 .../server/core/alarm/provider/NotifyHandler.java  |   2 +
 .../oap/server/core/alarm/provider/Rules.java      |   2 +
 .../server/core/alarm/provider/RulesReader.java    |  32 +-
 .../alarm/provider/welink/WeLinkHookCallback.java  | 172 +++++++
 .../core/alarm/provider/welink/WeLinkSettings.java |  73 +++
 .../core/alarm/provider/AlarmRulesWatcherTest.java |   1 +
 .../provider/welink/WeLinkHookCallbackTest.java    | 154 ++++++
 .../src/test/resources/alarm-settings.yml          |  13 +
 .../starter/config/ApplicationConfigLoader.java    |  22 +-
 .../src/main/resources/alarm-settings.yml          |  13 +
 .../src/main/resources/component-libraries.yml     |   5 +-
 .../src/main/resources/lal/envoy-als.yaml          |   2 +-
 .../src/main/resources/otel-oc-rules/envoy.yaml    |  40 --
 .../ui-initialized-templates/istio-dp.yml          |  57 +--
 .../meter/function/PercentileFunction.java         |  10 +-
 .../avg/AvgHistogramPercentileFunction.java        |  11 +-
 .../adapters/ProtoMetricFamily2MetricsAdapter.java |  31 ++
 .../receiver/mesh/TelemetryDataDispatcher.java     |   2 +-
 skywalking-ui                                      |   2 +-
 .../src/test/resources/expected/als/services.yml   |   2 +
 .../config/expectedData.yaml                       |   0
 .../configuration.yml}                             |  15 +-
 .../gateway-dist/bin/startup.sh                    |   0
 .../gateway-3.x-scenario/gateway-dist/pom.xml      |  54 ++
 .../gateway-dist/src/main/assembly/assembly.xml    |   0
 .../gateway-projectA-scenario/pom.xml              |  67 +++
 .../sc/gateway/projectA/ApiKeyResolver.java        |   0
 .../testcase/sc/gateway/projectA/Application.java  |   0
 .../testcase/sc/gateway/projectA/Test1Filter.java  |   0
 .../testcase/sc/gateway/projectA/Test2Filter.java  |   0
 .../sc/gateway/projectA/TestFilterConfig.java      |   0
 .../src/main/resources/application.yml             |   0
 .../gateway-projectB-scenario/pom.xml              |  57 +++
 .../testcase/sc/gateway/projectB/Application.java  |   0
 .../projectB/controller/TestController.java        |   0
 .../src/main/resources/application.properties      |   0
 test/plugin/scenarios/gateway-3.x-scenario/pom.xml |  58 +++
 .../support-version.list                           |  12 +-
 .../scenarios/kafka-scenario/support-version.list  |   2 +
 .../bin/startup.sh}                                |  14 +-
 .../mybatis-3.x-scenario/config/expectedData.yaml  | 128 +++++
 .../configuration.yml}                             |  26 +-
 test/plugin/scenarios/mybatis-3.x-scenario/pom.xml | 125 +++++
 .../src/main/assembly/assembly.xml                 |  41 ++
 .../apm/testcase/mybatis/Application.java}         |  19 +-
 .../apm/testcase/mybatis/config/JdbcConfig.java    |  49 ++
 .../mybatis/controller}/CaseController.java        |  36 +-
 .../apm/testcase/mybatis/mapper/DemoMapper.java}   |  13 +-
 .../apm/testcase/mybatis/service/DemoService.java} |  11 +-
 .../mybatis/service/impl/DemoServiceImpl.java}     |  19 +-
 .../src/main/resources/application.properties}     |  23 +-
 .../src/main/resources/mapper/DemoMapper.xml       |  26 +
 .../support-version.list                           |  11 +-
 .../pulsar-scenario/config/expectedData.yaml       | 193 +++++---
 .../testcase/pulsar/controller/CaseController.java |  47 +-
 .../spring-3.0.x-scenario/config/expectedData.yaml | 176 +++++--
 .../apm/testcase/spring3/CaseController.java       |   1 +
 .../spring3/implinterface/TestCaseController.java} |  21 +-
 .../spring3}/implinterface/TestCaseInterface.java  |  12 +-
 .../testcase/spring3/service/TestServiceBean.java  |   9 +
 .../spring-3.1.x-scenario/config/expectedData.yaml | 545 ++++++++++++---------
 .../implinterface/TestCaseController.java}         |  19 +-
 .../testcase/implinterface/TestCaseInterface.java  |  10 +-
 .../resttemplate/RestTemplateController.java       |   9 +
 .../spring-4.1.x-scenario/config/expectedData.yaml | 538 +++++++++++---------
 .../testcase/implinterface/TestCaseController.java |   0
 .../testcase/implinterface/TestCaseInterface.java  |   7 +-
 .../resttemplate/RestTemplateController.java       |   9 +
 .../testcase/implinterface/TestCaseInterface.java  |   5 +-
 tools/coverage/report.sh                           |  11 +-
 .../known-oap-backend-dependencies-es7.txt         |  15 +-
 .../known-oap-backend-dependencies.txt             |  15 +-
 157 files changed, 5120 insertions(+), 1624 deletions(-)
 copy apm-sniffer/apm-sdk-plugin/kafka-plugin/src/main/java/org/apache/skywalking/apm/plugin/kafka/{ConsumerConstructorInterceptor.java => AbstractConstructorInterceptPoint.java} (65%)
 copy apm-sniffer/apm-sdk-plugin/kafka-plugin/src/main/java/org/apache/skywalking/apm/plugin/kafka/{ConsumerConstructorInterceptor.java => ConstructorWithConsumerConfigInterceptPoint.java} (60%)
 create mode 100644 apm-sniffer/apm-sdk-plugin/kafka-plugin/src/main/java/org/apache/skywalking/apm/plugin/kafka/ConstructorWithMapInterceptPoint.java
 copy apm-sniffer/apm-sdk-plugin/kafka-plugin/src/test/java/org/apache/skywalking/apm/plugin/kafka/{ConsumerConstructorInterceptorTest.java => ConstructorWithConsumerConfigInterceptPointTest.java} (83%)
 rename apm-sniffer/apm-sdk-plugin/kafka-plugin/src/test/java/org/apache/skywalking/apm/plugin/kafka/{ConsumerConstructorInterceptorTest.java => ConstructorWithMapInterceptPointTest.java} (78%)
 rename apm-sniffer/apm-sdk-plugin/{kafka-plugin/src/main/java/org/apache/skywalking/apm/plugin/kafka/ConsumerConstructorInterceptor.java => pulsar-plugin/src/main/java/org/apache/skywalking/apm/plugin/pulsar/MessageConstructorInterceptor.java} (58%)
 copy apm-sniffer/apm-sdk-plugin/pulsar-plugin/src/main/java/org/apache/skywalking/apm/plugin/pulsar/{ConsumerEnhanceRequiredInfo.java => MessageEnhanceRequiredInfo.java} (62%)
 copy apm-sniffer/apm-sdk-plugin/pulsar-plugin/src/main/java/org/apache/skywalking/apm/plugin/pulsar/{PulsarConsumerInterceptor.java => PulsarConsumerListenerInterceptor.java} (52%)
 create mode 100644 apm-sniffer/apm-sdk-plugin/pulsar-plugin/src/main/java/org/apache/skywalking/apm/plugin/pulsar/define/MessageInstrumentation.java
 create mode 100644 apm-sniffer/apm-sdk-plugin/pulsar-plugin/src/main/java/org/apache/skywalking/apm/plugin/pulsar/define/PulsarConsumerListenerInstrumentation.java
 create mode 100644 apm-sniffer/apm-sdk-plugin/pulsar-plugin/src/test/java/org/apache/skywalking/apm/plugin/pulsar/MockConsumer.java
 copy apm-sniffer/apm-sdk-plugin/pulsar-plugin/src/test/java/org/apache/skywalking/apm/plugin/pulsar/{PulsarConsumerInterceptorTest.java => PulsarConsumerListenerInterceptorTest.java} (56%)
 copy apm-sniffer/optional-plugins/{optional-spring-plugins/optional-spring-cloud => mybatis-3.x-plugin}/pom.xml (72%)
 copy test/plugin/scenarios/spring-3.0.x-scenario/src/main/java/test/apache/skywalking/apm/testcase/spring3/service/TestServiceBean.java => apm-sniffer/optional-plugins/mybatis-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/mybatis/MyBatisMethodMatch.java (55%)
 create mode 100644 apm-sniffer/optional-plugins/mybatis-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/mybatis/SqlSessionOperationInterceptor.java
 create mode 100644 apm-sniffer/optional-plugins/mybatis-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/mybatis/define/MyBatisInstrumentation.java
 create mode 100644 apm-sniffer/optional-plugins/mybatis-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/mybatis/define/MyBatisSpringInstrumentation.java
 copy test/plugin/scenarios/kafka-scenario/support-version.list => apm-sniffer/optional-plugins/mybatis-3.x-plugin/src/main/resources/skywalking-plugin.def (82%)
 create mode 100644 apm-sniffer/optional-plugins/optional-spring-plugins/optional-spring-cloud/gateway-3.x-plugin/pom.xml
 create mode 100644 apm-sniffer/optional-plugins/optional-spring-plugins/optional-spring-cloud/gateway-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/cloud/gateway/v3x/HttpClientFinalizerConstructorInterceptor.java
 create mode 100644 apm-sniffer/optional-plugins/optional-spring-plugins/optional-spring-cloud/gateway-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/cloud/gateway/v3x/HttpClientFinalizerResponseConnectionInterceptor.java
 create mode 100644 apm-sniffer/optional-plugins/optional-spring-plugins/optional-spring-cloud/gateway-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/cloud/gateway/v3x/HttpClientFinalizerSendInterceptor.java
 create mode 100644 apm-sniffer/optional-plugins/optional-spring-plugins/optional-spring-cloud/gateway-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/cloud/gateway/v3x/HttpClientFinalizerUriInterceptor.java
 create mode 100644 apm-sniffer/optional-plugins/optional-spring-plugins/optional-spring-cloud/gateway-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/cloud/gateway/v3x/NettyRoutingFilterInterceptor.java
 create mode 100644 apm-sniffer/optional-plugins/optional-spring-plugins/optional-spring-cloud/gateway-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/cloud/gateway/v3x/define/AbstractGatewayV3EnhancePluginDefine.java
 copy test/plugin/scenarios/spring-3.0.x-scenario/src/main/java/test/apache/skywalking/apm/testcase/spring3/service/TestServiceBean.java => apm-sniffer/optional-plugins/optional-spring-plugins/optional-spring-cloud/gateway-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/cloud/gateway/v3x/define/DispatcherHandlerInstrumentation.java (56%)
 create mode 100644 apm-sniffer/optional-plugins/optional-spring-plugins/optional-spring-cloud/gateway-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/cloud/gateway/v3x/define/EnhanceObjectCache.java
 create mode 100644 apm-sniffer/optional-plugins/optional-spring-plugins/optional-spring-cloud/gateway-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/cloud/gateway/v3x/define/HttpClientFinalizerInstrumentation.java
 create mode 100644 apm-sniffer/optional-plugins/optional-spring-plugins/optional-spring-cloud/gateway-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/cloud/gateway/v3x/define/NettyRoutingFilterInstrumentation.java
 copy test/plugin/scenarios/spring-3.0.x-scenario/src/main/java/test/apache/skywalking/apm/testcase/spring3/service/TestServiceBean.java => apm-sniffer/optional-plugins/optional-spring-plugins/optional-spring-cloud/gateway-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/cloud/gateway/v3x/define/ServerWebExchangeInstrumentation.java (56%)
 copy apm-sniffer/{apm-sdk-plugin/pulsar-plugin => optional-plugins/optional-spring-plugins/optional-spring-cloud/gateway-3.x-plugin}/src/main/resources/skywalking-plugin.def (61%)
 create mode 100644 apm-sniffer/optional-plugins/optional-spring-plugins/optional-spring-cloud/gateway-3.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/spring/cloud/gateway/v3x/HttpClientFinalizerConstructorInterceptorTest.java
 create mode 100644 apm-sniffer/optional-plugins/optional-spring-plugins/optional-spring-cloud/gateway-3.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/spring/cloud/gateway/v3x/HttpClientFinalizerInterceptorTest.java
 create mode 100644 apm-sniffer/optional-plugins/optional-spring-plugins/optional-spring-cloud/gateway-3.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/spring/cloud/gateway/v3x/MockCliengRequest.java
 create mode 100644 apm-sniffer/optional-plugins/optional-spring-plugins/optional-spring-cloud/gateway-3.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/spring/cloud/gateway/v3x/MockClientResponse.java
 create mode 100644 apm-sniffer/optional-plugins/optional-spring-plugins/optional-spring-cloud/gateway-3.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/spring/cloud/gateway/v3x/NettyRoutingFilterInterceptorTest.java
 create mode 100644 oap-server/server-alarm-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/welink/WeLinkHookCallback.java
 create mode 100644 oap-server/server-alarm-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/welink/WeLinkSettings.java
 create mode 100644 oap-server/server-alarm-plugin/src/test/java/org/apache/skywalking/oap/server/core/alarm/provider/welink/WeLinkHookCallbackTest.java
 delete mode 100644 oap-server/server-bootstrap/src/main/resources/otel-oc-rules/envoy.yaml
 copy test/plugin/scenarios/{gateway-2.1.x-scenario => gateway-3.x-scenario}/config/expectedData.yaml (100%)
 copy test/plugin/scenarios/{kafka-scenario/support-version.list => gateway-3.x-scenario/configuration.yml} (76%)
 copy test/plugin/scenarios/{gateway-2.1.x-scenario => gateway-3.x-scenario}/gateway-dist/bin/startup.sh (100%)
 create mode 100644 test/plugin/scenarios/gateway-3.x-scenario/gateway-dist/pom.xml
 copy test/plugin/scenarios/{gateway-2.1.x-scenario => gateway-3.x-scenario}/gateway-dist/src/main/assembly/assembly.xml (100%)
 create mode 100644 test/plugin/scenarios/gateway-3.x-scenario/gateway-projectA-scenario/pom.xml
 copy test/plugin/scenarios/{gateway-2.1.x-scenario => gateway-3.x-scenario}/gateway-projectA-scenario/src/main/java/test/apache/skywalking/apm/testcase/sc/gateway/projectA/ApiKeyResolver.java (100%)
 copy test/plugin/scenarios/{gateway-2.1.x-scenario => gateway-3.x-scenario}/gateway-projectA-scenario/src/main/java/test/apache/skywalking/apm/testcase/sc/gateway/projectA/Application.java (100%)
 copy test/plugin/scenarios/{gateway-2.1.x-scenario => gateway-3.x-scenario}/gateway-projectA-scenario/src/main/java/test/apache/skywalking/apm/testcase/sc/gateway/projectA/Test1Filter.java (100%)
 copy test/plugin/scenarios/{gateway-2.1.x-scenario => gateway-3.x-scenario}/gateway-projectA-scenario/src/main/java/test/apache/skywalking/apm/testcase/sc/gateway/projectA/Test2Filter.java (100%)
 copy test/plugin/scenarios/{gateway-2.1.x-scenario => gateway-3.x-scenario}/gateway-projectA-scenario/src/main/java/test/apache/skywalking/apm/testcase/sc/gateway/projectA/TestFilterConfig.java (100%)
 copy test/plugin/scenarios/{gateway-2.1.x-scenario => gateway-3.x-scenario}/gateway-projectA-scenario/src/main/resources/application.yml (100%)
 create mode 100644 test/plugin/scenarios/gateway-3.x-scenario/gateway-projectB-scenario/pom.xml
 copy test/plugin/scenarios/{gateway-2.1.x-scenario => gateway-3.x-scenario}/gateway-projectB-scenario/src/main/java/test/apache/skywalking/apm/testcase/sc/gateway/projectB/Application.java (100%)
 copy test/plugin/scenarios/{gateway-2.1.x-scenario => gateway-3.x-scenario}/gateway-projectB-scenario/src/main/java/test/apache/skywalking/apm/testcase/sc/gateway/projectB/controller/TestController.java (100%)
 copy test/plugin/scenarios/{gateway-2.1.x-scenario => gateway-3.x-scenario}/gateway-projectB-scenario/src/main/resources/application.properties (100%)
 create mode 100644 test/plugin/scenarios/gateway-3.x-scenario/pom.xml
 copy test/plugin/scenarios/{kafka-scenario => gateway-3.x-scenario}/support-version.list (93%)
 copy test/plugin/scenarios/{kafka-scenario/support-version.list => mybatis-3.x-scenario/bin/startup.sh} (84%)
 create mode 100644 test/plugin/scenarios/mybatis-3.x-scenario/config/expectedData.yaml
 copy test/plugin/scenarios/{kafka-scenario/support-version.list => mybatis-3.x-scenario/configuration.yml} (63%)
 create mode 100644 test/plugin/scenarios/mybatis-3.x-scenario/pom.xml
 create mode 100644 test/plugin/scenarios/mybatis-3.x-scenario/src/main/assembly/assembly.xml
 copy test/plugin/scenarios/{spring-4.3.x-scenario/src/main/java/test/apache/skywalking/apm/testcase/implinterface/TestCaseInterface.java => mybatis-3.x-scenario/src/main/java/test/apache/skywalking/apm/testcase/mybatis/Application.java} (64%)
 create mode 100644 test/plugin/scenarios/mybatis-3.x-scenario/src/main/java/test/apache/skywalking/apm/testcase/mybatis/config/JdbcConfig.java
 copy test/plugin/scenarios/{spring-3.0.x-scenario/src/main/java/test/apache/skywalking/apm/testcase/spring3 => mybatis-3.x-scenario/src/main/java/test/apache/skywalking/apm/testcase/mybatis/controller}/CaseController.java (50%)
 copy test/plugin/scenarios/{spring-4.3.x-scenario/src/main/java/test/apache/skywalking/apm/testcase/implinterface/TestCaseInterface.java => mybatis-3.x-scenario/src/main/java/test/apache/skywalking/apm/testcase/mybatis/mapper/DemoMapper.java} (67%)
 copy test/plugin/scenarios/{spring-4.3.x-scenario/src/main/java/test/apache/skywalking/apm/testcase/implinterface/TestCaseInterface.java => mybatis-3.x-scenario/src/main/java/test/apache/skywalking/apm/testcase/mybatis/service/DemoService.java} (67%)
 copy test/plugin/scenarios/{spring-3.0.x-scenario/src/main/java/test/apache/skywalking/apm/testcase/spring3/service/TestServiceBean.java => mybatis-3.x-scenario/src/main/java/test/apache/skywalking/apm/testcase/mybatis/service/impl/DemoServiceImpl.java} (66%)
 copy test/{e2e/e2e-test/src/test/resources/expected/als/services.yml => plugin/scenarios/mybatis-3.x-scenario/src/main/resources/application.properties} (66%)
 create mode 100755 test/plugin/scenarios/mybatis-3.x-scenario/src/main/resources/mapper/DemoMapper.xml
 copy test/plugin/scenarios/{kafka-scenario => mybatis-3.x-scenario}/support-version.list (93%)
 copy test/plugin/scenarios/{spring-4.3.x-scenario/src/main/java/test/apache/skywalking/apm/testcase/implinterface/TestCaseInterface.java => spring-3.0.x-scenario/src/main/java/test/apache/skywalking/apm/testcase/spring3/implinterface/TestCaseController.java} (64%)
 copy test/plugin/scenarios/{spring-4.3.x-scenario/src/main/java/test/apache/skywalking/apm/testcase => spring-3.0.x-scenario/src/main/java/test/apache/skywalking/apm/testcase/spring3}/implinterface/TestCaseInterface.java (73%)
 copy test/plugin/scenarios/{spring-4.3.x-scenario/src/main/java/test/apache/skywalking/apm/testcase/implinterface/TestCaseInterface.java => spring-3.1.x-scenario/src/main/java/test/apache/skywalking/apm/testcase/implinterface/TestCaseController.java} (69%)
 copy test/plugin/scenarios/{spring-4.3.x-scenario => spring-3.1.x-scenario}/src/main/java/test/apache/skywalking/apm/testcase/implinterface/TestCaseInterface.java (78%)
 copy test/plugin/scenarios/{spring-4.3.x-scenario => spring-4.1.x-scenario}/src/main/java/test/apache/skywalking/apm/testcase/implinterface/TestCaseController.java (100%)
 copy test/plugin/scenarios/{spring-4.3.x-scenario => spring-4.1.x-scenario}/src/main/java/test/apache/skywalking/apm/testcase/implinterface/TestCaseInterface.java (84%)