You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@skywalking.apache.org by ha...@apache.org on 2020/08/31 01:02:33 UTC
[skywalking] branch grpc-reload-crt updated (cdadea5 -> 2e1076e)
This is an automated email from the ASF dual-hosted git repository.
hanahmily pushed a change to branch grpc-reload-crt
in repository https://gitbox.apache.org/repos/asf/skywalking.git.
from cdadea5 Hot reload gRPC certs of OAP.
add dfcec7b Support PKCS#1, update relevant documents.
add e878c11 Open more grpc config in the default application.yml (#5379)
add 1722548 Update vote check list (#5380)
add 77d94b4 Fix issue that spring mvc plugin doesn't works when running on reactive api (#5360)
add 720c1dd Use traceId as the judgment condition for sampling trace. (#5386)
add 086d730 Unary alternative to `TraceSegmentReportService.collect` (#5389)
add c5df076 Support IN filter expressions in OAL (#5390)
add fda4bbd Update powered-by.md (#5398)
add b11c351 Fix bug. (#5400)
add 8bf38cc using openjdk:14-buster as base image of PluginTest (#5404)
add a80a555 Fix bug about prepareBath in MetricsPersistentWorker #5399 (#5401)
add f89ed0c Optimize: truncate parameterString (#5396)
add afc0aef Add logic-endpoint and testcase for elasticjob-2.x plugin (#5395)
add 6227db1 Save error trace segment even that segment will abandoned by sampling mechanism (#5407)
add ca5e576 Fix sampling and Kafka reporter conflicting. (#5408)
add cbb2e17 Update configuration-vocabulary.md and trace-sampling.md (#5409)
add 9442a51 JsonLogger implementation (#5356) (#5357)
add 22bf8e6 fix auth in sharing server. (#5411)
add ae6b4ad #5311 Fix ActiveMQ NullPointerException (#5412)
add ca95769 Add support for quartz-scheduler (#5413)
add 2e1076e Merge branch 'master' into grpc-reload-crt
No new revisions were added by this update.
Summary of changes:
.github/workflows/plugins-test.0.yaml | 1 +
.github/workflows/plugins-test.3.yaml | 2 +
apm-commons/apm-datacarrier/pom.xml | 8 +
apm-commons/apm-util/pom.xml | 8 +
.../skywalking/apm/util/ConfigInitializer.java | 2 +-
.../network/trace/component/ComponentsDefine.java | 2 +
apm-protocol/apm-network/src/main/proto | 2 +-
apm-sniffer/apm-agent-core/pom.xml | 5 +
.../skywalking/apm/agent/core/conf/Config.java | 7 +
.../agent/core/conf/SnifferConfigInitializer.java | 18 +-
.../core/context/ContextManagerExtendService.java | 2 +-
.../apm/agent/core/context/TracingContext.java | 27 ---
.../core/context/trace/AbstractTracingSpan.java | 6 +
.../agent/core/logging/core/AbstractLogger.java | 185 +++++++++++++++++++++
.../apm/agent/core/logging/core/Converter.java | 4 +-
.../core/{Converter.java => JsonLogResolver.java} | 19 ++-
.../apm/agent/core/logging/core/JsonLogger.java | 80 +++++++++
.../apm/agent/core/logging/core/Parser.java | 2 +-
.../apm/agent/core/logging/core/PatternLogger.java | 148 +----------------
.../core/{Converter.java => ResolverType.java} | 9 +-
.../AgentNameConverter.java | 7 +-
.../{coverts => converters}/ClassConverter.java | 7 +-
.../{coverts => converters}/DateConverter.java | 7 +-
.../{coverts => converters}/LevelConverter.java | 7 +-
.../{coverts => converters}/LiteralConverter.java | 7 +-
.../{coverts => converters}/MessageConverter.java | 7 +-
.../{coverts => converters}/ThreadConverter.java | 7 +-
.../ThrowableConverter.java | 7 +-
.../apm/agent/core/sampling/SamplingService.java | 3 +-
.../agent/core/logging/core/JsonLoggerTest.java | 183 ++++++++++++++++++++
.../agent/core/logging/core/LoggingBenchmark.java | 96 +++++++++++
.../agent/core/logging/core/PatternLoggerTest.java | 49 +++++-
.../skywalking/apm/agent/SkyWalkingAgent.java | 34 ++--
.../apm/plugin/esjob/JobExecutorInterceptor.java | 26 ++-
.../plugin/esjob/JobExecutorInterceptorTest.java | 43 +++--
.../jdbc/PreparedStatementParameterBuilder.java | 18 +-
.../plugin/rocketMQ/v4/OnExceptionInterceptor.java | 13 +-
.../rocketMQ/v4/OnExceptionInterceptorTest.java | 18 +-
.../apm-sdk-plugin/solrj-7.x-plugin/pom.xml | 6 +
.../mvc/v3/HandlerMethodInvokerInterceptor.java | 5 +-
.../plugin/spring/mvc/v4/SpringTestCaseHelper.java | 6 +-
.../plugin/spring/mvc/v5/GetBeanInterceptor.java | 27 ++-
.../plugin/spring/mvc/v5/InvokeInterceptor.java | 63 +++++++
.../AbstractReactiveControllerInstrumentation.java | 120 +++++++++++++
.../AbstractSpring5ReactiveInstrumentation.java | 14 +-
.../InvocableHandlerMethodInstrumentation.java | 64 +++++++
.../ReactiveControllerInstrumentation.java | 13 +-
.../ReactiveRestControllerInstrumentation.java} | 15 +-
.../src/main/resources/skywalking-plugin.def | 5 +-
.../spring-plugins/mvc-annotation-commons/pom.xml | 6 +
.../mvc/commons/JavaxServletRequestHolder.java | 56 +++++++
.../mvc/commons/JavaxServletResponseHolder.java | 35 ++++
.../spring/mvc/commons/ReactiveRequestHolder.java | 61 +++++++
.../spring/mvc/commons/ReactiveResponseHolder.java | 34 ++++
.../plugin/spring/mvc/commons/RequestHolder.java | 33 ++++
.../plugin/spring/mvc/commons/ResponseHolder.java | 22 +++
.../interceptor/AbstractMethodInterceptor.java | 56 ++++---
.../commons/interceptor/GetBeanInterceptor.java | 5 +-
.../interceptor/InvokeForRequestInterceptor.java | 11 +-
.../InvokeHandlerMethodInterceptor.java | 16 +-
apm-sniffer/apm-test-tools/pom.xml | 5 +
apm-sniffer/optional-plugins/pom.xml | 1 +
.../quartz-scheduler-2.x-plugin}/pom.xml | 26 +--
.../quartz/JobRunShellConstructorInterceptor.java} | 20 +--
.../quartz/JobRunShellMethodInterceptor.java | 83 +++++++++
.../JobRunShellInterceptorInstrumentation.java | 94 +++++++++++
.../src/main/resources/skywalking-plugin.def | 4 +-
.../trace/ignore/TraceIgnoreExtendService.java | 36 ++--
.../apm/plugin/trace/ignore/TraceIgnoreTest.java | 24 ++-
docs/en/concepts-and-designs/oal.md | 31 ++--
docs/en/guides/How-to-release.md | 1 +
docs/en/setup/backend/configuration-vocabulary.md | 26 +--
docs/en/setup/backend/grpc-ssl.md | 6 +-
docs/en/setup/backend/trace-sampling.md | 15 +-
docs/en/setup/envoy/als_setting.md | 8 +-
.../setup/service-agent/java-agent/Plugin-list.md | 1 +
docs/en/setup/service-agent/java-agent/README.md | 4 +-
.../service-agent/java-agent/Supported-list.md | 1 +
docs/powered-by.md | 1 +
.../analyzer/provider/AnalyzerModuleConfig.java | 7 +
.../analyzer/provider/jvm/JVMSourceDispatcher.java | 20 +--
.../parser/listener/SegmentAnalysisListener.java | 26 +--
.../trace/parser/listener/TraceSegmentSampler.java | 4 +-
.../apache/skywalking/oal/rt/grammar/OALLexer.g4 | 37 +++--
.../apache/skywalking/oal/rt/grammar/OALParser.g4 | 10 +-
.../oal/rt/parser/ConditionExpression.java | 27 ++-
.../skywalking/oal/rt/parser/OALListener.java | 17 +-
.../skywalking/oal/rt/parser/ScriptParserTest.java | 40 +++++
.../src/main/resources/application.yml | 18 +-
.../src/main/resources/component-libraries.yml | 3 +
.../oap/server/core/CoreModuleProvider.java | 5 +-
.../analysis/metrics/expression/EqualMatch.java | 13 ++
.../expression/{EqualMatch.java => InMatch.java} | 23 ++-
.../analysis/metrics/expression/LikeMatch.java | 14 +-
.../analysis/worker/MetricsPersistentWorker.java | 2 +-
.../core/remote/client/RemoteClientManager.java | 16 +-
.../core/server/GRPCHandlerRegisterImpl.java | 2 +-
.../metrics/expression/EqualMatchTest.java | 8 +
.../analysis/metrics/expression/InMatchTest.java | 73 ++++++++
.../analysis/metrics/expression/LikeMatchTest.java | 15 +-
.../src/test/resources/component-libraries.yml | 3 +
.../oap/server/library/server/grpc/GRPCServer.java | 31 ++--
.../server/grpc/{ => ssl}/DynamicSslContext.java | 43 ++++-
.../library/server/grpc/ssl/PrivateKeyUtil.java | 82 +++++++++
.../server/SharingServerModuleProvider.java | 15 +-
.../v8/grpc/TraceSegmentReportServiceHandler.java | 24 ++-
pom.xml | 11 +-
test/plugin/containers/jvm-container/pom.xml | 3 +-
test/plugin/run.sh | 6 +-
.../elasticjob-2.x-scenario/bin/startup.sh | 8 +-
.../config/expectedData.yaml | 73 ++++++++
.../elasticjob-2.x-scenario/configuration.yml | 15 +-
.../scenarios/elasticjob-2.x-scenario/pom.xml | 132 +++++++++++++++
.../src/main/assembly/assembly.xml | 31 ++--
.../apm/testcase/elasticjob}/Application.java | 15 +-
.../elasticjob/controller/CaseController.java | 32 ++--
.../apm/testcase/elasticjob/job/DemoSimpleJob.java | 39 +++--
.../apm/testcase/elasticjob/job/JobConfig.java | 78 +++++++++
.../src/main/resources/application.yaml | 28 ++++
.../src/main/resources/log4j2.xml | 0
.../elasticjob-2.x-scenario/support-version.list | 8 +-
.../quartz-scheduler-2.x-scenario/bin/startup.sh | 8 +-
.../config/expectedData.yaml | 71 ++++++++
.../configuration.yml | 9 +-
.../quartz-scheduler-2.x-scenario/pom.xml | 130 +++++++++++++++
.../src/main/assembly/assembly.xml | 31 ++--
.../apm/testcase/quartzscheduler}/Application.java | 9 +-
.../quartzscheduler/controller/CaseController.java | 31 ++--
.../apm/testcase/quartzscheduler/job/DemoJob.java | 39 +++--
.../testcase/quartzscheduler/job/QuartzConfig.java | 59 +++++++
.../src/main/resources/application.yaml | 23 +++
.../src/main/resources/log4j2.xml | 0
.../support-version.list | 11 +-
.../springmvc-reactive-scenario/bin/startup.sh | 8 +-
.../config/expectedData.yaml | 50 ++++++
.../springmvc-reactive-scenario/configuration.yml | 7 +-
.../scenarios/springmvc-reactive-scenario/pom.xml | 97 +++++++++++
.../src/main/assembly/assembly.xml | 31 ++--
.../testcase/sc/springmvcreactive/Application.java | 29 ++++
.../springmvcreactive/controller/Controller.java | 46 +++++
.../sc/springmvcreactive/service/TestService.java | 42 +++++
.../src/main/resources/application.yml | 18 ++
.../support-version.list | 0
.../testcase/sc/webflux/projectB/Application.java | 29 ++++
.../sc/webflux/projectB/config/CustomFilter.java | 20 +--
.../controller/TestAnnotationController.java | 20 +--
.../projectB/route/RoutingConfiguration.java | 20 +--
.../sc/webflux/projectB/route/TestHandler.java | 20 +--
148 files changed, 3373 insertions(+), 678 deletions(-)
create mode 100644 apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/logging/core/AbstractLogger.java
copy apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/logging/core/{Converter.java => JsonLogResolver.java} (64%)
create mode 100644 apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/logging/core/JsonLogger.java
copy apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/logging/core/{Converter.java => ResolverType.java} (85%)
rename apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/logging/core/{coverts => converters}/AgentNameConverter.java (88%)
rename apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/logging/core/{coverts => converters}/ClassConverter.java (88%)
copy apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/logging/core/{coverts => converters}/DateConverter.java (89%)
rename apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/logging/core/{coverts => converters}/LevelConverter.java (88%)
copy apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/logging/core/{coverts => converters}/LiteralConverter.java (90%)
copy apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/logging/core/{coverts => converters}/MessageConverter.java (88%)
rename apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/logging/core/{coverts => converters}/ThreadConverter.java (88%)
copy apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/logging/core/{coverts => converters}/ThrowableConverter.java (92%)
create mode 100644 apm-sniffer/apm-agent-core/src/test/java/org/apache/skywalking/apm/agent/core/logging/core/JsonLoggerTest.java
create mode 100644 apm-sniffer/apm-agent-core/src/test/java/org/apache/skywalking/apm/agent/core/logging/core/LoggingBenchmark.java
create mode 100644 apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/mvc/v5/InvokeInterceptor.java
create mode 100644 apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/mvc/v5/define/reactive/AbstractReactiveControllerInstrumentation.java
copy test/plugin/scenarios/webflux-scenario/webflux-projectB-scenario/src/main/java/org/apache/skywalking/apm/testcase/sc/webflux/projectB/Application.java => apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/mvc/v5/define/reactive/AbstractSpring5ReactiveInstrumentation.java (60%)
create mode 100644 apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/mvc/v5/define/reactive/InvocableHandlerMethodInstrumentation.java
copy test/plugin/scenarios/webflux-scenario/webflux-projectB-scenario/src/main/java/org/apache/skywalking/apm/testcase/sc/webflux/projectB/Application.java => apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/mvc/v5/define/reactive/ReactiveControllerInstrumentation.java (68%)
rename apm-sniffer/{apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/logging/core/coverts/MessageConverter.java => apm-sdk-plugin/spring-plugins/mvc-annotation-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/mvc/v5/define/reactive/ReactiveRestControllerInstrumentation.java} (68%)
create mode 100644 apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-commons/src/main/java/org/apache/skywalking/apm/plugin/spring/mvc/commons/JavaxServletRequestHolder.java
create mode 100644 apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-commons/src/main/java/org/apache/skywalking/apm/plugin/spring/mvc/commons/JavaxServletResponseHolder.java
create mode 100644 apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-commons/src/main/java/org/apache/skywalking/apm/plugin/spring/mvc/commons/ReactiveRequestHolder.java
create mode 100644 apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-commons/src/main/java/org/apache/skywalking/apm/plugin/spring/mvc/commons/ReactiveResponseHolder.java
create mode 100644 apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-commons/src/main/java/org/apache/skywalking/apm/plugin/spring/mvc/commons/RequestHolder.java
create mode 100644 apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-commons/src/main/java/org/apache/skywalking/apm/plugin/spring/mvc/commons/ResponseHolder.java
copy apm-sniffer/{apm-sdk-plugin/solrj-7.x-plugin => optional-plugins/quartz-scheduler-2.x-plugin}/pom.xml (64%)
rename apm-sniffer/{apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/logging/core/coverts/DateConverter.java => optional-plugins/quartz-scheduler-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/quartz/JobRunShellConstructorInterceptor.java} (51%)
create mode 100644 apm-sniffer/optional-plugins/quartz-scheduler-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/quartz/JobRunShellMethodInterceptor.java
create mode 100644 apm-sniffer/optional-plugins/quartz-scheduler-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/quartz/define/JobRunShellInterceptorInstrumentation.java
copy apm-sniffer/{apm-sdk-plugin/spring-plugins/mvc-annotation-5.x-plugin => optional-plugins/quartz-scheduler-2.x-plugin}/src/main/resources/skywalking-plugin.def (70%)
copy oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/expression/{EqualMatch.java => InMatch.java} (63%)
create mode 100644 oap-server/server-core/src/test/java/org/apache/skywalking/oap/server/core/analysis/metrics/expression/InMatchTest.java
rename oap-server/server-library/library-server/src/main/java/org/apache/skywalking/oap/server/library/server/grpc/{ => ssl}/DynamicSslContext.java (68%)
create mode 100644 oap-server/server-library/library-server/src/main/java/org/apache/skywalking/oap/server/library/server/grpc/ssl/PrivateKeyUtil.java
copy apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-5.x-plugin/src/main/resources/skywalking-plugin.def => test/plugin/scenarios/elasticjob-2.x-scenario/bin/startup.sh (70%)
create mode 100644 test/plugin/scenarios/elasticjob-2.x-scenario/config/expectedData.yaml
copy apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-5.x-plugin/src/main/resources/skywalking-plugin.def => test/plugin/scenarios/elasticjob-2.x-scenario/configuration.yml (69%)
create mode 100644 test/plugin/scenarios/elasticjob-2.x-scenario/pom.xml
copy apm-commons/apm-datacarrier/pom.xml => test/plugin/scenarios/elasticjob-2.x-scenario/src/main/assembly/assembly.xml (53%)
copy test/plugin/scenarios/{webflux-scenario/webflux-projectB-scenario/src/main/java/org/apache/skywalking/apm/testcase/sc/webflux/projectB => elasticjob-2.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/elasticjob}/Application.java (70%)
copy apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/logging/core/coverts/LiteralConverter.java => test/plugin/scenarios/elasticjob-2.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/elasticjob/controller/CaseController.java (56%)
copy apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/logging/core/coverts/ThrowableConverter.java => test/plugin/scenarios/elasticjob-2.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/elasticjob/job/DemoSimpleJob.java (50%)
create mode 100644 test/plugin/scenarios/elasticjob-2.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/elasticjob/job/JobConfig.java
create mode 100644 test/plugin/scenarios/elasticjob-2.x-scenario/src/main/resources/application.yaml
copy test/plugin/scenarios/{spring-scheduled-scenario => elasticjob-2.x-scenario}/src/main/resources/log4j2.xml (100%)
copy apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-5.x-plugin/src/main/resources/skywalking-plugin.def => test/plugin/scenarios/elasticjob-2.x-scenario/support-version.list (66%)
copy apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-5.x-plugin/src/main/resources/skywalking-plugin.def => test/plugin/scenarios/quartz-scheduler-2.x-scenario/bin/startup.sh (70%)
create mode 100644 test/plugin/scenarios/quartz-scheduler-2.x-scenario/config/expectedData.yaml
copy apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-5.x-plugin/src/main/resources/skywalking-plugin.def => test/plugin/scenarios/quartz-scheduler-2.x-scenario/configuration.yml (70%)
create mode 100644 test/plugin/scenarios/quartz-scheduler-2.x-scenario/pom.xml
copy apm-commons/apm-datacarrier/pom.xml => test/plugin/scenarios/quartz-scheduler-2.x-scenario/src/main/assembly/assembly.xml (53%)
rename test/plugin/scenarios/{webflux-scenario/webflux-projectB-scenario/src/main/java/org/apache/skywalking/apm/testcase/sc/webflux/projectB => quartz-scheduler-2.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/quartzscheduler}/Application.java (80%)
rename apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/logging/core/coverts/LiteralConverter.java => test/plugin/scenarios/quartz-scheduler-2.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/quartzscheduler/controller/CaseController.java (56%)
rename apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/logging/core/coverts/ThrowableConverter.java => test/plugin/scenarios/quartz-scheduler-2.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/quartzscheduler/job/DemoJob.java (50%)
create mode 100644 test/plugin/scenarios/quartz-scheduler-2.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/quartzscheduler/job/QuartzConfig.java
create mode 100644 test/plugin/scenarios/quartz-scheduler-2.x-scenario/src/main/resources/application.yaml
copy test/plugin/scenarios/{spring-scheduled-scenario => quartz-scheduler-2.x-scenario}/src/main/resources/log4j2.xml (100%)
copy apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-5.x-plugin/src/main/resources/skywalking-plugin.def => test/plugin/scenarios/quartz-scheduler-2.x-scenario/support-version.list (66%)
copy apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-5.x-plugin/src/main/resources/skywalking-plugin.def => test/plugin/scenarios/springmvc-reactive-scenario/bin/startup.sh (70%)
create mode 100644 test/plugin/scenarios/springmvc-reactive-scenario/config/expectedData.yaml
copy apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-5.x-plugin/src/main/resources/skywalking-plugin.def => test/plugin/scenarios/springmvc-reactive-scenario/configuration.yml (70%)
create mode 100644 test/plugin/scenarios/springmvc-reactive-scenario/pom.xml
copy apm-commons/apm-datacarrier/pom.xml => test/plugin/scenarios/springmvc-reactive-scenario/src/main/assembly/assembly.xml (53%)
create mode 100644 test/plugin/scenarios/springmvc-reactive-scenario/src/main/java/test/apache/skywalking/apm/testcase/sc/springmvcreactive/Application.java
create mode 100644 test/plugin/scenarios/springmvc-reactive-scenario/src/main/java/test/apache/skywalking/apm/testcase/sc/springmvcreactive/controller/Controller.java
create mode 100644 test/plugin/scenarios/springmvc-reactive-scenario/src/main/java/test/apache/skywalking/apm/testcase/sc/springmvcreactive/service/TestService.java
create mode 100644 test/plugin/scenarios/springmvc-reactive-scenario/src/main/resources/application.yml
copy test/plugin/scenarios/{webflux-scenario => springmvc-reactive-scenario}/support-version.list (100%)
create mode 100644 test/plugin/scenarios/webflux-scenario/webflux-projectB-scenario/src/main/java/test/apache/skywalking/apm/testcase/sc/webflux/projectB/Application.java
rename test/plugin/scenarios/webflux-scenario/webflux-projectB-scenario/src/main/java/{org => test}/apache/skywalking/apm/testcase/sc/webflux/projectB/config/CustomFilter.java (56%)
rename test/plugin/scenarios/webflux-scenario/webflux-projectB-scenario/src/main/java/{org => test}/apache/skywalking/apm/testcase/sc/webflux/projectB/controller/TestAnnotationController.java (64%)
rename test/plugin/scenarios/webflux-scenario/webflux-projectB-scenario/src/main/java/{org => test}/apache/skywalking/apm/testcase/sc/webflux/projectB/route/RoutingConfiguration.java (53%)
rename test/plugin/scenarios/webflux-scenario/webflux-projectB-scenario/src/main/java/{org => test}/apache/skywalking/apm/testcase/sc/webflux/projectB/route/TestHandler.java (55%)