From 750bca2241177cb3450d3677be8ece7e71808507 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=B4=E6=99=9F=20Wu=20Sheng?= Date: Fri, 28 Sep 2018 16:59:25 +0800 Subject: [PATCH] Add new indicators and change two indicator names. (#1721) --- .../endpoint/EndpointAvgIndicator.java | 4 +- .../endpoint/EndpointP50Indicator.java | 2 +- .../endpoint/EndpointP75Indicator.java | 2 +- .../endpoint/EndpointP90Indicator.java | 2 +- .../endpoint/EndpointP95Indicator.java | 2 +- .../endpoint/EndpointP99Indicator.java | 2 +- .../endpoint/EndpointSlaIndicator.java | 2 +- .../EndpointRelationCpmIndicator.java | 2 +- .../EndpointRelationRespTimeIndicator.java | 2 +- .../service/ServiceCpmIndicator.java | 2 +- .../service/ServiceP50Indicator.java | 2 +- .../service/ServiceP75Indicator.java | 2 +- .../service/ServiceP90Indicator.java | 2 +- .../service/ServiceP95Indicator.java | 2 +- .../service/ServiceP99Indicator.java | 2 +- .../service/ServiceRespTimeIndicator.java | 2 +- .../service/ServiceSlaIndicator.java | 2 +- .../ServiceInstanceCpmIndicator.java | 2 +- .../ServiceInstanceRespTimeIndicator.java | 6 +- .../InstanceJvmCpuIndicator.java | 2 +- .../InstanceJvmOldGcCountIndicator.java | 2 +- .../InstanceJvmOldGcTimeIndicator.java | 2 +- .../InstanceJvmYoungGcCountIndicator.java | 2 +- .../InstanceJvmYoungGcTimeIndicator.java | 2 +- .../InstanceJvmMemoryHeapIndicator.java | 2 +- .../InstanceJvmMemoryHeapMaxIndicator.java | 181 ++++++++++++++++++ .../InstanceJvmMemoryNoheapIndicator.java | 2 +- .../InstanceJvmMemoryNoheapMaxIndicator.java | 181 ++++++++++++++++++ .../ServiceInstanceJVMMemoryDispatcher.java | 30 ++- ...ServiceRelationClientCallSlaIndicator.java | 2 +- .../ServiceRelationClientCpmIndicator.java | 2 +- ...erviceRelationClientRespTimeIndicator.java | 2 +- ...ServiceRelationServerCallSlaIndicator.java | 2 +- .../ServiceRelationServerCpmIndicator.java | 2 +- ...erviceRelationServerRespTimeIndicator.java | 2 +- .../src/main/resources/official_analysis.oal | 12 +- 36 files changed, 433 insertions(+), 41 deletions(-) create mode 100644 oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstancejvmmemory/InstanceJvmMemoryHeapMaxIndicator.java create mode 100644 oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstancejvmmemory/InstanceJvmMemoryNoheapMaxIndicator.java diff --git 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 index c7e104bd7..1fec15109 100644 --- 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 @@ -41,7 +41,7 @@ import org.apache.skywalking.oap.server.core.source.Scope; @StorageEntity(name = "endpoint_avg", builder = EndpointAvgIndicator.Builder.class) public class EndpointAvgIndicator extends LongAvgIndicator implements AlarmSupported { - @Setter @Getter @Column(columnName = "entity_id") @IDColumn private String entityId; + @Setter @Getter @Column(columnName = "entity_id") @IDColumn private java.lang.String entityId; @Setter @Getter @Column(columnName = "service_id") private int serviceId; @Setter @Getter @Column(columnName = "service_instance_id") private int serviceInstanceId; @@ -115,7 +115,7 @@ public class EndpointAvgIndicator extends LongAvgIndicator implements AlarmSuppo } @Override public AlarmMeta getAlarmMeta() { - return new AlarmMeta("endpoint_Avg", Scope.Endpoint, entityId); + return new AlarmMeta("endpoint_avg", Scope.Endpoint, entityId); } @Override diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/endpoint/EndpointP50Indicator.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/endpoint/EndpointP50Indicator.java index 0102e94d2..dd1086b38 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/endpoint/EndpointP50Indicator.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/endpoint/EndpointP50Indicator.java @@ -41,7 +41,7 @@ import org.apache.skywalking.oap.server.core.source.Scope; @StorageEntity(name = "endpoint_p50", builder = EndpointP50Indicator.Builder.class) public class EndpointP50Indicator extends P50Indicator implements AlarmSupported { - @Setter @Getter @Column(columnName = "entity_id") @IDColumn private String entityId; + @Setter @Getter @Column(columnName = "entity_id") @IDColumn private java.lang.String entityId; @Setter @Getter @Column(columnName = "service_id") private int serviceId; @Setter @Getter @Column(columnName = "service_instance_id") private int serviceInstanceId; diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/endpoint/EndpointP75Indicator.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/endpoint/EndpointP75Indicator.java index 02da8226b..301482cfd 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/endpoint/EndpointP75Indicator.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/endpoint/EndpointP75Indicator.java @@ -41,7 +41,7 @@ import org.apache.skywalking.oap.server.core.source.Scope; @StorageEntity(name = "endpoint_p75", builder = EndpointP75Indicator.Builder.class) public class EndpointP75Indicator extends P75Indicator implements AlarmSupported { - @Setter @Getter @Column(columnName = "entity_id") @IDColumn private String entityId; + @Setter @Getter @Column(columnName = "entity_id") @IDColumn private java.lang.String entityId; @Setter @Getter @Column(columnName = "service_id") private int serviceId; @Setter @Getter @Column(columnName = "service_instance_id") private int serviceInstanceId; diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/endpoint/EndpointP90Indicator.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/endpoint/EndpointP90Indicator.java index cdba9065b..712d1afa4 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/endpoint/EndpointP90Indicator.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/endpoint/EndpointP90Indicator.java @@ -41,7 +41,7 @@ import org.apache.skywalking.oap.server.core.source.Scope; @StorageEntity(name = "endpoint_p90", builder = EndpointP90Indicator.Builder.class) public class EndpointP90Indicator extends P90Indicator implements AlarmSupported { - @Setter @Getter @Column(columnName = "entity_id") @IDColumn private String entityId; + @Setter @Getter @Column(columnName = "entity_id") @IDColumn private java.lang.String entityId; @Setter @Getter @Column(columnName = "service_id") private int serviceId; @Setter @Getter @Column(columnName = "service_instance_id") private int serviceInstanceId; diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/endpoint/EndpointP95Indicator.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/endpoint/EndpointP95Indicator.java index 436b9850a..f9248537e 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/endpoint/EndpointP95Indicator.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/endpoint/EndpointP95Indicator.java @@ -41,7 +41,7 @@ import org.apache.skywalking.oap.server.core.source.Scope; @StorageEntity(name = "endpoint_p95", builder = EndpointP95Indicator.Builder.class) public class EndpointP95Indicator extends P95Indicator implements AlarmSupported { - @Setter @Getter @Column(columnName = "entity_id") @IDColumn private String entityId; + @Setter @Getter @Column(columnName = "entity_id") @IDColumn private java.lang.String entityId; @Setter @Getter @Column(columnName = "service_id") private int serviceId; @Setter @Getter @Column(columnName = "service_instance_id") private int serviceInstanceId; diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/endpoint/EndpointP99Indicator.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/endpoint/EndpointP99Indicator.java index fa14beb38..73b313cef 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/endpoint/EndpointP99Indicator.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/endpoint/EndpointP99Indicator.java @@ -41,7 +41,7 @@ import org.apache.skywalking.oap.server.core.source.Scope; @StorageEntity(name = "endpoint_p99", builder = EndpointP99Indicator.Builder.class) public class EndpointP99Indicator extends P99Indicator implements AlarmSupported { - @Setter @Getter @Column(columnName = "entity_id") @IDColumn private String entityId; + @Setter @Getter @Column(columnName = "entity_id") @IDColumn private java.lang.String entityId; @Setter @Getter @Column(columnName = "service_id") private int serviceId; @Setter @Getter @Column(columnName = "service_instance_id") private int serviceInstanceId; diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/endpoint/EndpointSlaIndicator.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/endpoint/EndpointSlaIndicator.java index 71a4138a5..86e12faf4 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/endpoint/EndpointSlaIndicator.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/endpoint/EndpointSlaIndicator.java @@ -41,7 +41,7 @@ import org.apache.skywalking.oap.server.core.source.Scope; @StorageEntity(name = "endpoint_sla", builder = EndpointSlaIndicator.Builder.class) public class EndpointSlaIndicator extends PercentIndicator implements AlarmSupported { - @Setter @Getter @Column(columnName = "entity_id") @IDColumn private String entityId; + @Setter @Getter @Column(columnName = "entity_id") @IDColumn private java.lang.String entityId; @Setter @Getter @Column(columnName = "service_id") private int serviceId; @Setter @Getter @Column(columnName = "service_instance_id") private int serviceInstanceId; diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/endpointrelation/EndpointRelationCpmIndicator.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/endpointrelation/EndpointRelationCpmIndicator.java index be083fc05..1651e0c0e 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/endpointrelation/EndpointRelationCpmIndicator.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/endpointrelation/EndpointRelationCpmIndicator.java @@ -41,7 +41,7 @@ import org.apache.skywalking.oap.server.core.source.Scope; @StorageEntity(name = "endpoint_relation_cpm", builder = EndpointRelationCpmIndicator.Builder.class) public class EndpointRelationCpmIndicator extends CPMIndicator implements AlarmSupported { - @Setter @Getter @Column(columnName = "entity_id") @IDColumn private String entityId; + @Setter @Getter @Column(columnName = "entity_id") @IDColumn private java.lang.String entityId; @Setter @Getter @Column(columnName = "service_id") private int serviceId; @Setter @Getter @Column(columnName = "child_service_id") private int childServiceId; @Setter @Getter @Column(columnName = "service_instance_id") private int serviceInstanceId; diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/endpointrelation/EndpointRelationRespTimeIndicator.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/endpointrelation/EndpointRelationRespTimeIndicator.java index acf26d601..7b6610813 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/endpointrelation/EndpointRelationRespTimeIndicator.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/endpointrelation/EndpointRelationRespTimeIndicator.java @@ -41,7 +41,7 @@ import org.apache.skywalking.oap.server.core.source.Scope; @StorageEntity(name = "endpoint_relation_resp_time", builder = EndpointRelationRespTimeIndicator.Builder.class) public class EndpointRelationRespTimeIndicator extends LongAvgIndicator implements AlarmSupported { - @Setter @Getter @Column(columnName = "entity_id") @IDColumn private String entityId; + @Setter @Getter @Column(columnName = "entity_id") @IDColumn private java.lang.String entityId; @Setter @Getter @Column(columnName = "service_id") private int serviceId; @Setter @Getter @Column(columnName = "child_service_id") private int childServiceId; @Setter @Getter @Column(columnName = "service_instance_id") private int serviceInstanceId; diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/service/ServiceCpmIndicator.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/service/ServiceCpmIndicator.java index c0619e12b..da2c37947 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/service/ServiceCpmIndicator.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/service/ServiceCpmIndicator.java @@ -41,7 +41,7 @@ import org.apache.skywalking.oap.server.core.source.Scope; @StorageEntity(name = "service_cpm", builder = ServiceCpmIndicator.Builder.class) public class ServiceCpmIndicator extends CPMIndicator implements AlarmSupported { - @Setter @Getter @Column(columnName = "entity_id") @IDColumn private String entityId; + @Setter @Getter @Column(columnName = "entity_id") @IDColumn private java.lang.String entityId; @Override public String id() { String splitJointId = String.valueOf(getTimeBucket()); diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/service/ServiceP50Indicator.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/service/ServiceP50Indicator.java index a09301cc8..30fab816e 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/service/ServiceP50Indicator.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/service/ServiceP50Indicator.java @@ -41,7 +41,7 @@ import org.apache.skywalking.oap.server.core.source.Scope; @StorageEntity(name = "service_p50", builder = ServiceP50Indicator.Builder.class) public class ServiceP50Indicator extends P50Indicator implements AlarmSupported { - @Setter @Getter @Column(columnName = "entity_id") @IDColumn private String entityId; + @Setter @Getter @Column(columnName = "entity_id") @IDColumn private java.lang.String entityId; @Override public String id() { String splitJointId = String.valueOf(getTimeBucket()); diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/service/ServiceP75Indicator.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/service/ServiceP75Indicator.java index bd7bfa821..78b716d79 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/service/ServiceP75Indicator.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/service/ServiceP75Indicator.java @@ -41,7 +41,7 @@ import org.apache.skywalking.oap.server.core.source.Scope; @StorageEntity(name = "service_p75", builder = ServiceP75Indicator.Builder.class) public class ServiceP75Indicator extends P75Indicator implements AlarmSupported { - @Setter @Getter @Column(columnName = "entity_id") @IDColumn private String entityId; + @Setter @Getter @Column(columnName = "entity_id") @IDColumn private java.lang.String entityId; @Override public String id() { String splitJointId = String.valueOf(getTimeBucket()); diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/service/ServiceP90Indicator.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/service/ServiceP90Indicator.java index 810b78343..0754d0e27 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/service/ServiceP90Indicator.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/service/ServiceP90Indicator.java @@ -41,7 +41,7 @@ import org.apache.skywalking.oap.server.core.source.Scope; @StorageEntity(name = "service_p90", builder = ServiceP90Indicator.Builder.class) public class ServiceP90Indicator extends P90Indicator implements AlarmSupported { - @Setter @Getter @Column(columnName = "entity_id") @IDColumn private String entityId; + @Setter @Getter @Column(columnName = "entity_id") @IDColumn private java.lang.String entityId; @Override public String id() { String splitJointId = String.valueOf(getTimeBucket()); diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/service/ServiceP95Indicator.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/service/ServiceP95Indicator.java index ff2591f79..3be4020f8 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/service/ServiceP95Indicator.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/service/ServiceP95Indicator.java @@ -41,7 +41,7 @@ import org.apache.skywalking.oap.server.core.source.Scope; @StorageEntity(name = "service_p95", builder = ServiceP95Indicator.Builder.class) public class ServiceP95Indicator extends P95Indicator implements AlarmSupported { - @Setter @Getter @Column(columnName = "entity_id") @IDColumn private String entityId; + @Setter @Getter @Column(columnName = "entity_id") @IDColumn private java.lang.String entityId; @Override public String id() { String splitJointId = String.valueOf(getTimeBucket()); diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/service/ServiceP99Indicator.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/service/ServiceP99Indicator.java index 93da1af4e..76e23d894 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/service/ServiceP99Indicator.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/service/ServiceP99Indicator.java @@ -41,7 +41,7 @@ import org.apache.skywalking.oap.server.core.source.Scope; @StorageEntity(name = "service_p99", builder = ServiceP99Indicator.Builder.class) public class ServiceP99Indicator extends P99Indicator implements AlarmSupported { - @Setter @Getter @Column(columnName = "entity_id") @IDColumn private String entityId; + @Setter @Getter @Column(columnName = "entity_id") @IDColumn private java.lang.String entityId; @Override public String id() { String splitJointId = String.valueOf(getTimeBucket()); diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/service/ServiceRespTimeIndicator.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/service/ServiceRespTimeIndicator.java index b07dc5ea5..46cef3163 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/service/ServiceRespTimeIndicator.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/service/ServiceRespTimeIndicator.java @@ -41,7 +41,7 @@ import org.apache.skywalking.oap.server.core.source.Scope; @StorageEntity(name = "service_resp_time", builder = ServiceRespTimeIndicator.Builder.class) public class ServiceRespTimeIndicator extends LongAvgIndicator implements AlarmSupported { - @Setter @Getter @Column(columnName = "entity_id") @IDColumn private String entityId; + @Setter @Getter @Column(columnName = "entity_id") @IDColumn private java.lang.String entityId; @Override public String id() { String splitJointId = String.valueOf(getTimeBucket()); diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/service/ServiceSlaIndicator.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/service/ServiceSlaIndicator.java index 97a55ff41..a77f30b98 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/service/ServiceSlaIndicator.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/service/ServiceSlaIndicator.java @@ -41,7 +41,7 @@ import org.apache.skywalking.oap.server.core.source.Scope; @StorageEntity(name = "service_sla", builder = ServiceSlaIndicator.Builder.class) public class ServiceSlaIndicator extends PercentIndicator implements AlarmSupported { - @Setter @Getter @Column(columnName = "entity_id") @IDColumn private String entityId; + @Setter @Getter @Column(columnName = "entity_id") @IDColumn private java.lang.String entityId; @Override public String id() { String splitJointId = String.valueOf(getTimeBucket()); diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstance/ServiceInstanceCpmIndicator.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstance/ServiceInstanceCpmIndicator.java index 0949ea0df..b850f4072 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstance/ServiceInstanceCpmIndicator.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstance/ServiceInstanceCpmIndicator.java @@ -41,7 +41,7 @@ import org.apache.skywalking.oap.server.core.source.Scope; @StorageEntity(name = "service_instance_cpm", builder = ServiceInstanceCpmIndicator.Builder.class) public class ServiceInstanceCpmIndicator extends CPMIndicator implements AlarmSupported { - @Setter @Getter @Column(columnName = "entity_id") @IDColumn private String entityId; + @Setter @Getter @Column(columnName = "entity_id") @IDColumn private java.lang.String entityId; @Setter @Getter @Column(columnName = "service_id") private int serviceId; @Override public String id() { diff --git 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 index 5a69084fa..4225fb82f 100644 --- 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 @@ -38,10 +38,10 @@ import org.apache.skywalking.oap.server.core.source.Scope; */ @IndicatorType @StreamData -@StorageEntity(name = "serviceinstance_resp_time", builder = ServiceInstanceRespTimeIndicator.Builder.class) +@StorageEntity(name = "service_instance_resp_time", builder = ServiceInstanceRespTimeIndicator.Builder.class) public class ServiceInstanceRespTimeIndicator extends LongAvgIndicator implements AlarmSupported { - @Setter @Getter @Column(columnName = "entity_id") @IDColumn private String entityId; + @Setter @Getter @Column(columnName = "entity_id") @IDColumn private java.lang.String entityId; @Setter @Getter @Column(columnName = "service_id") private int serviceId; @Override public String id() { @@ -112,7 +112,7 @@ public class ServiceInstanceRespTimeIndicator extends LongAvgIndicator implement } @Override public AlarmMeta getAlarmMeta() { - return new AlarmMeta("serviceInstance_resp_time", Scope.ServiceInstance, entityId); + return new AlarmMeta("service_instance_resp_time", Scope.ServiceInstance, entityId); } @Override diff --git 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 index e49420397..8e743e0c6 100644 --- 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 @@ -41,7 +41,7 @@ import org.apache.skywalking.oap.server.core.source.Scope; @StorageEntity(name = "instance_jvm_cpu", builder = InstanceJvmCpuIndicator.Builder.class) public class InstanceJvmCpuIndicator extends DoubleAvgIndicator implements AlarmSupported { - @Setter @Getter @Column(columnName = "entity_id") @IDColumn private String entityId; + @Setter @Getter @Column(columnName = "entity_id") @IDColumn private java.lang.String entityId; @Setter @Getter @Column(columnName = "service_instance_id") private int serviceInstanceId; @Override public String id() { diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstancejvmgc/InstanceJvmOldGcCountIndicator.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstancejvmgc/InstanceJvmOldGcCountIndicator.java index 0306793bc..8917f70cb 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstancejvmgc/InstanceJvmOldGcCountIndicator.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstancejvmgc/InstanceJvmOldGcCountIndicator.java @@ -41,7 +41,7 @@ import org.apache.skywalking.oap.server.core.source.Scope; @StorageEntity(name = "instance_jvm_old_gc_count", builder = InstanceJvmOldGcCountIndicator.Builder.class) public class InstanceJvmOldGcCountIndicator extends SumIndicator implements AlarmSupported { - @Setter @Getter @Column(columnName = "entity_id") @IDColumn private String entityId; + @Setter @Getter @Column(columnName = "entity_id") @IDColumn private java.lang.String entityId; @Setter @Getter @Column(columnName = "service_instance_id") private int serviceInstanceId; @Override public String id() { diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstancejvmgc/InstanceJvmOldGcTimeIndicator.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstancejvmgc/InstanceJvmOldGcTimeIndicator.java index da0a00a09..0f6eb1bf1 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstancejvmgc/InstanceJvmOldGcTimeIndicator.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstancejvmgc/InstanceJvmOldGcTimeIndicator.java @@ -41,7 +41,7 @@ import org.apache.skywalking.oap.server.core.source.Scope; @StorageEntity(name = "instance_jvm_old_gc_time", builder = InstanceJvmOldGcTimeIndicator.Builder.class) public class InstanceJvmOldGcTimeIndicator extends LongAvgIndicator implements AlarmSupported { - @Setter @Getter @Column(columnName = "entity_id") @IDColumn private String entityId; + @Setter @Getter @Column(columnName = "entity_id") @IDColumn private java.lang.String entityId; @Setter @Getter @Column(columnName = "service_instance_id") private int serviceInstanceId; @Override public String id() { diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstancejvmgc/InstanceJvmYoungGcCountIndicator.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstancejvmgc/InstanceJvmYoungGcCountIndicator.java index 8d53cbf94..5076a99df 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstancejvmgc/InstanceJvmYoungGcCountIndicator.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstancejvmgc/InstanceJvmYoungGcCountIndicator.java @@ -41,7 +41,7 @@ import org.apache.skywalking.oap.server.core.source.Scope; @StorageEntity(name = "instance_jvm_young_gc_count", builder = InstanceJvmYoungGcCountIndicator.Builder.class) public class InstanceJvmYoungGcCountIndicator extends SumIndicator implements AlarmSupported { - @Setter @Getter @Column(columnName = "entity_id") @IDColumn private String entityId; + @Setter @Getter @Column(columnName = "entity_id") @IDColumn private java.lang.String entityId; @Setter @Getter @Column(columnName = "service_instance_id") private int serviceInstanceId; @Override public String id() { diff --git 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 index 1d8bce4d5..56da0ccd4 100644 --- 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 @@ -41,7 +41,7 @@ import org.apache.skywalking.oap.server.core.source.Scope; @StorageEntity(name = "instance_jvm_young_gc_time", builder = InstanceJvmYoungGcTimeIndicator.Builder.class) public class InstanceJvmYoungGcTimeIndicator extends LongAvgIndicator implements AlarmSupported { - @Setter @Getter @Column(columnName = "entity_id") @IDColumn private String entityId; + @Setter @Getter @Column(columnName = "entity_id") @IDColumn private java.lang.String entityId; @Setter @Getter @Column(columnName = "service_instance_id") private int serviceInstanceId; @Override public String id() { diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstancejvmmemory/InstanceJvmMemoryHeapIndicator.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstancejvmmemory/InstanceJvmMemoryHeapIndicator.java index 8ec556fe4..815b9d566 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstancejvmmemory/InstanceJvmMemoryHeapIndicator.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstancejvmmemory/InstanceJvmMemoryHeapIndicator.java @@ -41,7 +41,7 @@ import org.apache.skywalking.oap.server.core.source.Scope; @StorageEntity(name = "instance_jvm_memory_heap", builder = InstanceJvmMemoryHeapIndicator.Builder.class) public class InstanceJvmMemoryHeapIndicator extends LongAvgIndicator implements AlarmSupported { - @Setter @Getter @Column(columnName = "entity_id") @IDColumn private String entityId; + @Setter @Getter @Column(columnName = "entity_id") @IDColumn private java.lang.String entityId; @Setter @Getter @Column(columnName = "service_instance_id") private int serviceInstanceId; @Override public String id() { diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstancejvmmemory/InstanceJvmMemoryHeapMaxIndicator.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstancejvmmemory/InstanceJvmMemoryHeapMaxIndicator.java new file mode 100644 index 000000000..f6c63d366 --- /dev/null +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstancejvmmemory/InstanceJvmMemoryHeapMaxIndicator.java @@ -0,0 +1,181 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +package org.apache.skywalking.oap.server.core.analysis.generated.serviceinstancejvmmemory; + +import java.util.*; +import lombok.*; +import org.apache.skywalking.oap.server.core.Const; +import org.apache.skywalking.oap.server.core.alarm.AlarmMeta; +import org.apache.skywalking.oap.server.core.alarm.AlarmSupported; +import org.apache.skywalking.oap.server.core.analysis.indicator.*; +import org.apache.skywalking.oap.server.core.analysis.indicator.annotation.IndicatorType; +import org.apache.skywalking.oap.server.core.remote.annotation.StreamData; +import org.apache.skywalking.oap.server.core.remote.grpc.proto.RemoteData; +import org.apache.skywalking.oap.server.core.storage.annotation.*; +import org.apache.skywalking.oap.server.core.storage.StorageBuilder; +import org.apache.skywalking.oap.server.core.source.Scope; + +/** + * This class is auto generated. Please don't change this class manually. + * + * @author Observability Analysis Language code generator + */ +@IndicatorType +@StreamData +@StorageEntity(name = "instance_jvm_memory_heap_max", builder = InstanceJvmMemoryHeapMaxIndicator.Builder.class) +public class InstanceJvmMemoryHeapMaxIndicator extends LongAvgIndicator implements AlarmSupported { + + @Setter @Getter @Column(columnName = "entity_id") @IDColumn private java.lang.String entityId; + @Setter @Getter @Column(columnName = "service_instance_id") private int serviceInstanceId; + + @Override public String id() { + String splitJointId = String.valueOf(getTimeBucket()); + splitJointId += Const.ID_SPLIT + entityId; + return splitJointId; + } + + @Override public int hashCode() { + int result = 17; + result = 31 * result + entityId.hashCode(); + result = 31 * result + (int)getTimeBucket(); + return result; + } + + + @Override public int remoteHashCode() { + int result = 17; + result = 31 * result + entityId.hashCode(); + return result; + } + + @Override public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + if (getClass() != obj.getClass()) + return false; + + InstanceJvmMemoryHeapMaxIndicator indicator = (InstanceJvmMemoryHeapMaxIndicator)obj; + if (entityId != indicator.entityId) + return false; + + if (getTimeBucket() != indicator.getTimeBucket()) + return false; + + return true; + } + + @Override public RemoteData.Builder serialize() { + RemoteData.Builder remoteBuilder = RemoteData.newBuilder(); + remoteBuilder.setDataStrings(0, getEntityId()); + + remoteBuilder.setDataLongs(0, getSummation()); + remoteBuilder.setDataLongs(1, getValue()); + remoteBuilder.setDataLongs(2, getTimeBucket()); + + + remoteBuilder.setDataIntegers(0, getServiceInstanceId()); + remoteBuilder.setDataIntegers(1, getCount()); + + return remoteBuilder; + } + + @Override public void deserialize(RemoteData remoteData) { + setEntityId(remoteData.getDataStrings(0)); + + setSummation(remoteData.getDataLongs(0)); + setValue(remoteData.getDataLongs(1)); + setTimeBucket(remoteData.getDataLongs(2)); + + + setServiceInstanceId(remoteData.getDataIntegers(0)); + setCount(remoteData.getDataIntegers(1)); + + + } + + @Override public AlarmMeta getAlarmMeta() { + return new AlarmMeta("instance_jvm_memory_heap_max", Scope.ServiceInstanceJVMMemory, entityId); + } + + @Override + public Indicator toHour() { + InstanceJvmMemoryHeapMaxIndicator indicator = new InstanceJvmMemoryHeapMaxIndicator(); + indicator.setTimeBucket(toTimeBucketInHour()); + indicator.setEntityId(this.getEntityId()); + 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() { + InstanceJvmMemoryHeapMaxIndicator indicator = new InstanceJvmMemoryHeapMaxIndicator(); + indicator.setTimeBucket(toTimeBucketInDay()); + indicator.setEntityId(this.getEntityId()); + 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 toMonth() { + InstanceJvmMemoryHeapMaxIndicator indicator = new InstanceJvmMemoryHeapMaxIndicator(); + indicator.setTimeBucket(toTimeBucketInMonth()); + indicator.setEntityId(this.getEntityId()); + 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 { + + @Override public Map data2Map(InstanceJvmMemoryHeapMaxIndicator storageData) { + Map map = new HashMap<>(); + map.put("entity_id", storageData.getEntityId()); + map.put("service_instance_id", storageData.getServiceInstanceId()); + map.put("summation", storageData.getSummation()); + map.put("count", storageData.getCount()); + map.put("value", storageData.getValue()); + map.put("time_bucket", storageData.getTimeBucket()); + return map; + } + + @Override public InstanceJvmMemoryHeapMaxIndicator map2Data(Map dbMap) { + InstanceJvmMemoryHeapMaxIndicator indicator = new InstanceJvmMemoryHeapMaxIndicator(); + indicator.setEntityId((String)dbMap.get("entity_id")); + indicator.setServiceInstanceId(((Number)dbMap.get("service_instance_id")).intValue()); + indicator.setSummation(((Number)dbMap.get("summation")).longValue()); + indicator.setCount(((Number)dbMap.get("count")).intValue()); + indicator.setValue(((Number)dbMap.get("value")).longValue()); + indicator.setTimeBucket(((Number)dbMap.get("time_bucket")).longValue()); + return indicator; + } + } +} diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstancejvmmemory/InstanceJvmMemoryNoheapIndicator.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstancejvmmemory/InstanceJvmMemoryNoheapIndicator.java index a42619f81..4d847d19d 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstancejvmmemory/InstanceJvmMemoryNoheapIndicator.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstancejvmmemory/InstanceJvmMemoryNoheapIndicator.java @@ -41,7 +41,7 @@ import org.apache.skywalking.oap.server.core.source.Scope; @StorageEntity(name = "instance_jvm_memory_noheap", builder = InstanceJvmMemoryNoheapIndicator.Builder.class) public class InstanceJvmMemoryNoheapIndicator extends LongAvgIndicator implements AlarmSupported { - @Setter @Getter @Column(columnName = "entity_id") @IDColumn private String entityId; + @Setter @Getter @Column(columnName = "entity_id") @IDColumn private java.lang.String entityId; @Setter @Getter @Column(columnName = "service_instance_id") private int serviceInstanceId; @Override public String id() { diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstancejvmmemory/InstanceJvmMemoryNoheapMaxIndicator.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstancejvmmemory/InstanceJvmMemoryNoheapMaxIndicator.java new file mode 100644 index 000000000..6e831d4e3 --- /dev/null +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstancejvmmemory/InstanceJvmMemoryNoheapMaxIndicator.java @@ -0,0 +1,181 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +package org.apache.skywalking.oap.server.core.analysis.generated.serviceinstancejvmmemory; + +import java.util.*; +import lombok.*; +import org.apache.skywalking.oap.server.core.Const; +import org.apache.skywalking.oap.server.core.alarm.AlarmMeta; +import org.apache.skywalking.oap.server.core.alarm.AlarmSupported; +import org.apache.skywalking.oap.server.core.analysis.indicator.*; +import org.apache.skywalking.oap.server.core.analysis.indicator.annotation.IndicatorType; +import org.apache.skywalking.oap.server.core.remote.annotation.StreamData; +import org.apache.skywalking.oap.server.core.remote.grpc.proto.RemoteData; +import org.apache.skywalking.oap.server.core.storage.annotation.*; +import org.apache.skywalking.oap.server.core.storage.StorageBuilder; +import org.apache.skywalking.oap.server.core.source.Scope; + +/** + * This class is auto generated. Please don't change this class manually. + * + * @author Observability Analysis Language code generator + */ +@IndicatorType +@StreamData +@StorageEntity(name = "instance_jvm_memory_noheap_max", builder = InstanceJvmMemoryNoheapMaxIndicator.Builder.class) +public class InstanceJvmMemoryNoheapMaxIndicator extends LongAvgIndicator implements AlarmSupported { + + @Setter @Getter @Column(columnName = "entity_id") @IDColumn private java.lang.String entityId; + @Setter @Getter @Column(columnName = "service_instance_id") private int serviceInstanceId; + + @Override public String id() { + String splitJointId = String.valueOf(getTimeBucket()); + splitJointId += Const.ID_SPLIT + entityId; + return splitJointId; + } + + @Override public int hashCode() { + int result = 17; + result = 31 * result + entityId.hashCode(); + result = 31 * result + (int)getTimeBucket(); + return result; + } + + + @Override public int remoteHashCode() { + int result = 17; + result = 31 * result + entityId.hashCode(); + return result; + } + + @Override public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + if (getClass() != obj.getClass()) + return false; + + InstanceJvmMemoryNoheapMaxIndicator indicator = (InstanceJvmMemoryNoheapMaxIndicator)obj; + if (entityId != indicator.entityId) + return false; + + if (getTimeBucket() != indicator.getTimeBucket()) + return false; + + return true; + } + + @Override public RemoteData.Builder serialize() { + RemoteData.Builder remoteBuilder = RemoteData.newBuilder(); + remoteBuilder.setDataStrings(0, getEntityId()); + + remoteBuilder.setDataLongs(0, getSummation()); + remoteBuilder.setDataLongs(1, getValue()); + remoteBuilder.setDataLongs(2, getTimeBucket()); + + + remoteBuilder.setDataIntegers(0, getServiceInstanceId()); + remoteBuilder.setDataIntegers(1, getCount()); + + return remoteBuilder; + } + + @Override public void deserialize(RemoteData remoteData) { + setEntityId(remoteData.getDataStrings(0)); + + setSummation(remoteData.getDataLongs(0)); + setValue(remoteData.getDataLongs(1)); + setTimeBucket(remoteData.getDataLongs(2)); + + + setServiceInstanceId(remoteData.getDataIntegers(0)); + setCount(remoteData.getDataIntegers(1)); + + + } + + @Override public AlarmMeta getAlarmMeta() { + return new AlarmMeta("instance_jvm_memory_noheap_max", Scope.ServiceInstanceJVMMemory, entityId); + } + + @Override + public Indicator toHour() { + InstanceJvmMemoryNoheapMaxIndicator indicator = new InstanceJvmMemoryNoheapMaxIndicator(); + indicator.setTimeBucket(toTimeBucketInHour()); + indicator.setEntityId(this.getEntityId()); + 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() { + InstanceJvmMemoryNoheapMaxIndicator indicator = new InstanceJvmMemoryNoheapMaxIndicator(); + indicator.setTimeBucket(toTimeBucketInDay()); + indicator.setEntityId(this.getEntityId()); + 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 toMonth() { + InstanceJvmMemoryNoheapMaxIndicator indicator = new InstanceJvmMemoryNoheapMaxIndicator(); + indicator.setTimeBucket(toTimeBucketInMonth()); + indicator.setEntityId(this.getEntityId()); + 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 { + + @Override public Map data2Map(InstanceJvmMemoryNoheapMaxIndicator storageData) { + Map map = new HashMap<>(); + map.put("entity_id", storageData.getEntityId()); + map.put("service_instance_id", storageData.getServiceInstanceId()); + map.put("summation", storageData.getSummation()); + map.put("count", storageData.getCount()); + map.put("value", storageData.getValue()); + map.put("time_bucket", storageData.getTimeBucket()); + return map; + } + + @Override public InstanceJvmMemoryNoheapMaxIndicator map2Data(Map dbMap) { + InstanceJvmMemoryNoheapMaxIndicator indicator = new InstanceJvmMemoryNoheapMaxIndicator(); + indicator.setEntityId((String)dbMap.get("entity_id")); + indicator.setServiceInstanceId(((Number)dbMap.get("service_instance_id")).intValue()); + indicator.setSummation(((Number)dbMap.get("summation")).longValue()); + indicator.setCount(((Number)dbMap.get("count")).intValue()); + indicator.setValue(((Number)dbMap.get("value")).longValue()); + indicator.setTimeBucket(((Number)dbMap.get("time_bucket")).longValue()); + return indicator; + } + } +} diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstancejvmmemory/ServiceInstanceJVMMemoryDispatcher.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstancejvmmemory/ServiceInstanceJVMMemoryDispatcher.java index 3095ab409..f6c58661e 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstancejvmmemory/ServiceInstanceJVMMemoryDispatcher.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstancejvmmemory/ServiceInstanceJVMMemoryDispatcher.java @@ -33,6 +33,8 @@ public class ServiceInstanceJVMMemoryDispatcher implements SourceDispatcher