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/03 10:47:08 UTC
[skywalking] branch config-API updated (89c2283 -> ba71f4d)
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a change to branch config-API
in repository https://gitbox.apache.org/repos/asf/skywalking.git.
from 89c2283 Finish the dynamic configuration service.
add 57427f2 Update powered-by.md
add c0074a9 Merge pull request #2791 from mliu111477/patch-2
add de46ee6 Make the step just to be the graphql java object. (#2792)
add 50ecc53 Update powered-by.md (#2794)
add 0a69681 Time bucket util improve. (#2795)
add fb71377 Fix lettuce AsyncCommand::onComplete bug (#2796)
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 ba71f4d Merge branch 'master' into config-API
No new revisions were added by this update.
Summary of changes:
.../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 +
.../lettuce/v5/AsyncCommandMethodInterceptor.java | 7 +-
.../v5/{SWConsumer.java => SWBiConsumer.java} | 14 +-
.../v5/define/AsyncCommandInstrumentation.java | 4 +-
docker/oap/docker-entrypoint.sh | 2 +-
docs/en/setup/backend/backend-storage.md | 14 +-
docs/en/setup/backend/ttl.md | 22 +-
.../service-agent/java-agent/Supported-list.md | 2 +-
docs/powered-by.md | 7 +
.../apache/skywalking/oap/server/core/Const.java | 5 +-
.../oap/server/core/CoreModuleConfig.java | 17 +-
.../oap/server/core/CoreModuleProvider.java | 6 +-
.../core/{DataTTL.java => DataTTLConfig.java} | 2 +-
.../core/alarm/AlarmStandardPersistence.java | 4 +-
.../core/{storage => analysis}/Downsampling.java | 5 +-
.../oap/server/core/analysis/TimeBucket.java | 62 ++
.../analysis/worker/MetricsPersistentWorker.java | 15 +-
.../analysis/worker/MetricsStreamProcessor.java | 16 +-
.../analysis/worker/RecordPersistentWorker.java | 9 +-
.../analysis/worker/RecordStreamProcessor.java | 4 +-
.../core/analysis/worker/TopNStreamProcessor.java | 4 +-
.../server/core/analysis/worker/TopNWorker.java | 9 +-
.../oap/server/core/config/ConfigService.java | 8 +-
.../core/config/DownsamplingConfigService.java | 2 +-
.../server/core/query/AggregationQueryService.java | 23 +-
.../oap/server/core/query/AlarmQueryService.java | 5 +-
.../oap/server/core/query/DurationUtils.java | 115 ++--
.../oap/server/core/query/LogQueryService.java | 1 +
.../oap/server/core/query/MetricQueryService.java | 22 +-
.../StepToDownsampling.java} | 32 +-
.../server/core/query/TopologyQueryService.java | 23 +-
.../server/core/register/EndpointInventory.java | 2 +-
.../core/register/NetworkAddressInventory.java | 2 +-
.../core/register/ServiceInstanceInventory.java | 2 +-
.../oap/server/core/register/ServiceInventory.java | 2 +-
.../register/worker/InventoryStreamProcessor.java | 1 +
.../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 | 2 +
.../server/core/storage/model/IModelSetter.java | 2 +-
.../oap/server/core/storage/model/Model.java | 39 +-
.../server/core/storage/model/ModelInstaller.java | 10 -
.../ModelName.java} | 34 +-
.../server/core/storage/model/StorageModels.java | 24 +-
.../core/storage/query/IAggregationQueryDAO.java | 17 +-
.../core/storage/query/IMetricsQueryDAO.java | 8 +-
.../core/storage/query/ITopologyQueryDAO.java | 16 +-
.../core/storage/ttl/DataTTLKeeperTimer.java | 18 +-
.../server/core/storage/ttl/DayTTLCalculator.java | 6 +-
...ayTTLCalculator.java => GeneralStorageTTL.java} | 18 +-
.../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 -
.../client/elasticsearch/ElasticSearchClient.java | 39 +-
.../elasticsearch/ITElasticSearchClient.java | 8 +-
.../oap/server/library/util/TimeBucketUtils.java | 83 ---
.../query/graphql/resolver/AggregationQuery.java | 10 +-
.../oap/query/graphql/resolver/MetricQuery.java | 6 +-
.../oap/query/graphql/resolver/TopologyQuery.java | 6 +-
.../receiver/envoy/MetricServiceGRPCHandler.java | 4 +-
.../server/receiver/jaeger/JaegerGRPCHandler.java | 3 +-
.../handler/CLRMetricReportServiceHandler.java | 4 +-
.../handler/JVMMetricReportServiceHandler.java | 4 +-
.../provider/handler/JVMMetricsServiceHandler.java | 4 +-
.../receiver/mesh/TelemetryDataDispatcher.java | 4 +-
.../trace/provider/parser/SegmentParse.java | 4 +-
.../trace/provider/parser/SegmentParseV2.java | 4 +-
.../listener/endpoint/MultiScopesSpanListener.java | 4 +-
.../listener/segment/SegmentSpanListener.java | 4 +-
.../server/receiver/zipkin/trace/SpanForward.java | 3 +-
.../src/main/assembly/application.yml | 5 +
.../src/main/resources/application.yml | 7 +-
.../StorageModuleElasticsearchConfig.java | 176 +-----
.../StorageModuleElasticsearchProvider.java | 68 +--
.../elasticsearch/base/HistoryDeleteEsDAO.java | 46 +-
.../plugin/elasticsearch/base/MetricsEsDAO.java | 11 +-
.../plugin/elasticsearch/base/RecordEsDAO.java | 4 +-
.../elasticsearch/base/StorageEsInstaller.java | 66 ++-
.../plugin/elasticsearch/base/TimeSeriesUtils.java | 56 ++
.../elasticsearch/query/AggregationQueryEsDAO.java | 26 +-
.../elasticsearch/query/MetricsQueryEsDAO.java | 17 +-
.../elasticsearch/query/TopologyQueryEsDAO.java | 33 +-
.../ElasticsearchStorageTTL.java} | 22 +-
.../elasticsearch/ttl/EsHourTTLCalculator.java} | 11 +-
.../elasticsearch/ttl/EsMinuteTTLCalculator.java} | 11 +-
.../base/TimeSeriesUtilsTestCase.java} | 11 +-
.../storage/plugin/jdbc/h2/H2StorageProvider.java | 52 +-
.../plugin/jdbc/h2/dao/H2AggregationQueryDAO.java | 45 +-
.../plugin/jdbc/h2/dao/H2HistoryDeleteDAO.java | 27 +-
.../storage/plugin/jdbc/h2/dao/H2MetricsDAO.java | 16 +-
.../plugin/jdbc/h2/dao/H2MetricsQueryDAO.java | 36 +-
.../storage/plugin/jdbc/h2/dao/H2RecordDAO.java | 9 +-
.../plugin/jdbc/h2/dao/H2TableInstaller.java | 23 +-
.../plugin/jdbc/h2/dao/H2TopologyQueryDAO.java | 26 +-
.../jdbc/mysql/MySQLAggregationQueryDAO.java | 19 +-
.../plugin/jdbc/mysql/MySQLStorageProvider.java | 50 +-
.../plugin/jdbc/mysql/MySQLTableInstaller.java | 40 +-
142 files changed, 957 insertions(+), 3407 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%)
copy apm-sniffer/optional-plugins/lettuce-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/lettuce/v5/{SWConsumer.java => SWBiConsumer.java} (83%)
rename oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/{DataTTL.java => DataTTLConfig.java} (97%)
rename oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/{storage => analysis}/Downsampling.java (87%)
create mode 100644 oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/TimeBucket.java
copy oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/{storage/DownSamplingModelNameBuilder.java => query/StepToDownsampling.java} (62%)
rename oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/{DownSamplingModelNameBuilder.java => model/ModelName.java} (55%)
copy oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/ttl/{DayTTLCalculator.java => 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-library/library-util/src/main/java/org/apache/skywalking/oap/server/library/util/TimeBucketUtils.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%)