This is an automated email from the ASF dual-hosted git repository. wusheng pushed a commit to branch istio-ci in repository https://gitbox.apache.org/repos/asf/skywalking.git
commit f6378a5346baa87f60996b0fc5068bcdfffa83a5 Merge: 36f8122 8d4e551 Author: Wu Sheng <[email protected]> AuthorDate: Tue Nov 12 08:21:52 2019 +0800 Merge branch 'master' into istio-ci .mvn/wrapper/MavenWrapperDownloader.java | 55 +- .mvn/wrapper/maven-wrapper.properties | 2 + CHANGES.md | 72 +++ Jenkinsfile | 23 +- Jenkinsfile-Agent-Test | 44 +- Jenkinsfile-Agent-Test-2 | 46 +- Jenkinsfile-Agent-Test-3 | 41 +- ...nsfile-Agent-Test-2 => Jenkinsfile-Agent-Test-4 | 58 +- Jenkinsfile-E2E | 6 + LICENSE | 1 + README.md | 28 +- .../apm/toolkit/trace/SupplierWrapper.java | 24 +- .../skywalking/apm/agent/core/conf/Config.java | 29 +- .../PSSetterDefinitionOfJDBCInstrumentation.java | 2 +- .../plugin/jdbc/define/StatementEnhanceInfos.java | 5 +- .../apm-sdk-plugin/mongodb-3.x-plugin/pom.xml | 2 +- .../mongodb/v3/MongoDBMethodInterceptor.java | 211 ------- .../define/{ => v30}/MongoDBInstrumentation.java | 87 +-- .../v37/MongoDBClientDelegateInstrumentation.java | 100 +++ .../MongoDBOperationExecutorInstrumentation.java | 96 +++ .../MongoDBOperationExecutorInstrumentation.java | 91 +++ .../v3/interceptor/v30/MongoDBInterceptor.java | 83 +++ .../v37/MongoDBClientDelegateInterceptor.java | 75 +++ .../v37/MongoDBOperationExecutorInterceptor.java} | 53 +- .../plugin/mongodb/v3/support/MongoConstants.java | 23 +- .../mongodb/v3/support/MongoOperationHelper.java | 150 +++++ .../mongodb/v3/support/MongoRemotePeerHelper.java} | 30 +- .../plugin/mongodb/v3/support/MongoSpanHelper.java | 48 ++ .../src/main/resources/skywalking-plugin.def | 8 +- .../v30/MongoDBInterceptorTest.java} | 25 +- .../v37/MongoDBClientDelegateInterceptorTest.java | 76 +++ .../MongoDBOperationExecutorInterceptorTest.java} | 58 +- .../src/main/resources/skywalking-plugin.def | 1 - .../CreateCallableStatementInterceptor.java | 0 .../CreatePreparedStatementInterceptor.java | 0 .../postgresql/CreateStatementInterceptor.java | 0 ...PrepareStatementWithStringArrayInterceptor.java | 0 ...PreparedStatementExecuteMethodsInterceptor.java | 33 + .../StatementExecuteMethodsInterceptor.java | 0 .../apm/plugin/jdbc/postgresql/Variables.java | 0 .../AbstractJdbc2StatementInstrumentation.java | 0 .../define/ConnectionInstrumentation.java | 0 .../plugin/jdbc/postgresql/define/Constants.java | 1 - .../postgresql/define/DriverInstrumentation.java | 0 .../define/Jdbc3ConnectionInstrumentation.java | 0 .../define/Jdbc4ConnectionInstrumentation.java | 0 .../define/PgCallableStatementInstrumentation.java | 0 .../define/PgPreparedStatementInstrumentation.java | 0 ... PgPreparedStatementSetterInstrumentation.java} | 21 +- .../define/PgStatementInstrumentation.java | 0 .../src/main/resources/skywalking-plugin.def | 1 + .../redisson/v3/ConnectionManagerInterceptor.java | 56 +- .../v3/RedisClientConstructorInterceptor.java | 2 - .../v3/RedisConnectionMethodInterceptor.java | 21 +- .../define/ConnectionManagerInstrumentation.java | 2 - .../v3/define/RedisClientInstrumentation.java | 2 - .../v3/define/RedisConnectionInstrumentation.java | 2 - .../apm/plugin/redisson/v3/util/ClassUtil.java} | 19 +- .../sharding-sphere-4.x-plugin/pom.xml | 6 +- .../v2x/HttpServerExchangeInterceptor.java} | 37 +- .../apm/plugin/undertow/v2x/SWRunnable.java | 53 ++ .../define/HttpServerExchangeInstrumentation.java} | 52 +- .../src/main/resources/skywalking-plugin.def | 2 + .../async/RingBufferLogEventInstrumentation.java} | 22 +- .../RingBufferLogEventMethodInterceptor.java} | 37 +- .../src/main/resources/skywalking-plugin.def | 1 + .../opentracing/span/SpanSetTagInterceptor.java | 2 + .../trace/CallableOrRunnableActivation.java | 4 +- docker/oap/docker-entrypoint.sh | 1 + docs/README.md | 5 + docs/en/concepts-and-designs/scope-definitions.md | 4 +- docs/en/guides/Java-Plugin-Development-Guide.md | 2 +- docs/en/guides/Plugin-test.md | 677 +++++++++++++++++++++ docs/en/setup/backend/backend-storage.md | 2 +- .../setup/backend/telemetry/mesh-mode-grafana.json | 100 ++- .../backend/telemetry/trace-mode-grafana.json | 100 ++- docs/en/setup/envoy/als_setting.md | 4 +- .../java-agent/Application-toolkit-log4j-2.x.md | 53 +- .../Application-toolkit-trace-cross-thread.md | 19 +- docs/en/setup/service-agent/java-agent/README.md | 3 + .../service-agent/java-agent/Supported-list.md | 4 +- docs/powered-by.md | 3 + mvnw | 34 +- mvnw.cmd | 43 +- .../cluster/plugin/etcd/EtcdCoordinator.java | 9 +- .../consul/ConsulConfigurationWatcherRegister.java | 5 +- .../oap/server/core/CoreModuleConfig.java | 8 + .../oap/server/core/CoreModuleProvider.java | 8 +- .../server/core/cache/EndpointInventoryCache.java | 14 +- .../core/cache/NetworkAddressInventoryCache.java | 13 +- .../core/cache/ServiceInstanceInventoryCache.java | 19 +- .../server/core/cache/ServiceInventoryCache.java | 16 +- .../server/core/query/MetadataQueryService.java | 8 +- .../register/worker/RegisterPersistentWorker.java | 70 ++- .../core/storage/query/IMetadataQueryDAO.java | 4 +- .../envoy/als/K8sALSServiceMeshHTTPAnalysis.java | 2 +- .../src/main/assembly/application.yml | 1 + .../src/main/resources/application.yml | 1 + .../StorageModuleElasticsearchConfig.java | 3 +- .../StorageModuleElasticsearchProvider.java | 6 +- .../cache/NetworkAddressInventoryCacheEsDAO.java | 8 +- .../cache/ServiceInventoryCacheEsDAO.java | 8 +- .../elasticsearch/query/MetadataQueryEsDAO.java | 4 +- .../plugin/jdbc/h2/dao/H2MetadataQueryDAO.java | 5 +- .../oap/server/telemetry/api/HistogramMetrics.java | 2 +- skywalking-ui | 2 +- test/e2e/e2e-mysql/pom.xml | 171 ++++++ .../e2e/e2e-mysql/src/docker}/application.yml | 60 +- .../e2e/e2e-mysql/src/docker/rc.d/rc0-prepare.sh | 22 +- .../e2e/e2e-mysql/src/docker/rc.d/rc1-startup.sh | 35 +- .../e2e/sample/client/SampleClientApplication.java | 17 +- .../e2e/sample/client/TestController.java | 49 ++ .../apache/skywalking/e2e/sample/client/User.java | 44 +- .../skywalking/e2e/sample/client/UserRepo.java} | 16 +- .../e2e-mysql/src/main/resources/application.yml} | 21 +- .../skywalking/e2e/SampleVerificationITCase.java | 316 ++++++++++ ...ing.e2e.SampleVerificationITCase.endpoints.yml} | 13 +- ...ing.e2e.SampleVerificationITCase.instances.yml} | 20 +- ...king.e2e.SampleVerificationITCase.services.yml} | 11 +- ...ywalking.e2e.SampleVerificationITCase.topo.yml} | 32 +- ...alking.e2e.SampleVerificationITCase.traces.yml} | 17 +- test/e2e/pom.xml | 2 + test/e2e/run.sh | 2 +- .../jvm/pom.xml} | 46 +- .../META-INF/maven/archetype-metadata.xml | 68 +++ .../resources/archetype-resources}/bin/startup.sh | 3 +- .../archetype-resources/config/expectedData.yaml | 14 +- .../archetype-resources/configuration.yml | 8 +- .../src/main/resources/archetype-resources/pom.xml | 114 ++++ .../src/main/assembly/assembly.xml} | 48 +- .../src/main/java/Application.java | 18 +- .../src/main/java/controller/CaseController.java} | 41 +- .../src/main/resources/application.yaml} | 24 +- .../src/main/resources/log4j2.xml} | 41 +- .../archetype-resources}/support-version.list | 8 +- .../pom.xml} | 41 +- .../tomcat/pom.xml} | 46 +- .../META-INF/maven/archetype-metadata.xml | 67 ++ .../archetype-resources/config/expectedData.yaml | 14 +- .../archetype-resources/configuration.yml | 7 +- .../main/resources/archetype-resources}/pom.xml | 61 +- .../src/main/java/CaseServlet.java} | 18 +- .../src/main/java}/HealthCheckServlet.java | 7 +- .../src/main/resources/log4j2.xml} | 41 +- .../src/main/webapp/WEB-INF/web.xml | 16 +- .../archetype-resources}/support-version.list | 8 +- test/plugin/containers/jvm-container/docker/run.sh | 11 +- test/plugin/containers/pom.xml | 2 +- .../containers/tomcat-container/docker/run.sh | 11 +- test/plugin/generator.sh | 77 +++ .../skywalking/plugin/test/mockcollector/Main.java | 20 + .../test/mockcollector/entity/RegistryItem.java | 9 +- .../service/MockCLRMetricReportService.java | 8 + .../service/MockJVMMetricReportService.java | 8 + .../service/MockTraceSegmentService.java | 2 +- test/plugin/run.sh | 25 +- .../plugin/test/helper/ConfigurationImpl.java | 2 +- .../main/resources/compose-start-script.template | 2 +- .../src/main/resources/docker-compose.template | 2 +- .../bin/startup.sh | 3 +- .../config/expectedData.yaml | 323 ++++++++++ .../apm-toolkit-trace-scenario/configuration.yml | 6 +- .../scenarios/apm-toolkit-trace-scenario/pom.xml | 118 ++++ .../src/main/assembly/assembly.xml} | 48 +- .../skywalking/apm/toolkit/trace/ActiveSpan.java | 34 +- .../apm/toolkit/trace/CallableWrapper.java | 26 +- .../apm/toolkit/trace/RunnableWrapper.java | 26 +- .../apm/toolkit/trace/SupplierWrapper.java | 24 +- .../apache/skywalking/apm/toolkit/trace/Trace.java | 23 +- .../skywalking/apm/toolkit/trace/TraceContext.java | 23 +- .../apm/toolkit/trace/TraceCrossThread.java} | 21 +- .../apm/testcase/toolkit/Application.java} | 19 +- .../toolkit/controller/TestController.java | 110 ++++ .../testcase/toolkit/controller/TestService.java | 89 +++ .../src/main/resources/application.yaml} | 21 +- .../support-version.list | 6 +- .../bin/startup.sh | 5 +- .../config/customize_enhance.xml | 57 ++ .../config/expectedData.yaml | 127 ++-- .../scenarios/customize-scenario/configuration.yml | 8 +- test/plugin/scenarios/customize-scenario/pom.xml | 112 ++++ .../src/main/assembly/assembly.xml | 46 ++ .../apm/testcase/customize/Application.java | 18 +- .../customize/controller/CustomizeController.java | 81 +++ .../apm/testcase/customize/model/Model0.java | 93 +++ .../apm/testcase/customize/model/Model1.java | 33 +- .../testcase/customize/service/TestService1.java | 34 +- .../testcase/customize/service/TestService2.java} | 27 +- .../src/main/resources/application.yaml} | 21 +- .../support-version.list | 6 +- .../dubbo-2.5.x-scenario/config/expectedData.yaml | 2 +- .../dubbo-2.7.x-scenario/config/expectedData.yaml | 2 +- .../ehcache-2.x-scenario/config/expectedData.yaml | 20 +- .../bin/startup.sh | 3 +- .../config/expectedData.yaml | 93 +++ .../configuration.yml | 16 +- .../scenarios/httpasyncclient-scenario/pom.xml | 126 ++++ .../src/main/assembly/assembly.xml} | 48 +- .../testcase/httpasyncclient/BackController.java} | 20 +- .../testcase/httpasyncclient/FrontController.java | 106 ++++ .../HttpasyncclientApplication.java} | 19 +- .../src/main/resource/application.yml} | 38 +- .../src/main/resource/log4j2.xml} | 40 +- .../support-version.list | 13 +- .../config/expectedData.yaml | 20 +- .../bin/startup.sh | 4 +- .../config/expectedData.yaml | 87 +-- .../configuration.yml} | 15 +- test/plugin/scenarios/jedis-scenario/pom.xml | 108 ++++ .../jedis-scenario/src/main/assembly/assembly.xml} | 48 +- .../skywalking/apm/testcase/jedis/Application.java | 18 +- .../testcase/jedis/controller/CaseController.java | 57 ++ .../jedis/controller/RedisCommandExecutor.java | 34 +- .../src/main/resources/application.yaml} | 22 +- .../support-version.list | 25 +- .../mongodb-3.x-scenario/support-version.list | 12 + .../config/expectedData.yaml | 32 +- .../apm/testcase/netty/socketio/CaseServlet.java | 11 - ...ealthCheckServlet.java => ContextListener.java} | 31 +- .../netty/socketio/HealthCheckServlet.java | 7 + .../testcase/netty/socketio/SocketIOStarter.java | 46 +- .../src/main/webapp/WEB-INF/web.xml | 1 - .../bin/startup.sh | 2 +- .../config/expectedData.yaml | 1 + .../configuration.yml | 2 +- .../support-version.list | 13 + .../postgresql-scenario/configuration.yml | 2 +- .../bin/startup.sh | 3 +- .../config/expectedData.yaml | 71 +-- .../scenarios/redisson-scenario/configuration.yml | 16 +- test/plugin/scenarios/redisson-scenario/pom.xml | 105 ++++ .../src/main/assembly/assembly.xml} | 48 +- .../apm/testcase/redisson/Application.java | 16 +- .../redisson/controller/CaseController.java | 74 +++ .../src/main/resources/application.properties} | 19 +- .../support-version.list | 44 +- .../spring-3.0.x-scenario/config/expectedData.yaml | 2 +- .../spring-3.1.x-scenario/config/expectedData.yaml | 2 +- .../spring-4.1.x-scenario/config/expectedData.yaml | 2 +- .../spring-4.3.x-scenario/config/expectedData.yaml | 2 +- .../spring-async-scenario/config/expectedData.yaml | 57 +- .../apm/testcase/spring/async/AsyncBean.java | 4 +- .../apm/testcase/spring/async/AsyncServlet.java} | 17 +- .../src/main/webapp/WEB-INF/web.xml | 9 + .../bin/startup.sh | 3 +- .../config/expectedData.yaml | 88 ++- .../scenarios/undertow-scenario/configuration.yml | 6 +- test/plugin/scenarios/undertow-scenario/pom.xml | 114 ++++ .../src/main/assembly/assembly.xml} | 48 +- .../amp/testcase/undertow/Application.java | 99 +++ .../support-version.list} | 32 +- .../webflux-scenario/config/expectedData.yaml | 310 ++++++++++ .../scenarios/webflux-scenario/configuration.yml | 6 +- .../webflux-scenario}/pom.xml | 47 +- .../support-version.list | 23 +- .../webflux-dist}/bin/startup.sh | 6 +- .../webflux-scenario/webflux-dist/pom.xml | 54 ++ .../webflux-dist/src/main/assembly/assembly.xml | 46 ++ .../webflux-projectA-scenario/pom.xml | 72 +++ .../testcase/sc/webflux/projectA/Application.java} | 22 +- .../projectA/controller/TestController.java | 61 ++ .../sc/webflux/projectA/utils/HttpUtils.java | 51 ++ .../src/main/resources/application.yml} | 26 +- .../webflux-projectB-scenario/pom.xml | 57 ++ .../testcase/sc/webflux/projectB/Application.java} | 22 +- .../sc/webflux/projectB/config/CustomFilter.java} | 32 +- .../controller/TestAnnotationController.java | 51 ++ .../projectB/route/RoutingConfiguration.java} | 31 +- .../sc/webflux/projectB/route/TestHandler.java} | 31 +- .../src/main/resources/application.yml} | 23 +- .../tool/validator/assertor/SegmentAssert.java | 32 + .../tool/validator/entity/SegmentForRead.java | 6 +- .../test/agent/tool/validator/entity/Span.java | 2 +- tools/ci/agent-build-condition.sh | 2 +- tools/ci/changed.sh | 62 +- .../ci/ci-build-condition.sh | 8 +- tools/ci/e2e-build-condition.sh | 2 +- tools/releasing/create_source_release.sh | 2 - 278 files changed, 7848 insertions(+), 1937 deletions(-)
