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/05/15 14:43:06 UTC
[skywalking] branch mesh-response-code updated (e7230bd -> f3841bf)
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a change to branch mesh-response-code
in repository https://gitbox.apache.org/repos/asf/skywalking.git.
from e7230bd Merge branch 'master' into mesh-response-code
add 63fb961 New OAP annotations, they are friendly for streaming loader. (#2670)
add f3841bf Merge branch 'master' into mesh-response-code
No new revisions were added by this update.
Summary of changes:
.../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 +--
.../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 +-
skywalking-ui | 2 +-
82 files changed, 451 insertions(+), 819 deletions(-)
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%)