This is an automated email from the ASF dual-hosted git repository. wusheng pushed a commit to branch timebucket in repository https://gitbox.apache.org/repos/asf/incubator-skywalking.git
commit 26e8e4b0969d5c15c9ba96697f668b17946c85f2 Merge: f42c1fd 1936d38 Author: Wu Sheng <[email protected]> AuthorDate: Wed Sep 12 15:12:29 2018 +0800 Merge commit '1936d38d163998762e66bbd3af8114a267bc1964' into timebucket # Conflicts: # oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/all/AllDispatcher.java # oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/all/AllHeatmapIndicator.java Support to hour, day, month dimensionalities .../generated/all/AllHeatmapIndicator.java | 14 +-- .../analysis/generated/all/AllP50Indicator.java | 14 +-- .../analysis/generated/all/AllP75Indicator.java | 14 +-- .../analysis/generated/all/AllP90Indicator.java | 14 +-- .../analysis/generated/all/AllP95Indicator.java | 14 +-- .../analysis/generated/all/AllP99Indicator.java | 14 +-- .../generated/endpoint/EndpointAvgIndicator.java | 12 +- .../endpoint/EndpointPercentIndicator.java | 12 +- .../EndpointRelationAvgIndicator.java | 12 +- .../generated/service/ServiceAvgIndicator.java | 12 +- .../service/ServiceCallsSumIndicator.java | 12 +- .../ServiceInstanceRespTimeIndicator.java | 12 +- .../InstanceJvmCpuIndicator.java | 12 +- .../InstanceJvmYoungGcTimeIndicator.java | 12 +- .../InstanceJvmMemoryMaxIndicator.java | 12 +- .../InstanceJvmMemoryPoolMaxIndicator.java | 12 +- .../ServiceInstanceRelationAvgIndicator.java | 12 +- .../ServiceRelationAvgIndicator.java | 12 +- .../ServiceRelationClientCallsSumIndicator.java | 12 +- .../ServiceRelationServerCallsSumIndicator.java | 12 +- .../analysis/indicator/ThermodynamicIndicator.java | 129 +++++++++++++++++++++ .../indicator/ThermodynamicIndicatorTest.java | 109 +++++++++++++++++ 22 files changed, 364 insertions(+), 126 deletions(-) diff --cc oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/all/AllHeatmapIndicator.java index 855fdf8,99909f5..f40a9b6 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/all/AllHeatmapIndicator.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/all/AllHeatmapIndicator.java @@@ -99,39 -99,6 +99,39 @@@ public class AllHeatmapIndicator extend return new AlarmMeta("All_heatmap", Scope.All); } + @Override + public Indicator toHour() { + AllHeatmapIndicator indicator = new AllHeatmapIndicator(); - indicator.setTimeBucket(toTimeBucketInHour(); ++ indicator.setTimeBucket(toTimeBucketInHour()); + indicator.setStep(this.getStep()); + indicator.setNumOfSteps(this.getNumOfSteps()); + indicator.setDetailGroup(this.getDetailGroup()); + indicator.setTimeBucket(this.getTimeBucket()); + return indicator; + } + + @Override + public Indicator toDay() { - AllHeatmapIndicator indicator = new AllHeatmapIndicator(); - indicator.setTimeBucket(toTimeBucketInDay(); ++ AllHeatmapIndicator indicator = new AllHeatmapIndicator(); ++ indicator.setTimeBucket(toTimeBucketInDay()); + indicator.setStep(this.getStep()); + indicator.setNumOfSteps(this.getNumOfSteps()); + indicator.setDetailGroup(this.getDetailGroup()); + indicator.setTimeBucket(this.getTimeBucket()); + return indicator; + } + + @Override - public Indicator toTimeBucketInMonth() { - AllHeatmapIndicator indicator = new AllHeatmapIndicator(); - indicator.setTimeBucket(toTimeBucketInHour(); ++ public Indicator toMonth() { ++ AllHeatmapIndicator indicator = new AllHeatmapIndicator(); ++ indicator.setTimeBucket(toTimeBucketInMonth()); + indicator.setStep(this.getStep()); + indicator.setNumOfSteps(this.getNumOfSteps()); + indicator.setDetailGroup(this.getDetailGroup()); + indicator.setTimeBucket(this.getTimeBucket()); + return indicator; + } + public static class Builder implements StorageBuilder<AllHeatmapIndicator> { @Override public Map<String, Object> data2Map(AllHeatmapIndicator storageData) { @@@ -147,7 -114,7 +147,7 @@@ AllHeatmapIndicator indicator = new AllHeatmapIndicator(); indicator.setStep(((Number)dbMap.get("step")).intValue()); indicator.setNumOfSteps(((Number)dbMap.get("num_of_steps")).intValue()); -- indicator.setDetailGroup((List)dbMap.get("detail_group")); ++ indicator.setDetailGroup((java.util.List)dbMap.get("detail_group")); indicator.setTimeBucket(((Number)dbMap.get("time_bucket")).longValue()); return indicator; } diff --cc oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/all/AllP50Indicator.java index 56d2a8f,6602815..3906026 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/all/AllP50Indicator.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/all/AllP50Indicator.java @@@ -99,39 -99,6 +99,39 @@@ public class AllP50Indicator extends P5 return new AlarmMeta("All_p50", Scope.All); } + @Override + public Indicator toHour() { + AllP50Indicator indicator = new AllP50Indicator(); - indicator.setTimeBucket(toTimeBucketInHour(); ++ indicator.setTimeBucket(toTimeBucketInHour()); + indicator.setValue(this.getValue()); + indicator.setPrecision(this.getPrecision()); + indicator.setDetailGroup(this.getDetailGroup()); + indicator.setTimeBucket(this.getTimeBucket()); + return indicator; + } + + @Override + public Indicator toDay() { - AllP50Indicator indicator = new AllP50Indicator(); - indicator.setTimeBucket(toTimeBucketInDay(); ++ AllP50Indicator indicator = new AllP50Indicator(); ++ indicator.setTimeBucket(toTimeBucketInDay()); + indicator.setValue(this.getValue()); + indicator.setPrecision(this.getPrecision()); + indicator.setDetailGroup(this.getDetailGroup()); + indicator.setTimeBucket(this.getTimeBucket()); + return indicator; + } + + @Override - public Indicator toTimeBucketInMonth() { - AllP50Indicator indicator = new AllP50Indicator(); - indicator.setTimeBucket(toTimeBucketInHour(); ++ public Indicator toMonth() { ++ AllP50Indicator indicator = new AllP50Indicator(); ++ indicator.setTimeBucket(toTimeBucketInMonth()); + indicator.setValue(this.getValue()); + indicator.setPrecision(this.getPrecision()); + indicator.setDetailGroup(this.getDetailGroup()); + indicator.setTimeBucket(this.getTimeBucket()); + return indicator; + } + public static class Builder implements StorageBuilder<AllP50Indicator> { @Override public Map<String, Object> data2Map(AllP50Indicator storageData) { @@@ -147,7 -114,7 +147,7 @@@ AllP50Indicator indicator = new AllP50Indicator(); indicator.setValue(((Number)dbMap.get("value")).intValue()); indicator.setPrecision(((Number)dbMap.get("precision")).intValue()); -- indicator.setDetailGroup((List)dbMap.get("detail_group")); ++ indicator.setDetailGroup((java.util.List)dbMap.get("detail_group")); indicator.setTimeBucket(((Number)dbMap.get("time_bucket")).longValue()); return indicator; } diff --cc oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/all/AllP75Indicator.java index 17bcd36,2a36fa2..306ee23 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/all/AllP75Indicator.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/all/AllP75Indicator.java @@@ -99,39 -99,6 +99,39 @@@ public class AllP75Indicator extends P7 return new AlarmMeta("All_p75", Scope.All); } + @Override + public Indicator toHour() { + AllP75Indicator indicator = new AllP75Indicator(); - indicator.setTimeBucket(toTimeBucketInHour(); ++ indicator.setTimeBucket(toTimeBucketInHour()); + indicator.setValue(this.getValue()); + indicator.setPrecision(this.getPrecision()); + indicator.setDetailGroup(this.getDetailGroup()); + indicator.setTimeBucket(this.getTimeBucket()); + return indicator; + } + + @Override + public Indicator toDay() { - AllP75Indicator indicator = new AllP75Indicator(); - indicator.setTimeBucket(toTimeBucketInDay(); ++ AllP75Indicator indicator = new AllP75Indicator(); ++ indicator.setTimeBucket(toTimeBucketInDay()); + indicator.setValue(this.getValue()); + indicator.setPrecision(this.getPrecision()); + indicator.setDetailGroup(this.getDetailGroup()); + indicator.setTimeBucket(this.getTimeBucket()); + return indicator; + } + + @Override - public Indicator toTimeBucketInMonth() { - AllP75Indicator indicator = new AllP75Indicator(); - indicator.setTimeBucket(toTimeBucketInHour(); ++ public Indicator toMonth() { ++ AllP75Indicator indicator = new AllP75Indicator(); ++ indicator.setTimeBucket(toTimeBucketInMonth()); + indicator.setValue(this.getValue()); + indicator.setPrecision(this.getPrecision()); + indicator.setDetailGroup(this.getDetailGroup()); + indicator.setTimeBucket(this.getTimeBucket()); + return indicator; + } + public static class Builder implements StorageBuilder<AllP75Indicator> { @Override public Map<String, Object> data2Map(AllP75Indicator storageData) { @@@ -147,7 -114,7 +147,7 @@@ AllP75Indicator indicator = new AllP75Indicator(); indicator.setValue(((Number)dbMap.get("value")).intValue()); indicator.setPrecision(((Number)dbMap.get("precision")).intValue()); -- indicator.setDetailGroup((List)dbMap.get("detail_group")); ++ indicator.setDetailGroup((java.util.List)dbMap.get("detail_group")); indicator.setTimeBucket(((Number)dbMap.get("time_bucket")).longValue()); return indicator; } diff --cc oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/all/AllP90Indicator.java index e87b534,1384e35..455fdfe --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/all/AllP90Indicator.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/all/AllP90Indicator.java @@@ -99,39 -99,6 +99,39 @@@ public class AllP90Indicator extends P9 return new AlarmMeta("All_p90", Scope.All); } + @Override + public Indicator toHour() { + AllP90Indicator indicator = new AllP90Indicator(); - indicator.setTimeBucket(toTimeBucketInHour(); ++ indicator.setTimeBucket(toTimeBucketInHour()); + indicator.setValue(this.getValue()); + indicator.setPrecision(this.getPrecision()); + indicator.setDetailGroup(this.getDetailGroup()); + indicator.setTimeBucket(this.getTimeBucket()); + return indicator; + } + + @Override + public Indicator toDay() { - AllP90Indicator indicator = new AllP90Indicator(); - indicator.setTimeBucket(toTimeBucketInDay(); ++ AllP90Indicator indicator = new AllP90Indicator(); ++ indicator.setTimeBucket(toTimeBucketInDay()); + indicator.setValue(this.getValue()); + indicator.setPrecision(this.getPrecision()); + indicator.setDetailGroup(this.getDetailGroup()); + indicator.setTimeBucket(this.getTimeBucket()); + return indicator; + } + + @Override - public Indicator toTimeBucketInMonth() { - AllP90Indicator indicator = new AllP90Indicator(); - indicator.setTimeBucket(toTimeBucketInHour(); ++ public Indicator toMonth() { ++ AllP90Indicator indicator = new AllP90Indicator(); ++ indicator.setTimeBucket(toTimeBucketInMonth()); + indicator.setValue(this.getValue()); + indicator.setPrecision(this.getPrecision()); + indicator.setDetailGroup(this.getDetailGroup()); + indicator.setTimeBucket(this.getTimeBucket()); + return indicator; + } + public static class Builder implements StorageBuilder<AllP90Indicator> { @Override public Map<String, Object> data2Map(AllP90Indicator storageData) { @@@ -147,7 -114,7 +147,7 @@@ AllP90Indicator indicator = new AllP90Indicator(); indicator.setValue(((Number)dbMap.get("value")).intValue()); indicator.setPrecision(((Number)dbMap.get("precision")).intValue()); -- indicator.setDetailGroup((List)dbMap.get("detail_group")); ++ indicator.setDetailGroup((java.util.List)dbMap.get("detail_group")); indicator.setTimeBucket(((Number)dbMap.get("time_bucket")).longValue()); return indicator; } diff --cc oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/all/AllP95Indicator.java index 3aff40b,4f6598a..8df0ca5 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/all/AllP95Indicator.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/all/AllP95Indicator.java @@@ -99,39 -99,6 +99,39 @@@ public class AllP95Indicator extends P9 return new AlarmMeta("All_p95", Scope.All); } + @Override + public Indicator toHour() { + AllP95Indicator indicator = new AllP95Indicator(); - indicator.setTimeBucket(toTimeBucketInHour(); ++ indicator.setTimeBucket(toTimeBucketInHour()); + indicator.setValue(this.getValue()); + indicator.setPrecision(this.getPrecision()); + indicator.setDetailGroup(this.getDetailGroup()); + indicator.setTimeBucket(this.getTimeBucket()); + return indicator; + } + + @Override + public Indicator toDay() { - AllP95Indicator indicator = new AllP95Indicator(); - indicator.setTimeBucket(toTimeBucketInDay(); ++ AllP95Indicator indicator = new AllP95Indicator(); ++ indicator.setTimeBucket(toTimeBucketInDay()); + indicator.setValue(this.getValue()); + indicator.setPrecision(this.getPrecision()); + indicator.setDetailGroup(this.getDetailGroup()); + indicator.setTimeBucket(this.getTimeBucket()); + return indicator; + } + + @Override - public Indicator toTimeBucketInMonth() { - AllP95Indicator indicator = new AllP95Indicator(); - indicator.setTimeBucket(toTimeBucketInHour(); ++ public Indicator toMonth() { ++ AllP95Indicator indicator = new AllP95Indicator(); ++ indicator.setTimeBucket(toTimeBucketInMonth()); + indicator.setValue(this.getValue()); + indicator.setPrecision(this.getPrecision()); + indicator.setDetailGroup(this.getDetailGroup()); + indicator.setTimeBucket(this.getTimeBucket()); + return indicator; + } + public static class Builder implements StorageBuilder<AllP95Indicator> { @Override public Map<String, Object> data2Map(AllP95Indicator storageData) { @@@ -147,7 -114,7 +147,7 @@@ AllP95Indicator indicator = new AllP95Indicator(); indicator.setValue(((Number)dbMap.get("value")).intValue()); indicator.setPrecision(((Number)dbMap.get("precision")).intValue()); -- indicator.setDetailGroup((List)dbMap.get("detail_group")); ++ indicator.setDetailGroup((java.util.List)dbMap.get("detail_group")); indicator.setTimeBucket(((Number)dbMap.get("time_bucket")).longValue()); return indicator; } diff --cc oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/all/AllP99Indicator.java index 2b88c9b,1ed1477..880a42b --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/all/AllP99Indicator.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/all/AllP99Indicator.java @@@ -99,39 -99,6 +99,39 @@@ public class AllP99Indicator extends P9 return new AlarmMeta("All_p99", Scope.All); } + @Override + public Indicator toHour() { + AllP99Indicator indicator = new AllP99Indicator(); - indicator.setTimeBucket(toTimeBucketInHour(); ++ indicator.setTimeBucket(toTimeBucketInHour()); + indicator.setValue(this.getValue()); + indicator.setPrecision(this.getPrecision()); + indicator.setDetailGroup(this.getDetailGroup()); + indicator.setTimeBucket(this.getTimeBucket()); + return indicator; + } + + @Override + public Indicator toDay() { - AllP99Indicator indicator = new AllP99Indicator(); - indicator.setTimeBucket(toTimeBucketInDay(); ++ AllP99Indicator indicator = new AllP99Indicator(); ++ indicator.setTimeBucket(toTimeBucketInDay()); + indicator.setValue(this.getValue()); + indicator.setPrecision(this.getPrecision()); + indicator.setDetailGroup(this.getDetailGroup()); + indicator.setTimeBucket(this.getTimeBucket()); + return indicator; + } + + @Override - public Indicator toTimeBucketInMonth() { - AllP99Indicator indicator = new AllP99Indicator(); - indicator.setTimeBucket(toTimeBucketInHour(); ++ public Indicator toMonth() { ++ AllP99Indicator indicator = new AllP99Indicator(); ++ indicator.setTimeBucket(toTimeBucketInMonth()); + indicator.setValue(this.getValue()); + indicator.setPrecision(this.getPrecision()); + indicator.setDetailGroup(this.getDetailGroup()); + indicator.setTimeBucket(this.getTimeBucket()); + return indicator; + } + public static class Builder implements StorageBuilder<AllP99Indicator> { @Override public Map<String, Object> data2Map(AllP99Indicator storageData) { @@@ -147,7 -114,7 +147,7 @@@ AllP99Indicator indicator = new AllP99Indicator(); indicator.setValue(((Number)dbMap.get("value")).intValue()); indicator.setPrecision(((Number)dbMap.get("precision")).intValue()); -- indicator.setDetailGroup((List)dbMap.get("detail_group")); ++ indicator.setDetailGroup((java.util.List)dbMap.get("detail_group")); indicator.setTimeBucket(((Number)dbMap.get("time_bucket")).longValue()); return indicator; } diff --cc oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/endpoint/EndpointAvgIndicator.java index 1704a62,9ec7a6d..e1eb230 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/endpoint/EndpointAvgIndicator.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/endpoint/EndpointAvgIndicator.java @@@ -111,48 -109,6 +111,48 @@@ public class EndpointAvgIndicator exten return new AlarmMeta("endpoint_Avg", Scope.Endpoint, id, serviceId, serviceInstanceId); } + @Override + public Indicator toHour() { + EndpointAvgIndicator indicator = new EndpointAvgIndicator(); - indicator.setTimeBucket(toTimeBucketInHour(); ++ indicator.setTimeBucket(toTimeBucketInHour()); + indicator.setId(this.getId()); + indicator.setServiceId(this.getServiceId()); + indicator.setServiceInstanceId(this.getServiceInstanceId()); + indicator.setSummation(this.getSummation()); + indicator.setCount(this.getCount()); + indicator.setValue(this.getValue()); + indicator.setTimeBucket(this.getTimeBucket()); + return indicator; + } + + @Override + public Indicator toDay() { - EndpointAvgIndicator indicator = new EndpointAvgIndicator(); - indicator.setTimeBucket(toTimeBucketInDay(); ++ EndpointAvgIndicator indicator = new EndpointAvgIndicator(); ++ indicator.setTimeBucket(toTimeBucketInDay()); + indicator.setId(this.getId()); + indicator.setServiceId(this.getServiceId()); + indicator.setServiceInstanceId(this.getServiceInstanceId()); + indicator.setSummation(this.getSummation()); + indicator.setCount(this.getCount()); + indicator.setValue(this.getValue()); + indicator.setTimeBucket(this.getTimeBucket()); + return indicator; + } + + @Override - public Indicator toTimeBucketInMonth() { - EndpointAvgIndicator indicator = new EndpointAvgIndicator(); - indicator.setTimeBucket(toTimeBucketInHour(); ++ public Indicator toMonth() { ++ EndpointAvgIndicator indicator = new EndpointAvgIndicator(); ++ indicator.setTimeBucket(toTimeBucketInMonth()); + indicator.setId(this.getId()); + indicator.setServiceId(this.getServiceId()); + indicator.setServiceInstanceId(this.getServiceInstanceId()); + indicator.setSummation(this.getSummation()); + indicator.setCount(this.getCount()); + indicator.setValue(this.getValue()); + indicator.setTimeBucket(this.getTimeBucket()); + return indicator; + } + public static class Builder implements StorageBuilder<EndpointAvgIndicator> { @Override public Map<String, Object> data2Map(EndpointAvgIndicator storageData) { diff --cc oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/endpoint/EndpointPercentIndicator.java index 5897f61,afd5dbf..de0e36b --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/endpoint/EndpointPercentIndicator.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/endpoint/EndpointPercentIndicator.java @@@ -111,48 -109,6 +111,48 @@@ public class EndpointPercentIndicator e return new AlarmMeta("endpoint_percent", Scope.Endpoint, id, serviceId, serviceInstanceId); } + @Override + public Indicator toHour() { + EndpointPercentIndicator indicator = new EndpointPercentIndicator(); - indicator.setTimeBucket(toTimeBucketInHour(); ++ indicator.setTimeBucket(toTimeBucketInHour()); + indicator.setId(this.getId()); + indicator.setServiceId(this.getServiceId()); + indicator.setServiceInstanceId(this.getServiceInstanceId()); + indicator.setTotal(this.getTotal()); + indicator.setPercentage(this.getPercentage()); + indicator.setMatch(this.getMatch()); + indicator.setTimeBucket(this.getTimeBucket()); + return indicator; + } + + @Override + public Indicator toDay() { - EndpointPercentIndicator indicator = new EndpointPercentIndicator(); - indicator.setTimeBucket(toTimeBucketInDay(); ++ EndpointPercentIndicator indicator = new EndpointPercentIndicator(); ++ indicator.setTimeBucket(toTimeBucketInDay()); + indicator.setId(this.getId()); + indicator.setServiceId(this.getServiceId()); + indicator.setServiceInstanceId(this.getServiceInstanceId()); + indicator.setTotal(this.getTotal()); + indicator.setPercentage(this.getPercentage()); + indicator.setMatch(this.getMatch()); + indicator.setTimeBucket(this.getTimeBucket()); + return indicator; + } + + @Override - public Indicator toTimeBucketInMonth() { - EndpointPercentIndicator indicator = new EndpointPercentIndicator(); - indicator.setTimeBucket(toTimeBucketInHour(); ++ public Indicator toMonth() { ++ EndpointPercentIndicator indicator = new EndpointPercentIndicator(); ++ indicator.setTimeBucket(toTimeBucketInMonth()); + indicator.setId(this.getId()); + indicator.setServiceId(this.getServiceId()); + indicator.setServiceInstanceId(this.getServiceInstanceId()); + indicator.setTotal(this.getTotal()); + indicator.setPercentage(this.getPercentage()); + indicator.setMatch(this.getMatch()); + indicator.setTimeBucket(this.getTimeBucket()); + return indicator; + } + public static class Builder implements StorageBuilder<EndpointPercentIndicator> { @Override public Map<String, Object> data2Map(EndpointPercentIndicator storageData) { diff --cc oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/endpointrelation/EndpointRelationAvgIndicator.java index 68e88c9,5b1f424..305739c --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/endpointrelation/EndpointRelationAvgIndicator.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/endpointrelation/EndpointRelationAvgIndicator.java @@@ -124,57 -122,6 +124,57 @@@ public class EndpointRelationAvgIndicat return new AlarmMeta("EndpointRelation_Avg", Scope.EndpointRelation, endpointId, childEndpointId, serviceId, childServiceId, serviceInstanceId, childServiceInstanceId); } + @Override + public Indicator toHour() { + EndpointRelationAvgIndicator indicator = new EndpointRelationAvgIndicator(); - indicator.setTimeBucket(toTimeBucketInHour(); ++ indicator.setTimeBucket(toTimeBucketInHour()); + indicator.setEndpointId(this.getEndpointId()); + indicator.setChildEndpointId(this.getChildEndpointId()); + indicator.setServiceId(this.getServiceId()); + indicator.setChildServiceId(this.getChildServiceId()); + indicator.setServiceInstanceId(this.getServiceInstanceId()); + indicator.setChildServiceInstanceId(this.getChildServiceInstanceId()); + indicator.setSummation(this.getSummation()); + indicator.setCount(this.getCount()); + indicator.setValue(this.getValue()); + indicator.setTimeBucket(this.getTimeBucket()); + return indicator; + } + + @Override + public Indicator toDay() { - EndpointRelationAvgIndicator indicator = new EndpointRelationAvgIndicator(); - indicator.setTimeBucket(toTimeBucketInDay(); ++ EndpointRelationAvgIndicator indicator = new EndpointRelationAvgIndicator(); ++ indicator.setTimeBucket(toTimeBucketInDay()); + indicator.setEndpointId(this.getEndpointId()); + indicator.setChildEndpointId(this.getChildEndpointId()); + indicator.setServiceId(this.getServiceId()); + indicator.setChildServiceId(this.getChildServiceId()); + indicator.setServiceInstanceId(this.getServiceInstanceId()); + indicator.setChildServiceInstanceId(this.getChildServiceInstanceId()); + indicator.setSummation(this.getSummation()); + indicator.setCount(this.getCount()); + indicator.setValue(this.getValue()); + indicator.setTimeBucket(this.getTimeBucket()); + return indicator; + } + + @Override - public Indicator toTimeBucketInMonth() { - EndpointRelationAvgIndicator indicator = new EndpointRelationAvgIndicator(); - indicator.setTimeBucket(toTimeBucketInHour(); ++ public Indicator toMonth() { ++ EndpointRelationAvgIndicator indicator = new EndpointRelationAvgIndicator(); ++ indicator.setTimeBucket(toTimeBucketInMonth()); + indicator.setEndpointId(this.getEndpointId()); + indicator.setChildEndpointId(this.getChildEndpointId()); + indicator.setServiceId(this.getServiceId()); + indicator.setChildServiceId(this.getChildServiceId()); + indicator.setServiceInstanceId(this.getServiceInstanceId()); + indicator.setChildServiceInstanceId(this.getChildServiceInstanceId()); + indicator.setSummation(this.getSummation()); + indicator.setCount(this.getCount()); + indicator.setValue(this.getValue()); + indicator.setTimeBucket(this.getTimeBucket()); + return indicator; + } + public static class Builder implements StorageBuilder<EndpointRelationAvgIndicator> { @Override public Map<String, Object> data2Map(EndpointRelationAvgIndicator storageData) { diff --cc oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/service/ServiceAvgIndicator.java index 90e68b4,e84c439..775f176 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/service/ServiceAvgIndicator.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/service/ServiceAvgIndicator.java @@@ -105,42 -103,6 +105,42 @@@ public class ServiceAvgIndicator extend return new AlarmMeta("Service_Avg", Scope.Service, id); } + @Override + public Indicator toHour() { + ServiceAvgIndicator indicator = new ServiceAvgIndicator(); - indicator.setTimeBucket(toTimeBucketInHour(); ++ indicator.setTimeBucket(toTimeBucketInHour()); + indicator.setId(this.getId()); + indicator.setSummation(this.getSummation()); + indicator.setCount(this.getCount()); + indicator.setValue(this.getValue()); + indicator.setTimeBucket(this.getTimeBucket()); + return indicator; + } + + @Override + public Indicator toDay() { - ServiceAvgIndicator indicator = new ServiceAvgIndicator(); - indicator.setTimeBucket(toTimeBucketInDay(); ++ ServiceAvgIndicator indicator = new ServiceAvgIndicator(); ++ indicator.setTimeBucket(toTimeBucketInDay()); + indicator.setId(this.getId()); + indicator.setSummation(this.getSummation()); + indicator.setCount(this.getCount()); + indicator.setValue(this.getValue()); + indicator.setTimeBucket(this.getTimeBucket()); + return indicator; + } + + @Override - public Indicator toTimeBucketInMonth() { - ServiceAvgIndicator indicator = new ServiceAvgIndicator(); - indicator.setTimeBucket(toTimeBucketInHour(); ++ public Indicator toMonth() { ++ ServiceAvgIndicator indicator = new ServiceAvgIndicator(); ++ indicator.setTimeBucket(toTimeBucketInMonth()); + indicator.setId(this.getId()); + indicator.setSummation(this.getSummation()); + indicator.setCount(this.getCount()); + indicator.setValue(this.getValue()); + indicator.setTimeBucket(this.getTimeBucket()); + return indicator; + } + public static class Builder implements StorageBuilder<ServiceAvgIndicator> { @Override public Map<String, Object> data2Map(ServiceAvgIndicator storageData) { diff --cc oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/service/ServiceCallsSumIndicator.java index add7c0c,202b8c8..fa0c58d --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/service/ServiceCallsSumIndicator.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/service/ServiceCallsSumIndicator.java @@@ -101,36 -98,6 +101,36 @@@ public class ServiceCallsSumIndicator e return new AlarmMeta("Service_Calls_Sum", Scope.Service, id); } + @Override + public Indicator toHour() { + ServiceCallsSumIndicator indicator = new ServiceCallsSumIndicator(); - indicator.setTimeBucket(toTimeBucketInHour(); ++ indicator.setTimeBucket(toTimeBucketInHour()); + indicator.setId(this.getId()); + indicator.setValue(this.getValue()); + indicator.setTimeBucket(this.getTimeBucket()); + return indicator; + } + + @Override + public Indicator toDay() { - ServiceCallsSumIndicator indicator = new ServiceCallsSumIndicator(); - indicator.setTimeBucket(toTimeBucketInDay(); ++ ServiceCallsSumIndicator indicator = new ServiceCallsSumIndicator(); ++ indicator.setTimeBucket(toTimeBucketInDay()); + indicator.setId(this.getId()); + indicator.setValue(this.getValue()); + indicator.setTimeBucket(this.getTimeBucket()); + return indicator; + } + + @Override - public Indicator toTimeBucketInMonth() { - ServiceCallsSumIndicator indicator = new ServiceCallsSumIndicator(); - indicator.setTimeBucket(toTimeBucketInHour(); ++ public Indicator toMonth() { ++ ServiceCallsSumIndicator indicator = new ServiceCallsSumIndicator(); ++ indicator.setTimeBucket(toTimeBucketInMonth()); + indicator.setId(this.getId()); + indicator.setValue(this.getValue()); + indicator.setTimeBucket(this.getTimeBucket()); + return indicator; + } + public static class Builder implements StorageBuilder<ServiceCallsSumIndicator> { @Override public Map<String, Object> data2Map(ServiceCallsSumIndicator storageData) { diff --cc oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstance/ServiceInstanceRespTimeIndicator.java index e1f8f53,ac68e5b..099ff36 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstance/ServiceInstanceRespTimeIndicator.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstance/ServiceInstanceRespTimeIndicator.java @@@ -108,45 -106,6 +108,45 @@@ public class ServiceInstanceRespTimeInd return new AlarmMeta("ServiceInstance_RespTime", Scope.ServiceInstance, id, serviceId); } + @Override + public Indicator toHour() { + ServiceInstanceRespTimeIndicator indicator = new ServiceInstanceRespTimeIndicator(); - indicator.setTimeBucket(toTimeBucketInHour(); ++ indicator.setTimeBucket(toTimeBucketInHour()); + indicator.setId(this.getId()); + indicator.setServiceId(this.getServiceId()); + indicator.setSummation(this.getSummation()); + indicator.setCount(this.getCount()); + indicator.setValue(this.getValue()); + indicator.setTimeBucket(this.getTimeBucket()); + return indicator; + } + + @Override + public Indicator toDay() { - ServiceInstanceRespTimeIndicator indicator = new ServiceInstanceRespTimeIndicator(); - indicator.setTimeBucket(toTimeBucketInDay(); ++ ServiceInstanceRespTimeIndicator indicator = new ServiceInstanceRespTimeIndicator(); ++ indicator.setTimeBucket(toTimeBucketInDay()); + indicator.setId(this.getId()); + indicator.setServiceId(this.getServiceId()); + indicator.setSummation(this.getSummation()); + indicator.setCount(this.getCount()); + indicator.setValue(this.getValue()); + indicator.setTimeBucket(this.getTimeBucket()); + return indicator; + } + + @Override - public Indicator toTimeBucketInMonth() { - ServiceInstanceRespTimeIndicator indicator = new ServiceInstanceRespTimeIndicator(); - indicator.setTimeBucket(toTimeBucketInHour(); ++ public Indicator toMonth() { ++ ServiceInstanceRespTimeIndicator indicator = new ServiceInstanceRespTimeIndicator(); ++ indicator.setTimeBucket(toTimeBucketInMonth()); + indicator.setId(this.getId()); + indicator.setServiceId(this.getServiceId()); + indicator.setSummation(this.getSummation()); + indicator.setCount(this.getCount()); + indicator.setValue(this.getValue()); + indicator.setTimeBucket(this.getTimeBucket()); + return indicator; + } + public static class Builder implements StorageBuilder<ServiceInstanceRespTimeIndicator> { @Override public Map<String, Object> data2Map(ServiceInstanceRespTimeIndicator storageData) { diff --cc oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstancejvmcpu/InstanceJvmCpuIndicator.java index e4c9fa9,409051b..ab53fc9 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstancejvmcpu/InstanceJvmCpuIndicator.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstancejvmcpu/InstanceJvmCpuIndicator.java @@@ -108,45 -106,6 +108,45 @@@ public class InstanceJvmCpuIndicator ex return new AlarmMeta("instance_jvm_cpu", Scope.ServiceInstanceJVMCPU, id, serviceInstanceId); } + @Override + public Indicator toHour() { + InstanceJvmCpuIndicator indicator = new InstanceJvmCpuIndicator(); - indicator.setTimeBucket(toTimeBucketInHour(); ++ indicator.setTimeBucket(toTimeBucketInHour()); + indicator.setId(this.getId()); + indicator.setServiceInstanceId(this.getServiceInstanceId()); + indicator.setSummation(this.getSummation()); + indicator.setCount(this.getCount()); + indicator.setValue(this.getValue()); + indicator.setTimeBucket(this.getTimeBucket()); + return indicator; + } + + @Override + public Indicator toDay() { - InstanceJvmCpuIndicator indicator = new InstanceJvmCpuIndicator(); - indicator.setTimeBucket(toTimeBucketInDay(); ++ InstanceJvmCpuIndicator indicator = new InstanceJvmCpuIndicator(); ++ indicator.setTimeBucket(toTimeBucketInDay()); + indicator.setId(this.getId()); + indicator.setServiceInstanceId(this.getServiceInstanceId()); + indicator.setSummation(this.getSummation()); + indicator.setCount(this.getCount()); + indicator.setValue(this.getValue()); + indicator.setTimeBucket(this.getTimeBucket()); + return indicator; + } + + @Override - public Indicator toTimeBucketInMonth() { - InstanceJvmCpuIndicator indicator = new InstanceJvmCpuIndicator(); - indicator.setTimeBucket(toTimeBucketInHour(); ++ public Indicator toMonth() { ++ InstanceJvmCpuIndicator indicator = new InstanceJvmCpuIndicator(); ++ indicator.setTimeBucket(toTimeBucketInMonth()); + indicator.setId(this.getId()); + indicator.setServiceInstanceId(this.getServiceInstanceId()); + indicator.setSummation(this.getSummation()); + indicator.setCount(this.getCount()); + indicator.setValue(this.getValue()); + indicator.setTimeBucket(this.getTimeBucket()); + return indicator; + } + public static class Builder implements StorageBuilder<InstanceJvmCpuIndicator> { @Override public Map<String, Object> data2Map(InstanceJvmCpuIndicator storageData) { diff --cc oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstancejvmgc/InstanceJvmYoungGcTimeIndicator.java index 73acd33,ce27456..a9e3b63 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstancejvmgc/InstanceJvmYoungGcTimeIndicator.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstancejvmgc/InstanceJvmYoungGcTimeIndicator.java @@@ -108,45 -106,6 +108,45 @@@ public class InstanceJvmYoungGcTimeIndi return new AlarmMeta("instance_jvm_young_gc_time", Scope.ServiceInstanceJVMGC, id, serviceInstanceId); } + @Override + public Indicator toHour() { + InstanceJvmYoungGcTimeIndicator indicator = new InstanceJvmYoungGcTimeIndicator(); - indicator.setTimeBucket(toTimeBucketInHour(); ++ indicator.setTimeBucket(toTimeBucketInHour()); + indicator.setId(this.getId()); + indicator.setServiceInstanceId(this.getServiceInstanceId()); + indicator.setSummation(this.getSummation()); + indicator.setCount(this.getCount()); + indicator.setValue(this.getValue()); + indicator.setTimeBucket(this.getTimeBucket()); + return indicator; + } + + @Override + public Indicator toDay() { - InstanceJvmYoungGcTimeIndicator indicator = new InstanceJvmYoungGcTimeIndicator(); - indicator.setTimeBucket(toTimeBucketInDay(); ++ InstanceJvmYoungGcTimeIndicator indicator = new InstanceJvmYoungGcTimeIndicator(); ++ indicator.setTimeBucket(toTimeBucketInDay()); + indicator.setId(this.getId()); + indicator.setServiceInstanceId(this.getServiceInstanceId()); + indicator.setSummation(this.getSummation()); + indicator.setCount(this.getCount()); + indicator.setValue(this.getValue()); + indicator.setTimeBucket(this.getTimeBucket()); + return indicator; + } + + @Override - public Indicator toTimeBucketInMonth() { - InstanceJvmYoungGcTimeIndicator indicator = new InstanceJvmYoungGcTimeIndicator(); - indicator.setTimeBucket(toTimeBucketInHour(); ++ public Indicator toMonth() { ++ InstanceJvmYoungGcTimeIndicator indicator = new InstanceJvmYoungGcTimeIndicator(); ++ indicator.setTimeBucket(toTimeBucketInMonth()); + indicator.setId(this.getId()); + indicator.setServiceInstanceId(this.getServiceInstanceId()); + indicator.setSummation(this.getSummation()); + indicator.setCount(this.getCount()); + indicator.setValue(this.getValue()); + indicator.setTimeBucket(this.getTimeBucket()); + return indicator; + } + public static class Builder implements StorageBuilder<InstanceJvmYoungGcTimeIndicator> { @Override public Map<String, Object> data2Map(InstanceJvmYoungGcTimeIndicator storageData) { diff --cc oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstancejvmmemory/InstanceJvmMemoryMaxIndicator.java index 6ec9a83,979b972..8da59b0 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstancejvmmemory/InstanceJvmMemoryMaxIndicator.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstancejvmmemory/InstanceJvmMemoryMaxIndicator.java @@@ -108,45 -106,6 +108,45 @@@ public class InstanceJvmMemoryMaxIndica return new AlarmMeta("instance_jvm_memory_max", Scope.ServiceInstanceJVMMemory, id, serviceInstanceId); } + @Override + public Indicator toHour() { + InstanceJvmMemoryMaxIndicator indicator = new InstanceJvmMemoryMaxIndicator(); - indicator.setTimeBucket(toTimeBucketInHour(); ++ indicator.setTimeBucket(toTimeBucketInHour()); + indicator.setId(this.getId()); + indicator.setServiceInstanceId(this.getServiceInstanceId()); + indicator.setSummation(this.getSummation()); + indicator.setCount(this.getCount()); + indicator.setValue(this.getValue()); + indicator.setTimeBucket(this.getTimeBucket()); + return indicator; + } + + @Override + public Indicator toDay() { - InstanceJvmMemoryMaxIndicator indicator = new InstanceJvmMemoryMaxIndicator(); - indicator.setTimeBucket(toTimeBucketInDay(); ++ InstanceJvmMemoryMaxIndicator indicator = new InstanceJvmMemoryMaxIndicator(); ++ indicator.setTimeBucket(toTimeBucketInDay()); + indicator.setId(this.getId()); + indicator.setServiceInstanceId(this.getServiceInstanceId()); + indicator.setSummation(this.getSummation()); + indicator.setCount(this.getCount()); + indicator.setValue(this.getValue()); + indicator.setTimeBucket(this.getTimeBucket()); + return indicator; + } + + @Override - public Indicator toTimeBucketInMonth() { - InstanceJvmMemoryMaxIndicator indicator = new InstanceJvmMemoryMaxIndicator(); - indicator.setTimeBucket(toTimeBucketInHour(); ++ public Indicator toMonth() { ++ InstanceJvmMemoryMaxIndicator indicator = new InstanceJvmMemoryMaxIndicator(); ++ indicator.setTimeBucket(toTimeBucketInMonth()); + indicator.setId(this.getId()); + indicator.setServiceInstanceId(this.getServiceInstanceId()); + indicator.setSummation(this.getSummation()); + indicator.setCount(this.getCount()); + indicator.setValue(this.getValue()); + indicator.setTimeBucket(this.getTimeBucket()); + return indicator; + } + public static class Builder implements StorageBuilder<InstanceJvmMemoryMaxIndicator> { @Override public Map<String, Object> data2Map(InstanceJvmMemoryMaxIndicator storageData) { diff --cc oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstancejvmmemorypool/InstanceJvmMemoryPoolMaxIndicator.java index 68770d0,294c707..30e0e26 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstancejvmmemorypool/InstanceJvmMemoryPoolMaxIndicator.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstancejvmmemorypool/InstanceJvmMemoryPoolMaxIndicator.java @@@ -108,45 -106,6 +108,45 @@@ public class InstanceJvmMemoryPoolMaxIn return new AlarmMeta("instance_jvm_memory_pool_max", Scope.ServiceInstanceJVMMemoryPool, id, serviceInstanceId); } + @Override + public Indicator toHour() { + InstanceJvmMemoryPoolMaxIndicator indicator = new InstanceJvmMemoryPoolMaxIndicator(); - indicator.setTimeBucket(toTimeBucketInHour(); ++ indicator.setTimeBucket(toTimeBucketInHour()); + indicator.setId(this.getId()); + indicator.setServiceInstanceId(this.getServiceInstanceId()); + indicator.setSummation(this.getSummation()); + indicator.setCount(this.getCount()); + indicator.setValue(this.getValue()); + indicator.setTimeBucket(this.getTimeBucket()); + return indicator; + } + + @Override + public Indicator toDay() { - InstanceJvmMemoryPoolMaxIndicator indicator = new InstanceJvmMemoryPoolMaxIndicator(); - indicator.setTimeBucket(toTimeBucketInDay(); ++ InstanceJvmMemoryPoolMaxIndicator indicator = new InstanceJvmMemoryPoolMaxIndicator(); ++ indicator.setTimeBucket(toTimeBucketInDay()); + indicator.setId(this.getId()); + indicator.setServiceInstanceId(this.getServiceInstanceId()); + indicator.setSummation(this.getSummation()); + indicator.setCount(this.getCount()); + indicator.setValue(this.getValue()); + indicator.setTimeBucket(this.getTimeBucket()); + return indicator; + } + + @Override - public Indicator toTimeBucketInMonth() { - InstanceJvmMemoryPoolMaxIndicator indicator = new InstanceJvmMemoryPoolMaxIndicator(); - indicator.setTimeBucket(toTimeBucketInHour(); ++ public Indicator toMonth() { ++ InstanceJvmMemoryPoolMaxIndicator indicator = new InstanceJvmMemoryPoolMaxIndicator(); ++ indicator.setTimeBucket(toTimeBucketInMonth()); + indicator.setId(this.getId()); + indicator.setServiceInstanceId(this.getServiceInstanceId()); + indicator.setSummation(this.getSummation()); + indicator.setCount(this.getCount()); + indicator.setValue(this.getValue()); + indicator.setTimeBucket(this.getTimeBucket()); + return indicator; + } + public static class Builder implements StorageBuilder<InstanceJvmMemoryPoolMaxIndicator> { @Override public Map<String, Object> data2Map(InstanceJvmMemoryPoolMaxIndicator storageData) { diff --cc oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstancerelation/ServiceInstanceRelationAvgIndicator.java index e56114a,aea745a..f36e1c4 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstancerelation/ServiceInstanceRelationAvgIndicator.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstancerelation/ServiceInstanceRelationAvgIndicator.java @@@ -118,51 -116,6 +118,51 @@@ public class ServiceInstanceRelationAvg return new AlarmMeta("ServiceInstanceRelation_Avg", Scope.ServiceInstanceRelation, sourceServiceId, destServiceId, sourceServiceInstanceId, destServiceInstanceId); } + @Override + public Indicator toHour() { + ServiceInstanceRelationAvgIndicator indicator = new ServiceInstanceRelationAvgIndicator(); - indicator.setTimeBucket(toTimeBucketInHour(); ++ indicator.setTimeBucket(toTimeBucketInHour()); + indicator.setSourceServiceId(this.getSourceServiceId()); + indicator.setDestServiceId(this.getDestServiceId()); + indicator.setSourceServiceInstanceId(this.getSourceServiceInstanceId()); + indicator.setDestServiceInstanceId(this.getDestServiceInstanceId()); + indicator.setSummation(this.getSummation()); + indicator.setCount(this.getCount()); + indicator.setValue(this.getValue()); + indicator.setTimeBucket(this.getTimeBucket()); + return indicator; + } + + @Override + public Indicator toDay() { - ServiceInstanceRelationAvgIndicator indicator = new ServiceInstanceRelationAvgIndicator(); - indicator.setTimeBucket(toTimeBucketInDay(); ++ ServiceInstanceRelationAvgIndicator indicator = new ServiceInstanceRelationAvgIndicator(); ++ indicator.setTimeBucket(toTimeBucketInDay()); + indicator.setSourceServiceId(this.getSourceServiceId()); + indicator.setDestServiceId(this.getDestServiceId()); + indicator.setSourceServiceInstanceId(this.getSourceServiceInstanceId()); + indicator.setDestServiceInstanceId(this.getDestServiceInstanceId()); + indicator.setSummation(this.getSummation()); + indicator.setCount(this.getCount()); + indicator.setValue(this.getValue()); + indicator.setTimeBucket(this.getTimeBucket()); + return indicator; + } + + @Override - public Indicator toTimeBucketInMonth() { - ServiceInstanceRelationAvgIndicator indicator = new ServiceInstanceRelationAvgIndicator(); - indicator.setTimeBucket(toTimeBucketInHour(); ++ public Indicator toMonth() { ++ ServiceInstanceRelationAvgIndicator indicator = new ServiceInstanceRelationAvgIndicator(); ++ indicator.setTimeBucket(toTimeBucketInMonth()); + indicator.setSourceServiceId(this.getSourceServiceId()); + indicator.setDestServiceId(this.getDestServiceId()); + indicator.setSourceServiceInstanceId(this.getSourceServiceInstanceId()); + indicator.setDestServiceInstanceId(this.getDestServiceInstanceId()); + indicator.setSummation(this.getSummation()); + indicator.setCount(this.getCount()); + indicator.setValue(this.getValue()); + indicator.setTimeBucket(this.getTimeBucket()); + return indicator; + } + public static class Builder implements StorageBuilder<ServiceInstanceRelationAvgIndicator> { @Override public Map<String, Object> data2Map(ServiceInstanceRelationAvgIndicator storageData) { diff --cc oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/servicerelation/ServiceRelationAvgIndicator.java index b0f5897,71be3fc..3b6b5a3 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/servicerelation/ServiceRelationAvgIndicator.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/servicerelation/ServiceRelationAvgIndicator.java @@@ -112,45 -109,6 +112,45 @@@ public class ServiceRelationAvgIndicato return new AlarmMeta("ServiceRelation_Avg", Scope.ServiceRelation, sourceServiceId, destServiceId); } + @Override + public Indicator toHour() { + ServiceRelationAvgIndicator indicator = new ServiceRelationAvgIndicator(); - indicator.setTimeBucket(toTimeBucketInHour(); ++ indicator.setTimeBucket(toTimeBucketInHour()); + indicator.setSourceServiceId(this.getSourceServiceId()); + indicator.setDestServiceId(this.getDestServiceId()); + indicator.setSummation(this.getSummation()); + indicator.setCount(this.getCount()); + indicator.setValue(this.getValue()); + indicator.setTimeBucket(this.getTimeBucket()); + return indicator; + } + + @Override + public Indicator toDay() { - ServiceRelationAvgIndicator indicator = new ServiceRelationAvgIndicator(); - indicator.setTimeBucket(toTimeBucketInDay(); ++ ServiceRelationAvgIndicator indicator = new ServiceRelationAvgIndicator(); ++ indicator.setTimeBucket(toTimeBucketInDay()); + indicator.setSourceServiceId(this.getSourceServiceId()); + indicator.setDestServiceId(this.getDestServiceId()); + indicator.setSummation(this.getSummation()); + indicator.setCount(this.getCount()); + indicator.setValue(this.getValue()); + indicator.setTimeBucket(this.getTimeBucket()); + return indicator; + } + + @Override - public Indicator toTimeBucketInMonth() { - ServiceRelationAvgIndicator indicator = new ServiceRelationAvgIndicator(); - indicator.setTimeBucket(toTimeBucketInHour(); ++ public Indicator toMonth() { ++ ServiceRelationAvgIndicator indicator = new ServiceRelationAvgIndicator(); ++ indicator.setTimeBucket(toTimeBucketInMonth()); + indicator.setSourceServiceId(this.getSourceServiceId()); + indicator.setDestServiceId(this.getDestServiceId()); + indicator.setSummation(this.getSummation()); + indicator.setCount(this.getCount()); + indicator.setValue(this.getValue()); + indicator.setTimeBucket(this.getTimeBucket()); + return indicator; + } + public static class Builder implements StorageBuilder<ServiceRelationAvgIndicator> { @Override public Map<String, Object> data2Map(ServiceRelationAvgIndicator storageData) { diff --cc oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/servicerelation/ServiceRelationClientCallsSumIndicator.java index 73326c2,0d1f03a..0fa0c21 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/servicerelation/ServiceRelationClientCallsSumIndicator.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/servicerelation/ServiceRelationClientCallsSumIndicator.java @@@ -108,39 -105,6 +108,39 @@@ public class ServiceRelationClientCalls return new AlarmMeta("Service_Relation_Client_Calls_Sum", Scope.ServiceRelation, sourceServiceId, destServiceId); } + @Override + public Indicator toHour() { + ServiceRelationClientCallsSumIndicator indicator = new ServiceRelationClientCallsSumIndicator(); - indicator.setTimeBucket(toTimeBucketInHour(); ++ indicator.setTimeBucket(toTimeBucketInHour()); + indicator.setSourceServiceId(this.getSourceServiceId()); + indicator.setDestServiceId(this.getDestServiceId()); + indicator.setValue(this.getValue()); + indicator.setTimeBucket(this.getTimeBucket()); + return indicator; + } + + @Override + public Indicator toDay() { - ServiceRelationClientCallsSumIndicator indicator = new ServiceRelationClientCallsSumIndicator(); - indicator.setTimeBucket(toTimeBucketInDay(); ++ ServiceRelationClientCallsSumIndicator indicator = new ServiceRelationClientCallsSumIndicator(); ++ indicator.setTimeBucket(toTimeBucketInDay()); + indicator.setSourceServiceId(this.getSourceServiceId()); + indicator.setDestServiceId(this.getDestServiceId()); + indicator.setValue(this.getValue()); + indicator.setTimeBucket(this.getTimeBucket()); + return indicator; + } + + @Override - public Indicator toTimeBucketInMonth() { - ServiceRelationClientCallsSumIndicator indicator = new ServiceRelationClientCallsSumIndicator(); - indicator.setTimeBucket(toTimeBucketInHour(); ++ public Indicator toMonth() { ++ ServiceRelationClientCallsSumIndicator indicator = new ServiceRelationClientCallsSumIndicator(); ++ indicator.setTimeBucket(toTimeBucketInMonth()); + indicator.setSourceServiceId(this.getSourceServiceId()); + indicator.setDestServiceId(this.getDestServiceId()); + indicator.setValue(this.getValue()); + indicator.setTimeBucket(this.getTimeBucket()); + return indicator; + } + public static class Builder implements StorageBuilder<ServiceRelationClientCallsSumIndicator> { @Override public Map<String, Object> data2Map(ServiceRelationClientCallsSumIndicator storageData) { diff --cc oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/servicerelation/ServiceRelationServerCallsSumIndicator.java index 08432a1,ced9e3d..a15c43e --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/servicerelation/ServiceRelationServerCallsSumIndicator.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/servicerelation/ServiceRelationServerCallsSumIndicator.java @@@ -108,39 -105,6 +108,39 @@@ public class ServiceRelationServerCalls return new AlarmMeta("Service_Relation_Server_Calls_Sum", Scope.ServiceRelation, sourceServiceId, destServiceId); } + @Override + public Indicator toHour() { + ServiceRelationServerCallsSumIndicator indicator = new ServiceRelationServerCallsSumIndicator(); - indicator.setTimeBucket(toTimeBucketInHour(); ++ indicator.setTimeBucket(toTimeBucketInHour()); + indicator.setSourceServiceId(this.getSourceServiceId()); + indicator.setDestServiceId(this.getDestServiceId()); + indicator.setValue(this.getValue()); + indicator.setTimeBucket(this.getTimeBucket()); + return indicator; + } + + @Override + public Indicator toDay() { - ServiceRelationServerCallsSumIndicator indicator = new ServiceRelationServerCallsSumIndicator(); - indicator.setTimeBucket(toTimeBucketInDay(); ++ ServiceRelationServerCallsSumIndicator indicator = new ServiceRelationServerCallsSumIndicator(); ++ indicator.setTimeBucket(toTimeBucketInDay()); + indicator.setSourceServiceId(this.getSourceServiceId()); + indicator.setDestServiceId(this.getDestServiceId()); + indicator.setValue(this.getValue()); + indicator.setTimeBucket(this.getTimeBucket()); + return indicator; + } + + @Override - public Indicator toTimeBucketInMonth() { - ServiceRelationServerCallsSumIndicator indicator = new ServiceRelationServerCallsSumIndicator(); - indicator.setTimeBucket(toTimeBucketInHour(); ++ public Indicator toMonth() { ++ ServiceRelationServerCallsSumIndicator indicator = new ServiceRelationServerCallsSumIndicator(); ++ indicator.setTimeBucket(toTimeBucketInMonth()); + indicator.setSourceServiceId(this.getSourceServiceId()); + indicator.setDestServiceId(this.getDestServiceId()); + indicator.setValue(this.getValue()); + indicator.setTimeBucket(this.getTimeBucket()); + return indicator; + } + public static class Builder implements StorageBuilder<ServiceRelationServerCallsSumIndicator> { @Override public Map<String, Object> data2Map(ServiceRelationServerCallsSumIndicator storageData) {
