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/04/24 07:30:15 UTC

[incubator-skywalking] branch refactor/agent updated (1166c7b -> 03e4b82)

This is an automated email from the ASF dual-hosted git repository.

wusheng pushed a change to branch refactor/agent
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking.git.


    from 1166c7b  Add test cases for new plugin boot service machanism.
     add d28cc64  Refactor tps to cpm (#1105)
     add 03e4b82  Merge branch 'master' into refactor/agent

No new revisions were added by this update.

Summary of changes:
 .../grpc/provider/handler/mock/AgentDataMock.java  |  2 +-
 .../grpc/provider/handler/mock/JVMMetricMock.java  |  2 +
 .../jvm/define/service/IGCMetricService.java       |  2 +-
 .../jvm/provider/service/GCMetricService.java      |  3 +-
 .../worker/cpu/CpuDayMetricPersistenceWorker.java  |  2 +-
 .../worker/cpu/CpuHourMetricPersistenceWorker.java |  2 +-
 .../cpu/CpuMinuteMetricPersistenceWorker.java      |  2 +-
 .../cpu/CpuMonthMetricPersistenceWorker.java       |  2 +-
 .../worker/gc/GCDayMetricPersistenceWorker.java    |  5 +-
 .../worker/gc/GCHourMetricPersistenceWorker.java   |  2 +-
 .../jvm/provider/worker/gc/GCMetricCopy.java       |  1 +
 .../worker/gc/GCMinuteMetricPersistenceWorker.java |  2 +-
 .../worker/gc/GCMonthMetricPersistenceWorker.java  |  2 +-
 .../storage/dao/ui/IApplicationMetricUIDAO.java    | 10 +--
 .../collector/storage/dao/ui/IGCMetricUIDAO.java   | 36 +++++++--
 .../storage/dao/ui/IInstanceMetricUIDAO.java       | 10 +--
 .../storage/dao/ui/IServiceMetricUIDAO.java        | 12 ++-
 .../apm/collector/storage/table/jvm/GCMetric.java  | 16 ++--
 .../collector/storage/table/jvm/GCMetricTable.java |  2 +
 .../storage/ui/application/ApplicationNode.java    | 10 +--
 .../apm/collector/storage/ui/common/Call.java      | 10 +--
 ...licationTPS.java => ApplicationThroughput.java} | 12 +--
 .../collector/storage/ui/server/AppServerInfo.java | 10 +--
 .../apm/collector/storage/ui/server/GCTrend.java   | 47 ++++++++---
 .../storage/ui/service/ServiceMetric.java          | 10 +--
 .../apm/collector/storage/utils/DurationPoint.java |  8 +-
 .../dao/gc/AbstractGCMetricEsPersistenceDAO.java   |  8 +-
 .../es/dao/ui/ApplicationMetricEsUIDAO.java        | 41 +++++-----
 .../storage/es/dao/ui/GCMetricEsUIDAO.java         | 28 +++----
 .../storage/es/dao/ui/InstanceMetricEsUIDAO.java   | 42 ++++------
 .../storage/es/dao/ui/ServiceMetricEsUIDAO.java    |  6 +-
 .../define/gc/AbstractGCMetricEsTableDefine.java   |  1 +
 .../storage/h2/StorageModuleH2Provider.java        |  8 +-
 .../AbstractGCMetricH2PersistenceDAO.java          | 13 ++--
 .../{gcmp => gc}/GCDayMetricH2PersistenceDAO.java  |  2 +-
 .../{gcmp => gc}/GCHourMetricH2PersistenceDAO.java |  2 +-
 .../GCMinuteMetricH2PersistenceDAO.java            |  2 +-
 .../GCMonthMetricH2PersistenceDAO.java             |  2 +-
 .../h2/dao/ui/ApplicationMetricH2UIDAO.java        |  6 +-
 .../storage/h2/dao/ui/GCMetricH2UIDAO.java         | 29 ++++---
 .../storage/h2/dao/ui/InstanceMetricH2UIDAO.java   | 27 +++----
 .../storage/h2/dao/ui/ServiceMetricH2UIDAO.java    | 31 ++++----
 .../define/gc/AbstractGCMetricH2TableDefine.java   |  4 +-
 .../apm/collector/ui/query/OverViewLayerQuery.java |  4 +-
 .../apm/collector/ui/query/ServerQuery.java        | 22 ++----
 .../apm/collector/ui/query/ServiceQuery.java       |  4 +-
 .../collector/ui/service/ApplicationService.java   | 39 ++++------
 .../ui/service/ClusterTopologyService.java         | 18 ++---
 ...BetweenService.java => DateBetweenService.java} | 34 ++++++--
 .../apm/collector/ui/service/ServerService.java    | 56 ++++++--------
 .../collector/ui/service/ServiceNameService.java   | 27 +++----
 .../ui/service/ServiceTopologyService.java         | 28 ++-----
 .../apm/collector/ui/service/TopologyBuilder.java  | 40 +++-------
 .../apm/collector/ui/utils/DurationUtils.java      | 90 +++++++++++++---------
 .../apm/collector/ui/query/ServerQueryTest.java    |  6 +-
 .../apm/collector/ui/query/ServiceQueryTest.java   |  6 +-
 .../ui/service/ApplicationServiceTest.java         | 48 ++++--------
 ...erviceTest.java => DateBetweenServiceTest.java} | 12 +--
 .../collector/ui/service/ServerServiceTest.java    | 52 ++++---------
 .../ui/service/ServiceNameServiceTest.java         | 31 +++-----
 .../ui/service/ServiceTopologyServiceTest.java     | 31 +++-----
 .../collector/ui/service/TopologyBuilderTest.java  | 34 +++-----
 .../ui-graphql/application-layer.graphqls          |  2 +-
 .../src/main/resources/ui-graphql/common.graphqls  |  2 +-
 .../resources/ui-graphql/overview-layer.graphqls   |  6 +-
 .../resources/ui-graphql/server-layer.graphqls     | 12 +--
 .../resources/ui-graphql/service-layer.graphqls    |  4 +-
 67 files changed, 515 insertions(+), 567 deletions(-)
 rename apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/ui/overview/{ApplicationTPS.java => ApplicationThroughput.java} (86%)
 rename apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/{gcmp => gc}/AbstractGCMetricH2PersistenceDAO.java (88%)
 rename apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/{gcmp => gc}/GCDayMetricH2PersistenceDAO.java (96%)
 rename apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/{gcmp => gc}/GCHourMetricH2PersistenceDAO.java (96%)
 rename apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/{gcmp => gc}/GCMinuteMetricH2PersistenceDAO.java (96%)
 rename apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/{gcmp => gc}/GCMonthMetricH2PersistenceDAO.java (96%)
 rename apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/ui/service/{SecondBetweenService.java => DateBetweenService.java} (65%)
 rename apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/test/java/org/apache/skywalking/apm/collector/ui/service/{SecondBetweenServiceTest.java => DateBetweenServiceTest.java} (86%)

-- 
To stop receiving notification emails like this one, please contact
wusheng@apache.org.