This is an automated email from the ASF dual-hosted git repository.
tanjian pushed a change to branch webapp_refactoring
in repository https://gitbox.apache.org/repos/asf/skywalking.git.
from f81ce26 replace zuul proxy with spring cloud gateway 2.x.
add e7bc81a Perf: optimize Envoy ALS analyzer performance in high traffic
load scenario (reduce ~1cpu in ~10k RPS) (#7182)
add e1aad42 fix the response time of gRPC is not right. (#7179)
add 273bc5b Sync UI (#7187)
add d63f3ff revert #7091 (#7189)
add de1d046 perf: trim useless metadata fields in ALS to improve
performance (#7191)
add a966eea Support prepare and save metrics concurrency (#7153)
add b8fadec fix slow db dynamic config bug (#7192)
add 84a7fe3 Perf: cache regex pattern and result, optimize string
concatenation (#7199)
add f5b7c3e Perf: cache metrics id and entity id (#7201)
add 16ebaad Optimize IDs reading in the persistent worker. (#7193)
add 89549c0 Fix the queue initial size is not set by max batch size
accordingly (#7204)
add 4374fac Fix broken image path for mssql server in testing. (#7211)
add 50a0bcb Optimize L1 aggregation, enhance gRPC client between L1 and
L2 aggregation. (#7206)
add dcefc69 Doc: update doc to declare that zookeeper 3.5+ is required in
cluster coordinator (#7212)
add 0975809 Add an agent plugin for ShardingSphere 5.0.0-beta (#7171)
add 536b7d2 Support connectTimeout and socketTimeout settings (#7214)
add abd36df fix some method exception error (#7210)
add 68e4945 Merge branch 'master' into webapp_refactoring
No new revisions were added by this update.
Summary of changes:
.github/workflows/plugins-test.2.yaml | 1 +
CHANGES.md | 49 +-
.../datacarrier/consumer/ConsumerThread.java | 1 +
.../commons/datacarrier/consumer/IConsumer.java | 8 +
.../consumer/MultipleChannelsConsumer.java | 3 +-
apm-dist-es7/src/main/assembly/binary-es7.xml | 1 -
apm-dist/src/main/assembly/binary.xml | 1 -
.../agent/core/conf/SnifferConfigInitializer.java | 2 +-
.../plugin/grpc/v1/server/ServerInterceptor.java | 17 +-
.../plugin/grpc/v1/server/TracingServerCall.java | 11 +-
.../grpc/v1/server/TracingServerCallListener.java | 39 +-
apm-sniffer/apm-sdk-plugin/pom.xml | 1 +
.../shardingsphere-5.0.0-beta-plugin/pom.xml | 73 ++
.../plugin/shardingsphere/v500beta/Constant.java | 13 +-
.../v500beta/ExecuteInterceptor.java | 59 ++
.../v500beta/JDBCRootInvokeInterceptor.java | 52 ++
.../shardingsphere/v500beta/ParseInterceptor.java | 53 ++
.../v500beta/ProxyRootInvokeInterceptor.java | 52 ++
.../v500beta/RewriteInterceptor.java | 50 ++
.../shardingsphere/v500beta/RouteInterceptor.java | 50 ++
...tractShardingSphereV500BetaInstrumentation.java | 25 +-
.../v500beta/define/ExecuteInstrumentation.java | 71 ++
.../define/JDBCRootInvokeInstrumentation.java | 87 +++
.../v500beta/define/ParseInstrumentation.java | 69 ++
.../define/ProxyRootInvokeInstrumentation.java | 69 ++
.../v500beta/define/RewriteInstrumentation.java | 69 ++
.../v500beta/define/RouteInstrumentation.java | 69 ++
.../src/main/resources/skywalking-plugin.def | 23 +-
.../shardingsphere/v500beta/InterceptorTest.java | 168 ++++
docs/en/concepts-and-designs/scope-definitions.md | 56 ++
docs/en/setup/backend/backend-cluster.md | 6 +-
docs/en/setup/backend/configuration-vocabulary.md | 6 +
.../setup/service-agent/java-agent/Plugin-list.md | 1 +
.../service-agent/java-agent/Supported-list.md | 2 +-
.../analyzer/provider/jvm/JVMSourceDispatcher.java | 289 +++----
.../trace/DBLatencyThresholdsAndWatcher.java | 16 +-
.../prometheus/PrometheusMetricConverter.java | 31 +-
.../server/exporter/provider/grpc/MockMetrics.java | 2 +-
.../apache/skywalking/oal/rt/grammar/OALLexer.g4 | 5 +
.../apache/skywalking/oal/rt/grammar/OALParser.g4 | 1 +
.../main/resources/code-templates/metrics/id.ftl | 15 +-
.../core/alarm/provider/RunningRuleTest.java | 6 +-
oap-server/server-bootstrap/pom.xml | 1 -
.../src/main/resources/application.yml | 8 +
.../src/main/resources/jvm-metrics-rules/jvm.yaml | 61 --
.../src/main/resources/oal/java-agent.oal | 31 +
.../oap/server/core/CoreModuleConfig.java | 20 +-
.../oap/server/core/CoreModuleProvider.java | 3 +-
.../analysis/manual/endpoint/EndpointTraffic.java | 2 +-
.../analysis/manual/instance/InstanceTraffic.java | 2 +-
.../manual/networkalias/NetworkAddressAlias.java | 2 +-
.../EndpointRelationServerSideMetrics.java | 2 +-
.../ServiceInstanceRelationClientSideMetrics.java | 2 +-
.../ServiceInstanceRelationServerSideMetrics.java | 2 +-
.../service/ServiceRelationClientSideMetrics.java | 2 +-
.../service/ServiceRelationServerSideMetrics.java | 2 +-
.../analysis/manual/service/ServiceTraffic.java | 2 +-
.../analysis/meter/function/HistogramFunction.java | 2 +-
.../meter/function/PercentileFunction.java | 2 +-
.../analysis/meter/function/avg/AvgFunction.java | 2 +-
.../meter/function/avg/AvgHistogramFunction.java | 2 +-
.../avg/AvgHistogramPercentileFunction.java | 2 +-
.../meter/function/avg/AvgLabeledFunction.java | 2 +-
.../meter/function/latest/LatestFunction.java | 2 +-
.../analysis/meter/function/sum/SumFunction.java | 2 +-
.../oap/server/core/analysis/metrics/Metrics.java | 12 +
.../analysis/worker/MetricsAggregateWorker.java | 37 +-
.../analysis/worker/MetricsPersistentWorker.java | 19 +-
.../analysis/worker/MetricsStreamProcessor.java | 15 +-
.../core/remote/client/GRPCRemoteClient.java | 78 +-
.../skywalking/oap/server/core/source/Event.java | 2 +-
.../skywalking/oap/server/core/source/Service.java | 7 +-
.../oap/server/core/source/ServiceInstance.java | 7 +-
...iceInstance.java => ServiceInstanceJVMCPU.java} | 49 +-
...viceInstance.java => ServiceInstanceJVMGC.java} | 47 +-
...Instance.java => ServiceInstanceJVMMemory.java} | 45 +-
...ance.java => ServiceInstanceJVMMemoryPool.java} | 45 +-
...Instance.java => ServiceInstanceJVMThread.java} | 47 +-
.../server/core/storage/BlockingBatchQueue.java | 18 +-
.../oap/server/core/storage/IMetricsDAO.java | 4 +-
.../oap/server/core/storage/PersistenceTimer.java | 176 ++++-
.../core/analysis/metrics/ApdexMetricsTest.java | 2 +-
.../core/analysis/metrics/CountMetricsTest.java | 2 +-
.../core/analysis/metrics/HeatMapMetricsTest.java | 2 +-
.../core/analysis/metrics/LongAvgMetricsTest.java | 2 +-
.../core/analysis/metrics/MaxLongMetricsTest.java | 2 +-
.../server/core/analysis/metrics/MetricsTest.java | 2 +-
.../core/analysis/metrics/MinLongMetricsTest.java | 2 +-
.../core/analysis/metrics/PercentMetricsTest.java | 2 +-
.../analysis/metrics/PercentileMetricsTest.java | 2 +-
.../core/analysis/metrics/PxxMetricsTest.java | 2 +-
.../core/storage/BlockingBatchQueueBenchmark.java | 149 ++++
.../BlockingBatchQueueWithLinkedBlockingQueue.java | 74 ++
.../BlockingBatchQueueWithReentrantLock.java | 100 +++
.../server/core/storage/PersistenceTimerTest.java | 123 +++
.../agent/kafka/provider/KafkaFetcherProvider.java | 12 +-
.../kafka/provider/handler/JVMMetricsHandler.java | 13 +-
.../provider/handler/JVMMetricsHandlerTest.java | 31 +-
.../client/elasticsearch/ElasticSearchClient.java | 13 +-
.../elasticsearch/ITElasticSearchClient.java | 2 +-
.../receiver/envoy/ServiceMetaInfoFactoryImpl.java | 2 +-
.../server/receiver/envoy/als/mx/FieldsHelper.java | 52 +-
.../envoy/als/mx/ServiceMetaInfoAdapter.java | 27 +-
.../receiver/jvm/provider/JVMModuleProvider.java | 16 +-
.../server/receiver/jvm/provider/JVMOALDefine.java | 22 +-
.../handler/JVMMetricReportServiceHandler.java | 13 +-
.../StorageModuleElasticsearchConfig.java | 12 +
.../StorageModuleElasticsearchProvider.java | 4 +-
.../StorageModuleElasticsearch7Provider.java | 2 +-
.../client/ElasticSearch7Client.java | 9 +-
skywalking-ui | 2 +-
.../config/expectedData.yaml | 15 -
.../grpc-scenario/config/expectedData.yaml | 868 ++++++++++-----------
.../mssql-jdbc-scenario/configuration.yml | 4 +-
.../mssql-jtds-scenario/configuration.yml | 4 +-
.../bin/startup.sh} | 21 +-
.../config/expectedData.yaml | 231 ++++++
.../configuration.yml | 16 +-
.../shardingsphere-5.0.0-beta-scenario/pom.xml | 122 +++
.../src/main/assembly/assembly.xml | 41 +
.../apm/testcase/shardingsphere/Application.java | 22 +-
.../shardingsphere/controller/CaseController.java | 0
.../shardingsphere/service/api/entity/Order.java | 0
.../service/api/entity/OrderItem.java | 0
.../service/api/repository/CommonRepository.java | 0
.../api/repository/OrderItemRepository.java | 0
.../service/api/repository/OrderRepository.java | 0
.../service/api/service/CommonService.java | 0
.../service/api/service/CommonServiceImpl.java | 0
...dingDatabasesAndTablesConfigurationPrecise.java | 94 +++
.../jdbc/JDBCOrderItemRepositoryImpl.java | 0
.../repository/jdbc/JDBCOrderRepositoryImpl.java | 0
.../service/repository/service/RawPojoService.java | 0
.../service/utility/config/DataSourceUtil.java | 0
.../utility/config/ExampleConfiguration.java | 14 +-
.../src/main/resources/application.properties} | 19 +-
.../support-version.list} | 17 +-
137 files changed, 3315 insertions(+), 1259 deletions(-)
create mode 100644
apm-sniffer/apm-sdk-plugin/shardingsphere-5.0.0-beta-plugin/pom.xml
copy
apm-commons/apm-datacarrier/src/main/java/org/apache/skywalking/apm/commons/datacarrier/consumer/IConsumer.java
=>
apm-sniffer/apm-sdk-plugin/shardingsphere-5.0.0-beta-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/v500beta/Constant.java
(77%)
create mode 100644
apm-sniffer/apm-sdk-plugin/shardingsphere-5.0.0-beta-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/v500beta/ExecuteInterceptor.java
create mode 100644
apm-sniffer/apm-sdk-plugin/shardingsphere-5.0.0-beta-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/v500beta/JDBCRootInvokeInterceptor.java
create mode 100644
apm-sniffer/apm-sdk-plugin/shardingsphere-5.0.0-beta-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/v500beta/ParseInterceptor.java
create mode 100644
apm-sniffer/apm-sdk-plugin/shardingsphere-5.0.0-beta-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/v500beta/ProxyRootInvokeInterceptor.java
create mode 100644
apm-sniffer/apm-sdk-plugin/shardingsphere-5.0.0-beta-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/v500beta/RewriteInterceptor.java
create mode 100644
apm-sniffer/apm-sdk-plugin/shardingsphere-5.0.0-beta-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/v500beta/RouteInterceptor.java
copy
apm-commons/apm-datacarrier/src/main/java/org/apache/skywalking/apm/commons/datacarrier/consumer/IConsumer.java
=>
apm-sniffer/apm-sdk-plugin/shardingsphere-5.0.0-beta-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/v500beta/define/AbstractShardingSphereV500BetaInstrumentation.java
(50%)
create mode 100644
apm-sniffer/apm-sdk-plugin/shardingsphere-5.0.0-beta-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/v500beta/define/ExecuteInstrumentation.java
create mode 100644
apm-sniffer/apm-sdk-plugin/shardingsphere-5.0.0-beta-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/v500beta/define/JDBCRootInvokeInstrumentation.java
create mode 100644
apm-sniffer/apm-sdk-plugin/shardingsphere-5.0.0-beta-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/v500beta/define/ParseInstrumentation.java
create mode 100644
apm-sniffer/apm-sdk-plugin/shardingsphere-5.0.0-beta-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/v500beta/define/ProxyRootInvokeInstrumentation.java
create mode 100644
apm-sniffer/apm-sdk-plugin/shardingsphere-5.0.0-beta-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/v500beta/define/RewriteInstrumentation.java
create mode 100644
apm-sniffer/apm-sdk-plugin/shardingsphere-5.0.0-beta-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/v500beta/define/RouteInstrumentation.java
copy test/plugin/scenarios/mssql-jdbc-scenario/configuration.yml =>
apm-sniffer/apm-sdk-plugin/shardingsphere-5.0.0-beta-plugin/src/main/resources/skywalking-plugin.def
(53%)
create mode 100644
apm-sniffer/apm-sdk-plugin/shardingsphere-5.0.0-beta-plugin/src/test/java/org/apache/skywalking/apm/plugin/shardingsphere/v500beta/InterceptorTest.java
delete mode 100644
oap-server/server-bootstrap/src/main/resources/jvm-metrics-rules/jvm.yaml
create mode 100644
oap-server/server-bootstrap/src/main/resources/oal/java-agent.oal
copy
oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/{ServiceInstance.java
=> ServiceInstanceJVMCPU.java} (63%)
copy
oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/{ServiceInstance.java
=> ServiceInstanceJVMGC.java} (65%)
copy
oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/{ServiceInstance.java
=> ServiceInstanceJVMMemory.java} (66%)
copy
oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/{ServiceInstance.java
=> ServiceInstanceJVMMemoryPool.java} (66%)
copy
oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/{ServiceInstance.java
=> ServiceInstanceJVMThread.java} (65%)
copy
apm-commons/apm-datacarrier/src/main/java/org/apache/skywalking/apm/commons/datacarrier/consumer/IConsumer.java
=>
oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/BlockingBatchQueue.java
(67%)
create mode 100644
oap-server/server-core/src/test/java/org/apache/skywalking/oap/server/core/storage/BlockingBatchQueueBenchmark.java
create mode 100644
oap-server/server-core/src/test/java/org/apache/skywalking/oap/server/core/storage/BlockingBatchQueueWithLinkedBlockingQueue.java
create mode 100644
oap-server/server-core/src/test/java/org/apache/skywalking/oap/server/core/storage/BlockingBatchQueueWithReentrantLock.java
create mode 100644
oap-server/server-core/src/test/java/org/apache/skywalking/oap/server/core/storage/PersistenceTimerTest.java
copy
apm-commons/apm-datacarrier/src/main/java/org/apache/skywalking/apm/commons/datacarrier/consumer/IConsumer.java
=>
oap-server/server-receiver-plugin/skywalking-jvm-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/jvm/provider/JVMOALDefine.java
(63%)
copy test/plugin/scenarios/{mssql-jtds-scenario/configuration.yml =>
shardingsphere-5.0.0-beta-scenario/bin/startup.sh} (64%)
create mode 100644
test/plugin/scenarios/shardingsphere-5.0.0-beta-scenario/config/expectedData.yaml
copy test/plugin/scenarios/{mssql-jdbc-scenario =>
shardingsphere-5.0.0-beta-scenario}/configuration.yml (67%)
create mode 100644
test/plugin/scenarios/shardingsphere-5.0.0-beta-scenario/pom.xml
create mode 100644
test/plugin/scenarios/shardingsphere-5.0.0-beta-scenario/src/main/assembly/assembly.xml
copy
apm-commons/apm-datacarrier/src/main/java/org/apache/skywalking/apm/commons/datacarrier/consumer/IConsumer.java
=>
test/plugin/scenarios/shardingsphere-5.0.0-beta-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/Application.java
(60%)
copy test/plugin/scenarios/{shardingsphere-4.x-scenario =>
shardingsphere-5.0.0-beta-scenario}/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/controller/CaseController.java
(100%)
copy test/plugin/scenarios/{shardingsphere-4.x-scenario =>
shardingsphere-5.0.0-beta-scenario}/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/api/entity/Order.java
(100%)
copy test/plugin/scenarios/{shardingsphere-4.x-scenario =>
shardingsphere-5.0.0-beta-scenario}/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/api/entity/OrderItem.java
(100%)
copy test/plugin/scenarios/{shardingsphere-4.x-scenario =>
shardingsphere-5.0.0-beta-scenario}/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/api/repository/CommonRepository.java
(100%)
copy test/plugin/scenarios/{shardingsphere-4.x-scenario =>
shardingsphere-5.0.0-beta-scenario}/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/api/repository/OrderItemRepository.java
(100%)
copy test/plugin/scenarios/{shardingsphere-4.x-scenario =>
shardingsphere-5.0.0-beta-scenario}/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/api/repository/OrderRepository.java
(100%)
copy test/plugin/scenarios/{shardingsphere-4.x-scenario =>
shardingsphere-5.0.0-beta-scenario}/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/api/service/CommonService.java
(100%)
copy test/plugin/scenarios/{shardingsphere-4.x-scenario =>
shardingsphere-5.0.0-beta-scenario}/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/api/service/CommonServiceImpl.java
(100%)
create mode 100644
test/plugin/scenarios/shardingsphere-5.0.0-beta-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/config/ShardingDatabasesAndTablesConfigurationPrecise.java
copy test/plugin/scenarios/{shardingsphere-4.x-scenario =>
shardingsphere-5.0.0-beta-scenario}/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/repository/jdbc/JDBCOrderItemRepositoryImpl.java
(100%)
copy test/plugin/scenarios/{shardingsphere-4.x-scenario =>
shardingsphere-5.0.0-beta-scenario}/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/repository/jdbc/JDBCOrderRepositoryImpl.java
(100%)
copy test/plugin/scenarios/{shardingsphere-4.x-scenario =>
shardingsphere-5.0.0-beta-scenario}/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/repository/service/RawPojoService.java
(100%)
copy test/plugin/scenarios/{shardingsphere-4.x-scenario =>
shardingsphere-5.0.0-beta-scenario}/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/utility/config/DataSourceUtil.java
(100%)
copy
apm-commons/apm-datacarrier/src/main/java/org/apache/skywalking/apm/commons/datacarrier/consumer/IConsumer.java
=>
test/plugin/scenarios/shardingsphere-5.0.0-beta-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/utility/config/ExampleConfiguration.java
(77%)
copy test/plugin/scenarios/{mssql-jdbc-scenario/configuration.yml =>
shardingsphere-5.0.0-beta-scenario/src/main/resources/application.properties}
(64%)
copy test/plugin/scenarios/{mssql-jtds-scenario/configuration.yml =>
shardingsphere-5.0.0-beta-scenario/support-version.list} (64%)
