You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@skywalking.apache.org by wu...@apache.org on 2018/06/10 10:37:40 UTC
[incubator-skywalking] 01/01: Merge branch 'master' into
remove-timeout
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch remove-timeout
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking.git
commit d274c8e91f08986c9dd36524a1331d680cbd2758
Merge: a096965 0f0b56d
Author: 吴晟 Wu Sheng <wu...@foxmail.com>
AuthorDate: Sun Jun 10 18:37:34 2018 +0800
Merge branch 'master' into remove-timeout
.../provider/AnalysisAlarmModuleProvider.java | 50 +++----
.../jvm/provider/AnalysisJVMModuleProvider.java | 26 +---
.../metric/define/graph/MetricGraphIdDefine.java | 1 +
.../metric/define/graph/MetricWorkerIdDefine.java | 146 +++++++++++----------
.../provider/AnalysisMetricModuleProvider.java | 95 +++++---------
.../heartbeat/ServiceNameAggregationWorker.java | 60 +++++++++
.../heartbeat/ServiceNameHeartBeatGraph.java | 51 +++++++
.../ServiceNameHeartBeatPersistenceWorker.java | 72 ++++++++++
.../ServiceNameHeartBeatRemoteWorker.java} | 31 ++---
.../service/heartbeat/ServiceNameSpanListener.java | 92 +++++++++++++
.../provider/AnalysisRegisterModuleProvider.java | 36 ++---
.../register/ServiceNameRegisterRemoteWorker.java | 13 +-
.../register/ServiceNameRegisterSerialWorker.java | 16 ++-
.../AnalysisSegmentParserModuleProvider.java | 20 +--
.../base/AbstractLocalAsyncWorkerProvider.java | 2 +-
.../apm/collector/storage/StorageModule.java | 130 ++++--------------
.../IServiceNameHeartBeatPersistenceDAO.java} | 25 +---
.../storage/dao/ui/IServiceNameServiceUIDAO.java | 10 +-
.../table/alarm/ApplicationReferenceAlarm.java | 13 +-
.../table/alarm/ApplicationReferenceAlarmList.java | 13 +-
.../table/alarm/InstanceReferenceAlarm.java | 13 +-
.../table/alarm/InstanceReferenceAlarmList.java | 13 +-
.../storage/table/alarm/ServiceReferenceAlarm.java | 13 +-
.../table/alarm/ServiceReferenceAlarmList.java | 13 +-
.../collector/storage/table/register/Instance.java | 9 +-
.../storage/table/register/InstanceTable.java | 4 -
.../storage/table/register/RegisterColumns.java | 4 +
.../storage/table/register/ServiceName.java | 28 +++-
.../ITTLConfigService.java} | 25 ++--
.../collector/storage/ui/service/ServiceInfo.java | 18 +++
.../collector/storage/es/DataTTLKeeperTimer.java | 39 ++----
.../storage/es/StorageModuleEsConfig.java | 32 ++---
.../storage/es/StorageModuleEsProvider.java | 12 +-
.../dao/ServiceNameHeartBeatEsPersistenceDAO.java | 76 +++++++++++
.../es/dao/register/ServiceNameRegisterEsDAO.java | 11 +-
.../es/dao/ui/ServiceNameServiceEsUIDAO.java | 39 +++---
.../define/register/ServiceNameEsTableDefine.java | 5 +-
.../collector/storage/es/ttl/TTLConfigService.java | 54 ++++++++
.../storage/es/DataTTLKeeperTimerTestCase.java | 2 +-
.../h2/dao/register/ServiceNameRegisterH2DAO.java | 14 +-
.../h2/dao/ui/ServiceNameServiceH2UIDAO.java | 30 ++---
.../define/register/ServiceNameH2TableDefine.java | 5 +-
.../apm/collector/ui/query/ServiceQuery.java | 14 +-
.../collector/ui/service/ServiceNameService.java | 32 ++++-
.../apm/collector/ui/query/ServiceQueryTest.java | 33 ++---
.../ui/service/ServiceNameServiceTest.java | 2 +-
.../resources/ui-graphql/service-layer.graphqls | 4 +-
...dleInterceptor.java => ForwardInterceptor.java} | 54 +++-----
.../plugin/jetty/v9/server/HandleInterceptor.java | 4 +-
...ntation.java => DispatcherInstrumentation.java} | 39 +++---
.../v9/server/define/JettyInstrumentation.java | 10 +-
.../src/main/resources/skywalking-plugin.def | 1 +
.../jetty/v9/server/HandleInterceptorTest.java | 76 +++++++----
.../apm/plugin/spring/mvc/commons/Constants.java | 2 +
.../interceptor/AbstractMethodInterceptor.java | 20 +++
.../apm/plugin/tomcat78x/ForwardInterceptor.java | 64 +++++++++
.../ApplicationDispatcherInstrumentation.java} | 42 +++---
.../tomcat78x/define/TomcatInstrumentation.java | 4 +-
.../src/main/resources/skywalking-plugin.def | 1 +
docs/cn/Deploy-skywalking-agent-CN.md | 16 ++-
docs/en/Deploy-skywalking-agent.md | 15 ++-
61 files changed, 1083 insertions(+), 711 deletions(-)
--
To stop receiving notification emails like this one, please contact
wusheng@apache.org.