This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a change to branch jdk15
in repository https://gitbox.apache.org/repos/asf/skywalking.git.
from 9feda70 Try JRE15 (OpenJDK)
add 1cc68b4 correct the doc of backend trace sampling with the latest
configuration (#6085)
add 462c685 Update cancel.yaml to use ASF GHA (#6087)
add 1f01246 Update .asf.yaml (#6088)
add c010481 Checkstyle plugin checks test codes (#6003)
add f4b739c Fix CVE of UninstrumentedGateways in Dynamic Configuration
activation. (#6098)
add 8aeabfd ui sync (#6102)
add 6e48dca Improvement Influxdb query performance (#6066)
add 1b1f085 Add two generated source codes folders. (#6113)
add ff2ab69 Fix the uuid field in GRPCConfigWatcherRegister is not
updated. (#6115)
add 6101163 Support Envoy {AccessLog,Metrics}Service API V3 (#6116)
add f54f639 Enhance Envoy metrics service analyzer by MAL (#6091)
add cb70dac Merge branch 'master' into jdk15
No new revisions were added by this update.
Summary of changes:
.asf.yaml | 2 +
.github/workflows/cancel.yaml | 40 +-
.github/workflows/e2e.istio.yaml | 94 +++++
.github/workflows/plugins-jdk14-test.0.yaml | 11 +-
.github/workflows/plugins-test.0.yaml | 2 +
.github/workflows/plugins-test.1.yaml | 2 +
.github/workflows/plugins-test.2.yaml | 2 +
.github/workflows/plugins-test.3.yaml | 4 +
CHANGES.md | 8 +
apm-dist-es7/src/main/assembly/binary-es7.xml | 1 +
apm-dist/src/main/assembly/binary.xml | 1 +
docs/en/concepts-and-designs/mal.md | 8 +-
docs/en/guides/How-to-build.md | 2 +
docs/en/setup/backend/trace-sampling.md | 2 +-
docs/en/setup/envoy/als_setting.md | 2 +-
docs/en/setup/envoy/config.yaml | 3 +
.../envoy/examples/metrics/docker-compose.yaml | 2 +-
docs/en/setup/envoy/examples/metrics/envoy.yaml | 5 +-
docs/en/setup/envoy/metrics_service_setting.md | 11 +
.../trace/UninstrumentedGatewaysConfig.java | 21 +-
.../trace/UninstrumentedGatewaysConfigTest.java | 77 ++++
.../agent-analyzer/src/test/resources/gateways.yml | 30 +-
.../oap/meter/analyzer/dsl/SampleFamily.java | 43 +-
.../prometheus/PrometheusMetricConverter.java | 23 +-
.../oap/meter/analyzer/dsl/AggregationTest.java | 89 ++++-
oap-server/server-bootstrap/pom.xml | 3 +-
.../main/resources/envoy-metrics-rules/envoy.yaml | 59 +++
.../src/main/resources/oal/envoy.oal | 22 --
.../ui-initialized-templates/istio-dp.yml | 82 ++++
.../resources/ui-initialized-templates/istio.yml | 2 +-
.../grpc/GRPCConfigWatcherRegister.java | 1 +
.../analysis/worker/MetricsPersistentWorker.java | 27 +-
.../oap/server/core/storage/IMetricsDAO.java | 6 +-
oap-server/server-library/library-util/pom.xml | 4 +
.../library/util/yaml/ClassFilterConstructor.java | 38 +-
.../envoy-metrics-receiver-plugin/pom.xml | 5 +
.../envoy/AccessLogServiceGRPCHandler.java | 5 +-
...ine.java => AccessLogServiceGRPCHandlerV3.java} | 24 +-
.../receiver/envoy/EnvoyMetricReceiverConfig.java | 7 +
.../envoy/EnvoyMetricReceiverProvider.java | 23 +-
.../receiver/envoy/MetricServiceGRPCHandler.java | 125 +++---
...Define.java => MetricServiceGRPCHandlerV3.java} | 24 +-
.../server/receiver/envoy/als/ALSHTTPAnalysis.java | 4 +-
.../receiver/envoy/als/AbstractALSAnalyzer.java | 6 +-
.../envoy/als/LogEntry2MetricsAdapter.java | 12 +-
.../als/k8s/K8sALSServiceMeshHTTPAnalysis.java | 10 +-
.../envoy/als/mx/MetaExchangeALSHTTPAnalyzer.java | 6 +-
.../adapters/ProtoMetricFamily2MetricsAdapter.java | 84 ++++
.../envoy/MetricServiceGRPCHandlerTestMain.java | 4 +-
.../als/k8s/K8SALSServiceMeshHTTPAnalysisTest.java | 2 +-
.../receiver/envoy/als/mx/FieldsHelperTest.java | 2 +-
.../src/test/resources/envoy-ingress.msg | 5 +-
.../src/test/resources/envoy-ingress2sidecar.msg | 3 +-
.../test/resources/envoy-mesh-client-sidecar.msg | 5 +-
.../test/resources/envoy-mesh-server-sidecar.msg | 5 +-
.../src/test/resources/envoy-metric.msg | 3 +-
.../src/test/resources/field-helper.msg | 3 +-
.../src/main/proto/envoy/api/v2/core/base.proto | 256 ------------
.../{api/v2/core => config/core/v3}/address.proto | 97 +++--
.../main/proto/envoy/config/core/v3/backoff.proto | 36 ++
.../src/main/proto/envoy/config/core/v3/base.proto | 435 +++++++++++++++++++++
.../main/proto/envoy/config/core/v3/http_uri.proto | 56 +++
.../proto/envoy/config/core/v3/socket_option.proto | 56 +++
.../data/accesslog/{v2 => v3}/accesslog.proto | 78 +++-
.../proto/envoy/service/accesslog/v2/als.proto | 62 +--
.../envoy/service/accesslog/{v2 => v3}/als.proto | 56 ++-
.../envoy/service/metrics/v2/metrics_service.proto | 27 +-
.../metrics/{v2 => v3}/metrics_service.proto | 32 +-
.../main/proto/envoy/type/{ => v3}/percent.proto | 26 +-
.../proto/envoy/type/v3/semantic_version.proto | 26 ++
.../src/main/proto/udpa/annotations/migrate.proto | 49 +++
.../src/main/proto/udpa/annotations/status.proto | 34 ++
.../main/proto/udpa/annotations/versioning.proto | 17 +
.../src/main/proto/validate/validate.proto | 48 ++-
.../plugin/elasticsearch/base/MetricsEsDAO.java | 5 +-
.../plugin/elasticsearch7/dao/MetricsEs7DAO.java | 12 +-
.../storage/plugin/influxdb/InfluxConstants.java | 2 +-
.../storage/plugin/influxdb/TableMetaInfo.java | 28 +-
.../storage/plugin/influxdb/base/MetricsDAO.java | 68 +++-
.../plugin/influxdb/query/MetadataQuery.java | 10 +-
.../storage/plugin/jdbc/h2/dao/H2MetricsDAO.java | 6 +-
pom.xml | 1 +
skywalking-ui | 2 +-
.../org/apache/skywalking/e2e/utils/Yamls.java | 4 +
.../skywalking/e2e/metrics/MetricsQuery.java | 12 +
.../skywalking/e2e/mesh/MetricsServiceE2E.java | 130 ++++++
.../instances-istio-dp-reviews.yml} | 0
.../expected/{als => metricsservice}/instances.yml | 0
.../expected/metricsservice/services.yml} | 36 +-
test/plugin/pom.xml | 65 ++-
test/plugin/run.sh | 8 +
.../test/helper/AbstractRunningGenerator.java | 1 -
.../plugin/test/helper/ConfigurationImpl.java | 6 +-
.../helper/DockerContainerRunningGenerator.java | 1 -
.../plugin/test/helper/vo/CaseConfiguration.java | 7 +-
.../plugin/test/helper/vo/DependencyComponent.java | 7 +-
.../plugin/test/helper/vo/DockerService.java | 2 +-
.../runner-helper/src/main/resources/scenario.sh | 18 +-
.../src/test/resources/docker-compose-test.yml | 4 +-
.../config/expectedData.yaml | 16 +-
.../apm/testcase/toolkit}/Application.java | 2 +-
.../toolkit/controller/TestController.java | 2 +-
.../testcase/toolkit/controller/TestService.java | 2 +-
.../baidu.brpc/controller/CaseController.java | 3 -
.../baidu.brpc/service/EchoServiceImpl.java | 1 -
.../testcase/grpc/consumr/ConsumerInterceptor.java | 18 +-
.../provider/interceptor/ProviderInterceptor.java | 10 +-
.../config/customize_enhance.xml | 6 +-
.../customize-scenario/config/expectedData.yaml | 2 +-
.../apm/testcase/customize/Application.java | 2 +-
.../customize/controller/CustomizeController.java | 10 +-
.../apm/testcase/customize/model/Model0.java | 2 +-
.../apm/testcase/customize/model/Model1.java | 2 +-
.../testcase/customize/service/TestService1.java | 5 +-
.../testcase/customize/service/TestService2.java | 2 +-
.../skywalking/apm/testcase/cxf/Application.java | 3 -
.../apm/testcase/cxf/service/UserService.java | 9 +-
.../skywalking/apm/testcase/dbcp/MysqlConfig.java | 22 +-
.../testcase/dbcp/controller/CaseController.java | 4 +-
.../apm/testcase/dbcp/service/CaseService.java | 6 +-
.../testcase/dubbo/controller/CaseController.java | 2 +-
.../testcase/dubbo/controller/CaseController.java | 2 +-
.../apm/testcase/elasticjob/job/DemoSimpleJob.java | 4 +-
.../elasticsearch/RestHighLevelClientCase.java | 2 +-
.../elasticsearch/config/ElasticsearchConfig.java | 2 +-
.../config/TransportClientConfig.java | 2 +-
.../elasticsearch/config/ElasticsearchConfig.java | 2 +-
.../elasticsearch/controller/CaseController.java | 2 +-
.../bin/startup.sh | 2 +-
.../config/expectedData.yaml | 22 +-
.../apm/testcase/exceptionchecker/Application.java | 2 +-
.../controller/CaseController.java | 4 +-
.../exception/TestAnnotatedException.java | 2 +-
.../exceptionchecker/exception/TestException.java | 2 +-
.../exception/TestHierarchyListedException.java | 2 +-
.../exception/TestListedException.java | 2 +-
.../exceptionchecker/service/TestService.java | 10 +-
.../config/expectedData.yaml | 22 +-
.../configuration.yml | 2 +-
.../controller/CaseController.java | 4 +-
.../exception/TestAnnotatedException.java | 2 +-
.../exceptionchecker/exception/TestException.java | 2 +-
.../exception/TestHierarchyListedException.java | 2 +-
.../exception/TestListedException.java | 2 +-
.../exception/TestOtherClassLoaderException.java | 4 +-
.../exceptionchecker/service/TestService.java | 10 +-
.../src/main/webapp/WEB-INF/spring-mvc-servlet.xml | 2 +-
.../testcase/feign/controller/RestController.java | 10 +-
.../testcase/finagle/FinagleRpcApplication.java | 2 -
.../finagle/controller/CaseController.java | 3 +-
.../finagle/service/FinagleRpcDemoServiceImpl.java | 1 -
.../testcase/finagle/FinagleRpcApplication.java | 2 -
.../finagle/controller/CaseController.java | 3 +-
.../finagle/service/FinagleRpcDemoServiceImpl.java | 1 -
.../projectB/controller/TestController.java | 1 -
.../projectB/controller/TestController.java | 1 -
.../graphql/configuration/GraphSchema.java | 2 -
.../testcase/grpc/consumr/ConsumerInterceptor.java | 18 +-
.../testcase/grpc/controller/CaseController.java | 6 +-
.../provider/interceptor/ProviderInterceptor.java | 12 +-
.../testcase/hbase/controller/HBaseController.java | 26 +-
.../influxdb/controller/CaseController.java | 16 +-
.../influxdb/executor/InfluxDBExecutor.java | 58 +--
.../jdk-threading-scenario/bin/startup.sh | 2 +-
.../config/expectedData.yaml | 4 +-
.../apm/testcase/jdk/threading/Application.java | 2 +-
.../apm/testcase/kafka}/Application.java | 2 +-
.../testcase/kafka/controller/CaseController.java | 2 +-
.../testcase/logger/controller/CaseController.java | 6 +-
.../testcase/logger/controller/CaseController.java | 9 +-
.../testcase/logger/controller/CaseController.java | 8 +-
.../apm/testcase/mariadb/MariadbConfig.java | 18 +-
.../mariadb/controller/CaseController.java | 2 -
.../mongodb/controller/CaseController.java | 6 +-
.../skywalking/apm/testcase/mssql/MssqlConfig.java | 18 +-
.../skywalking/apm/testcase/mssql/MssqlConfig.java | 18 +-
.../skywalking/apm/testcase/mysql/MysqlConfig.java | 18 +-
.../testcase/mysql/controller/CaseController.java | 2 -
.../apm/testcase/pulsar/Application.java | 4 +-
.../testcase/pulsar/controller/CaseController.java | 2 +-
.../apm/testcase/quartzscheduler/job/DemoJob.java | 4 +-
.../testcase/quartzscheduler/job/QuartzConfig.java | 10 +-
.../apm/testcase/redisson/Application.java | 2 +-
.../redisson/controller/CaseController.java | 2 +-
.../apm/testcase/retransform}/Application.java | 2 +-
.../apm/testcase/retransform}/RetransformUtil.java | 12 +-
.../retransform}/controller/CaseController.java | 7 +-
.../apm/testcase/retransform}/CaseController.java | 7 +-
.../apm/testcase/retransform}/RetransformUtil.java | 12 +-
.../apm/testcase/retransform}/StartupListener.java | 2 +-
.../src/main/webapp/WEB-INF/spring-mvc-servlet.xml | 2 +-
...dingDatabasesAndTablesConfigurationPrecise.java | 8 +-
.../service/utility/config/DataSourceUtil.java | 6 +-
...dingDatabasesAndTablesConfigurationPrecise.java | 8 +-
.../repository/jdbc/JDBCOrderRepositoryImpl.java | 6 +-
.../service/utility/config/DataSourceUtil.java | 6 +-
.../apm/testcase/shardingsphere/Application.java | 9 +-
...dingDatabasesAndTablesConfigurationPrecise.java | 8 +-
.../service/utility/config/DataSourceUtil.java | 6 +-
.../apm/testcase/shardingsphere/Application.java | 7 -
...dingDatabasesAndTablesConfigurationPrecise.java | 8 +-
.../service/utility/config/DataSourceUtil.java | 6 +-
.../apm/testcase/shardingsphere/Application.java | 7 -
...dingDatabasesAndTablesConfigurationPrecise.java | 8 +-
.../service/utility/config/DataSourceUtil.java | 6 +-
.../sofarpc/controller/CaseController.java | 2 +-
.../spring-3.0.x-scenario/config/expectedData.yaml | 6 +-
.../apm/testcase/spring3/CaseController.java | 4 +-
.../spring3/component/TestComponentBean.java | 2 +-
.../testcase/spring3/dao/TestRepositoryBean.java | 2 +-
.../testcase/spring3/service/TestServiceBean.java | 6 +-
.../src/main/webapp/WEB-INF/spring-mvc-servlet.xml | 2 +-
.../spring-3.1.x-scenario/config/expectedData.yaml | 6 +-
.../skywalking/apm/testcase/entity/User.java | 2 +-
.../apm/testcase/restapi/RestCaseController.java | 12 +-
.../resttemplate/RestTemplateController.java | 16 +-
.../apm/testcase/spring3/CaseController.java | 4 +-
.../spring3/component/TestComponentBean.java | 2 +-
.../testcase/spring3/dao/TestRepositoryBean.java | 2 +-
.../testcase/spring3/service/TestServiceBean.java | 6 +-
.../src/main/webapp/WEB-INF/spring-mvc-servlet.xml | 2 +-
.../spring-4.1.x-scenario/config/expectedData.yaml | 6 +-
.../skywalking/apm/testcase/entity/User.java | 2 +-
.../apm/testcase/restapi/RestCaseController.java | 12 +-
.../resttemplate/RestTemplateController.java | 16 +-
.../apm/testcase/spring3/CaseController.java | 4 +-
.../spring3/component/TestComponentBean.java | 2 +-
.../testcase/spring3/dao/TestRepositoryBean.java | 2 +-
.../testcase/spring3/service/TestServiceBean.java | 6 +-
.../src/main/webapp/WEB-INF/spring-mvc-servlet.xml | 2 +-
.../spring-4.3.x-scenario/config/expectedData.yaml | 6 +-
.../skywalking/apm/testcase/entity/User.java | 2 +-
.../implinterface/TestCaseController.java} | 19 +-
.../testcase/implinterface/TestCaseInterface.java} | 16 +-
.../apm/testcase/inherit/ChildController.java} | 13 +-
.../apm/testcase/inherit/ParentController.java} | 16 +-
.../apm/testcase/restapi/RestCaseController.java | 12 +-
.../resttemplate/RestTemplateController.java | 22 +-
.../apm/testcase/spring3/CaseController.java | 4 +-
.../spring3/component/TestComponentBean.java | 2 +-
.../testcase/spring3/dao/TestRepositoryBean.java | 2 +-
.../testcase/spring3/service/TestServiceBean.java | 6 +-
.../testcase/implinterface/TestCaseController.java | 36 --
.../testcase/implinterface/TestCaseInterface.java | 31 --
.../apm/testcase/inherit/ChildController.java | 29 --
.../apm/testcase/inherit/ParentController.java | 33 --
.../src/main/webapp/WEB-INF/spring-mvc-servlet.xml | 2 +-
.../testcase/feign/controller/BackController.java | 18 +-
.../apm/testcase/spring/kafka/Application.java | 5 +-
.../spring/kafka/controller/CaseController.java | 2 +-
.../apm/testcase/spring/kafka/Application.java | 5 +-
.../spring/kafka/controller/CaseController.java | 2 +-
.../apm/testcase/spring/kafka/Application.java | 2 +-
.../spring/kafka/controller/CaseController.java | 2 +-
.../scheduled/controller/CaseController.java | 2 +-
.../spring/scheduled/job/SchedulingJob.java | 8 +-
.../spring-tx-scenario/config/expectedData.yaml | 2 +-
.../testcase/spring/transaction/Application.java | 2 +-
.../spring/transaction/config/JdbcConfig.java | 2 +-
.../transaction/config/TransactionConfig.java | 2 +-
.../transaction/controller/CaseController.java | 4 +-
.../testcase/spring/transaction/dao/DemoDao.java | 2 +-
.../spring/transaction/dao/impl/DemoDaoImpl.java | 4 +-
.../spring/transaction/service/DemoService.java | 2 +-
.../transaction/service/impl/DemoServiceImpl.java | 6 +-
.../apm/testcase/thrift/client/Application.java | 4 +-
.../thrift/client/controller/CaseController.java | 2 +-
.../thrift/client/service/AsyncClient.java | 6 +-
.../testcase/thrift/client/service/HttpClient.java | 1 -
.../testcase/thrift/server/service/IServer.java | 1 -
.../apm/testcase/vertxeventbus/Application.java | 1 +
.../vertxeventbus/controller/ClusterReceiver.java | 1 +
.../vertxeventbus/controller/LocalReceiver.java | 1 +
.../controller/VertxEventbusController.java | 5 +-
.../testcase/vertxeventbus/util/CustomMessage.java | 1 +
.../vertxeventbus/util/CustomMessageCodec.java | 1 +
.../apm/testcase/vertxweb/Application.java | 1 +
.../vertxweb/controller/VertxWebController.java | 1 +
.../apm/testcase/vertxweb/Application.java | 1 +
.../vertxweb/controller/VertxWebController.java | 1 +
.../controller/TestAnnotationController.java | 4 +-
.../sc/webflux/projectB/route/TestHandler.java | 2 +-
.../xxl-job-2.x-scenario/config/expectedData.yaml | 4 +-
.../apm/testcase/xxljob/job/XXLJobConfig.java | 2 +-
.../apm/testcase/xxljob/job/BeanJob.java | 2 +-
285 files changed, 2653 insertions(+), 1455 deletions(-)
create mode 100644
oap-server/analyzer/agent-analyzer/src/test/java/org/apache/skywalking/oap/server/analyzer/provider/trace/UninstrumentedGatewaysConfigTest.java
copy test/plugin/runner-helper/src/test/resources/docker-compose-test.yml =>
oap-server/analyzer/agent-analyzer/src/test/resources/gateways.yml (55%)
mode change 100644 => 100755
create mode 100644
oap-server/server-bootstrap/src/main/resources/envoy-metrics-rules/envoy.yaml
delete mode 100644 oap-server/server-bootstrap/src/main/resources/oal/envoy.oal
create mode 100644
oap-server/server-bootstrap/src/main/resources/ui-initialized-templates/istio-dp.yml
copy
test/plugin/scenarios/xxl-job-2.x-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/xxljob/job/BeanJob.java
=>
oap-server/server-library/library-util/src/main/java/org/apache/skywalking/oap/server/library/util/yaml/ClassFilterConstructor.java
(52%)
copy
oap-server/server-receiver-plugin/envoy-metrics-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/envoy/{EnvoyOALDefine.java
=> AccessLogServiceGRPCHandlerV3.java} (56%)
rename
oap-server/server-receiver-plugin/envoy-metrics-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/envoy/{EnvoyOALDefine.java
=> MetricServiceGRPCHandlerV3.java} (57%)
create mode 100644
oap-server/server-receiver-plugin/envoy-metrics-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/envoy/metrics/adapters/ProtoMetricFamily2MetricsAdapter.java
delete mode 100644
oap-server/server-receiver-plugin/receiver-proto/src/main/proto/envoy/api/v2/core/base.proto
rename
oap-server/server-receiver-plugin/receiver-proto/src/main/proto/envoy/{api/v2/core
=> config/core/v3}/address.proto (54%)
create mode 100644
oap-server/server-receiver-plugin/receiver-proto/src/main/proto/envoy/config/core/v3/backoff.proto
create mode 100644
oap-server/server-receiver-plugin/receiver-proto/src/main/proto/envoy/config/core/v3/base.proto
create mode 100644
oap-server/server-receiver-plugin/receiver-proto/src/main/proto/envoy/config/core/v3/http_uri.proto
create mode 100644
oap-server/server-receiver-plugin/receiver-proto/src/main/proto/envoy/config/core/v3/socket_option.proto
rename
oap-server/server-receiver-plugin/receiver-proto/src/main/proto/envoy/data/accesslog/{v2
=> v3}/accesslog.proto (83%)
copy
oap-server/server-receiver-plugin/receiver-proto/src/main/proto/envoy/service/accesslog/{v2
=> v3}/als.proto (58%)
copy
oap-server/server-receiver-plugin/receiver-proto/src/main/proto/envoy/service/metrics/{v2
=> v3}/metrics_service.proto (58%)
rename
oap-server/server-receiver-plugin/receiver-proto/src/main/proto/envoy/type/{ =>
v3}/percent.proto (67%)
create mode 100644
oap-server/server-receiver-plugin/receiver-proto/src/main/proto/envoy/type/v3/semantic_version.proto
create mode 100644
oap-server/server-receiver-plugin/receiver-proto/src/main/proto/udpa/annotations/migrate.proto
create mode 100644
oap-server/server-receiver-plugin/receiver-proto/src/main/proto/udpa/annotations/status.proto
create mode 100644
oap-server/server-receiver-plugin/receiver-proto/src/main/proto/udpa/annotations/versioning.proto
create mode 100644
test/e2e/e2e-test/src/test/java/org/apache/skywalking/e2e/mesh/MetricsServiceE2E.java
copy test/e2e/e2e-test/src/test/resources/expected/{als/instances-reviews.yml
=> metricsservice/instances-istio-dp-reviews.yml} (100%)
copy test/e2e/e2e-test/src/test/resources/expected/{als =>
metricsservice}/instances.yml (100%)
copy test/{plugin/runner-helper/src/test/resources/docker-compose-test.yml =>
e2e/e2e-test/src/test/resources/expected/metricsservice/services.yml} (56%)
rename
test/plugin/scenarios/{kafka-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/kafka
=>
apm-toolkit-trace-scenario/src/main/java/test/apache/skywalking/apm/testcase/toolkit}/Application.java
(95%)
rename
test/plugin/scenarios/apm-toolkit-trace-scenario/src/main/java/test/{org =>
}/apache/skywalking/apm/testcase/toolkit/controller/TestController.java (98%)
rename
test/plugin/scenarios/apm-toolkit-trace-scenario/src/main/java/test/{org =>
}/apache/skywalking/apm/testcase/toolkit/controller/TestService.java (97%)
rename test/plugin/scenarios/customize-scenario/src/main/java/test/{org =>
}/apache/skywalking/apm/testcase/customize/Application.java (95%)
rename test/plugin/scenarios/customize-scenario/src/main/java/test/{org =>
}/apache/skywalking/apm/testcase/customize/controller/CustomizeController.java
(87%)
rename test/plugin/scenarios/customize-scenario/src/main/java/test/{org =>
}/apache/skywalking/apm/testcase/customize/model/Model0.java (96%)
rename test/plugin/scenarios/customize-scenario/src/main/java/test/{org =>
}/apache/skywalking/apm/testcase/customize/model/Model1.java (94%)
rename test/plugin/scenarios/customize-scenario/src/main/java/test/{org =>
}/apache/skywalking/apm/testcase/customize/service/TestService1.java (89%)
rename test/plugin/scenarios/customize-scenario/src/main/java/test/{org =>
}/apache/skywalking/apm/testcase/customize/service/TestService2.java (93%)
rename
test/plugin/scenarios/exception-checker-spring-scenario/src/main/java/test/{org
=> }/apache/skywalking/apm/testcase/exceptionchecker/Application.java (94%)
rename
test/plugin/scenarios/exception-checker-spring-scenario/src/main/java/test/{org
=>
}/apache/skywalking/apm/testcase/exceptionchecker/controller/CaseController.java
(93%)
rename
test/plugin/scenarios/exception-checker-spring-scenario/src/main/java/test/{org
=>
}/apache/skywalking/apm/testcase/exceptionchecker/exception/TestAnnotatedException.java
(95%)
rename
test/plugin/scenarios/{exception-checker-tomcat-scenario/src/main/java/test/org
=>
exception-checker-spring-scenario/src/main/java/test}/apache/skywalking/apm/testcase/exceptionchecker/exception/TestException.java
(95%)
rename
test/plugin/scenarios/exception-checker-spring-scenario/src/main/java/test/{org
=>
}/apache/skywalking/apm/testcase/exceptionchecker/exception/TestHierarchyListedException.java
(95%)
rename
test/plugin/scenarios/{exception-checker-tomcat-scenario/src/main/java/test/org
=>
exception-checker-spring-scenario/src/main/java/test}/apache/skywalking/apm/testcase/exceptionchecker/exception/TestListedException.java
(95%)
rename
test/plugin/scenarios/{exception-checker-tomcat-scenario/src/main/java/test/org
=>
exception-checker-spring-scenario/src/main/java/test}/apache/skywalking/apm/testcase/exceptionchecker/service/TestService.java
(74%)
rename
test/plugin/scenarios/exception-checker-tomcat-scenario/src/main/java/test/{org
=>
}/apache/skywalking/apm/testcase/exceptionchecker/controller/CaseController.java
(93%)
rename
test/plugin/scenarios/exception-checker-tomcat-scenario/src/main/java/test/{org
=>
}/apache/skywalking/apm/testcase/exceptionchecker/exception/TestAnnotatedException.java
(95%)
rename
test/plugin/scenarios/{exception-checker-spring-scenario/src/main/java/test/org
=>
exception-checker-tomcat-scenario/src/main/java/test}/apache/skywalking/apm/testcase/exceptionchecker/exception/TestException.java
(95%)
rename
test/plugin/scenarios/exception-checker-tomcat-scenario/src/main/java/test/{org
=>
}/apache/skywalking/apm/testcase/exceptionchecker/exception/TestHierarchyListedException.java
(95%)
rename
test/plugin/scenarios/{exception-checker-spring-scenario/src/main/java/test/org
=>
exception-checker-tomcat-scenario/src/main/java/test}/apache/skywalking/apm/testcase/exceptionchecker/exception/TestListedException.java
(95%)
rename
test/plugin/scenarios/exception-checker-tomcat-scenario/src/main/java/test/{org
=>
}/apache/skywalking/apm/testcase/exceptionchecker/exception/TestOtherClassLoaderException.java
(95%)
rename
test/plugin/scenarios/{exception-checker-spring-scenario/src/main/java/test/org
=>
exception-checker-tomcat-scenario/src/main/java/test}/apache/skywalking/apm/testcase/exceptionchecker/service/TestService.java
(74%)
rename test/plugin/scenarios/jdk-threading-scenario/src/main/java/test/{org =>
}/apache/skywalking/apm/testcase/jdk/threading/Application.java (97%)
rename
test/plugin/scenarios/{apm-toolkit-trace-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/toolkit
=>
kafka-scenario/src/main/java/test/apache/skywalking/apm/testcase/kafka}/Application.java
(95%)
rename test/plugin/scenarios/kafka-scenario/src/main/java/test/{org =>
}/apache/skywalking/apm/testcase/kafka/controller/CaseController.java (99%)
rename test/plugin/scenarios/pulsar-scenario/src/main/java/test/{org =>
}/apache/skywalking/apm/testcase/pulsar/Application.java (91%)
rename test/plugin/scenarios/pulsar-scenario/src/main/java/test/{org =>
}/apache/skywalking/apm/testcase/pulsar/controller/CaseController.java (98%)
rename test/plugin/scenarios/redisson-scenario/src/main/java/test/{org =>
}/apache/skywalking/apm/testcase/redisson/Application.java (94%)
rename test/plugin/scenarios/redisson-scenario/src/main/java/test/{org =>
}/apache/skywalking/apm/testcase/redisson/controller/CaseController.java (97%)
rename
test/plugin/scenarios/retransform-class-scenario/src/main/java/{test/org/apache/skywalking/apm/testcase/retransform_class
=> org/apache/skywalking/apm/testcase/retransform}/Application.java (95%)
rename
test/plugin/scenarios/retransform-class-scenario/src/main/java/{test/org/apache/skywalking/apm/testcase/retransform_class
=> org/apache/skywalking/apm/testcase/retransform}/RetransformUtil.java (86%)
rename
test/plugin/scenarios/retransform-class-scenario/src/main/java/{test/org/apache/skywalking/apm/testcase/retransform_class
=>
org/apache/skywalking/apm/testcase/retransform}/controller/CaseController.java
(92%)
rename
test/plugin/scenarios/retransform-class-tomcat-scenario/src/main/java/test/{org/apache/skywalking/apm/testcase/retransform_class
=> apache/skywalking/apm/testcase/retransform}/CaseController.java (90%)
rename
test/plugin/scenarios/retransform-class-tomcat-scenario/src/main/java/test/{org/apache/skywalking/apm/testcase/retransform_class
=> apache/skywalking/apm/testcase/retransform}/RetransformUtil.java (84%)
rename
test/plugin/scenarios/retransform-class-tomcat-scenario/src/main/java/test/{org/apache/skywalking/apm/testcase/retransform_class
=> apache/skywalking/apm/testcase/retransform}/StartupListener.java (94%)
rename test/plugin/scenarios/spring-3.0.x-scenario/src/main/java/test/{org =>
}/apache/skywalking/apm/testcase/spring3/CaseController.java (91%)
rename test/plugin/scenarios/{spring-4.1.x-scenario/src/main/java/test/org =>
spring-3.0.x-scenario/src/main/java/test}/apache/skywalking/apm/testcase/spring3/component/TestComponentBean.java
(93%)
rename test/plugin/scenarios/spring-3.0.x-scenario/src/main/java/test/{org =>
}/apache/skywalking/apm/testcase/spring3/dao/TestRepositoryBean.java (94%)
rename test/plugin/scenarios/spring-3.0.x-scenario/src/main/java/test/{org =>
}/apache/skywalking/apm/testcase/spring3/service/TestServiceBean.java (84%)
rename test/plugin/scenarios/{spring-4.1.x-scenario/src/main/java/test/org =>
spring-3.1.x-scenario/src/main/java/test}/apache/skywalking/apm/testcase/entity/User.java
(95%)
rename test/plugin/scenarios/{spring-4.1.x-scenario/src/main/java/test/org =>
spring-3.1.x-scenario/src/main/java/test}/apache/skywalking/apm/testcase/restapi/RestCaseController.java
(90%)
rename test/plugin/scenarios/spring-3.1.x-scenario/src/main/java/test/{org =>
}/apache/skywalking/apm/testcase/resttemplate/RestTemplateController.java (81%)
rename test/plugin/scenarios/{spring-4.1.x-scenario/src/main/java/test/org =>
spring-3.1.x-scenario/src/main/java/test}/apache/skywalking/apm/testcase/spring3/CaseController.java
(90%)
rename test/plugin/scenarios/{spring-4.3.x-scenario/src/main/java/test/org =>
spring-3.1.x-scenario/src/main/java/test}/apache/skywalking/apm/testcase/spring3/component/TestComponentBean.java
(93%)
rename test/plugin/scenarios/spring-3.1.x-scenario/src/main/java/test/{org =>
}/apache/skywalking/apm/testcase/spring3/dao/TestRepositoryBean.java (94%)
rename test/plugin/scenarios/{spring-4.1.x-scenario/src/main/java/test/org =>
spring-3.1.x-scenario/src/main/java/test}/apache/skywalking/apm/testcase/spring3/service/TestServiceBean.java
(84%)
rename test/plugin/scenarios/{spring-4.3.x-scenario/src/main/java/test/org =>
spring-4.1.x-scenario/src/main/java/test}/apache/skywalking/apm/testcase/entity/User.java
(95%)
rename test/plugin/scenarios/{spring-3.1.x-scenario/src/main/java/test/org =>
spring-4.1.x-scenario/src/main/java/test}/apache/skywalking/apm/testcase/restapi/RestCaseController.java
(90%)
rename test/plugin/scenarios/spring-4.1.x-scenario/src/main/java/test/{org =>
}/apache/skywalking/apm/testcase/resttemplate/RestTemplateController.java (81%)
rename test/plugin/scenarios/{spring-3.1.x-scenario/src/main/java/test/org =>
spring-4.1.x-scenario/src/main/java/test}/apache/skywalking/apm/testcase/spring3/CaseController.java
(90%)
copy test/plugin/scenarios/{spring-3.0.x-scenario/src/main/java/test/org =>
spring-4.1.x-scenario/src/main/java/test}/apache/skywalking/apm/testcase/spring3/component/TestComponentBean.java
(93%)
rename test/plugin/scenarios/spring-4.1.x-scenario/src/main/java/test/{org =>
}/apache/skywalking/apm/testcase/spring3/dao/TestRepositoryBean.java (94%)
rename test/plugin/scenarios/{spring-3.1.x-scenario/src/main/java/test/org =>
spring-4.1.x-scenario/src/main/java/test}/apache/skywalking/apm/testcase/spring3/service/TestServiceBean.java
(84%)
rename test/plugin/scenarios/{spring-3.1.x-scenario/src/main/java/test/org =>
spring-4.3.x-scenario/src/main/java/test}/apache/skywalking/apm/testcase/entity/User.java
(95%)
copy
test/plugin/scenarios/{vertx-eventbus-3.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/vertxeventbus/controller/LocalReceiver.java
=>
spring-4.3.x-scenario/src/main/java/test/apache/skywalking/apm/testcase/implinterface/TestCaseController.java}
(65%)
copy
test/plugin/scenarios/{finagle-17.10.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/finagle/service/FinagleRpcDemoServiceImpl.java
=>
spring-4.3.x-scenario/src/main/java/test/apache/skywalking/apm/testcase/implinterface/TestCaseInterface.java}
(67%)
rename
test/plugin/scenarios/{spring-3.0.x-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/spring3/component/TestComponentBean.java
=>
spring-4.3.x-scenario/src/main/java/test/apache/skywalking/apm/testcase/inherit/ChildController.java}
(73%)
copy
test/plugin/scenarios/{finagle-17.10.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/finagle/service/FinagleRpcDemoServiceImpl.java
=>
spring-4.3.x-scenario/src/main/java/test/apache/skywalking/apm/testcase/inherit/ParentController.java}
(69%)
rename test/plugin/scenarios/spring-4.3.x-scenario/src/main/java/test/{org =>
}/apache/skywalking/apm/testcase/restapi/RestCaseController.java (91%)
rename test/plugin/scenarios/spring-4.3.x-scenario/src/main/java/test/{org =>
}/apache/skywalking/apm/testcase/resttemplate/RestTemplateController.java (81%)
rename test/plugin/scenarios/spring-4.3.x-scenario/src/main/java/test/{org =>
}/apache/skywalking/apm/testcase/spring3/CaseController.java (90%)
rename test/plugin/scenarios/{spring-3.1.x-scenario/src/main/java/test/org =>
spring-4.3.x-scenario/src/main/java/test}/apache/skywalking/apm/testcase/spring3/component/TestComponentBean.java
(93%)
rename test/plugin/scenarios/spring-4.3.x-scenario/src/main/java/test/{org =>
}/apache/skywalking/apm/testcase/spring3/dao/TestRepositoryBean.java (94%)
rename test/plugin/scenarios/spring-4.3.x-scenario/src/main/java/test/{org =>
}/apache/skywalking/apm/testcase/spring3/service/TestServiceBean.java (84%)
delete mode 100644
test/plugin/scenarios/spring-4.3.x-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/implinterface/TestCaseController.java
delete mode 100644
test/plugin/scenarios/spring-4.3.x-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/implinterface/TestCaseInterface.java
delete mode 100644
test/plugin/scenarios/spring-4.3.x-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/inherit/ChildController.java
delete mode 100644
test/plugin/scenarios/spring-4.3.x-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/inherit/ParentController.java
rename
test/plugin/scenarios/{spring-kafka-2.2.x-scenario/src/main/java/test/org =>
spring-kafka-1.3.x-scenario/src/main/java/test}/apache/skywalking/apm/testcase/spring/kafka/Application.java
(85%)
rename
test/plugin/scenarios/spring-kafka-1.3.x-scenario/src/main/java/test/{org =>
}/apache/skywalking/apm/testcase/spring/kafka/controller/CaseController.java
(98%)
rename
test/plugin/scenarios/{spring-kafka-1.3.x-scenario/src/main/java/test/org =>
spring-kafka-2.2.x-scenario/src/main/java/test}/apache/skywalking/apm/testcase/spring/kafka/Application.java
(85%)
rename
test/plugin/scenarios/spring-kafka-2.2.x-scenario/src/main/java/test/{org =>
}/apache/skywalking/apm/testcase/spring/kafka/controller/CaseController.java
(98%)
rename
test/plugin/scenarios/spring-kafka-2.3.x-scenario/src/main/java/test/{org =>
}/apache/skywalking/apm/testcase/spring/kafka/Application.java (94%)
rename
test/plugin/scenarios/spring-kafka-2.3.x-scenario/src/main/java/test/{org =>
}/apache/skywalking/apm/testcase/spring/kafka/controller/CaseController.java
(98%)
rename test/plugin/scenarios/spring-tx-scenario/src/main/java/test/{org =>
}/apache/skywalking/apm/testcase/spring/transaction/Application.java (94%)
rename test/plugin/scenarios/spring-tx-scenario/src/main/java/test/{org =>
}/apache/skywalking/apm/testcase/spring/transaction/config/JdbcConfig.java (95%)
rename test/plugin/scenarios/spring-tx-scenario/src/main/java/test/{org =>
}/apache/skywalking/apm/testcase/spring/transaction/config/TransactionConfig.java
(94%)
rename test/plugin/scenarios/spring-tx-scenario/src/main/java/test/{org =>
}/apache/skywalking/apm/testcase/spring/transaction/controller/CaseController.java
(93%)
rename test/plugin/scenarios/spring-tx-scenario/src/main/java/test/{org =>
}/apache/skywalking/apm/testcase/spring/transaction/dao/DemoDao.java (92%)
rename test/plugin/scenarios/spring-tx-scenario/src/main/java/test/{org =>
}/apache/skywalking/apm/testcase/spring/transaction/dao/impl/DemoDaoImpl.java
(88%)
rename test/plugin/scenarios/spring-tx-scenario/src/main/java/test/{org =>
}/apache/skywalking/apm/testcase/spring/transaction/service/DemoService.java
(91%)
rename test/plugin/scenarios/spring-tx-scenario/src/main/java/test/{org =>
}/apache/skywalking/apm/testcase/spring/transaction/service/impl/DemoServiceImpl.java
(83%)
rename test/plugin/scenarios/xxl-job-2.x-scenario/src/main/java/test/{org =>
}/apache/skywalking/apm/testcase/xxljob/job/BeanJob.java (96%)
