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:39 UTC
[incubator-skywalking] branch remove-timeout updated (a096965 ->
d274c8e)
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a change to branch remove-timeout
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking.git.
from a096965 Relied on grpc response for certain, to avoid OOM when collector is overloaded.
add ab82f64 Adjust Tomcat deploy doc (#1330)
add a6d9a60 modify the document (#1331)
add c2a425f Filter non-active service name when UI query. (#1262)
add d56ad5e #1232 (#1333)
add 5f81c00 #1176 (#1335)
add 0f0b56d Fix #1280: Modify tomcat interceptor (#1325)
new d274c8e Merge branch 'master' into remove-timeout
The 1 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:
.../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} | 29 ++--
.../heartbeat/ServiceNameHeartBeatGraph.java} | 18 +--
.../ServiceNameHeartBeatPersistenceWorker.java} | 29 ++--
.../ServiceNameHeartBeatRemoteWorker.java} | 30 ++---
.../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 ++++--------------
...va => IServiceNameHeartBeatPersistenceDAO.java} | 4 +-
.../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 +++-
.../collector/storage/ttl/ITTLConfigService.java} | 13 +-
.../collector/storage/ui/service/ServiceInfo.java | 18 +++
.../collector/storage/es/DataTTLKeeperTimer.java | 39 ++----
.../storage/es/StorageModuleEsConfig.java | 32 ++---
.../storage/es/StorageModuleEsProvider.java | 12 +-
...a => ServiceNameHeartBeatEsPersistenceDAO.java} | 40 +++---
.../es/dao/register/ServiceNameRegisterEsDAO.java | 11 +-
.../es/dao/ui/ServiceNameServiceEsUIDAO.java | 39 +++---
.../define/register/ServiceNameEsTableDefine.java | 5 +-
.../storage/es/ttl/TTLConfigService.java} | 35 +++--
.../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 +-
.../jetty/v9/server/ForwardInterceptor.java} | 38 +++---
.../plugin/jetty/v9/server/HandleInterceptor.java | 4 +-
.../server/define/DispatcherInstrumentation.java} | 21 ++-
.../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} | 41 +++---
.../ApplicationDispatcherInstrumentation.java} | 20 +--
.../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, 783 insertions(+), 736 deletions(-)
copy apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/{instance/mapping/InstanceMappingMinuteAggregationWorker.java => service/heartbeat/ServiceNameAggregationWorker.java} (59%)
copy apm-collector/apm-collector-analysis/{analysis-register/register-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/register/provider/register/ServiceNameRegisterGraph.java => analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/service/heartbeat/ServiceNameHeartBeatGraph.java} (62%)
copy apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/{instance/heartbeat/InstHeartBeatPersistenceWorker.java => service/heartbeat/ServiceNameHeartBeatPersistenceWorker.java} (67%)
copy apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/{instance/metric/InstanceMinuteMetricRemoteWorker.java => service/heartbeat/ServiceNameHeartBeatRemoteWorker.java} (63%)
create mode 100644 apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/service/heartbeat/ServiceNameSpanListener.java
copy apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/dao/{IInstanceHeartBeatPersistenceDAO.java => IServiceNameHeartBeatPersistenceDAO.java} (85%)
copy apm-collector/{apm-collector-configuration/collector-configuration-define/src/main/java/org/apache/skywalking/apm/collector/configuration/service/IResponseTimeDistributionConfigService.java => apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/ttl/ITTLConfigService.java} (78%)
copy apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/dao/{InstanceHeartBeatEsPersistenceDAO.java => ServiceNameHeartBeatEsPersistenceDAO.java} (52%)
copy apm-collector/{apm-collector-component/server-component/src/main/java/org/apache/skywalking/apm/collector/server/jetty/JettyServerConfig.java => apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/ttl/TTLConfigService.java} (50%)
copy apm-sniffer/apm-sdk-plugin/{spring-plugins/resttemplate-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/resttemplate/sync/RestResponseInterceptor.java => jetty-plugin/jetty-server-9.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jetty/v9/server/ForwardInterceptor.java} (63%)
copy apm-sniffer/apm-sdk-plugin/{grpc-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/grpc/v1/define/AbstractStubInstrumentation.java => jetty-plugin/jetty-server-9.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jetty/v9/server/define/DispatcherInstrumentation.java} (78%)
copy apm-sniffer/apm-sdk-plugin/{grpc-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/grpc/v1/AbstractStubInterceptor.java => tomcat-7.x-8.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/tomcat78x/ForwardInterceptor.java} (64%)
copy apm-sniffer/apm-sdk-plugin/{grpc-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/grpc/v1/define/AbstractStubInstrumentation.java => tomcat-7.x-8.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/tomcat78x/define/ApplicationDispatcherInstrumentation.java} (78%)
--
To stop receiving notification emails like this one, please contact
wusheng@apache.org.
[incubator-skywalking] 01/01: Merge branch 'master' into
remove-timeout
Posted by wu...@apache.org.
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.