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/06/14 04:12:39 UTC
[skywalking] branch line-pxx updated (05cf4e0 -> 89e6d52)
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a change to branch line-pxx
in repository https://gitbox.apache.org/repos/asf/skywalking.git.
from 05cf4e0 Merge branch 'master' into line-pxx
add 8c0d44a Add Xinyebang.com to powered-by page. (#2804)
add 2250377 fix docker-entrypoint.sh in consul cluster mode. (#2805)
add 9786893 Update powered-by.md (#2807)
add f803a2a Provide plugin for ShardingSphere (#2699) (#2727)
add 8716bb0 Fix Mysql 6.x plugin (#2803)
add 5036e83 Good news of an important feature: time series implementation in Elasticsearch storage. (#2808)
add 2e846c6 Dynamic Configuration and Dynamic Configuration Service (#2810)
add e1195ab add time series implementation configuration. (#2815)
add 1f7125a Remove storage annotation. (#2813)
add 3217ff1 Fix the span cannot stop when forward request (#2820)
add 6ae5174 Provide plugin for Solr-7.x(client) (#2730)
add a763f8a sync UI submodule. (#2831)
add 57aedb8 Refactor ConfigWatcherRegister to only read interested configs. fixes #2834 (#2835)
add 7f22770 Provide Nacos dynamic configuration center implementation. fixes #2816 (#2817)
add 3831c5e Remove current RUNTIME_CONTEXT when the lastSpan will be stop (#2827)
add 2197820 Support exporter runs in increment and total modes (#2840)
add e05e092 Remove unstable tests (#2841)
add f683850 Improve plugin performance (#2838)
add 2cdbe83 Move zipkin and jaeger span source to disable from metrics. (#2842)
add c983d85 Fix miss change of envoy receiver. (#2844)
add ec731b2 Remove unnecessary docs and config keys (#2845)
add 1c545a3 Fixed a time series bug about downsampling setting in processors are different from the setting in receivers. (#2856)
add ee7c418 Optimize SegmentParseV2::parse code logic (#2828)
add dbb8bd8 Fix wrong query condition (#2858)
add 4e63331 #2860 (#2861)
add f5db90b Integrate Jenkins CI (#2864)
add c3de8e8 Add FAQ for ElasticSearch server side setting (#2859)
add bc0c25a the static paramater is best to be referenced by the class (#2868)
add 5b6a890 Adjust pom plugin position and add docs (#2870)
add 0f9c27d Revert SolrJ plugin. (#2871)
add 0103d8a Fix no stream register. (#2873)
add 89e6d52 Merge branch 'master' into line-pxx
No new revisions were added by this update.
Summary of changes:
.travis.yml | 4 +-
Jenkinsfile | 84 +--
.../apm/agent/core/context/ContextManager.java | 1 +
.../core/remote/TraceSegmentServiceClient.java | 1 +
.../apm/agent/core/context/TracingContextTest.java | 34 +-
.../jdbc/ConnectionServiceMethodInterceptor.java | 19 +-
.../apm/plugin/jdbc/JDBCDriverInterceptor.java | 2 +-
.../jdbc/connectionurl/parser/MysqlURLParser.java | 6 +-
.../jdbc/connectionurl/parser/URLParserTest.java | 4 +-
.../mysql/v5/ConnectionCreate5xInterceptor.java | 1 +
.../mysql/v5/define/CacheIpsInstrumentation.java | 4 +-
.../mysql/v6/ConnectionCreateNewInterceptor.java} | 9 +-
.../mysql/v6/ConnectionCreateOldInterceptor.java} | 13 +-
...eateJdbcConnectionProxyInstanceInterceptor.java | 54 --
...BalancedConnectionProxyInstanceInterceptor.java | 53 --
...licationConnectionProxyInstanceInterceptor.java | 53 --
.../mysql/v6/define/CacheIpsInstrumentation.java} | 26 +-
.../ConnectionImplCreateInstrumentation.java | 38 +-
.../FailoverConnectionProxyInstrumentation.java | 57 --
...LoadBalancedConnectionProxyInstrumentation.java | 55 --
.../ReplicationConnectionProxyInstrumentation.java | 54 --
.../mysql/v6/wrapper/CallableStatementWrapper.java | 539 -----------------
.../mysql/v6/wrapper/JdbcConnectionWrapper.java | 652 ---------------------
.../v6/wrapper/LoadBalancedConnectionWrapper.java | 48 --
.../mysql/v6/wrapper/PreparedStatementWrapper.java | 303 ----------
.../v6/wrapper/ReplicationConnectionWrapper.java | 80 ---
.../jdbc/mysql/v6/wrapper/StatementWrapper.java | 307 ----------
.../plugin/jdbc/mysql/v6/wrapper/TracingUtils.java | 53 --
.../src/main/resources/skywalking-plugin.def | 5 +-
.../define/PreparedStatementInstrumentation.java | 4 +-
.../apm/plugin/jdbc/mysql}/ConnectionCache.java | 6 +-
.../apm/plugin/jdbc/mysql/Constants.java | 1 +
.../jdbc/mysql}/DriverConnectInterceptor.java | 2 +-
apm-sniffer/apm-sdk-plugin/pom.xml | 1 +
.../pom.xml | 20 +-
.../apm/plugin/shardingsphere/v4}/Constant.java | 2 +-
.../shardingsphere/v4}/ExecuteInterceptor.java | 6 +-
.../v4}/JDBCRootInvokeInterceptor.java | 6 +-
.../shardingsphere/v4}/ParseInterceptor.java | 4 +-
.../v4}/ProxyRootInvokeInterceptor.java | 6 +-
.../v4}/define/ExecuteInstrumentation.java | 8 +-
.../v4}/define/JDBCRootInvokeInstrumentation.java | 8 +-
.../v4}/define/ParseInstrumentation.java | 8 +-
.../v4}/define/ProxyRootInvokeInstrumentation.java | 8 +-
.../src/main/resources/skywalking-plugin.def | 7 +-
.../apm/plugin/shardingsphere/InterceptorTest.java | 4 +
.../apm/plugin/solrj/SolrClientInterceptor.java | 229 ++++++++
.../plugin/solrj/StringFormatBenchmarkTest.java | 71 +++
.../apm/plugin/tomcat78x/ForwardInterceptor.java | 2 +-
docker/oap/docker-entrypoint.sh | 9 +-
docs/en/FAQ/ES-Server-FAQ.md | 23 +
docs/en/FAQ/README.md | 3 +-
docs/en/guides/How-to-build.md | 3 +-
docs/en/guides/README.md | 21 +-
docs/en/setup/backend/backend-setup.md | 2 +
docs/en/setup/backend/backend-storage.md | 14 +-
docs/en/setup/backend/dynamic-config.md | 57 ++
docs/en/setup/backend/ttl.md | 22 +-
.../service-agent/java-agent/Supported-list.md | 2 +-
docs/powered-by.md | 1 +
.../exporter/provider/grpc/GRPCExporter.java | 14 +-
.../exporter/provider/grpc/GRPCExporterTest.java | 12 +-
.../skywalking/oal/tool/grammar/OALParser.g4 | 5 +-
.../code-templates/MetricsImplementor.ftl | 2 +-
.../expectedFiles/MetricsImplementorExpected.java | 2 +-
oap-server/pom.xml | 44 +-
.../cluster-nacos-plugin/pom.xml | 7 +-
.../configuration-api}/pom.xml | 9 +-
.../api/AbstractConfigurationProvider.java} | 28 +-
.../configuration/api/ConfigChangeWatcher.java | 77 +++
.../oap/server/configuration/api/ConfigTable.java} | 30 +-
.../configuration/api/ConfigWatcherRegister.java | 149 +++++
.../configuration/api/ConfigurationModule.java} | 16 +-
.../api/DynamicConfigurationService.java} | 22 +-
.../api/NoneConfigurationProvider.java} | 19 +-
...ywalking.oap.server.library.module.ModuleDefine | 2 +-
...alking.oap.server.library.module.ModuleProvider | 3 +-
.../api/ConfigWatcherRegisterTest.java | 137 +++++
.../configuration-nacos/pom.xml | 191 ++++++
.../nacos/NacosConfigWatcherRegister.java | 132 +++++
.../nacos/NacosConfigurationProvider.java | 73 +++
.../configuration/nacos/NacosServerSettings.java | 79 +++
...alking.oap.server.library.module.ModuleProvider | 2 +-
.../nacos/ITNacosConfigurationTest.java | 124 ++++
.../nacos/NacosConfigWatcherRegisterTest.java | 66 +++
.../nacos/NacosConfigurationTestModule.java} | 14 +-
.../nacos/NacosConfigurationTestProvider.java | 93 +++
...ywalking.oap.server.library.module.ModuleDefine | 4 +-
...alking.oap.server.library.module.ModuleProvider | 2 +-
.../src/test/resources/application.yml | 23 +-
.../docker-entrypoint-initdb.d/nacos-mysql.sql | 215 +++++++
.../grpc-configuration-sync}/pom.xml | 38 +-
.../grpc/GRPCConfigWatcherRegister.java | 58 ++
.../grpc/GRPCConfigurationProvider.java} | 46 +-
.../grpc/RemoteEndpointSettings.java} | 20 +-
.../src/main/proto/configuration-service.proto | 50 ++
...alking.oap.server.library.module.ModuleProvider | 2 +-
.../server-configuration}/pom.xml | 23 +-
oap-server/server-core/pom.xml | 5 +
.../oap/server/core/CoreModuleConfig.java | 17 +-
.../oap/server/core/CoreModuleProvider.java | 10 +-
.../core/{DataTTL.java => DataTTLConfig.java} | 2 +-
.../oap/server/core/alarm/AlarmRecord.java | 4 +-
.../oap/server/core/analysis/Downsampling.java | 2 +-
.../oap/server/core/analysis/Stream.java | 4 +-
.../manual/database/TopNDatabaseStatement.java | 3 +-
.../EndpointRelationServerSideMetrics.java | 2 +-
.../analysis/manual/log/HTTPAccessLogRecord.java | 5 +-
.../analysis/manual/segment/SegmentRecord.java | 4 +-
.../ServiceRelationClientSideMetrics.java | 4 +-
.../ServiceRelationServerSideMetrics.java | 4 +-
.../server/core/analysis/worker/ExportWorker.java | 14 +-
.../analysis/worker/MetricsPersistentWorker.java | 28 +-
.../analysis/worker/MetricsStreamProcessor.java | 33 +-
.../analysis/worker/RecordPersistentWorker.java | 9 +-
.../analysis/worker/RecordStreamProcessor.java | 9 +-
.../core/analysis/worker/TopNStreamProcessor.java | 9 +-
.../server/core/analysis/worker/TopNWorker.java | 9 +-
.../oap/server/core/config/ConfigService.java | 8 +-
.../ExportEvent.java} | 47 +-
.../core/exporter/MetricValuesExportService.java | 8 +-
.../{cluster/RemoteInstance.java => query/ID.java} | 28 +-
.../oap/server/core/query/MetricQueryService.java | 13 +-
.../server/core/register/EndpointInventory.java | 4 +-
.../core/register/NetworkAddressInventory.java | 4 +-
.../core/register/ServiceInstanceInventory.java | 4 +-
.../oap/server/core/register/ServiceInventory.java | 4 +-
.../register/worker/InventoryStreamProcessor.java | 12 +-
.../core/remote/define/StreamDataMapping.java | 27 +-
.../oap/server/core/storage/IHistoryDeleteDAO.java | 3 +-
.../oap/server/core/storage/IMetricsDAO.java | 7 +-
.../oap/server/core/storage/IRecordDAO.java | 3 +-
.../server/core/storage/annotation/Storage.java | 22 +-
.../annotation/StorageEntityAnnotationUtils.java | 46 --
.../server/core/storage/model/IModelSetter.java | 5 +-
.../oap/server/core/storage/model/Model.java | 37 +-
.../server/core/storage/model/ModelInstaller.java | 10 -
.../oap/server/core/storage/model/ModelName.java | 6 +-
.../server/core/storage/model/StorageModels.java | 31 +-
.../core/storage/query/IMetricsQueryDAO.java | 5 +-
.../core/storage/ttl/DataTTLKeeperTimer.java | 18 +-
.../server/core/storage/ttl/DayTTLCalculator.java | 6 +-
.../GeneralStorageTTL.java} | 22 +-
.../server/core/storage/ttl/HourTTLCalculator.java | 6 +-
.../core/storage/ttl/MinuteTTLCalculator.java | 6 +-
.../core/storage/ttl/MonthTTLCalculator.java | 6 +-
.../core/storage/ttl/SecondTTLCalculator.java | 6 +-
.../ttl/{TTLCalculator.java => StorageTTL.java} | 8 +-
.../oap/server/core/storage/ttl/TTLCalculator.java | 4 +-
.../core/storage/StorageInstallerTestCase.java | 8 -
oap-server/server-library/library-client/pom.xml | 143 +++--
.../client/elasticsearch/ElasticSearchClient.java | 46 +-
.../elasticsearch/ITElasticSearchClient.java | 38 +-
.../library/module/ModuleStartException.java | 3 +
.../envoy/EnvoyMetricReceiverProvider.java | 5 +-
.../envoy/als/K8sALSServiceMeshHTTPAnalysis.java | 4 +-
.../provider/IstioTelemetryReceiverProvider.java | 2 +-
.../trace/provider/DBLatencyThresholds.java | 51 --
.../provider/DBLatencyThresholdsAndWatcher.java | 78 +++
.../trace/provider/TraceModuleProvider.java | 10 +-
.../trace/provider/TraceServiceModuleConfig.java | 2 +-
.../trace/provider/parser/SegmentParse.java | 2 +-
.../trace/provider/parser/SegmentParseV2.java | 4 +-
.../listener/endpoint/MultiScopesSpanListener.java | 2 +-
.../server/receiver/trace/mock/AgentDataMock.java | 4 +-
oap-server/server-starter/pom.xml | 12 +
.../src/main/assembly/application.yml | 18 +
.../src/main/resources/application.yml | 21 +-
.../StorageModuleElasticsearchConfig.java | 176 +-----
.../StorageModuleElasticsearchProvider.java | 68 +--
.../elasticsearch/base/HistoryDeleteEsDAO.java | 46 +-
.../plugin/elasticsearch/base/MetricsEsDAO.java | 10 +-
.../plugin/elasticsearch/base/RecordEsDAO.java | 4 +-
.../elasticsearch/base/StorageEsInstaller.java | 66 ++-
.../plugin/elasticsearch/base/TimeSeriesUtils.java | 60 ++
.../plugin/elasticsearch/query/LogQueryEsDAO.java | 2 +-
.../elasticsearch/query/MetricsQueryEsDAO.java | 31 +-
.../ElasticsearchStorageTTL.java} | 22 +-
.../elasticsearch/ttl/EsHourTTLCalculator.java} | 11 +-
.../elasticsearch/ttl/EsMinuteTTLCalculator.java} | 11 +-
.../base/TimeSeriesUtilsTestCase.java} | 11 +-
.../storage/plugin/jaeger/JaegerSpanRecord.java | 2 +-
.../storage/plugin/jdbc/h2/H2StorageProvider.java | 52 +-
.../plugin/jdbc/h2/dao/H2HistoryDeleteDAO.java | 27 +-
.../storage/plugin/jdbc/h2/dao/H2MetricsDAO.java | 16 +-
.../plugin/jdbc/h2/dao/H2MetricsQueryDAO.java | 17 +-
.../storage/plugin/jdbc/h2/dao/H2RecordDAO.java | 9 +-
.../plugin/jdbc/h2/dao/H2TableInstaller.java | 23 +-
.../plugin/jdbc/mysql/MySQLStorageProvider.java | 50 +-
.../plugin/jdbc/mysql/MySQLTableInstaller.java | 40 +-
.../storage/plugin/zipkin/ZipkinSpanRecord.java | 2 +-
pom.xml | 49 +-
skywalking-ui | 2 +-
193 files changed, 3260 insertions(+), 3545 deletions(-)
copy apm-sniffer/apm-sdk-plugin/{mysql-8.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/v8/ConnectionCreateInterceptor.java => mysql-6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/v6/ConnectionCreateNewInterceptor.java} (89%)
copy apm-sniffer/apm-sdk-plugin/{mysql-8.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/v8/ConnectionCreateInterceptor.java => mysql-6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/v6/ConnectionCreateOldInterceptor.java} (80%)
delete mode 100644 apm-sniffer/apm-sdk-plugin/mysql-6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/v6/CreateJdbcConnectionProxyInstanceInterceptor.java
delete mode 100644 apm-sniffer/apm-sdk-plugin/mysql-6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/v6/CreateLoadBalancedConnectionProxyInstanceInterceptor.java
delete mode 100644 apm-sniffer/apm-sdk-plugin/mysql-6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/v6/CreateReplicationConnectionProxyInstanceInterceptor.java
copy apm-sniffer/apm-sdk-plugin/{httpasyncclient-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/httpasyncclient/v4/define/HttpAsyncRequestExecutorInstrumentation.java => mysql-6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/v6/define/CacheIpsInstrumentation.java} (69%)
copy apm-sniffer/apm-sdk-plugin/{mysql-8.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/v8 => mysql-6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/v6}/define/ConnectionImplCreateInstrumentation.java (63%)
delete mode 100644 apm-sniffer/apm-sdk-plugin/mysql-6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/v6/define/FailoverConnectionProxyInstrumentation.java
delete mode 100644 apm-sniffer/apm-sdk-plugin/mysql-6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/v6/define/LoadBalancedConnectionProxyInstrumentation.java
delete mode 100644 apm-sniffer/apm-sdk-plugin/mysql-6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/v6/define/ReplicationConnectionProxyInstrumentation.java
delete mode 100644 apm-sniffer/apm-sdk-plugin/mysql-6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/v6/wrapper/CallableStatementWrapper.java
delete mode 100644 apm-sniffer/apm-sdk-plugin/mysql-6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/v6/wrapper/JdbcConnectionWrapper.java
delete mode 100644 apm-sniffer/apm-sdk-plugin/mysql-6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/v6/wrapper/LoadBalancedConnectionWrapper.java
delete mode 100644 apm-sniffer/apm-sdk-plugin/mysql-6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/v6/wrapper/PreparedStatementWrapper.java
delete mode 100644 apm-sniffer/apm-sdk-plugin/mysql-6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/v6/wrapper/ReplicationConnectionWrapper.java
delete mode 100644 apm-sniffer/apm-sdk-plugin/mysql-6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/v6/wrapper/StatementWrapper.java
delete mode 100644 apm-sniffer/apm-sdk-plugin/mysql-6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/v6/wrapper/TracingUtils.java
rename apm-sniffer/apm-sdk-plugin/{mysql-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/v5 => mysql-common/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql}/ConnectionCache.java (86%)
rename apm-sniffer/apm-sdk-plugin/{mysql-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/v5 => mysql-common/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql}/DriverConnectInterceptor.java (97%)
copy apm-sniffer/apm-sdk-plugin/{sharding-sphere-3.x-plugin => sharding-sphere-4.x-plugin}/pom.xml (79%)
copy apm-sniffer/apm-sdk-plugin/{sharding-sphere-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere => sharding-sphere-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/v4}/Constant.java (93%)
copy apm-sniffer/apm-sdk-plugin/{sharding-sphere-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere => sharding-sphere-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/v4}/ExecuteInterceptor.java (89%)
copy apm-sniffer/apm-sdk-plugin/{sharding-sphere-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere => sharding-sphere-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/v4}/JDBCRootInvokeInterceptor.java (87%)
copy apm-sniffer/apm-sdk-plugin/{sharding-sphere-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere => sharding-sphere-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/v4}/ParseInterceptor.java (91%)
copy apm-sniffer/apm-sdk-plugin/{sharding-sphere-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere => sharding-sphere-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/v4}/ProxyRootInvokeInterceptor.java (87%)
copy apm-sniffer/apm-sdk-plugin/{sharding-sphere-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere => sharding-sphere-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/v4}/define/ExecuteInstrumentation.java (88%)
copy apm-sniffer/apm-sdk-plugin/{sharding-sphere-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere => sharding-sphere-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/v4}/define/JDBCRootInvokeInstrumentation.java (87%)
copy apm-sniffer/apm-sdk-plugin/{sharding-sphere-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere => sharding-sphere-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/v4}/define/ParseInstrumentation.java (88%)
copy apm-sniffer/apm-sdk-plugin/{sharding-sphere-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere => sharding-sphere-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/v4}/define/ProxyRootInvokeInstrumentation.java (87%)
copy apm-sniffer/apm-sdk-plugin/{canal-1.x-plugin => sharding-sphere-4.x-plugin}/src/main/resources/skywalking-plugin.def (65%)
copy apm-sniffer/apm-sdk-plugin/{sharding-sphere-3.x-plugin => sharding-sphere-4.x-plugin}/src/test/java/org/apache/skywalking/apm/plugin/shardingsphere/InterceptorTest.java (94%)
create mode 100644 apm-sniffer/apm-sdk-plugin/solrj-7.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/solrj/SolrClientInterceptor.java
create mode 100644 apm-sniffer/apm-sdk-plugin/solrj-7.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/solrj/StringFormatBenchmarkTest.java
create mode 100644 docs/en/FAQ/ES-Server-FAQ.md
create mode 100644 docs/en/setup/backend/dynamic-config.md
copy oap-server/{server-telemetry/telemetry-api => server-configuration/configuration-api}/pom.xml (77%)
copy oap-server/{server-telemetry/telemetry-api/src/main/java/org/apache/skywalking/oap/server/telemetry/none/NoneTelemetryProvider.java => server-configuration/configuration-api/src/main/java/org/apache/skywalking/oap/server/configuration/api/AbstractConfigurationProvider.java} (67%)
create mode 100644 oap-server/server-configuration/configuration-api/src/main/java/org/apache/skywalking/oap/server/configuration/api/ConfigChangeWatcher.java
copy oap-server/{server-core/src/main/java/org/apache/skywalking/oap/server/core/query/entity/Logs.java => server-configuration/configuration-api/src/main/java/org/apache/skywalking/oap/server/configuration/api/ConfigTable.java} (62%)
create mode 100644 oap-server/server-configuration/configuration-api/src/main/java/org/apache/skywalking/oap/server/configuration/api/ConfigWatcherRegister.java
copy oap-server/{server-receiver-plugin/jaeger-receiver-plugin/src/main/java/org/apache/skywalking/aop/server/receiver/jaeger/JaegerReceiverModule.java => server-configuration/configuration-api/src/main/java/org/apache/skywalking/oap/server/configuration/api/ConfigurationModule.java} (63%)
copy oap-server/{server-receiver-plugin/skywalking-jvm-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/jvm/module/JVMModule.java => server-configuration/configuration-api/src/main/java/org/apache/skywalking/oap/server/configuration/api/DynamicConfigurationService.java} (68%)
copy oap-server/{server-telemetry/telemetry-api/src/main/java/org/apache/skywalking/oap/server/telemetry/none/NoneTelemetryProvider.java => server-configuration/configuration-api/src/main/java/org/apache/skywalking/oap/server/configuration/api/NoneConfigurationProvider.java} (76%)
copy oap-server/{server-receiver-plugin/skywalking-jvm-receiver-plugin => server-configuration/configuration-api}/src/main/resources/META-INF/services/org.apache.skywalking.oap.server.library.module.ModuleDefine (91%)
copy oap-server/{exporter => server-configuration/configuration-api}/src/main/resources/META-INF/services/org.apache.skywalking.oap.server.library.module.ModuleProvider (90%)
create mode 100644 oap-server/server-configuration/configuration-api/src/test/java/org/apache/skywalking/oap/server/configuration/api/ConfigWatcherRegisterTest.java
create mode 100644 oap-server/server-configuration/configuration-nacos/pom.xml
create mode 100644 oap-server/server-configuration/configuration-nacos/src/main/java/org/apache/skywalking/oap/server/configuration/nacos/NacosConfigWatcherRegister.java
create mode 100644 oap-server/server-configuration/configuration-nacos/src/main/java/org/apache/skywalking/oap/server/configuration/nacos/NacosConfigurationProvider.java
create mode 100644 oap-server/server-configuration/configuration-nacos/src/main/java/org/apache/skywalking/oap/server/configuration/nacos/NacosServerSettings.java
copy oap-server/{exporter => server-configuration/configuration-nacos}/src/main/resources/META-INF/services/org.apache.skywalking.oap.server.library.module.ModuleProvider (90%)
create mode 100644 oap-server/server-configuration/configuration-nacos/src/test/java/org/apache/skywalking/oap/server/configuration/nacos/ITNacosConfigurationTest.java
create mode 100644 oap-server/server-configuration/configuration-nacos/src/test/java/org/apache/skywalking/oap/server/configuration/nacos/NacosConfigWatcherRegisterTest.java
copy oap-server/{server-receiver-plugin/skywalking-istio-telemetry-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/istio/telemetry/module/IstioTelemetryReceiverModule.java => server-configuration/configuration-nacos/src/test/java/org/apache/skywalking/oap/server/configuration/nacos/NacosConfigurationTestModule.java} (75%)
create mode 100644 oap-server/server-configuration/configuration-nacos/src/test/java/org/apache/skywalking/oap/server/configuration/nacos/NacosConfigurationTestProvider.java
copy oap-server/{server-receiver-plugin/envoy-metrics-receiver-plugin/src/main => server-configuration/configuration-nacos/src/test}/resources/META-INF/services/org.apache.skywalking.oap.server.library.module.ModuleDefine (83%)
copy oap-server/{exporter/src/main => server-configuration/configuration-nacos/src/test}/resources/META-INF/services/org.apache.skywalking.oap.server.library.module.ModuleProvider (90%)
copy apm-dist/bin/startup.sh => oap-server/server-configuration/configuration-nacos/src/test/resources/application.yml (65%)
create mode 100644 oap-server/server-configuration/configuration-nacos/src/test/resources/docker/docker-entrypoint-initdb.d/nacos-mysql.sql
copy oap-server/{server-receiver-plugin/skywalking-istio-telemetry-receiver-plugin => server-configuration/grpc-configuration-sync}/pom.xml (70%)
create mode 100644 oap-server/server-configuration/grpc-configuration-sync/src/main/java/org/apache/skywalking/oap/server/configuration/grpc/GRPCConfigWatcherRegister.java
copy oap-server/{server-telemetry/telemetry-api/src/main/java/org/apache/skywalking/oap/server/telemetry/none/NoneTelemetryProvider.java => server-configuration/grpc-configuration-sync/src/main/java/org/apache/skywalking/oap/server/configuration/grpc/GRPCConfigurationProvider.java} (51%)
copy oap-server/{server-receiver-plugin/zipkin-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/zipkin/ZipkinReceiverConfig.java => server-configuration/grpc-configuration-sync/src/main/java/org/apache/skywalking/oap/server/configuration/grpc/RemoteEndpointSettings.java} (68%)
create mode 100644 oap-server/server-configuration/grpc-configuration-sync/src/main/proto/configuration-service.proto
copy oap-server/{server-alarm-plugin => server-configuration/grpc-configuration-sync}/src/main/resources/META-INF/services/org.apache.skywalking.oap.server.library.module.ModuleProvider (91%)
copy {apm-sniffer/apm-sdk-plugin/resteasy-plugin => oap-server/server-configuration}/pom.xml (76%)
rename oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/{DataTTL.java => DataTTLConfig.java} (97%)
copy oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/{alarm/AlarmEntrance.java => exporter/ExportEvent.java} (54%)
copy oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/{cluster/RemoteInstance.java => query/ID.java} (60%)
delete mode 100644 oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/annotation/StorageEntityAnnotationUtils.java
copy oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/{model/IModelSetter.java => ttl/GeneralStorageTTL.java} (63%)
copy oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/ttl/{TTLCalculator.java => StorageTTL.java} (83%)
delete mode 100644 oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/DBLatencyThresholds.java
create mode 100644 oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/DBLatencyThresholdsAndWatcher.java
create mode 100644 oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/base/TimeSeriesUtils.java
copy oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/{base/MatchCNameBuilder.java => ttl/ElasticsearchStorageTTL.java} (60%)
copy oap-server/{server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/ttl/DayTTLCalculator.java => server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/ttl/EsHourTTLCalculator.java} (69%)
copy oap-server/{server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/ttl/DayTTLCalculator.java => server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/ttl/EsMinuteTTLCalculator.java} (69%)
copy oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/{main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/base/MatchCNameBuilder.java => test/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/base/TimeSeriesUtilsTestCase.java} (82%)