You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@skywalking.apache.org by wu...@apache.org on 2019/11/20 05:48:08 UTC
[skywalking] branch istio-ci updated (2b5f1c6 -> 5b849d2)
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a change to branch istio-ci
in repository https://gitbox.apache.org/repos/asf/skywalking.git.
from 2b5f1c6 Add minikube to CI (#3836)
add 3fbaec4 Move to 6.6.0 SNAPSHOT (#3839)
add e11d207 Add elasticsearch 6.x plugin & elasticsearch 6.x test scenario (#3803)
add 424ec7e ignore kryo ".reflectasm." class (#3845)
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 5b849d2 Merge branch 'master' into istio-ci
No new revisions were added by this update.
Summary of changes:
.../configuration.yml => .asf.yaml | 34 ++-
Jenkinsfile-Agent-Test | 14 +-
Jenkinsfile-Agent-Test-2 | 8 +-
Jenkinsfile-Agent-Test-3 | 14 +-
Jenkinsfile-Agent-Test-4 | 18 +-
.../apm-toolkit-log4j-1.x/pom.xml | 2 +-
.../apm-toolkit-log4j-2.x/pom.xml | 2 +-
.../apm-toolkit-logback-1.x/pom.xml | 2 +-
.../apm-toolkit-opentracing/pom.xml | 2 +-
apm-application-toolkit/apm-toolkit-trace/pom.xml | 2 +-
apm-application-toolkit/pom.xml | 2 +-
apm-commons/apm-datacarrier/pom.xml | 2 +-
.../apm/commons/datacarrier/DataCarrier.java | 5 -
.../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-commons/apm-util/pom.xml | 2 +-
apm-commons/pom.xml | 2 +-
apm-dist/pom.xml | 2 +-
apm-dist/release-docs/LICENSE | 2 +-
apm-protocol/apm-network/pom.xml | 2 +-
.../network/trace/component/ComponentsDefine.java | 4 +
apm-protocol/pom.xml | 2 +-
apm-sniffer/apm-agent-core/pom.xml | 2 +-
.../skywalking/apm/agent/core/conf/Config.java | 8 +
.../plugin/loader/InterceptorInstanceLoader.java | 5 +-
apm-sniffer/apm-agent/pom.xml | 2 +-
.../skywalking/apm/agent/SkyWalkingAgent.java | 1 +
.../apm-sdk-plugin/activemq-5.x-plugin/pom.xml | 2 +-
.../apm-sdk-plugin/canal-1.x-plugin/pom.xml | 2 +-
.../cassandra-java-driver-3.x-plugin/pom.xml | 6 +-
.../dubbo-2.7.x-conflict-patch/pom.xml | 2 +-
.../apm-sdk-plugin/dubbo-2.7.x-plugin/pom.xml | 2 +-
.../apm-sdk-plugin/dubbo-conflict-patch/pom.xml | 2 +-
apm-sniffer/apm-sdk-plugin/dubbo-plugin/pom.xml | 2 +-
.../apm-sdk-plugin/ehcache-2.x-plugin/pom.xml | 2 +-
.../apm-sdk-plugin/elastic-job-2.x-plugin/pom.xml | 2 +-
.../elasticsearch-5.x-plugin/pom.xml | 2 +-
.../pom.xml | 23 +-
.../plugin/elasticsearch/v6/RemotePeerCache.java | 31 ++-
.../elasticsearch/v6/RestClientEnhanceInfo.java | 21 +-
.../v6/define/IndicesClientInstrumentation.java | 96 ++++++++
.../define/RestHighLevelClientInstrumentation.java | 177 ++++++++++++++
.../elasticsearch/v6/interceptor/Constants.java | 43 ++++
.../IndicesClientCreateMethodsInterceptor.java | 84 +++++++
.../IndicesClientDeleteMethodsInterceptor.java | 79 +++++++
.../RestHighLevelClientConInterceptor.java} | 36 +--
.../RestHighLevelClientGetMethodsInterceptor.java} | 57 +++--
...estHighLevelClientIndexMethodsInterceptor.java} | 57 +++--
...stHighLevelClientIndicesMethodsInterceptor.java | 52 +++++
...stHighLevelClientSearchMethodsInterceptor.java} | 58 +++--
...stHighLevelClientUpdateMethodsInterceptor.java} | 57 +++--
.../src/main/resources/skywalking-plugin.def | 3 +-
.../IndicesClientCreateMethodsInterceptorTest.java | 137 +++++++++++
.../IndicesClientDeleteMethodsInterceptorTest.java | 126 ++++++++++
.../RestHighLevelClientConInterceptorTest.java | 96 ++++++++
...stHighLevelClientGetMethodsInterceptorTest.java | 132 +++++++++++
...HighLevelClientIndexMethodsInterceptorTest.java | 132 +++++++++++
...ighLevelClientSearchMethodsInterceptorTest.java | 134 +++++++++++
...ighLevelClientUpdateMethodsInterceptorTest.java | 132 +++++++++++
.../feign-default-http-9.x-plugin/pom.xml | 2 +-
.../http/v9/DefaultHttpClientInterceptor.java | 64 +++---
.../apm/plugin/feign/http/v9/FeignResolvedURL.java | 51 +++--
.../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-sniffer/apm-sdk-plugin/grpc-1.x-plugin/pom.xml | 2 +-
.../apm/plugin/grpc/v1/CallServerInterceptor.java | 2 +
apm-sniffer/apm-sdk-plugin/h2-1.x-plugin/pom.xml | 2 +-
.../apm-sdk-plugin/httpClient-4.x-plugin/pom.xml | 2 +-
.../httpasyncclient-4.x-plugin/pom.xml | 2 +-
.../v4/SessionRequestConstructorInterceptor.java | 4 +
.../apm-sdk-plugin/hystrix-1.x-plugin/pom.xml | 2 +-
apm-sniffer/apm-sdk-plugin/jdbc-commons/pom.xml | 2 +-
.../apm-sdk-plugin/jedis-2.x-plugin/pom.xml | 2 +-
.../jetty-plugin/jetty-client-9.0-plugin/pom.xml | 2 +-
.../jetty-plugin/jetty-client-9.x-plugin/pom.xml | 2 +-
.../jetty-plugin/jetty-server-9.x-plugin/pom.xml | 2 +-
apm-sniffer/apm-sdk-plugin/jetty-plugin/pom.xml | 2 +-
apm-sniffer/apm-sdk-plugin/kafka-plugin/pom.xml | 2 +-
.../light4j-plugins/light4j-plugin/pom.xml | 2 +-
apm-sniffer/apm-sdk-plugin/light4j-plugins/pom.xml | 2 +-
.../apm-sdk-plugin/mongodb-2.x-plugin/pom.xml | 2 +-
.../apm-sdk-plugin/mongodb-3.x-plugin/pom.xml | 2 +-
apm-sniffer/apm-sdk-plugin/motan-plugin/pom.xml | 2 +-
.../apm-sdk-plugin/mysql-5.x-plugin/pom.xml | 2 +-
.../apm-sdk-plugin/mysql-6.x-plugin/pom.xml | 2 +-
.../apm-sdk-plugin/mysql-8.x-plugin/pom.xml | 2 +-
apm-sniffer/apm-sdk-plugin/mysql-common/pom.xml | 2 +-
.../apm-sdk-plugin/netty-socketio-plugin/pom.xml | 6 +-
.../nutz-plugins/http-1.x-plugin/pom.xml | 2 +-
.../nutz-plugins/mvc-annotation-1.x-plugin/pom.xml | 2 +-
apm-sniffer/apm-sdk-plugin/nutz-plugins/pom.xml | 2 +-
.../apm-sdk-plugin/okhttp-3.x-plugin/pom.xml | 2 +-
apm-sniffer/apm-sdk-plugin/pom.xml | 3 +-
.../apm-sdk-plugin/postgresql-8.x-plugin/pom.xml | 2 +-
apm-sniffer/apm-sdk-plugin/pulsar-plugin/pom.xml | 2 +-
.../apm-sdk-plugin/rabbitmq-5.x-plugin/pom.xml | 2 +-
.../rabbitmq/RabbitMQConsumerInterceptor.java | 4 +-
.../define/RabbitMQConsumerInstrumentation.java | 13 +-
.../rabbitmq/RabbitMQConsumerInterceptorTest.java | 6 +-
.../apm-sdk-plugin/redisson-3.x-plugin/pom.xml | 2 +-
apm-sniffer/apm-sdk-plugin/resteasy-plugin/pom.xml | 2 +-
.../resteasy-server-3.x-plugin/pom.xml | 2 +-
.../apm-sdk-plugin/rocketMQ-3.x-plugin/pom.xml | 2 +-
.../apm-sdk-plugin/rocketMQ-4.x-plugin/pom.xml | 2 +-
.../apm-sdk-plugin/servicecomb-plugin/pom.xml | 2 +-
.../servicecomb-java-chassis-0.x-plugin/pom.xml | 2 +-
.../servicecomb-java-chassis-1.x-plugin/pom.xml | 2 +-
.../sharding-jdbc-1.5.x-plugin/pom.xml | 2 +-
.../sharding-sphere-3.x-plugin/pom.xml | 2 +-
.../sharding-sphere-4.x-plugin/pom.xml | 2 +-
apm-sniffer/apm-sdk-plugin/sofarpc-plugin/pom.xml | 2 +-
.../apm-sdk-plugin/solrj-7.x-plugin/pom.xml | 2 +-
.../spring-plugins/async-annotation-plugin/pom.xml | 2 +-
.../concurrent-util-4.x-plugin/pom.xml | 2 +-
.../spring-plugins/core-patch/pom.xml | 2 +-
.../mvc-annotation-3.x-plugin/pom.xml | 2 +-
.../mvc-annotation-4.x-plugin/pom.xml | 2 +-
.../mvc-annotation-5.x-plugin/pom.xml | 2 +-
.../spring-plugins/mvc-annotation-commons/pom.xml | 2 +-
.../RequestMappingMethodInterceptor.java | 5 +-
.../interceptor/RestMappingMethodInterceptor.java | 11 +-
apm-sniffer/apm-sdk-plugin/spring-plugins/pom.xml | 2 +-
.../spring-plugins/resttemplate-4.x-plugin/pom.xml | 2 +-
.../spring-cloud/netflix-plugins/pom.xml | 2 +-
.../spring-cloud-feign-1.x-plugin/pom.xml | 2 +-
.../spring-plugins/spring-cloud/pom.xml | 2 +-
.../spring-plugins/spring-commons/pom.xml | 2 +-
.../spring-plugins/webflux-5.x-plugin/pom.xml | 2 +-
.../apm-sdk-plugin/spymemcached-2.x-plugin/pom.xml | 2 +-
.../apm-sdk-plugin/struts2-2.x-plugin/pom.xml | 2 +-
.../apm-sdk-plugin/tomcat-7.x-8.x-plugin/pom.xml | 2 +-
.../apm-sdk-plugin/undertow-plugins/pom.xml | 2 +-
.../undertow-plugins/undertow-2.x-plugin/pom.xml | 2 +-
apm-sniffer/apm-sdk-plugin/vertx-plugins/pom.xml | 2 +-
.../vertx-plugins/vertx-core-3.x-plugin/pom.xml | 2 +-
.../apm-sdk-plugin/xmemcached-2.x-plugin/pom.xml | 2 +-
apm-sniffer/apm-test-tools/pom.xml | 2 +-
.../apm-toolkit-log4j-1.x-activation/pom.xml | 2 +-
.../apm-toolkit-log4j-2.x-activation/pom.xml | 2 +-
.../apm-toolkit-logback-1.x-activation/pom.xml | 2 +-
.../apm-toolkit-opentracing-activation/pom.xml | 2 +-
.../apm-toolkit-trace-activation/pom.xml | 2 +-
apm-sniffer/apm-toolkit-activation/pom.xml | 2 +-
.../bootstrap-plugins/jdk-http-plugin/pom.xml | 2 +-
apm-sniffer/bootstrap-plugins/pom.xml | 2 +-
.../customize-enhance-plugin/pom.xml | 2 +-
.../optional-plugins/gson-2.8.x-plugin/pom.xml | 2 +-
.../optional-plugins/lettuce-5.x-plugin/pom.xml | 2 +-
.../gateway-2.1.x-plugin/pom.xml | 2 +-
.../optional-spring-cloud/pom.xml | 2 +-
.../optional-spring-plugins/pom.xml | 3 +-
.../spring-annotation-plugin/pom.xml | 2 +-
.../pom.xml | 10 +-
.../EndTransactionMethodInterceptor.java | 59 +++++
.../GetTransactionMethodInterceptor.java | 81 +++++++
.../spring/transaction/context/Constants.java | 35 +++
...tPlatformTransactionManagerInstrumentation.java | 80 +++++++
.../src/main/resources/skywalking-plugin.def | 2 +-
.../optional-plugins/play-2.x-plugin/pom.xml | 2 +-
apm-sniffer/optional-plugins/pom.xml | 2 +-
.../optional-plugins/trace-ignore-plugin/pom.xml | 2 +-
.../zookeeper-3.4.x-plugin/pom.xml | 2 +-
apm-sniffer/pom.xml | 2 +-
apm-webapp/pom.xml | 2 +-
docs/README.md | 1 +
docs/en/concepts-and-designs/service-mesh-probe.md | 2 +-
docs/en/guides/Plugin-test.md | 40 ++--
docs/en/setup/service-agent/java-agent/README.md | 2 +
.../service-agent/java-agent/Supported-list.md | 3 +
docs/powered-by.md | 4 +-
oap-server/exporter/pom.xml | 2 +-
oap-server/oal-grammar/pom.xml | 2 +-
oap-server/oal-rt/pom.xml | 2 +-
oap-server/pom.xml | 4 +-
oap-server/server-alarm-plugin/pom.xml | 2 +-
.../cluster-consul-plugin/pom.xml | 2 +-
.../cluster-etcd-plugin/pom.xml | 2 +-
.../cluster-kubernetes-plugin/pom.xml | 2 +-
.../cluster-nacos-plugin/pom.xml | 2 +-
.../cluster-standalone-plugin/pom.xml | 2 +-
.../cluster-zookeeper-plugin/pom.xml | 2 +-
oap-server/server-cluster-plugin/pom.xml | 2 +-
.../server-configuration/configuration-api/pom.xml | 2 +-
.../configuration-apollo/pom.xml | 2 +-
.../configuration-consul/pom.xml | 6 +-
.../configuration-etcd/pom.xml | 2 +-
.../configuration-nacos/pom.xml | 2 +-
.../configuration-zookeeper/pom.xml | 2 +-
.../grpc-configuration-sync/pom.xml | 2 +-
oap-server/server-configuration/pom.xml | 2 +-
oap-server/server-core/pom.xml | 2 +-
.../oap/server/core/CoreModuleConfig.java | 1 +
.../oap/server/core/CoreModuleProvider.java | 2 +
.../core/analysis/worker/TopNStreamProcessor.java | 5 +-
.../server/core/analysis/worker/TopNWorker.java | 6 +-
.../core/remote/client/GRPCRemoteClient.java | 2 -
.../src/test/resources/component-libraries.yml | 9 +-
oap-server/server-library/library-buffer/pom.xml | 2 +-
oap-server/server-library/library-client/pom.xml | 2 +-
oap-server/server-library/library-module/pom.xml | 2 +-
oap-server/server-library/library-server/pom.xml | 2 +-
oap-server/server-library/library-util/pom.xml | 2 +-
oap-server/server-library/pom.xml | 2 +-
oap-server/server-query-plugin/pom.xml | 2 +-
.../query-graphql-plugin/pom.xml | 5 +-
.../envoy-metrics-receiver-plugin/pom.xml | 2 +-
.../jaeger-receiver-plugin/pom.xml | 2 +-
oap-server/server-receiver-plugin/pom.xml | 2 +-
.../server-receiver-plugin/receiver-proto/pom.xml | 2 +-
.../skywalking-clr-receiver-plugin/pom.xml | 2 +-
.../pom.xml | 2 +-
.../skywalking-jvm-receiver-plugin/pom.xml | 2 +-
.../skywalking-mesh-receiver-plugin/pom.xml | 2 +-
.../skywalking-register-receiver-plugin/pom.xml | 2 +-
.../skywalking-sharing-server-plugin/pom.xml | 2 +-
.../skywalking-so11y-receiver-plugin/pom.xml | 2 +-
.../skywalking-trace-receiver-plugin/pom.xml | 2 +-
.../listener/endpoint/MultiScopesSpanListener.java | 34 +--
.../zipkin-receiver-plugin/pom.xml | 2 +-
oap-server/server-starter/pom.xml | 2 +-
.../src/main/assembly/application.yml | 1 +
.../src/main/resources/application.yml | 1 +
.../src/main/resources/component-libraries.yml | 18 +-
oap-server/server-storage-plugin/pom.xml | 2 +-
.../storage-elasticsearch-plugin/pom.xml | 2 +-
.../storage-jaeger-plugin/pom.xml | 2 +-
.../storage-jdbc-hikaricp-plugin/pom.xml | 2 +-
.../storage-zipkin-plugin/pom.xml | 2 +-
oap-server/server-telemetry/pom.xml | 2 +-
oap-server/server-telemetry/telemetry-api/pom.xml | 2 +-
.../server-telemetry/telemetry-prometheus/pom.xml | 2 +-
.../server-telemetry/telemetry-so11y/pom.xml | 2 +-
oap-server/server-testing/pom.xml | 2 +-
pom.xml | 4 +-
skywalking-ui | 2 +-
.../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/bin/startup.sh | 5 +-
.../config/expectedData.yaml | 149 ++++++++++++
.../configuration.yml | 9 +-
.../elasticsearch-6.x-scenario}/pom.xml | 83 ++++---
.../src/main/assembly/assembly.xml | 32 ++-
.../apm/testcase/elasticsearch/Application.java | 23 +-
.../elasticsearch/config/ElasticsearchConfig.java | 58 +++++
.../elasticsearch/controller/CaseController.java | 217 ++++++++++++++++++
.../src/main/resource}/application.yml | 0
.../src/main/resource}/log4j2.xml | 0
.../support-version.list | 9 +-
.../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 | 32 ++-
.../apm/testcase/elasticsearch/Application.java} | 26 +--
.../elasticsearch/config/ElasticsearchConfig.java | 58 +++++
.../elasticsearch/controller/CaseController.java | 223 ++++++++++++++++++
.../src/main/resources/application.yaml} | 29 +--
.../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 | 32 ++-
.../skywalking/apm/testcase/feign/Application.java | 21 +-
.../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} | 29 +--
.../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 | 32 ++-
.../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 | 26 ++-
.../src/main/resources/application.yaml} | 29 +--
.../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 | 32 ++-
.../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} | 29 +--
.../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 | 26 +--
.../rabbitmq-scenario}/pom.xml | 70 +++---
.../src/main/assembly/assembly.xml | 32 ++-
.../apm/testcase/rabbitmq/Application.java | 23 +-
.../rabbitmq/controller/CaseController.java | 152 +++++++++++++
.../src/main/resources/application.properties} | 26 +--
.../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 | 32 ++-
.../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 | 14 +-
.../spring/transaction/dao/impl/DemoDaoImpl.java | 26 ++-
.../spring/transaction/service/DemoService.java | 15 +-
.../transaction/service/impl/DemoServiceImpl.java} | 34 ++-
.../src/main/resources/application.properties} | 27 +--
.../spring-tx-scenario/support-version.list | 13 +-
.../known-oap-backend-dependencies.txt | 2 +-
347 files changed, 6370 insertions(+), 1324 deletions(-)
copy test/plugin/scenarios/elasticsearch-5.x-scenario/configuration.yml => .asf.yaml (54%)
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
copy apm-sniffer/apm-sdk-plugin/{elastic-job-2.x-plugin => elasticsearch-6.x-plugin}/pom.xml (77%)
copy apm-commons/apm-datacarrier/src/main/java/org/apache/skywalking/apm/commons/datacarrier/BlockingDataCarrier.java => apm-sniffer/apm-sdk-plugin/elasticsearch-6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/elasticsearch/v6/RemotePeerCache.java (56%)
copy apm-commons/apm-datacarrier/src/main/java/org/apache/skywalking/apm/commons/datacarrier/BlockingDataCarrier.java => apm-sniffer/apm-sdk-plugin/elasticsearch-6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/elasticsearch/v6/RestClientEnhanceInfo.java (62%)
create mode 100644 apm-sniffer/apm-sdk-plugin/elasticsearch-6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/elasticsearch/v6/define/IndicesClientInstrumentation.java
create mode 100644 apm-sniffer/apm-sdk-plugin/elasticsearch-6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/elasticsearch/v6/define/RestHighLevelClientInstrumentation.java
create mode 100644 apm-sniffer/apm-sdk-plugin/elasticsearch-6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/elasticsearch/v6/interceptor/Constants.java
create mode 100644 apm-sniffer/apm-sdk-plugin/elasticsearch-6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/elasticsearch/v6/interceptor/IndicesClientCreateMethodsInterceptor.java
create mode 100644 apm-sniffer/apm-sdk-plugin/elasticsearch-6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/elasticsearch/v6/interceptor/IndicesClientDeleteMethodsInterceptor.java
copy apm-sniffer/apm-sdk-plugin/{httpasyncclient-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/httpasyncclient/v4/SessionRequestConstructorInterceptor.java => elasticsearch-6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/elasticsearch/v6/interceptor/RestHighLevelClientConInterceptor.java} (50%)
copy apm-sniffer/apm-sdk-plugin/{rabbitmq-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/rabbitmq/RabbitMQConsumerInterceptor.java => elasticsearch-6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/elasticsearch/v6/interceptor/RestHighLevelClientGetMethodsInterceptor.java} (52%)
copy apm-sniffer/apm-sdk-plugin/{rabbitmq-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/rabbitmq/RabbitMQConsumerInterceptor.java => elasticsearch-6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/elasticsearch/v6/interceptor/RestHighLevelClientIndexMethodsInterceptor.java} (52%)
create mode 100644 apm-sniffer/apm-sdk-plugin/elasticsearch-6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/elasticsearch/v6/interceptor/RestHighLevelClientIndicesMethodsInterceptor.java
copy apm-sniffer/apm-sdk-plugin/{rabbitmq-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/rabbitmq/RabbitMQConsumerInterceptor.java => elasticsearch-6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/elasticsearch/v6/interceptor/RestHighLevelClientSearchMethodsInterceptor.java} (52%)
copy apm-sniffer/apm-sdk-plugin/{rabbitmq-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/rabbitmq/RabbitMQConsumerInterceptor.java => elasticsearch-6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/elasticsearch/v6/interceptor/RestHighLevelClientUpdateMethodsInterceptor.java} (52%)
copy apm-sniffer/apm-sdk-plugin/{feign-default-http-9.x-plugin => elasticsearch-6.x-plugin}/src/main/resources/skywalking-plugin.def (78%)
create mode 100644 apm-sniffer/apm-sdk-plugin/elasticsearch-6.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/elasticsearch/v6/interceptor/IndicesClientCreateMethodsInterceptorTest.java
create mode 100644 apm-sniffer/apm-sdk-plugin/elasticsearch-6.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/elasticsearch/v6/interceptor/IndicesClientDeleteMethodsInterceptorTest.java
create mode 100644 apm-sniffer/apm-sdk-plugin/elasticsearch-6.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/elasticsearch/v6/interceptor/RestHighLevelClientConInterceptorTest.java
create mode 100644 apm-sniffer/apm-sdk-plugin/elasticsearch-6.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/elasticsearch/v6/interceptor/RestHighLevelClientGetMethodsInterceptorTest.java
create mode 100644 apm-sniffer/apm-sdk-plugin/elasticsearch-6.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/elasticsearch/v6/interceptor/RestHighLevelClientIndexMethodsInterceptorTest.java
create mode 100644 apm-sniffer/apm-sdk-plugin/elasticsearch-6.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/elasticsearch/v6/interceptor/RestHighLevelClientSearchMethodsInterceptorTest.java
create mode 100644 apm-sniffer/apm-sdk-plugin/elasticsearch-6.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/elasticsearch/v6/interceptor/RestHighLevelClientUpdateMethodsInterceptorTest.java
copy test/plugin/scenarios/netty-socketio-scenario/src/main/java/org/apache/skywalking/apm/testcase/netty/socketio/ContextListener.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-annotation-plugin => spring-tx-plugin}/pom.xml (83%)
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%)
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-6.x-scenario/bin/startup.sh (82%)
create mode 100644 test/plugin/scenarios/elasticsearch-6.x-scenario/config/expectedData.yaml
copy test/plugin/scenarios/{elasticsearch-5.x-scenario => elasticsearch-6.x-scenario}/configuration.yml (87%)
copy test/plugin/{archetypes/jvm/src/main/resources/archetype-resources => scenarios/elasticsearch-6.x-scenario}/pom.xml (67%)
copy apm-sniffer/apm-toolkit-activation/apm-toolkit-log4j-2.x-activation/pom.xml => test/plugin/scenarios/elasticsearch-6.x-scenario/src/main/assembly/assembly.xml (53%)
copy apm-commons/apm-datacarrier/src/main/java/org/apache/skywalking/apm/commons/datacarrier/buffer/BufferStrategy.java => test/plugin/scenarios/elasticsearch-6.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/elasticsearch/Application.java (61%)
create mode 100644 test/plugin/scenarios/elasticsearch-6.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/elasticsearch/config/ElasticsearchConfig.java
create mode 100644 test/plugin/scenarios/elasticsearch-6.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/elasticsearch/controller/CaseController.java
copy test/plugin/scenarios/{postgresql-scenario/src/main/resources => elasticsearch-6.x-scenario/src/main/resource}/application.yml (100%)
copy test/plugin/scenarios/{solrj-7.x-scenario/src/main/resources => elasticsearch-6.x-scenario/src/main/resource}/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-6.x-scenario/support-version.list (87%)
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/apm-toolkit-activation/apm-toolkit-log4j-2.x-activation/pom.xml => test/plugin/scenarios/elasticsearch-7.x-scenario/src/main/assembly/assembly.xml (53%)
copy test/plugin/scenarios/{netty-socketio-scenario/src/main/java/org/apache/skywalking/apm/testcase/netty/socketio/ContextListener.java => elasticsearch-7.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/elasticsearch/Application.java} (58%)
create mode 100644 test/plugin/scenarios/elasticsearch-7.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/elasticsearch/config/ElasticsearchConfig.java
create mode 100644 test/plugin/scenarios/elasticsearch-7.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/elasticsearch/controller/CaseController.java
copy test/plugin/scenarios/{elasticsearch-5.x-scenario/configuration.yml => elasticsearch-7.x-scenario/src/main/resources/application.yaml} (54%)
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/apm-toolkit-activation/apm-toolkit-log4j-2.x-activation/pom.xml => test/plugin/scenarios/feign-scenario/src/main/assembly/assembly.xml (53%)
copy apm-commons/apm-datacarrier/src/main/java/org/apache/skywalking/apm/commons/datacarrier/buffer/BufferStrategy.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 test/plugin/scenarios/{elasticsearch-5.x-scenario/configuration.yml => feign-scenario/src/main/resources/application.yaml} (54%)
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/apm-toolkit-activation/apm-toolkit-log4j-2.x-activation/pom.xml => test/plugin/scenarios/grpc-scenario/src/main/assembly/assembly.xml (53%)
copy apm-commons/apm-datacarrier/src/main/java/org/apache/skywalking/apm/commons/datacarrier/buffer/BufferStrategy.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 apm-commons/apm-datacarrier/src/main/java/org/apache/skywalking/apm/commons/datacarrier/buffer/BufferStrategy.java => test/plugin/scenarios/grpc-scenario/src/main/proto/GreetService.proto (66%)
copy test/plugin/scenarios/{elasticsearch-5.x-scenario/configuration.yml => grpc-scenario/src/main/resources/application.yaml} (54%)
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/apm-toolkit-activation/apm-toolkit-log4j-2.x-activation/pom.xml => test/plugin/scenarios/hystrix-scenario/src/main/assembly/assembly.xml (53%)
copy apm-commons/apm-datacarrier/src/main/java/org/apache/skywalking/apm/commons/datacarrier/buffer/BufferStrategy.java => test/plugin/scenarios/hystrix-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/hystrix/Application.java (65%)
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 test/plugin/scenarios/{elasticsearch-5.x-scenario/configuration.yml => hystrix-scenario/src/main/resources/application.yaml} (54%)
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-5.x-scenario => rabbitmq-scenario}/configuration.yml (61%)
copy test/plugin/{archetypes/jvm/src/main/resources/archetype-resources => scenarios/rabbitmq-scenario}/pom.xml (69%)
copy apm-sniffer/apm-toolkit-activation/apm-toolkit-log4j-2.x-activation/pom.xml => test/plugin/scenarios/rabbitmq-scenario/src/main/assembly/assembly.xml (53%)
copy apm-commons/apm-datacarrier/src/main/java/org/apache/skywalking/apm/commons/datacarrier/buffer/BufferStrategy.java => test/plugin/scenarios/rabbitmq-scenario/src/main/java/org/apache/skywalking/apm/testcase/rabbitmq/Application.java (65%)
create mode 100644 test/plugin/scenarios/rabbitmq-scenario/src/main/java/org/apache/skywalking/apm/testcase/rabbitmq/controller/CaseController.java
copy test/plugin/scenarios/{elasticsearch-5.x-scenario/configuration.yml => rabbitmq-scenario/src/main/resources/application.properties} (54%)
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/apm-toolkit-activation/apm-toolkit-log4j-2.x-activation/pom.xml => test/plugin/scenarios/spring-tx-scenario/src/main/assembly/assembly.xml (53%)
copy apm-commons/apm-datacarrier/src/main/java/org/apache/skywalking/apm/commons/datacarrier/buffer/BufferStrategy.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
rename apm-commons/apm-datacarrier/src/main/java/org/apache/skywalking/apm/commons/datacarrier/callback/QueueBlockingCallback.java => test/plugin/scenarios/spring-tx-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/spring/transaction/dao/DemoDao.java (77%)
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%)
copy apm-commons/apm-datacarrier/src/main/java/org/apache/skywalking/apm/commons/datacarrier/buffer/BufferStrategy.java => test/plugin/scenarios/spring-tx-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/spring/transaction/service/DemoService.java (82%)
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%)
copy test/plugin/scenarios/{elasticsearch-5.x-scenario/configuration.yml => spring-tx-scenario/src/main/resources/application.properties} (54%)
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%)