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/02/24 00:49:11 UTC
[incubator-skywalking] branch scope-refactor updated (cbc90b5 ->
62c858a)
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a change to branch scope-refactor
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking.git.
from cbc90b5 Fix test cases in ci.
new fb2e53d Change step 1
new 3526ce2 Refactor step 2
new 62c858a Other compile issue done. Prepare the generator changes.
The 4594 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../skywalking/oal/tool/grammar/OALParser.g4 | 2 +-
.../skywalking/oal/tool/parser/AnalysisResult.java | 2 +-
.../skywalking/oal/tool/parser/DeepAnalysis.java | 12 +-
.../code-templates/IndicatorImplementor.ftl | 2 +-
.../oal/tool/meta/MockSourceColumnsFactory.java | 2 +-
.../oal/tool/output/FileGeneratorTest.java | 4 +-
.../oal/tool/parser/DeepAnalysisTest.java | 8 +-
.../oal/tool/parser/ScriptParserTest.java | 2 +-
.../IndicatorImplementorExpected.java | 6 +-
.../server/core/alarm/provider/NotifyHandler.java | 10 +-
.../server/core/alarm/provider/RunningRule.java | 7 +-
.../alarm/provider/AlarmMessageFormatterTest.java | 12 +-
.../core/alarm/provider/RunningRuleTest.java | 26 ++---
.../core/alarm/provider/WebhookCallbackTest.java | 10 +-
.../oap/server/core/CoreModuleProvider.java | 10 +-
.../oap/server/core/alarm/AlarmEntrance.java | 16 ++-
.../oap/server/core/alarm/AlarmMessage.java | 3 +-
.../oap/server/core/alarm/AlarmMeta.java | 10 +-
.../oap/server/core/alarm/AlarmRecord.java | 4 +-
.../core/alarm/AlarmStandardPersistence.java | 2 +-
.../oap/server/core/alarm/EndpointMetaInAlarm.java | 6 +-
.../oap/server/core/alarm/MetaInAlarm.java | 5 +-
.../core/alarm/ServiceInstanceMetaInAlarm.java | 6 +-
.../oap/server/core/alarm/ServiceMetaInAlarm.java | 6 +-
.../server/core/analysis/DispatcherManager.java | 24 ++--
.../manual/database/TopNDatabaseStatement.java | 5 +-
.../EndpointRelationServerSideIndicator.java | 4 +-
.../analysis/manual/segment/SegmentRecord.java | 4 +-
.../ServiceRelationClientSideIndicator.java | 4 +-
.../ServiceRelationServerSideIndicator.java | 4 +-
.../oap/server/core/annotation/AnnotationScan.java | 4 +-
.../oap/server/core/query/AlarmQueryService.java | 5 +-
.../oap/server/core/query/entity/AlarmMessage.java | 4 +-
.../server/core/register/EndpointInventory.java | 4 +-
.../core/register/NetworkAddressInventory.java | 4 +-
.../core/register/ServiceInstanceInventory.java | 4 +-
.../oap/server/core/register/ServiceInventory.java | 4 +-
.../core/register/worker/InventoryProcess.java | 20 +---
.../register/worker/RegisterPersistentWorker.java | 12 +-
.../skywalking/oap/server/core/source/All.java | 8 +-
.../oap/server/core/source/DatabaseAccess.java | 7 +-
.../server/core/source/DatabaseSlowStatement.java | 4 +-
.../oap/server/core/source/DefaultScopeDefine.java | 121 +++++++++++++++++++++
.../oap/server/core/source/Endpoint.java | 4 +-
.../oap/server/core/source/EndpointRelation.java | 4 +-
.../skywalking/oap/server/core/source/Scope.java | 35 ------
.../SourceType.java => ScopeDeclaration.java} | 13 ++-
.../SourceType.java => ScopeDeclarations.java} | 9 +-
.../skywalking/oap/server/core/source/Segment.java | 4 +-
.../skywalking/oap/server/core/source/Service.java | 4 +-
.../oap/server/core/source/ServiceInstance.java | 4 +-
.../server/core/source/ServiceInstanceJVMCPU.java | 4 +-
.../server/core/source/ServiceInstanceJVMGC.java | 4 +-
.../core/source/ServiceInstanceJVMMemory.java | 4 +-
.../core/source/ServiceInstanceJVMMemoryPool.java | 4 +-
.../core/source/ServiceInstanceRelation.java | 4 +-
.../oap/server/core/source/ServiceRelation.java | 4 +-
.../skywalking/oap/server/core/source/Source.java | 2 +-
.../oap/server/core/storage/IRegisterLockDAO.java | 5 +-
.../annotation/StorageAnnotationListener.java | 18 +--
.../core/storage/annotation/StorageEntity.java | 6 +-
.../annotation/StorageEntityAnnotationUtils.java | 5 +-
.../oap/server/core/storage/model/Model.java | 10 +-
.../server/core/storage/query/IAlarmQueryDAO.java | 5 +-
.../oap/query/graphql/resolver/AlarmQuery.java | 6 +-
.../{BatchMetricConditions.java => Scope.java} | 25 +++--
.../provider/IstioTelemetryGRPCHandler.java | 2 +-
.../src/main/proto/gogoproto/gogo.proto | 4 +-
.../src/main/proto/istio-metric.proto | 4 +-
.../src/main/proto/policy/v1beta1/type.proto | 2 +-
.../receiver/mesh/TelemetryDataDispatcher.java | 4 +-
.../listener/endpoint/MultiScopesSpanListener.java | 2 +-
.../elasticsearch/lock/RegisterLockDAOImpl.java | 5 +-
.../elasticsearch/lock/RegisterLockInstaller.java | 5 +-
.../elasticsearch/query/AlarmQueryEsDAO.java | 11 +-
.../plugin/jdbc/h2/dao/H2AlarmQueryDAO.java | 9 +-
.../plugin/jdbc/h2/dao/H2RegisterLockDAO.java | 9 +-
.../jdbc/h2/dao/H2RegisterLockInstaller.java | 6 +-
.../plugin/jdbc/mysql/MySQLAlarmQueryDAO.java | 11 +-
.../plugin/jdbc/mysql/MySQLTableInstaller.java | 20 ++--
.../PreventRedistributionMySQLDriverTest.java | 2 +-
81 files changed, 386 insertions(+), 312 deletions(-)
create mode 100644 oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/DefaultScopeDefine.java
delete mode 100644 oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/Scope.java
copy oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/{annotation/SourceType.java => ScopeDeclaration.java} (78%)
copy oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/{annotation/SourceType.java => ScopeDeclarations.java} (83%)
copy oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/type/{BatchMetricConditions.java => Scope.java} (62%)