This is an automated email from the ASF dual-hosted git repository. tanjian pushed a commit to branch tidb_provider in repository https://gitbox.apache.org/repos/asf/skywalking.git
commit 546416efe61312e89445808012e6cf45567c00db Merge: 8b13719 4a01f80 Author: JaredTan95 <jian....@daocloud.io> AuthorDate: Tue Nov 10 15:57:21 2020 +0800 Merge remote-tracking branch 'origin/master' into dev-fix-tdb # Conflicts: # CHANGES.md .asf.yaml | 12 + .github/PULL_REQUEST_TEMPLATE | 2 +- .github/workflows/docker-ci.yaml | 1 + .github/workflows/e2e.istio.yaml | 8 +- .github/workflows/plugins-test.0.yaml | 1 + .github/workflows/plugins-test.3.yaml | 1 + CHANGES.md | 15 + LICENSE | 1 + README.md | 2 +- .../network/trace/component/ComponentsDefine.java | 5 +- .../asynchttpclient-2.x-plugin/pom.xml | 45 +++ .../asynchttpclient/v2/AsyncHandlerWrapper.java | 160 +++++++++++ .../asynchttpclient/v2/ExecuteInterceptor.java | 85 ++++++ .../DefaultAsyncHttpClientInstrumentation.java | 70 +++++ .../src/main/resources/skywalking-plugin.def | 17 ++ .../asynchttpclient/v2/ExecuteInterceptorTest.java | 147 ++++++++++ apm-sniffer/apm-sdk-plugin/dbcp-2.x-plugin/pom.xml | 46 +++ .../dbcp/v2/PoolingCloseConnectInterceptor.java | 50 ++++ .../dbcp/v2/PoolingGetConnectInterceptor.java | 50 ++++ .../v2/define/BasicDataSourceInstrumentation.java | 75 +++++ .../DelegatingConnectionInstrumentation.java | 76 +++++ .../src/main/resources/skywalking-plugin.def | 18 ++ .../plugin/hystrix/v1/SWExecutionHookWrapper.java | 28 +- .../nutz/http/sync/SenderSendInterceptor.java | 7 +- apm-sniffer/apm-sdk-plugin/pom.xml | 2 + dist-material/release-docs/LICENSE | 2 + docker/oap/log4j2.xml | 2 +- docs/en/setup/README.md | 3 - docs/en/setup/backend/backend-setup.md | 2 + docs/en/setup/backend/backend-ui-setup.md | 6 +- docs/en/setup/backend/configuration-vocabulary.md | 11 +- docs/en/setup/envoy/als_setting.md | 9 +- .../setup/service-agent/java-agent/Plugin-list.md | 4 +- .../service-agent/java-agent/Supported-list.md | 12 + .../trace/UninstrumentedGatewaysConfig.java | 27 +- oap-server/pom.xml | 7 + .../server/core/alarm/provider/RulesReader.java | 31 +- .../src/main/resources/application.yml | 15 +- .../src/main/resources/component-libraries.yml | 7 +- .../main/resources/metadata-service-mapping.yaml} | 7 +- .../server/core/analysis/ApdexThresholdConfig.java | 3 +- .../avg/AvgHistogramPercentileFunction.java | 4 +- .../config/group/EndpointGroupingRuleReader.java | 9 +- .../kafka/provider/handler/JVMMetricsHandler.java | 5 +- .../provider/handler/MeterServiceHandler.java | 5 +- .../kafka/provider/handler/ProfileTaskHandler.java | 5 +- .../provider/handler/ServiceManagementHandler.java | 5 +- .../provider/handler/TraceSegmentHandler.java | 2 +- .../envoy-metrics-receiver-plugin/pom.xml | 5 + .../envoy/AccessLogServiceGRPCHandler.java | 19 +- .../server/receiver/envoy/als/ALSHTTPAnalysis.java | 8 +- .../receiver/envoy/als/AbstractALSAnalyzer.java | 64 +++++ .../envoy/als/LogEntry2MetricsAdapter.java | 163 +++++++++++ .../server/receiver/envoy/als/ServiceMetaInfo.java | 30 +- .../als/k8s/K8sALSServiceMeshHTTPAnalysis.java | 320 +++++---------------- .../server/receiver/envoy/als/mx/FieldsHelper.java | 137 +++++++++ .../envoy/als/mx/MetaExchangeALSHTTPAnalyzer.java | 125 ++++++++ .../envoy/als/mx/ServiceMetaInfoAdapter.java | 85 ++++++ ...g.oap.server.receiver.envoy.als.ALSHTTPAnalysis | 1 + ...java => K8SALSServiceMeshHTTPAnalysisTest.java} | 52 ++-- .../receiver/envoy/als/mx/FieldsHelperTest.java | 95 ++++++ .../src/test/resources/field-helper.msg | 90 ++++++ .../server-receiver-plugin/receiver-proto/pom.xml | 120 +++++++- .../src/main/fbs/istio/node-info.fbs | 51 ++++ .../sharing/server/SharingServerConfig.java | 16 +- .../server/SharingServerModuleProvider.java | 28 +- pom.xml | 4 + .../skywalking/e2e/retryable/RetryableTest.java | 2 +- test/e2e/e2e-test/docker/lua/Dockerfile.nginx | 2 +- test/e2e/e2e-test/docker/lua/docker-compose.yml | 2 +- .../org/apache/skywalking/e2e/mesh/IDManager.java | 58 ---- .../src/test/resources/expected/als/topo.yml | 1 + test/e2e/pom.xml | 2 +- .../asynchttpclient-scenario/bin/startup.sh | 21 ++ .../config/expectedData.yaml | 72 +++++ .../asynchttpclient-scenario/configuration.yml | 20 ++ .../pom.xml | 103 +++---- .../src/main/assembly/assembly.xml | 40 +-- .../apm/testcase/asynchttpclient/Application.java | 28 +- .../testcase/asynchttpclient/CaseController.java | 73 +++++ .../src/main/resources/application.yaml | 7 +- .../src/main/resources}/log4j2.xml | 17 +- .../asynchttpclient-scenario/support-version.list | 29 ++ .../scenarios/dbcp-2.x-scenario/bin/startup.sh | 21 ++ .../dbcp-2.x-scenario/config/expectedData.yaml | 240 ++++++++++++++++ .../scenarios/dbcp-2.x-scenario/configuration.yml | 32 +++ .../pom.xml | 127 ++++---- .../src/main/assembly/assembly.xml | 40 +-- .../skywalking/apm/testcase/dbcp/Application.java | 28 +- .../skywalking/apm/testcase/dbcp/MysqlConfig.java | 57 ++++ .../testcase/dbcp}/controller/CaseController.java | 42 +-- .../apm/testcase/dbcp/service/CaseService.java | 71 +++++ .../src/main/resources/application.yaml | 9 +- .../src/main/resources/jdbc.properties | 18 ++ .../src/main/resources}/log4j2.xml | 17 +- .../dbcp-2.x-scenario/support-version.list | 25 ++ .../scenarios/shardingsphere-3.x-scenario/pom.xml | 5 - .../apm/testcase/shardingsphere/Application.java | 21 +- .../shardingsphere/controller/CaseController.java | 22 +- .../jdbc/JDBCOrderItemRepositoryImpl.java | 17 +- .../repository/jdbc/JDBCOrderRepositoryImpl.java | 17 +- .../service/utility/config/DataSourceUtil.java | 9 +- .../shardingsphere-4.0.x-scenario/pom.xml | 5 - .../apm/testcase/shardingsphere/Application.java | 22 +- .../shardingsphere/controller/CaseController.java | 16 +- .../jdbc/JDBCOrderItemRepositoryImpl.java | 25 +- .../repository/jdbc/JDBCOrderRepositoryImpl.java | 18 +- .../service/utility/config/DataSourceUtil.java | 9 +- .../shardingsphere-4.x-RC1-RC2-scenario/pom.xml | 5 - .../apm/testcase/shardingsphere/Application.java | 9 +- .../shardingsphere/controller/CaseController.java | 17 +- .../jdbc/JDBCOrderItemRepositoryImpl.java | 17 +- .../repository/jdbc/JDBCOrderRepositoryImpl.java | 17 +- .../service/utility/config/DataSourceUtil.java | 9 +- .../shardingsphere-4.x-RC3-scenario/pom.xml | 5 - .../apm/testcase/shardingsphere/Application.java | 9 +- .../shardingsphere/controller/CaseController.java | 17 +- .../jdbc/JDBCOrderItemRepositoryImpl.java | 17 +- .../repository/jdbc/JDBCOrderRepositoryImpl.java | 17 +- .../service/utility/config/DataSourceUtil.java | 9 +- .../scenarios/shardingsphere-4.x-scenario/pom.xml | 5 - .../apm/testcase/shardingsphere/Application.java | 9 +- .../shardingsphere/controller/CaseController.java | 17 +- .../jdbc/JDBCOrderItemRepositoryImpl.java | 17 +- .../repository/jdbc/JDBCOrderRepositoryImpl.java | 17 +- .../service/utility/config/DataSourceUtil.java | 10 +- .../known-oap-backend-dependencies-es7.txt | 1 + .../known-oap-backend-dependencies.txt | 1 + 128 files changed, 3193 insertions(+), 942 deletions(-) diff --cc CHANGES.md index 19054ab,c4a354c..ba662f1 --- a/CHANGES.md +++ b/CHANGES.md @@@ -28,9 -34,16 +34,17 @@@ Release Notes * Fix deadlock problem when using elasticsearch-client-7.0.0. * Fix storage-jdbc isExists not set dbname. * Fix `searchService` bug in the InfluxDB storage implementation. + * Fix CVE in the alarm module, when activating the dynamic configuration feature. + * Fix CVE in the endpoint grouping, when activating the dynamic configuration feature. + * Fix CVE in the uninstrumented gateways configs, when activating the dynamic configuration feature. + * Fix CVE in the Apdex threshold configs, when activating the dynamic configuration feature. + * Make the codes and doc consistent in sharding server and core server. + * Fix that chunked string is incorrect while the tag contains colon +* Fix "transaction too large error" when use TiDB as storage. #### UI + * Fix incorrect label in radial chart in topology. + * Replace node-sass with dart-sass. #### Documentation * Add VNode FAQ doc.