You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@skywalking.apache.org by ha...@apache.org on 2019/05/15 15:14:19 UTC
[skywalking] branch docker/build updated (a317558 -> cb50dae)
This is an automated email from the ASF dual-hosted git repository.
hanahmily pushed a change to branch docker/build
in repository https://gitbox.apache.org/repos/asf/skywalking.git.
from a317558 Merge branch 'master' into docker/build
add e1507ae Update document
add 70aa629 Merge branch 'docker/build' of https://github.com/apache/skywalking into docker/build
add cb50dae Merge from master
No new revisions were added by this update.
Summary of changes:
.../network/trace/component/ComponentsDefine.java | 5 +-
apm-sniffer/apm-sdk-plugin/pom.xml | 1 +
.../pom.xml | 20 ++++-
.../apm/plugin/shardingsphere/Constant.java} | 8 +-
.../plugin/shardingsphere/ExecuteInterceptor.java} | 44 +++++------
.../shardingsphere/JDBCRootInvokeInterceptor.java} | 39 ++++-----
.../plugin/shardingsphere/ParseInterceptor.java} | 38 ++++-----
.../ProxyRootInvokeInterceptor.java} | 39 ++++-----
.../define/ExecuteInstrumentation.java} | 48 ++++++-----
.../define/JDBCRootInvokeInstrumentation.java} | 48 ++++++-----
.../define/ParseInstrumentation.java} | 49 ++++++------
.../define/ProxyRootInvokeInstrumentation.java} | 48 ++++++-----
.../src/main/resources/skywalking-plugin.def | 6 +-
.../plugin/shardingsphere/InterceptorTest.java} | 92 ++++++++++++----------
.../service-agent/java-agent/Supported-list.md | 1 +
.../code-templates/DispatcherTemplate.ftl | 5 +-
.../code-templates/MetricsImplementor.ftl | 10 +--
.../expectedFiles/MetricsImplementorExpected.java | 10 +--
.../expectedFiles/ServiceDispatcherExpected.java | 5 +-
.../generate-tool/src/test/resources/oal_test.oal | 1 -
.../core/alarm/provider/AlarmModuleProvider.java | 1 +
.../skywalking/oap/server/core/CoreModule.java | 6 +-
.../oap/server/core/CoreModuleProvider.java | 39 +++------
.../oap/server/core/alarm/AlarmRecord.java | 6 +-
.../core/alarm/AlarmStandardPersistence.java | 4 +-
.../oap/server/core/analysis/SourceDispatcher.java | 4 +-
.../StreamData.java => analysis/Stream.java} | 13 ++-
.../core/analysis/StreamAnnotationListener.java | 68 ++++++++++++++++
...{SourceDispatcher.java => StreamProcessor.java} | 9 ++-
.../database/DatabaseStatementDispatcher.java | 5 +-
.../manual/database/TopNDatabaseStatement.java | 12 +--
.../EndpointCallRelationDispatcher.java | 6 +-
.../EndpointRelationServerSideMetrics.java | 14 ++--
.../manual/log/HTTPAccessLogDispatcher.java | 5 +-
.../analysis/manual/log/HTTPAccessLogRecord.java | 7 +-
.../analysis/manual/segment/SegmentDispatcher.java | 4 +-
.../analysis/manual/segment/SegmentRecord.java | 6 +-
.../ServiceCallRelationDispatcher.java | 9 ++-
.../ServiceRelationClientSideMetrics.java | 14 ++--
.../ServiceRelationServerSideMetrics.java | 15 ++--
.../metrics/annotation/MetricsAnnotationUtils.java | 29 -------
.../analysis/metrics/annotation/MetricsType.java | 29 -------
.../metrics/annotation/MetricsTypeListener.java | 44 -----------
.../analysis/record/annotation/RecordType.java | 29 -------
.../record/annotation/RecordTypeListener.java | 44 -----------
.../core/analysis/topn/annotation/TopNType.java | 26 ------
.../analysis/topn/annotation/TopNTypeListener.java | 44 -----------
...icsProcess.java => MetricsStreamProcessor.java} | 56 +++++++------
...cordProcess.java => RecordStreamProcessor.java} | 30 +++----
.../{TopNProcess.java => TopNStreamProcessor.java} | 37 +++++----
.../oap/server/core/annotation/AnnotationScan.java | 6 +-
.../server/core/register/EndpointInventory.java | 10 +--
.../core/register/NetworkAddressInventory.java | 12 ++-
.../core/register/ServiceInstanceInventory.java | 11 +--
.../oap/server/core/register/ServiceInventory.java | 10 +--
.../core/register/annotation/InventoryType.java | 32 --------
.../register/annotation/InventoryTypeListener.java | 44 -----------
.../service/EndpointInventoryRegister.java | 16 ++--
.../service/NetworkAddressInventoryRegister.java | 32 +++-----
.../service/ServiceInstanceInventoryRegister.java | 18 ++---
.../register/service/ServiceInventoryRegister.java | 22 +++---
...yProcess.java => InventoryStreamProcessor.java} | 32 ++++----
.../server/core/remote/RemoteServiceHandler.java | 12 +--
.../annotation/StreamAnnotationListener.java | 49 ------------
.../core/remote/client/GRPCRemoteClient.java | 10 +--
.../core/remote/client/RemoteClientManager.java | 12 +--
.../StreamDataMapping.java} | 32 ++++----
.../StreamDataMappingGetter.java} | 8 +-
.../StreamDataMappingSetter.java} | 9 +--
.../oap/server/core/storage/PersistenceTimer.java | 6 +-
.../{StorageEntity.java => Storage.java} | 8 +-
.../annotation/StorageEntityAnnotationUtils.java | 26 +-----
...eAnnotationListener.java => StorageModels.java} | 25 ++----
.../model/{IModelGetter.java => IModelSetter.java} | 6 +-
.../core/remote/RemoteServiceHandlerTestCase.java | 10 +--
.../remote/client/GRPCRemoteClientRealClient.java | 6 +-
.../remote/client/GRPCRemoteClientRealServer.java | 4 +-
.../remote/client/GRPCRemoteClientTestCase.java | 12 +--
.../remote/client/RemoteClientManagerTestCase.java | 6 +-
.../core/storage/StorageInstallerTestCase.java | 8 +-
.../src/test/resources/component-libraries.yml | 3 +
.../src/main/resources/component-libraries.yml | 3 +
.../cache/EndpointInventoryCacheEsDAO.java | 4 +-
.../cache/NetworkAddressInventoryCacheEsDAO.java | 4 +-
.../cache/ServiceInstanceInventoryCacheDAO.java | 4 +-
.../cache/ServiceInventoryCacheEsDAO.java | 6 +-
.../elasticsearch/lock/RegisterLockInstaller.java | 10 +--
.../elasticsearch/query/MetadataQueryEsDAO.java | 18 ++---
.../storage/plugin/jaeger/JaegerSpanRecord.java | 6 +-
.../plugin/jaeger/JaegerSpanRecordDispatcher.java | 5 +-
.../jdbc/h2/dao/H2EndpointInventoryCacheDAO.java | 4 +-
.../plugin/jdbc/h2/dao/H2MetadataQueryDAO.java | 18 ++---
.../h2/dao/H2NetworkAddressInventoryCacheDAO.java | 4 +-
.../jdbc/h2/dao/H2RegisterLockInstaller.java | 10 +--
.../h2/dao/H2ServiceInstanceInventoryCacheDAO.java | 4 +-
.../jdbc/h2/dao/H2ServiceInventoryCacheDAO.java | 20 ++---
.../storage/plugin/zipkin/ZipkinSpanRecord.java | 6 +-
.../plugin/zipkin/ZipkinSpanRecordDispatcher.java | 5 +-
98 files changed, 712 insertions(+), 1048 deletions(-)
copy apm-sniffer/apm-sdk-plugin/{sharding-jdbc-1.5.x-plugin => sharding-sphere-3.x-plugin}/pom.xml (75%)
copy apm-sniffer/{apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/logging/core/IWriter.java => apm-sdk-plugin/sharding-sphere-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/Constant.java} (83%)
copy apm-sniffer/apm-sdk-plugin/{httpasyncclient-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/httpasyncclient/v4/SessionRequestCompleteInterceptor.java => sharding-sphere-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/ExecuteInterceptor.java} (61%)
copy apm-sniffer/{optional-plugins/gson-2.8.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/gson/GsonFromJsonInterceptor.java => apm-sdk-plugin/sharding-sphere-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/JDBCRootInvokeInterceptor.java} (64%)
copy apm-sniffer/{optional-plugins/gson-2.8.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/gson/GsonFromJsonInterceptor.java => apm-sdk-plugin/sharding-sphere-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/ParseInterceptor.java} (67%)
copy apm-sniffer/{optional-plugins/gson-2.8.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/gson/GsonFromJsonInterceptor.java => apm-sdk-plugin/sharding-sphere-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/ProxyRootInvokeInterceptor.java} (64%)
copy apm-sniffer/apm-sdk-plugin/{sofarpc-plugin/src/main/java/org/apache/skywalking/apm/plugin/sofarpc/SofaRpcProviderInstrumentation.java => sharding-sphere-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/define/ExecuteInstrumentation.java} (72%)
copy apm-sniffer/apm-sdk-plugin/{sofarpc-plugin/src/main/java/org/apache/skywalking/apm/plugin/sofarpc/SofaRpcProviderInstrumentation.java => sharding-sphere-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/define/JDBCRootInvokeInstrumentation.java} (70%)
copy apm-sniffer/apm-sdk-plugin/{dubbo-2.7.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/asf/dubbo/DubboInstrumentation.java => sharding-sphere-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/define/ParseInstrumentation.java} (72%)
copy apm-sniffer/apm-sdk-plugin/{sofarpc-plugin/src/main/java/org/apache/skywalking/apm/plugin/sofarpc/SofaRpcConsumerInstrumentation.java => sharding-sphere-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/define/ProxyRootInvokeInstrumentation.java} (72%)
copy apm-sniffer/apm-sdk-plugin/{activemq-5.x-plugin => sharding-sphere-3.x-plugin}/src/main/resources/skywalking-plugin.def (65%)
copy apm-sniffer/apm-sdk-plugin/{elastic-job-2.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/esjob/JobExecutorInterceptorTest.java => sharding-sphere-3.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/shardingsphere/InterceptorTest.java} (51%)
rename oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/{remote/annotation/StreamData.java => analysis/Stream.java} (77%)
create mode 100644 oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/StreamAnnotationListener.java
copy oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/{SourceDispatcher.java => StreamProcessor.java} (77%)
delete mode 100644 oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/annotation/MetricsAnnotationUtils.java
delete mode 100644 oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/annotation/MetricsType.java
delete mode 100644 oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/annotation/MetricsTypeListener.java
delete mode 100644 oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/record/annotation/RecordType.java
delete mode 100644 oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/record/annotation/RecordTypeListener.java
delete mode 100644 oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/topn/annotation/TopNType.java
delete mode 100644 oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/topn/annotation/TopNTypeListener.java
rename oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/worker/{MetricsProcess.java => MetricsStreamProcessor.java} (59%)
rename oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/worker/{RecordProcess.java => RecordStreamProcessor.java} (65%)
rename oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/worker/{TopNProcess.java => TopNStreamProcessor.java} (58%)
delete mode 100644 oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/register/annotation/InventoryType.java
delete mode 100644 oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/register/annotation/InventoryTypeListener.java
rename oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/register/worker/{InventoryProcess.java => InventoryStreamProcessor.java} (65%)
delete mode 100644 oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/remote/annotation/StreamAnnotationListener.java
rename oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/remote/{annotation/StreamDataAnnotationContainer.java => define/StreamDataMapping.java} (55%)
copy oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/remote/{annotation/StreamDataClassGetter.java => define/StreamDataMappingGetter.java} (80%)
rename oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/remote/{annotation/StreamDataClassGetter.java => define/StreamDataMappingSetter.java} (81%)
rename oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/annotation/{StorageEntity.java => Storage.java} (90%)
rename oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/annotation/{StorageAnnotationListener.java => StorageModels.java} (74%)
copy oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/model/{IModelGetter.java => IModelSetter.java} (81%)