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 2019/11/25 11:58:03 UTC

[skywalking] branch oal/apdex updated (c19052a -> 265fd7d)

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

hanahmily pushed a change to branch oal/apdex
in repository https://gitbox.apache.org/repos/asf/skywalking.git.


    from c19052a  Add apdex function to OAL
     add 62297a5  Add empty line
     add a0306ca  UI Sync: multiple metrics compare and topology interaction (#3852)
     add db0b748  fix component-libraries.yml miss component:rest-high-level-client (#3859)
     add 41bb3b5  [hotfix] Make socketio-plugin test case stable (#3861)
     add 5f8ee25  [test/plugin] immigrate test feign scenario. (#3838)
     add d0a1cdd  Rabbitmq plugin test migration (#3788)
     add b2d1460  make words be consistent in the context.& fix typo (#3865)
     add e8f6789  Make kafka-scenario stable (#3866)
     add d7038fe  Refactor DataCarrier, support ArrayBlockingQueueBuffer as implementor (#3849)
     add 554df44  fix docker build bug (#3869)
     add 77019ba  Rabbitmq instrument consumer class correctly to get duration reported accurately (#3761)
     add 33d2962  [test/plugin] add elasticsearch 7.x plugin test scenario. (#3868)
     add 58149a7  Intercept feign URL without parameters (#3854)
     add 1041c34  Create .asf.yaml (#3873)
     add 89923d6  [test/plugin] immigrate grpc scenario (#3840)
     add 2c4caed  Update joda lib to fix UTC +13/+14 bug (#3876)
     add 6b07e35  UI sync: compare dependency metric (#3878)
     add f74bab6  Add fangdd.com to powered-by page. (#3879)
     add d48efcf  Add MINSHENG FinTech to powered-by (#3881)
     add 4c618f5  Add 17173.com to powered-by.md page (#3884)
     add fe98490  Fix Istio architecture link (#3885)
     add 70f94d5  make sql statement more semantic. (#3882)
     add 96a3e34  Add componentId for apache servicecomb. (#3676)
     add 1b433da  Add documentation link - illustrate module hierarchy and call flow (#3888)
     add 6ffd927  Support spring-tx in optional plugin (#3857)
     add 7e889d3  fix: spring annotation inheritance problem #3847 (#3886)
     add a2dce71  [test/plugin] immigrate test hystrix scenario. (#3887)
     add 5d064ce  make topN worker report period configurable. (#3892)
     add 6d3b0e2  [test/plugin] Print systeminfo on failure (#3874)
     add aa4ecb4  fix project deadlock when starting application in issue 3784 (#3894)
     add 3d2325a  Set up GitHub Action to include istio+sw in CI process (#3902)
     add 0724cdb  Support ordered segment list in trace query (#3906)
     add 6c4cca8  Add jetty's Java agent deployment instructions (#3909)
     add 9b408e8  [Feature] Support ElasticSearch 7 as backend storage (#3870)
     add 8479287  typo error (#3914)
     add d581f22  Support custom elasticsearch settings in index level. (#3913)
     add 0c0b767  UI sync (#3915)
     add 3cd803d  Merge branch 'master' into oal/apdex
     add 265fd7d  Setup config watcher

No new revisions were added by this update.

Summary of changes:
 .../endpoint_naming_rules.properties => .asf.yaml  |  13 +-
 .../workflows/istio-mixer-ci.yaml                  |  26 +-
 Jenkinsfile                                        |   1 -
 Jenkinsfile-Agent-Test                             |  15 +-
 Jenkinsfile-Agent-Test-2                           |   8 +-
 Jenkinsfile-Agent-Test-3                           |  14 +-
 Jenkinsfile-Agent-Test-4                           |  12 +-
 Jenkinsfile-E2E                                    |  12 +
 .../apm/commons/datacarrier/DataCarrier.java       |   7 +-
 .../buffer/ArrayBlockingQueueBuffer.java           |  69 +++++
 .../apm/commons/datacarrier/buffer/Buffer.java     |  30 +--
 .../commons/datacarrier/buffer/BufferStrategy.java |   1 -
 .../apm/commons/datacarrier/buffer/Channels.java   |  25 +-
 .../{BufferStrategy.java => QueueBuffer.java}      |  32 ++-
 .../datacarrier/consumer/ConsumeDriver.java        |  54 ++--
 .../datacarrier/consumer/ConsumerThread.java       |  29 +--
 .../consumer/MultipleChannelsConsumer.java         |   7 +-
 .../apm/commons/datacarrier/DataCarrierTest.java   |  49 ++--
 .../datacarrier/consumer/BulkConsumePoolTest.java  |  91 -------
 .../commons/datacarrier/consumer/ConsumerTest.java |   2 +-
 apm-dist/pom.xml                                   |  37 ++-
 apm-dist/release-docs/LICENSE                      |   3 +-
 .../src/main/assembly/alarm-settings-sample.yml    |   0
 .../src/main/assembly/alarm-settings.yml           |   0
 .../src/main/assembly/application.yml              |  23 ++
 .../main/assembly/{binary.xml => binary-es7.xml}   | 191 +++++++-------
 apm-dist/src/main/assembly/binary.xml              |  19 ++
 .../src/main/assembly/log4j2.xml                   |   0
 .../network/trace/component/ComponentsDefine.java  |   2 +
 .../skywalking/apm/agent/core/conf/Config.java     |   8 +
 .../plugin/loader/InterceptorInstanceLoader.java   |   5 +-
 .../http/v9/DefaultHttpClientInterceptor.java      |  64 ++---
 .../apm/plugin/feign/http/v9/FeignResolvedURL.java |  47 +++-
 .../plugin/feign/http/v9/PathVarInterceptor.java   |  70 ++++++
 .../http/v9/define/PathVarInstrumentation.java     |  68 +++++
 .../src/main/resources/skywalking-plugin.def       |   3 +-
 .../http/v9/DefaultHttpClientInterceptorTest.java  |  29 ++-
 .../feign/http/v9/PathVarInterceptorTest.java      |  86 +++++++
 .../apm/plugin/grpc/v1/CallServerInterceptor.java  |   2 +
 .../rabbitmq/RabbitMQConsumerInterceptor.java      |   4 +-
 .../define/RabbitMQConsumerInstrumentation.java    |  13 +-
 .../rabbitmq/RabbitMQConsumerInterceptorTest.java  |   6 +-
 .../RequestMappingMethodInterceptor.java           |   5 +-
 .../interceptor/RestMappingMethodInterceptor.java  |  11 +-
 .../optional-spring-plugins/pom.xml                |   1 +
 .../{ => spring-tx-plugin}/pom.xml                 |  21 +-
 .../EndTransactionMethodInterceptor.java           |  59 +++++
 .../GetTransactionMethodInterceptor.java           |  81 ++++++
 .../spring/transaction/context/Constants.java      |  35 +++
 ...tPlatformTransactionManagerInstrumentation.java |  80 ++++++
 .../src/main/resources/skywalking-plugin.def       |   2 +-
 docker/oap/docker-entrypoint.sh                    |   1 +
 docs/README.md                                     |   1 +
 docs/en/concepts-and-designs/service-mesh-probe.md |   2 +-
 docs/en/guides/Plugin-test.md                      |  23 +-
 docs/en/setup/backend/backend-storage.md           |  62 ++++-
 docs/en/setup/service-agent/java-agent/README.md   |  11 +-
 .../service-agent/java-agent/Supported-list.md     |   2 +
 docs/powered-by.md                                 |   4 +-
 install/README.md                                  |   7 +
 .../deploy/all_cleanup.sh                          |   6 +-
 install/deploy/demo-deploy.sh                      |  45 ++++
 install/deploy/istio-deploy.sh                     | 104 ++++++++
 install/deploy/skywalking-deploy.sh                |  56 +++++
 .../kubernetes/helm/skywalking/.helmignore         |  26 +-
 .../kubernetes/helm/skywalking/Chart.yaml          |  38 +--
 .../kubernetes/helm/skywalking/OWNERS              |  10 +-
 install/kubernetes/helm/skywalking/README.md       | 232 +++++++++++++++++
 .../kubernetes/helm/skywalking/templates/NOTES.txt |  43 ++++
 .../helm/skywalking/templates/_helpers.tpl         |  78 ++++++
 .../helm/skywalking/templates/es-init.job.yaml     |  53 ++++
 .../templates/istio-adapter/adapter.yaml           |  12 +-
 .../templates/istio-adapter/handler.yaml           |  11 +-
 .../templates/istio-adapter/instance.yaml          |  42 ++++
 .../skywalking/templates/istio-adapter/rule.yaml   |  13 +-
 .../helm/skywalking/templates/oap-clusterrole.yaml |  22 +-
 .../templates/oap-clusterrolebinding.yaml          |  23 +-
 .../helm/skywalking/templates/oap-deployment.yaml  | 118 +++++++++
 .../helm/skywalking/templates/oap-role.yaml        |  19 +-
 .../helm/skywalking/templates/oap-rolebinding.yaml |  23 +-
 .../skywalking/templates/oap-serviceaccount.yaml   |  14 +-
 .../helm/skywalking/templates/oap-svc.yaml         |  25 +-
 .../helm/skywalking/templates/ui-deployment.yaml   |  57 +++++
 .../helm/skywalking/templates/ui-ingress.yaml      |  49 ++++
 .../helm/skywalking/templates/ui-svc.yaml          |  63 +++++
 install/kubernetes/helm/skywalking/values.yaml     | 269 ++++++++++++++++++++
 oap-server/pom.xml                                 |   4 +-
 .../{server-starter => server-bootstrap}/pom.xml   |  49 +---
 .../oap/server/starter/OAPServerBootstrap.java}    |  16 +-
 .../starter/config/ApplicationConfigLoader.java    |   0
 .../config/ConfigFileNotFoundException.java        |   0
 .../oap/server/starter/config/ConfigLoader.java    |   0
 .../src/main/resources/alarm-settings.yml          |   0
 .../src/main/resources/application.yml             |  30 ++-
 .../src/main/resources/component-libraries.yml     |  12 +
 .../resources/endpoint_naming_rules.properties     |   0
 .../src/main/resources}/gateways.yml               |   0
 .../src/main/resources/log4j2.xml                  |   0
 .../src/main/resources/official_analysis.oal       |   1 +
 .../main/resources/service-apdex-threshold.yml}    |  11 +-
 .../config/ApplicationConfigLoaderTestCase.java    |   0
 .../src/test/resources/application.yml             |   0
 .../oap/server/core/CoreModuleConfig.java          |   1 +
 .../oap/server/core/CoreModuleProvider.java        |  10 +
 .../server/core/analysis/ApdexThresholdConfig.java |  99 ++++++++
 .../{metrics => }/ConfigurationDictionary.java     |   2 +-
 .../server/core/analysis/metrics/ApdexMetrics.java |   1 +
 .../core/analysis/worker/TopNStreamProcessor.java  |   5 +-
 .../server/core/analysis/worker/TopNWorker.java    |   6 +-
 .../oap/server/core/query/TraceQueryService.java   |  38 ++-
 .../core/remote/client/GRPCRemoteClient.java       |   2 -
 .../core/analysis/metrics/ApdexMetricsTest.java    |   2 +-
 .../src/test/resources/component-libraries.yml     |   9 +-
 .../client/elasticsearch/ElasticSearchClient.java  | 107 ++++----
 .../elasticsearch/ITElasticSearchClient.java       |  41 ++-
 .../listener/endpoint/MultiScopesSpanListener.java |  34 ++-
 oap-server/server-starter-es7/pom.xml              |  72 ++++++
 .../src/main/assembly/assembly.xml                 |  21 --
 .../oap/server/starter/OAPServerStartUp.java       |  14 +-
 oap-server/server-starter/pom.xml                  | 196 +--------------
 .../server-starter/src/main/assembly/assembly.xml  |  21 --
 .../oap/server/starter/OAPServerStartUp.java       |  33 +--
 oap-server/server-storage-plugin/pom.xml           |   1 +
 .../StorageModuleElasticsearchConfig.java          |   1 +
 .../StorageModuleElasticsearchProvider.java        |   2 +-
 .../plugin/elasticsearch/base/MetricsEsDAO.java    |  10 +-
 .../plugin/elasticsearch/base/RecordEsDAO.java     |   2 +-
 .../plugin/elasticsearch/base/RegisterEsDAO.java   |   2 +-
 .../elasticsearch/base/StorageEsInstaller.java     |  90 ++++---
 .../plugin/elasticsearch/base/TimeSeriesUtils.java |   2 +-
 .../cache/EndpointInventoryCacheEsDAO.java         |   2 +-
 .../cache/NetworkAddressInventoryCacheEsDAO.java   |   4 +-
 .../cache/ServiceInstanceInventoryCacheDAO.java    |   2 +-
 .../cache/ServiceInventoryCacheEsDAO.java          |   4 +-
 .../elasticsearch/lock/RegisterLockInstaller.java  |  40 +--
 .../elasticsearch/query/AggregationQueryEsDAO.java |  23 +-
 .../elasticsearch/query/MetadataQueryEsDAO.java    |   2 +-
 .../elasticsearch/query/MetricsQueryEsDAO.java     |   2 +-
 .../storage-elasticsearch7-plugin}/pom.xml         |  35 ++-
 .../storage/plugin/elasticsearch7/Es7DAO.java}     |  18 +-
 .../StorageModuleElasticsearch7Config.java         |  19 +-
 .../StorageModuleElasticsearch7Provider.java}      | 106 ++++----
 .../elasticsearch7/base/StorageEs7Installer.java   |  65 +++++
 .../cache/EndpointInventoryCacheEs7DAO.java}       |  41 +--
 .../cache/NetworkAddressInventoryCacheEs7DAO.java} |  52 ++--
 .../ServiceInstanceInventoryCacheEs7DAO.java}      |  50 +---
 .../cache/ServiceInventoryCacheEs7DAO.java}        |  57 ++---
 .../client/ElasticSearch7Client.java               | 277 +++++++++++++++++++++
 .../client/ElasticSearch7InsertRequest.java        |  31 +--
 .../client/ElasticSearch7UpdateRequest.java}       |  19 +-
 .../plugin/elasticsearch7/dao/MetricsEs7DAO.java}  |  44 ++--
 .../plugin/elasticsearch7/dao/StorageEs7DAO.java   |  54 ++++
 .../lock/RegisterLockEs77DAOImpl.java              |  79 ++++++
 .../lock/RegisterLockEs7Installer.java             |  57 +++++
 .../query/AggregationQueryEs7DAO.java              |  89 +++++++
 .../elasticsearch7/query/AlarmQueryEs7DAO.java     |  93 +++++++
 .../elasticsearch7/query/LogQueryEs7DAO.java       | 122 +++++++++
 .../elasticsearch7/query/MetadataQueryEs7DAO.java  |  86 +++++++
 .../elasticsearch7/query/MetricsQueryEs7DAO.java   | 112 +++++++++
 .../elasticsearch7/query/TraceQueryEs7DAO.java     | 140 +++++++++++
 ...lking.oap.server.library.module.ModuleProvider} |   2 +-
 pom.xml                                            |   1 +
 skywalking-ui                                      |   2 +-
 test/e2e/e2e-cluster/test-runner/pom.xml           |   3 +-
 .../test-runner/src/docker/clusterize.awk          |   6 +-
 test/e2e/e2e-ttl/e2e-ttl-es/pom.xml                |   3 +-
 .../e2e-ttl/e2e-ttl-es/src/docker/es_storage.awk   |   6 +-
 test/e2e/run.sh                                    |  18 +-
 .../src/main/resources/archetype-resources/pom.xml |   1 -
 test/plugin/containers/pom.xml                     |   3 +-
 test/plugin/run.sh                                 |   5 +
 .../plugin/test/helper/ConfigurationImpl.java      |  12 +-
 .../test/helper/DockerComposeRunningGenerator.java |   2 +
 .../plugin/test/helper/IConfiguration.java         |   2 +
 .../src/main/resources/docker-compose.template     |   5 +
 .../elasticsearch-5.x-scenario/configuration.yml   |   6 +-
 .../elasticsearch-6.x-scenario/configuration.yml   |   8 +-
 .../elasticsearch/controller/CaseController.java   |   4 +-
 .../elasticsearch-7.x-scenario/bin/startup.sh      |   6 +-
 .../config/expectedData.yaml                       | 149 +++++++++++
 .../elasticsearch-7.x-scenario/configuration.yml   |  20 +-
 .../elasticsearch-7.x-scenario}/pom.xml            |  45 +++-
 .../src/main/assembly/assembly.xml                 |  41 +--
 .../apm/testcase/elasticsearch/Application.java    |  22 +-
 .../elasticsearch/config/ElasticsearchConfig.java  |   0
 .../elasticsearch/controller/CaseController.java   |  28 ++-
 .../src/main/resources/application.yaml            |   8 +-
 .../src/main/resources/log4j2.xml                  |   0
 .../support-version.list                           |  14 +-
 .../plugin/scenarios/feign-scenario/bin/startup.sh |   6 +-
 .../feign-scenario/config/expectedData.yaml        | 202 +++++++++++++++
 .../scenarios/feign-scenario/configuration.yml     |   8 +-
 .../feign-scenario}/pom.xml                        |  39 ++-
 .../feign-scenario/src/main/assembly/assembly.xml  |  41 +--
 .../skywalking/apm/testcase/feign/Application.java |  23 +-
 .../testcase/feign/controller/CaseController.java  |  51 ++++
 .../testcase/feign/controller/RestController.java  |  77 ++++++
 .../apm/testcase/feign/controller/RestRequest.java |  57 +++++
 .../skywalking/apm/testcase/feign/entity/User.java |  40 ++-
 .../src/main/resources/application.yaml            |   8 +-
 .../feign-scenario}/src/main/resources/log4j2.xml  |   0
 .../scenarios/feign-scenario/support-version.list  |  12 +-
 .../plugin/scenarios/grpc-scenario/bin/startup.sh  |   6 +-
 .../grpc-scenario/config/expectedData.yaml         | 253 +++++++++++++++++++
 .../scenarios/grpc-scenario/configuration.yml      |   8 +-
 .../grpc-scenario}/pom.xml                         |  48 +++-
 .../grpc-scenario/src/main/assembly/assembly.xml   |  41 +--
 .../skywalking/apm/testcase/grpc/Application.java  |  22 +-
 .../testcase/grpc/consumr/ConsumerInterceptor.java | 104 ++++++++
 .../testcase/grpc/controller/CaseController.java   | 132 ++++++++++
 .../grpc/provider/ProviderConfiguration.java       |  45 ++++
 .../provider/interceptor/ProviderInterceptor.java  |  89 +++++++
 .../service/GreeterBlockingServiceImpl.java        |  24 +-
 .../grpc/provider/service/GreeterServiceImpl.java  |  52 ++++
 .../src/main/proto/GreetService.proto              |  28 ++-
 .../src/main/resources/application.yaml            |   8 +-
 .../grpc-scenario}/src/main/resources/log4j2.xml   |   0
 .../scenarios/grpc-scenario/support-version.list   |  29 ++-
 .../scenarios/hystrix-scenario/bin/startup.sh      |   6 +-
 .../hystrix-scenario/config/expectedData.yaml      |  98 ++++++++
 .../scenarios/hystrix-scenario/configuration.yml   |   8 +-
 .../hystrix-scenario}/pom.xml                      |  23 +-
 .../src/main/assembly/assembly.xml                 |  41 +--
 .../apm/testcase/hystrix/Application.java          |  22 +-
 .../hystrix/controller/CaseController.java         |  92 +++++++
 .../testcase/hystrix/controller/TestACommand.java  |  61 +++++
 .../testcase/hystrix/controller/TestBCommand.java  |  64 +++++
 .../src/main/resources/application.yaml            |   8 +-
 .../src/main/resources/log4j2.xml                  |   0
 .../hystrix-scenario/support-version.list          |  23 +-
 .../apm/testcase/netty/socketio/CaseServlet.java   |  38 ++-
 .../netty/socketio/HealthCheckServlet.java         |   6 +-
 .../testcase/netty/socketio/SocketIOStarter.java   |  47 ++--
 .../scenarios/rabbitmq-scenario/bin/startup.sh     |   5 +-
 .../rabbitmq-scenario/config/expectedData.yaml     |  83 ++++++
 .../configuration.yml                              |  25 +-
 .../rabbitmq-scenario}/pom.xml                     |  70 +++---
 .../src/main/assembly/assembly.xml                 |  41 +--
 .../apm/testcase/rabbitmq/Application.java         |  21 +-
 .../rabbitmq/controller/CaseController.java        | 152 +++++++++++
 .../src/main/resources/application.properties      |   3 +-
 .../src/main/resources/log4j2.xml                  |   0
 .../rabbitmq-scenario/support-version.list         |  15 +-
 .../scenarios/spring-tx-scenario/bin/startup.sh    |   6 +-
 .../spring-tx-scenario/config/expectedData.yaml    | 168 +++++++++++++
 .../scenarios/spring-tx-scenario/configuration.yml |  19 +-
 .../spring-tx-scenario}/pom.xml                    |  59 ++---
 .../src/main/assembly/assembly.xml                 |  41 +--
 .../testcase/spring/transaction/Application.java   |  20 +-
 .../spring/transaction/config/JdbcConfig.java      |  53 ++++
 .../transaction/config/TransactionConfig.java      |  23 +-
 .../transaction/controller/CaseController.java     |  72 ++++++
 .../testcase/spring/transaction/dao/DemoDao.java   |  13 +-
 .../spring/transaction/dao/impl/DemoDaoImpl.java   |  26 +-
 .../spring/transaction/service/DemoService.java    |  13 +-
 .../transaction/service/impl/DemoServiceImpl.java} |  34 ++-
 .../src/main/resources/application.properties      |   4 +-
 .../spring-tx-scenario/support-version.list        |  13 +-
 test/scripts/clean.sh                              |  28 +++
 test/scripts/minikube.sh                           | 114 +++++++++
 test/scripts/pre.sh                                |  81 ++++++
 tools/dependencies/check-LICENSE.sh                |  14 ++
 ....txt => known-oap-backend-dependencies-es7.txt} |  71 +++---
 .../known-oap-backend-dependencies.txt             |   2 +-
 264 files changed, 7592 insertions(+), 1817 deletions(-)
 copy oap-server/server-starter/src/main/resources/endpoint_naming_rules.properties => .asf.yaml (77%)
 copy apm-sniffer/apm-sdk-plugin/feign-default-http-9.x-plugin/src/main/resources/skywalking-plugin.def => .github/workflows/istio-mixer-ci.yaml (53%)
 create mode 100644 apm-commons/apm-datacarrier/src/main/java/org/apache/skywalking/apm/commons/datacarrier/buffer/ArrayBlockingQueueBuffer.java
 copy apm-commons/apm-datacarrier/src/main/java/org/apache/skywalking/apm/commons/datacarrier/buffer/{BufferStrategy.java => QueueBuffer.java} (62%)
 delete mode 100644 apm-commons/apm-datacarrier/src/test/java/org/apache/skywalking/apm/commons/datacarrier/consumer/BulkConsumePoolTest.java
 rename {oap-server/server-starter => apm-dist}/src/main/assembly/alarm-settings-sample.yml (100%)
 rename {oap-server/server-starter => apm-dist}/src/main/assembly/alarm-settings.yml (100%)
 rename {oap-server/server-starter => apm-dist}/src/main/assembly/application.yml (84%)
 copy apm-dist/src/main/assembly/{binary.xml => binary-es7.xml} (70%)
 rename {oap-server/server-starter => apm-dist}/src/main/assembly/log4j2.xml (100%)
 copy oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/ConfigurationDictionary.java => apm-sniffer/apm-sdk-plugin/feign-default-http-9.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/feign/http/v9/FeignResolvedURL.java (50%)
 create mode 100644 apm-sniffer/apm-sdk-plugin/feign-default-http-9.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/feign/http/v9/PathVarInterceptor.java
 create mode 100644 apm-sniffer/apm-sdk-plugin/feign-default-http-9.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/feign/http/v9/define/PathVarInstrumentation.java
 create mode 100644 apm-sniffer/apm-sdk-plugin/feign-default-http-9.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/feign/http/v9/PathVarInterceptorTest.java
 copy apm-sniffer/optional-plugins/optional-spring-plugins/{ => spring-tx-plugin}/pom.xml (72%)
 create mode 100644 apm-sniffer/optional-plugins/optional-spring-plugins/spring-tx-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/transaction/EndTransactionMethodInterceptor.java
 create mode 100644 apm-sniffer/optional-plugins/optional-spring-plugins/spring-tx-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/transaction/GetTransactionMethodInterceptor.java
 create mode 100644 apm-sniffer/optional-plugins/optional-spring-plugins/spring-tx-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/transaction/context/Constants.java
 create mode 100644 apm-sniffer/optional-plugins/optional-spring-plugins/spring-tx-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/transaction/define/AbstractPlatformTransactionManagerInstrumentation.java
 copy apm-sniffer/{apm-sdk-plugin/feign-default-http-9.x-plugin => optional-plugins/optional-spring-plugins/spring-tx-plugin}/src/main/resources/skywalking-plugin.def (86%)
 create mode 100644 install/README.md
 copy apm-sniffer/apm-sdk-plugin/feign-default-http-9.x-plugin/src/main/resources/skywalking-plugin.def => install/deploy/all_cleanup.sh (87%)
 create mode 100644 install/deploy/demo-deploy.sh
 create mode 100644 install/deploy/istio-deploy.sh
 create mode 100644 install/deploy/skywalking-deploy.sh
 copy oap-server/server-starter/src/main/resources/endpoint_naming_rules.properties => install/kubernetes/helm/skywalking/.helmignore (69%)
 copy test/plugin/scenarios/elasticsearch-6.x-scenario/configuration.yml => install/kubernetes/helm/skywalking/Chart.yaml (57%)
 copy oap-server/server-starter/src/main/resources/endpoint_naming_rules.properties => install/kubernetes/helm/skywalking/OWNERS (92%)
 create mode 100644 install/kubernetes/helm/skywalking/README.md
 create mode 100644 install/kubernetes/helm/skywalking/templates/NOTES.txt
 create mode 100644 install/kubernetes/helm/skywalking/templates/_helpers.tpl
 create mode 100644 install/kubernetes/helm/skywalking/templates/es-init.job.yaml
 copy apm-sniffer/apm-sdk-plugin/feign-default-http-9.x-plugin/src/main/resources/skywalking-plugin.def => install/kubernetes/helm/skywalking/templates/istio-adapter/adapter.yaml (78%)
 copy apm-sniffer/apm-sdk-plugin/feign-default-http-9.x-plugin/src/main/resources/skywalking-plugin.def => install/kubernetes/helm/skywalking/templates/istio-adapter/handler.yaml (72%)
 create mode 100644 install/kubernetes/helm/skywalking/templates/istio-adapter/instance.yaml
 copy apm-sniffer/apm-sdk-plugin/feign-default-http-9.x-plugin/src/main/resources/skywalking-plugin.def => install/kubernetes/helm/skywalking/templates/istio-adapter/rule.yaml (73%)
 copy oap-server/server-starter/src/main/resources/endpoint_naming_rules.properties => install/kubernetes/helm/skywalking/templates/oap-clusterrole.yaml (59%)
 copy oap-server/server-starter/src/main/resources/endpoint_naming_rules.properties => install/kubernetes/helm/skywalking/templates/oap-clusterrolebinding.yaml (56%)
 create mode 100644 install/kubernetes/helm/skywalking/templates/oap-deployment.yaml
 copy oap-server/server-starter/src/main/resources/endpoint_naming_rules.properties => install/kubernetes/helm/skywalking/templates/oap-role.yaml (64%)
 copy oap-server/server-starter/src/main/resources/endpoint_naming_rules.properties => install/kubernetes/helm/skywalking/templates/oap-rolebinding.yaml (56%)
 copy oap-server/server-starter/src/main/resources/endpoint_naming_rules.properties => install/kubernetes/helm/skywalking/templates/oap-serviceaccount.yaml (70%)
 copy oap-server/server-starter/src/main/resources/endpoint_naming_rules.properties => install/kubernetes/helm/skywalking/templates/oap-svc.yaml (56%)
 create mode 100644 install/kubernetes/helm/skywalking/templates/ui-deployment.yaml
 create mode 100644 install/kubernetes/helm/skywalking/templates/ui-ingress.yaml
 create mode 100644 install/kubernetes/helm/skywalking/templates/ui-svc.yaml
 create mode 100644 install/kubernetes/helm/skywalking/values.yaml
 copy oap-server/{server-starter => server-bootstrap}/pom.xml (82%)
 copy oap-server/{server-starter/src/main/java/org/apache/skywalking/oap/server/starter/OAPServerStartUp.java => server-bootstrap/src/main/java/org/apache/skywalking/oap/server/starter/OAPServerBootstrap.java} (82%)
 rename oap-server/{server-starter => server-bootstrap}/src/main/java/org/apache/skywalking/oap/server/starter/config/ApplicationConfigLoader.java (100%)
 copy oap-server/{server-starter => server-bootstrap}/src/main/java/org/apache/skywalking/oap/server/starter/config/ConfigFileNotFoundException.java (100%)
 copy oap-server/{server-starter => server-bootstrap}/src/main/java/org/apache/skywalking/oap/server/starter/config/ConfigLoader.java (100%)
 rename oap-server/{server-starter => server-bootstrap}/src/main/resources/alarm-settings.yml (100%)
 rename oap-server/{server-starter => server-bootstrap}/src/main/resources/application.yml (82%)
 rename oap-server/{server-starter => server-bootstrap}/src/main/resources/component-libraries.yml (97%)
 copy oap-server/{server-starter => server-bootstrap}/src/main/resources/endpoint_naming_rules.properties (100%)
 rename oap-server/{server-starter/src/main/assembly => server-bootstrap/src/main/resources}/gateways.yml (100%)
 rename oap-server/{server-starter => server-bootstrap}/src/main/resources/log4j2.xml (100%)
 rename oap-server/{server-starter => server-bootstrap}/src/main/resources/official_analysis.oal (99%)
 copy oap-server/{server-starter/src/main/resources/endpoint_naming_rules.properties => server-bootstrap/src/main/resources/service-apdex-threshold.yml} (81%)
 rename oap-server/{server-starter => server-bootstrap}/src/test/java/org/apache/skywalking/oap/server/starter/config/ApplicationConfigLoaderTestCase.java (100%)
 rename oap-server/{server-starter => server-bootstrap}/src/test/resources/application.yml (100%)
 create mode 100644 oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/ApdexThresholdConfig.java
 rename oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/{metrics => }/ConfigurationDictionary.java (94%)
 create mode 100644 oap-server/server-starter-es7/pom.xml
 copy oap-server/{server-starter => server-starter-es7}/src/main/assembly/assembly.xml (63%)
 mode change 100755 => 100644
 rename apm-commons/apm-datacarrier/src/main/java/org/apache/skywalking/apm/commons/datacarrier/callback/QueueBlockingCallback.java => oap-server/server-starter-es7/src/main/java/org/apache/skywalking/oap/server/starter/OAPServerStartUp.java (77%)
 mode change 100755 => 100644 oap-server/server-starter/src/main/assembly/assembly.xml
 copy {apm-sniffer/optional-plugins/optional-spring-plugins => oap-server/server-storage-plugin/storage-elasticsearch7-plugin}/pom.xml (50%)
 copy oap-server/{server-starter/src/main/java/org/apache/skywalking/oap/server/starter/config/ConfigFileNotFoundException.java => server-storage-plugin/storage-elasticsearch7-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch7/Es7DAO.java} (67%)
 copy apm-commons/apm-datacarrier/src/main/java/org/apache/skywalking/apm/commons/datacarrier/BlockingDataCarrier.java => oap-server/server-storage-plugin/storage-elasticsearch7-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch7/StorageModuleElasticsearch7Config.java (60%)
 copy oap-server/server-storage-plugin/{storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/StorageModuleElasticsearchProvider.java => storage-elasticsearch7-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch7/StorageModuleElasticsearch7Provider.java} (72%)
 create mode 100644 oap-server/server-storage-plugin/storage-elasticsearch7-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch7/base/StorageEs7Installer.java
 copy oap-server/server-storage-plugin/{storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/cache/EndpointInventoryCacheEsDAO.java => storage-elasticsearch7-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch7/cache/EndpointInventoryCacheEs7DAO.java} (60%)
 copy oap-server/server-storage-plugin/{storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/cache/EndpointInventoryCacheEsDAO.java => storage-elasticsearch7-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch7/cache/NetworkAddressInventoryCacheEs7DAO.java} (50%)
 copy oap-server/server-storage-plugin/{storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/cache/ServiceInstanceInventoryCacheDAO.java => storage-elasticsearch7-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch7/cache/ServiceInstanceInventoryCacheEs7DAO.java} (56%)
 copy oap-server/server-storage-plugin/{storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/cache/ServiceInstanceInventoryCacheDAO.java => storage-elasticsearch7-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch7/cache/ServiceInventoryCacheEs7DAO.java} (52%)
 create mode 100644 oap-server/server-storage-plugin/storage-elasticsearch7-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch7/client/ElasticSearch7Client.java
 copy test/plugin/scenarios/netty-socketio-scenario/src/main/java/org/apache/skywalking/apm/testcase/netty/socketio/ContextListener.java => oap-server/server-storage-plugin/storage-elasticsearch7-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch7/client/ElasticSearch7InsertRequest.java (55%)
 copy oap-server/{server-starter/src/main/java/org/apache/skywalking/oap/server/starter/config/ConfigFileNotFoundException.java => server-storage-plugin/storage-elasticsearch7-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch7/client/ElasticSearch7UpdateRequest.java} (59%)
 copy oap-server/server-storage-plugin/{storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/base/MetricsEsDAO.java => storage-elasticsearch7-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch7/dao/MetricsEs7DAO.java} (50%)
 create mode 100644 oap-server/server-storage-plugin/storage-elasticsearch7-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch7/dao/StorageEs7DAO.java
 create mode 100644 oap-server/server-storage-plugin/storage-elasticsearch7-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch7/lock/RegisterLockEs77DAOImpl.java
 create mode 100644 oap-server/server-storage-plugin/storage-elasticsearch7-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch7/lock/RegisterLockEs7Installer.java
 create mode 100644 oap-server/server-storage-plugin/storage-elasticsearch7-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch7/query/AggregationQueryEs7DAO.java
 create mode 100644 oap-server/server-storage-plugin/storage-elasticsearch7-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch7/query/AlarmQueryEs7DAO.java
 create mode 100644 oap-server/server-storage-plugin/storage-elasticsearch7-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch7/query/LogQueryEs7DAO.java
 create mode 100644 oap-server/server-storage-plugin/storage-elasticsearch7-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch7/query/MetadataQueryEs7DAO.java
 create mode 100644 oap-server/server-storage-plugin/storage-elasticsearch7-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch7/query/MetricsQueryEs7DAO.java
 create mode 100644 oap-server/server-storage-plugin/storage-elasticsearch7-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch7/query/TraceQueryEs7DAO.java
 copy oap-server/{server-starter/src/main/resources/endpoint_naming_rules.properties => server-storage-plugin/storage-elasticsearch7-plugin/src/main/resources/META-INF/services/org.apache.skywalking.oap.server.library.module.ModuleProvider} (88%)
 mode change 100644 => 100755 test/plugin/run.sh
 copy apm-sniffer/apm-sdk-plugin/feign-default-http-9.x-plugin/src/main/resources/skywalking-plugin.def => test/plugin/scenarios/elasticsearch-7.x-scenario/bin/startup.sh (82%)
 create mode 100644 test/plugin/scenarios/elasticsearch-7.x-scenario/config/expectedData.yaml
 copy apm-sniffer/apm-sdk-plugin/feign-default-http-9.x-plugin/src/main/resources/skywalking-plugin.def => test/plugin/scenarios/elasticsearch-7.x-scenario/configuration.yml (55%)
 copy test/plugin/{archetypes/jvm/src/main/resources/archetype-resources => scenarios/elasticsearch-7.x-scenario}/pom.xml (70%)
 copy apm-sniffer/optional-plugins/optional-spring-plugins/pom.xml => test/plugin/scenarios/elasticsearch-7.x-scenario/src/main/assembly/assembly.xml (53%)
 copy oap-server/server-starter/src/main/java/org/apache/skywalking/oap/server/starter/config/ConfigFileNotFoundException.java => test/plugin/scenarios/elasticsearch-7.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/elasticsearch/Application.java (65%)
 copy test/plugin/scenarios/{elasticsearch-6.x-scenario => elasticsearch-7.x-scenario}/src/main/java/org/apache/skywalking/apm/testcase/elasticsearch/config/ElasticsearchConfig.java (100%)
 copy test/plugin/scenarios/{elasticsearch-6.x-scenario => elasticsearch-7.x-scenario}/src/main/java/org/apache/skywalking/apm/testcase/elasticsearch/controller/CaseController.java (93%)
 copy oap-server/server-starter/src/main/resources/endpoint_naming_rules.properties => test/plugin/scenarios/elasticsearch-7.x-scenario/src/main/resources/application.yaml (87%)
 copy test/plugin/{archetypes/tomcat/src/main/resources/archetype-resources => scenarios/elasticsearch-7.x-scenario}/src/main/resources/log4j2.xml (100%)
 copy apm-sniffer/apm-sdk-plugin/feign-default-http-9.x-plugin/src/main/resources/skywalking-plugin.def => test/plugin/scenarios/elasticsearch-7.x-scenario/support-version.list (81%)
 copy apm-sniffer/apm-sdk-plugin/feign-default-http-9.x-plugin/src/main/resources/skywalking-plugin.def => test/plugin/scenarios/feign-scenario/bin/startup.sh (87%)
 create mode 100644 test/plugin/scenarios/feign-scenario/config/expectedData.yaml
 copy apm-sniffer/apm-sdk-plugin/feign-default-http-9.x-plugin/src/main/resources/skywalking-plugin.def => test/plugin/scenarios/feign-scenario/configuration.yml (77%)
 copy test/plugin/{archetypes/jvm/src/main/resources/archetype-resources => scenarios/feign-scenario}/pom.xml (76%)
 copy apm-sniffer/optional-plugins/optional-spring-plugins/pom.xml => test/plugin/scenarios/feign-scenario/src/main/assembly/assembly.xml (53%)
 copy oap-server/server-starter/src/main/java/org/apache/skywalking/oap/server/starter/config/ConfigFileNotFoundException.java => test/plugin/scenarios/feign-scenario/src/main/java/org/apache/skywalking/apm/testcase/feign/Application.java (66%)
 create mode 100644 test/plugin/scenarios/feign-scenario/src/main/java/org/apache/skywalking/apm/testcase/feign/controller/CaseController.java
 create mode 100644 test/plugin/scenarios/feign-scenario/src/main/java/org/apache/skywalking/apm/testcase/feign/controller/RestController.java
 create mode 100644 test/plugin/scenarios/feign-scenario/src/main/java/org/apache/skywalking/apm/testcase/feign/controller/RestRequest.java
 copy apm-commons/apm-datacarrier/src/main/java/org/apache/skywalking/apm/commons/datacarrier/BlockingDataCarrier.java => test/plugin/scenarios/feign-scenario/src/main/java/org/apache/skywalking/apm/testcase/feign/entity/User.java (59%)
 copy oap-server/server-starter/src/main/resources/endpoint_naming_rules.properties => test/plugin/scenarios/feign-scenario/src/main/resources/application.yaml (88%)
 copy test/plugin/{archetypes/tomcat/src/main/resources/archetype-resources => scenarios/feign-scenario}/src/main/resources/log4j2.xml (100%)
 copy apm-sniffer/apm-sdk-plugin/feign-default-http-9.x-plugin/src/main/resources/skywalking-plugin.def => test/plugin/scenarios/feign-scenario/support-version.list (81%)
 copy apm-sniffer/apm-sdk-plugin/feign-default-http-9.x-plugin/src/main/resources/skywalking-plugin.def => test/plugin/scenarios/grpc-scenario/bin/startup.sh (87%)
 create mode 100644 test/plugin/scenarios/grpc-scenario/config/expectedData.yaml
 copy apm-sniffer/apm-sdk-plugin/feign-default-http-9.x-plugin/src/main/resources/skywalking-plugin.def => test/plugin/scenarios/grpc-scenario/configuration.yml (77%)
 copy test/plugin/{archetypes/jvm/src/main/resources/archetype-resources => scenarios/grpc-scenario}/pom.xml (68%)
 copy apm-sniffer/optional-plugins/optional-spring-plugins/pom.xml => test/plugin/scenarios/grpc-scenario/src/main/assembly/assembly.xml (53%)
 copy oap-server/server-starter/src/main/java/org/apache/skywalking/oap/server/starter/config/ConfigFileNotFoundException.java => test/plugin/scenarios/grpc-scenario/src/main/java/org/apache/skywalking/apm/testcase/grpc/Application.java (66%)
 create mode 100644 test/plugin/scenarios/grpc-scenario/src/main/java/org/apache/skywalking/apm/testcase/grpc/consumr/ConsumerInterceptor.java
 create mode 100644 test/plugin/scenarios/grpc-scenario/src/main/java/org/apache/skywalking/apm/testcase/grpc/controller/CaseController.java
 create mode 100644 test/plugin/scenarios/grpc-scenario/src/main/java/org/apache/skywalking/apm/testcase/grpc/provider/ProviderConfiguration.java
 create mode 100644 test/plugin/scenarios/grpc-scenario/src/main/java/org/apache/skywalking/apm/testcase/grpc/provider/interceptor/ProviderInterceptor.java
 copy apm-commons/apm-datacarrier/src/main/java/org/apache/skywalking/apm/commons/datacarrier/BlockingDataCarrier.java => test/plugin/scenarios/grpc-scenario/src/main/java/org/apache/skywalking/apm/testcase/grpc/provider/service/GreeterBlockingServiceImpl.java (55%)
 create mode 100644 test/plugin/scenarios/grpc-scenario/src/main/java/org/apache/skywalking/apm/testcase/grpc/provider/service/GreeterServiceImpl.java
 copy oap-server/server-starter/src/main/java/org/apache/skywalking/oap/server/starter/config/ConfigFileNotFoundException.java => test/plugin/scenarios/grpc-scenario/src/main/proto/GreetService.proto (68%)
 copy oap-server/server-starter/src/main/resources/endpoint_naming_rules.properties => test/plugin/scenarios/grpc-scenario/src/main/resources/application.yaml (88%)
 copy test/plugin/{archetypes/tomcat/src/main/resources/archetype-resources => scenarios/grpc-scenario}/src/main/resources/log4j2.xml (100%)
 copy apm-sniffer/apm-sdk-plugin/feign-default-http-9.x-plugin/src/main/resources/skywalking-plugin.def => test/plugin/scenarios/grpc-scenario/support-version.list (61%)
 copy apm-sniffer/apm-sdk-plugin/feign-default-http-9.x-plugin/src/main/resources/skywalking-plugin.def => test/plugin/scenarios/hystrix-scenario/bin/startup.sh (87%)
 create mode 100644 test/plugin/scenarios/hystrix-scenario/config/expectedData.yaml
 copy apm-sniffer/apm-sdk-plugin/feign-default-http-9.x-plugin/src/main/resources/skywalking-plugin.def => test/plugin/scenarios/hystrix-scenario/configuration.yml (76%)
 copy test/plugin/{archetypes/jvm/src/main/resources/archetype-resources => scenarios/hystrix-scenario}/pom.xml (86%)
 copy apm-sniffer/optional-plugins/optional-spring-plugins/pom.xml => test/plugin/scenarios/hystrix-scenario/src/main/assembly/assembly.xml (53%)
 copy oap-server/server-starter/src/main/java/org/apache/skywalking/oap/server/starter/config/ConfigFileNotFoundException.java => test/plugin/scenarios/hystrix-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/hystrix/Application.java (66%)
 create mode 100644 test/plugin/scenarios/hystrix-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/hystrix/controller/CaseController.java
 create mode 100644 test/plugin/scenarios/hystrix-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/hystrix/controller/TestACommand.java
 create mode 100644 test/plugin/scenarios/hystrix-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/hystrix/controller/TestBCommand.java
 copy oap-server/server-starter/src/main/resources/endpoint_naming_rules.properties => test/plugin/scenarios/hystrix-scenario/src/main/resources/application.yaml (87%)
 copy test/plugin/scenarios/{spring-4.3.x-scenario => hystrix-scenario}/src/main/resources/log4j2.xml (100%)
 copy apm-sniffer/apm-sdk-plugin/feign-default-http-9.x-plugin/src/main/resources/skywalking-plugin.def => test/plugin/scenarios/hystrix-scenario/support-version.list (80%)
 copy apm-sniffer/apm-sdk-plugin/feign-default-http-9.x-plugin/src/main/resources/skywalking-plugin.def => test/plugin/scenarios/rabbitmq-scenario/bin/startup.sh (87%)
 create mode 100644 test/plugin/scenarios/rabbitmq-scenario/config/expectedData.yaml
 copy test/plugin/scenarios/{elasticsearch-6.x-scenario => rabbitmq-scenario}/configuration.yml (63%)
 copy test/plugin/{archetypes/jvm/src/main/resources/archetype-resources => scenarios/rabbitmq-scenario}/pom.xml (69%)
 copy apm-sniffer/optional-plugins/optional-spring-plugins/pom.xml => test/plugin/scenarios/rabbitmq-scenario/src/main/assembly/assembly.xml (53%)
 copy oap-server/server-starter/src/main/java/org/apache/skywalking/oap/server/starter/config/ConfigFileNotFoundException.java => test/plugin/scenarios/rabbitmq-scenario/src/main/java/org/apache/skywalking/apm/testcase/rabbitmq/Application.java (66%)
 create mode 100644 test/plugin/scenarios/rabbitmq-scenario/src/main/java/org/apache/skywalking/apm/testcase/rabbitmq/controller/CaseController.java
 copy oap-server/server-starter/src/main/resources/endpoint_naming_rules.properties => test/plugin/scenarios/rabbitmq-scenario/src/main/resources/application.properties (92%)
 copy test/plugin/scenarios/{mongodb-3.x-scenario => rabbitmq-scenario}/src/main/resources/log4j2.xml (100%)
 copy apm-sniffer/apm-sdk-plugin/feign-default-http-9.x-plugin/src/main/resources/skywalking-plugin.def => test/plugin/scenarios/rabbitmq-scenario/support-version.list (81%)
 copy apm-sniffer/apm-sdk-plugin/feign-default-http-9.x-plugin/src/main/resources/skywalking-plugin.def => test/plugin/scenarios/spring-tx-scenario/bin/startup.sh (77%)
 create mode 100644 test/plugin/scenarios/spring-tx-scenario/config/expectedData.yaml
 copy apm-sniffer/apm-sdk-plugin/feign-default-http-9.x-plugin/src/main/resources/skywalking-plugin.def => test/plugin/scenarios/spring-tx-scenario/configuration.yml (62%)
 copy test/plugin/{archetypes/jvm/src/main/resources/archetype-resources => scenarios/spring-tx-scenario}/pom.xml (73%)
 copy apm-sniffer/optional-plugins/optional-spring-plugins/pom.xml => test/plugin/scenarios/spring-tx-scenario/src/main/assembly/assembly.xml (53%)
 rename oap-server/server-starter/src/main/java/org/apache/skywalking/oap/server/starter/config/ConfigFileNotFoundException.java => test/plugin/scenarios/spring-tx-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/spring/transaction/Application.java (63%)
 create mode 100644 test/plugin/scenarios/spring-tx-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/spring/transaction/config/JdbcConfig.java
 copy apm-commons/apm-datacarrier/src/main/java/org/apache/skywalking/apm/commons/datacarrier/BlockingDataCarrier.java => test/plugin/scenarios/spring-tx-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/spring/transaction/config/TransactionConfig.java (58%)
 create mode 100644 test/plugin/scenarios/spring-tx-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/spring/transaction/controller/CaseController.java
 copy oap-server/server-starter/src/main/java/org/apache/skywalking/oap/server/starter/config/ConfigLoader.java => test/plugin/scenarios/spring-tx-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/spring/transaction/dao/DemoDao.java (83%)
 rename apm-commons/apm-datacarrier/src/main/java/org/apache/skywalking/apm/commons/datacarrier/BlockingDataCarrier.java => test/plugin/scenarios/spring-tx-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/spring/transaction/dao/impl/DemoDaoImpl.java (57%)
 rename oap-server/server-starter/src/main/java/org/apache/skywalking/oap/server/starter/config/ConfigLoader.java => test/plugin/scenarios/spring-tx-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/spring/transaction/service/DemoService.java (83%)
 rename test/plugin/scenarios/{netty-socketio-scenario/src/main/java/org/apache/skywalking/apm/testcase/netty/socketio/ContextListener.java => spring-tx-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/spring/transaction/service/impl/DemoServiceImpl.java} (55%)
 rename oap-server/server-starter/src/main/resources/endpoint_naming_rules.properties => test/plugin/scenarios/spring-tx-scenario/src/main/resources/application.properties (88%)
 copy apm-sniffer/apm-sdk-plugin/feign-default-http-9.x-plugin/src/main/resources/skywalking-plugin.def => test/plugin/scenarios/spring-tx-scenario/support-version.list (79%)
 create mode 100755 test/scripts/clean.sh
 create mode 100755 test/scripts/minikube.sh
 create mode 100755 test/scripts/pre.sh
 copy tools/dependencies/{known-oap-backend-dependencies.txt => known-oap-backend-dependencies-es7.txt} (75%)