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/03/03 22:58:37 UTC
[incubator-skywalking] branch sync-ui updated (fd3d5ad -> c6dce72)
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a change to branch sync-ui
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking.git.
from fd3d5ad Merge branch 'master' into sync-ui
add 5825914 Fixed the Dashboard and Topology bug.
add 6ba5453 Use JVM metric to update instance heart beat time when using java agent.
add 41840ce Fixed the bug which the memory max non heap metric value is -1 when using JDK 1.8.
add bdc0601 Fixed the call type in calls of topology.
add 09f9c12 Fixed the pagination bug.
add 40eeb87 1. Get the service id only when agent register service name. 2. Setting the src span type when agent register service name. 3. Revert the topology build logic.
add 5d0ea12 Merge branch 'master' into fixed/855
add 8b366e1 Merge branch 'fixed/855' of https://github.com/peng-yongsheng/incubator-skywalking into fixed/855
add 0e61c97 Merge branch 'master' into fixed/855
add e7b3014 Merge pull request #865 from peng-yongsheng/fixed/855
new c6dce72 Merge branch 'master' into sync-ui
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/handler/JVMMetricsServiceHandler.java | 9 +++++++++
.../ServiceNameDiscoveryServiceHandler.java | 2 +-
.../define/service/IServiceNameService.java | 3 +++
.../provider/service/ServiceNameService.java | 4 ++++
.../define/decorator/ReferenceDecorator.java | 1 +
.../storage/es/dao/ui/MemoryMetricEsUIDAO.java | 8 +++++++-
.../storage/h2/dao/ui/MemoryMetricH2UIDAO.java | 7 ++++++-
.../apm/collector/ui/query/TraceQuery.java | 6 +++---
.../collector/ui/service/ApplicationService.java | 14 ++++++++------
.../collector/ui/service/SecondBetweenService.java | 6 +++++-
.../apm/collector/ui/service/ServerService.java | 20 ++++++++++++--------
.../ui/service/ServiceTopologyService.java | 4 ++--
.../apm/collector/ui/utils/ApdexCalculator.java | 6 +++++-
.../core/dictionary/OperationNameDictionary.java | 22 +++++++++++++++++++---
14 files changed, 85 insertions(+), 27 deletions(-)
--
To stop receiving notification emails like this one, please contact
wusheng@apache.org.
[incubator-skywalking] 01/01: Merge branch 'master' into sync-ui
Posted by wu...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch sync-ui
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking.git
commit c6dce72be4de96e6e84a4b930602f1d7f0ea6fb7
Merge: fd3d5ad e7b3014
Author: 吴晟 Wu Sheng <wu...@foxmail.com>
AuthorDate: Sun Mar 4 06:58:35 2018 +0800
Merge branch 'master' into sync-ui
.../provider/handler/JVMMetricsServiceHandler.java | 9 +++++++++
.../ServiceNameDiscoveryServiceHandler.java | 2 +-
.../define/service/IServiceNameService.java | 3 +++
.../provider/service/ServiceNameService.java | 4 ++++
.../define/decorator/ReferenceDecorator.java | 1 +
.../storage/es/dao/ui/MemoryMetricEsUIDAO.java | 8 +++++++-
.../storage/h2/dao/ui/MemoryMetricH2UIDAO.java | 7 ++++++-
.../apm/collector/ui/query/TraceQuery.java | 6 +++---
.../collector/ui/service/ApplicationService.java | 14 ++++++++------
.../collector/ui/service/SecondBetweenService.java | 6 +++++-
.../apm/collector/ui/service/ServerService.java | 20 ++++++++++++--------
.../ui/service/ServiceTopologyService.java | 4 ++--
.../apm/collector/ui/utils/ApdexCalculator.java | 6 +++++-
.../core/dictionary/OperationNameDictionary.java | 22 +++++++++++++++++++---
14 files changed, 85 insertions(+), 27 deletions(-)
--
To stop receiving notification emails like this one, please contact
wusheng@apache.org.