From 59a30ed0ac058789f0fdb094975965d3846576d9 Mon Sep 17 00:00:00 2001 From: Wu Sheng Date: Tue, 28 Aug 2018 20:55:53 +0800 Subject: [PATCH] Fix CI and Add new alarm bridge by using latest code generator. --- .../oap/server/core/alarm/AlarmMeta.java | 38 ++++++ .../oap/server/core/alarm/AlarmSupported.java | 28 ++++ .../oap/server/core/alarm/ScopeIDs.java | 37 +++++ .../endpoint/EndpointAvgIndicator.java | 13 +- .../endpoint/EndpointDispatcher.java | 7 +- .../endpoint/EndpointPercentIndicator.java | 13 +- .../service/ServiceAvgIndicator.java | 127 ++++++++++++++++++ .../generated/service/ServiceDispatcher.java | 45 +++++++ .../InstanceJvmCpuIndicator.java | 13 +- .../ServiceInstanceJVMCPUDispatcher.java | 3 +- ...a => InstanceJvmYoungGcTimeIndicator.java} | 25 ++-- .../ServiceInstanceJVMGCDispatcher.java | 13 +- .../InstanceJvmMemoryMaxIndicator.java | 13 +- .../ServiceInstanceJVMMemoryDispatcher.java | 3 +- .../InstanceJvmMemoryPoolMaxIndicator.java | 13 +- ...erviceInstanceJVMMemoryPoolDispatcher.java | 3 +- 16 files changed, 360 insertions(+), 34 deletions(-) create mode 100644 oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/alarm/AlarmMeta.java create mode 100644 oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/alarm/AlarmSupported.java create mode 100644 oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/alarm/ScopeIDs.java create mode 100644 oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/service/ServiceAvgIndicator.java create mode 100644 oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/service/ServiceDispatcher.java rename oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstancejvmgc/{InstanceJvmGcTimeIndicator.java => InstanceJvmYoungGcTimeIndicator.java} (83%) diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/alarm/AlarmMeta.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/alarm/AlarmMeta.java new file mode 100644 index 000000000..a9227a5df --- /dev/null +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/alarm/AlarmMeta.java @@ -0,0 +1,38 @@ +/* + * 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.alarm; + +import lombok.Getter; +import lombok.Setter; +import org.apache.skywalking.oap.server.core.source.Scope; + +/** + * @author wusheng + */ +public class AlarmMeta { + @Setter @Getter private String indicatorName; + @Setter @Getter private Scope scope; + @Setter @Getter private ScopeIDs ids; + + public AlarmMeta(String indicatorName, Scope scope, int... ids) { + this.indicatorName = indicatorName; + this.scope = scope; + this.ids = new ScopeIDs(ids); + } +} diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/alarm/AlarmSupported.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/alarm/AlarmSupported.java new file mode 100644 index 000000000..9846491d5 --- /dev/null +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/alarm/AlarmSupported.java @@ -0,0 +1,28 @@ +/* + * 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.alarm; + +/** + * Alarm supported interface implementor could return the {@link AlarmMeta} + * + * @author wusheng + */ +public interface AlarmSupported { + AlarmMeta getAlarmMeta(); +} diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/alarm/ScopeIDs.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/alarm/ScopeIDs.java new file mode 100644 index 000000000..f788ce9d1 --- /dev/null +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/alarm/ScopeIDs.java @@ -0,0 +1,37 @@ +/* + * 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.alarm; + +/** + * Scope IDs represent IDs of this scope. + * Such as: + * 1. Service, Endpoint have a single int ID. + * 2. Service Relation ID is combined by two INTs. + */ +public class ScopeIDs { + private int[] ids; + + public ScopeIDs(int... ids) { + this.ids = ids; + } + + public int getID(int idx) { + return ids[idx]; + } +} 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 bc2834564..2826b0588 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 @@ -21,12 +21,15 @@ package org.apache.skywalking.oap.server.core.analysis.generated.endpoint; import java.util.*; import lombok.*; import org.apache.skywalking.oap.server.core.Const; -import org.apache.skywalking.oap.server.core.analysis.indicator.LongAvgIndicator; +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.StorageBuilder; 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. @@ -36,7 +39,7 @@ import org.apache.skywalking.oap.server.core.storage.annotation.*; @IndicatorType @StreamData @StorageEntity(name = "endpoint_avg", builder = EndpointAvgIndicator.Builder.class) -public class EndpointAvgIndicator extends LongAvgIndicator { +public class EndpointAvgIndicator extends LongAvgIndicator implements AlarmSupported { @Setter @Getter @Column(columnName = "id") private int id; @Setter @Getter @Column(columnName = "service_id") private int serviceId; @@ -101,6 +104,10 @@ public class EndpointAvgIndicator extends LongAvgIndicator { setCount(remoteData.getDataIntegers(3)); } + @Override public AlarmMeta getAlarmMeta() { + return new AlarmMeta("endpoint_Avg", Scope.Endpoint, id, serviceId, serviceInstanceId); + } + public static class Builder implements StorageBuilder { @Override public Map data2Map(EndpointAvgIndicator storageData) { diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/endpoint/EndpointDispatcher.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/endpoint/EndpointDispatcher.java index 565e65dd9..16f759594 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/endpoint/EndpointDispatcher.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/endpoint/EndpointDispatcher.java @@ -19,9 +19,8 @@ package org.apache.skywalking.oap.server.core.analysis.generated.endpoint; import org.apache.skywalking.oap.server.core.analysis.SourceDispatcher; -import org.apache.skywalking.oap.server.core.analysis.indicator.expression.EqualMatch; import org.apache.skywalking.oap.server.core.analysis.worker.IndicatorProcess; -import org.apache.skywalking.oap.server.core.source.Endpoint; +import org.apache.skywalking.oap.server.core.source.*; /** * This class is auto generated. Please don't change this class manually. @@ -38,6 +37,7 @@ public class EndpointDispatcher implements SourceDispatcher { private void doEndpointAvg(Endpoint source) { EndpointAvgIndicator indicator = new EndpointAvgIndicator(); + indicator.setTimeBucket(source.getTimeBucket()); indicator.setId(source.getId()); indicator.setServiceId(source.getServiceId()); @@ -49,11 +49,12 @@ public class EndpointDispatcher implements SourceDispatcher { private void doEndpointPercent(Endpoint source) { EndpointPercentIndicator indicator = new EndpointPercentIndicator(); + indicator.setTimeBucket(source.getTimeBucket()); indicator.setId(source.getId()); indicator.setServiceId(source.getServiceId()); indicator.setServiceInstanceId(source.getServiceInstanceId()); - indicator.combine(new EqualMatch(), source.isStatus(), true); + indicator.combine(new org.apache.skywalking.oap.server.core.analysis.indicator.expression.EqualMatch(), source.isStatus(), true); IndicatorProcess.INSTANCE.in(indicator); } diff --git 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 index e581434ab..43bbf9f3b 100644 --- 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 @@ -21,12 +21,15 @@ package org.apache.skywalking.oap.server.core.analysis.generated.endpoint; import java.util.*; import lombok.*; import org.apache.skywalking.oap.server.core.Const; -import org.apache.skywalking.oap.server.core.analysis.indicator.PercentIndicator; +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.StorageBuilder; 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. @@ -36,7 +39,7 @@ import org.apache.skywalking.oap.server.core.storage.annotation.*; @IndicatorType @StreamData @StorageEntity(name = "endpoint_percent", builder = EndpointPercentIndicator.Builder.class) -public class EndpointPercentIndicator extends PercentIndicator { +public class EndpointPercentIndicator extends PercentIndicator implements AlarmSupported { @Setter @Getter @Column(columnName = "id") private int id; @Setter @Getter @Column(columnName = "service_id") private int serviceId; @@ -101,6 +104,10 @@ public class EndpointPercentIndicator extends PercentIndicator { setPercentage(remoteData.getDataIntegers(3)); } + @Override public AlarmMeta getAlarmMeta() { + return new AlarmMeta("endpoint_percent", Scope.Endpoint, id, serviceId, serviceInstanceId); + } + public static class Builder implements StorageBuilder { @Override public Map data2Map(EndpointPercentIndicator storageData) { diff --git 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 new file mode 100644 index 000000000..aef5f605d --- /dev/null +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/service/ServiceAvgIndicator.java @@ -0,0 +1,127 @@ +/* + * 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.service; + +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 = "service_avg", builder = ServiceAvgIndicator.Builder.class) +public class ServiceAvgIndicator extends LongAvgIndicator implements AlarmSupported { + + @Setter @Getter @Column(columnName = "id") private int id; + + @Override public String id() { + String splitJointId = String.valueOf(getTimeBucket()); + splitJointId += Const.ID_SPLIT + String.valueOf(id); + return splitJointId; + } + + @Override public int hashCode() { + int result = 17; + result = 31 * result + id; + result = 31 * result + (int)getTimeBucket(); + return result; + } + + @Override public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + if (getClass() != obj.getClass()) + return false; + + ServiceAvgIndicator indicator = (ServiceAvgIndicator)obj; + if (id != indicator.id) + return false; + if (getTimeBucket() != indicator.getTimeBucket()) + return false; + + return true; + } + + @Override public RemoteData.Builder serialize() { + RemoteData.Builder remoteBuilder = RemoteData.newBuilder(); + + remoteBuilder.setDataLongs(0, getSummation()); + remoteBuilder.setDataLongs(1, getValue()); + remoteBuilder.setDataLongs(2, getTimeBucket()); + + + remoteBuilder.setDataIntegers(0, getId()); + remoteBuilder.setDataIntegers(1, getCount()); + + return remoteBuilder; + } + + @Override public void deserialize(RemoteData remoteData) { + + setSummation(remoteData.getDataLongs(0)); + setValue(remoteData.getDataLongs(1)); + setTimeBucket(remoteData.getDataLongs(2)); + + + setId(remoteData.getDataIntegers(0)); + setCount(remoteData.getDataIntegers(1)); + } + + @Override public AlarmMeta getAlarmMeta() { + return new AlarmMeta("Service_Avg", Scope.Service, id); + } + + public static class Builder implements StorageBuilder { + + @Override public Map data2Map(ServiceAvgIndicator storageData) { + Map map = new HashMap<>(); + map.put("id", storageData.getId()); + 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 ServiceAvgIndicator map2Data(Map dbMap) { + ServiceAvgIndicator indicator = new ServiceAvgIndicator(); + indicator.setId(((Number)dbMap.get("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/service/ServiceDispatcher.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/service/ServiceDispatcher.java new file mode 100644 index 000000000..cdef6a8e7 --- /dev/null +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/service/ServiceDispatcher.java @@ -0,0 +1,45 @@ +/* + * 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.service; + +import org.apache.skywalking.oap.server.core.analysis.SourceDispatcher; +import org.apache.skywalking.oap.server.core.analysis.worker.IndicatorProcess; +import org.apache.skywalking.oap.server.core.source.*; + +/** + * This class is auto generated. Please don't change this class manually. + * + * @author Observability Analysis Language code generator + */ +public class ServiceDispatcher implements SourceDispatcher { + + @Override public void dispatch(Service source) { + doServiceAvg(source); + } + + private void doServiceAvg(Service source) { + ServiceAvgIndicator indicator = new ServiceAvgIndicator(); + + + indicator.setTimeBucket(source.getTimeBucket()); + indicator.setId(source.getId()); + indicator.combine(source.getLatency(), 1); + IndicatorProcess.INSTANCE.in(indicator); + } +} 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 cc193650f..a2e3f9ad4 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 @@ -21,12 +21,15 @@ package org.apache.skywalking.oap.server.core.analysis.generated.serviceinstance import java.util.*; import lombok.*; import org.apache.skywalking.oap.server.core.Const; -import org.apache.skywalking.oap.server.core.analysis.indicator.DoubleAvgIndicator; +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.StorageBuilder; 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. @@ -36,7 +39,7 @@ import org.apache.skywalking.oap.server.core.storage.annotation.*; @IndicatorType @StreamData @StorageEntity(name = "instance_jvm_cpu", builder = InstanceJvmCpuIndicator.Builder.class) -public class InstanceJvmCpuIndicator extends DoubleAvgIndicator { +public class InstanceJvmCpuIndicator extends DoubleAvgIndicator implements AlarmSupported { @Setter @Getter @Column(columnName = "id") private int id; @Setter @Getter @Column(columnName = "service_instance_id") private int serviceInstanceId; @@ -98,6 +101,10 @@ public class InstanceJvmCpuIndicator extends DoubleAvgIndicator { setCount(remoteData.getDataIntegers(2)); } + @Override public AlarmMeta getAlarmMeta() { + return new AlarmMeta("instance_jvm_cpu", Scope.ServiceInstanceJVMCPU, id, serviceInstanceId); + } + public static class Builder implements StorageBuilder { @Override public Map data2Map(InstanceJvmCpuIndicator storageData) { diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstancejvmcpu/ServiceInstanceJVMCPUDispatcher.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstancejvmcpu/ServiceInstanceJVMCPUDispatcher.java index 48df5b419..84acb9e91 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstancejvmcpu/ServiceInstanceJVMCPUDispatcher.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstancejvmcpu/ServiceInstanceJVMCPUDispatcher.java @@ -20,7 +20,7 @@ package org.apache.skywalking.oap.server.core.analysis.generated.serviceinstance import org.apache.skywalking.oap.server.core.analysis.SourceDispatcher; import org.apache.skywalking.oap.server.core.analysis.worker.IndicatorProcess; -import org.apache.skywalking.oap.server.core.source.ServiceInstanceJVMCPU; +import org.apache.skywalking.oap.server.core.source.*; /** * This class is auto generated. Please don't change this class manually. @@ -36,6 +36,7 @@ public class ServiceInstanceJVMCPUDispatcher implements SourceDispatcher { + @Override public AlarmMeta getAlarmMeta() { + return new AlarmMeta("instance_jvm_young_gc_time", Scope.ServiceInstanceJVMGC, id, serviceInstanceId); + } - @Override public Map data2Map(InstanceJvmGcTimeIndicator storageData) { + public static class Builder implements StorageBuilder { + + @Override public Map data2Map(InstanceJvmYoungGcTimeIndicator storageData) { Map map = new HashMap<>(); map.put("id", storageData.getId()); map.put("service_instance_id", storageData.getServiceInstanceId()); @@ -111,8 +118,8 @@ public class InstanceJvmGcTimeIndicator extends LongAvgIndicator { return map; } - @Override public InstanceJvmGcTimeIndicator map2Data(Map dbMap) { - InstanceJvmGcTimeIndicator indicator = new InstanceJvmGcTimeIndicator(); + @Override public InstanceJvmYoungGcTimeIndicator map2Data(Map dbMap) { + InstanceJvmYoungGcTimeIndicator indicator = new InstanceJvmYoungGcTimeIndicator(); indicator.setId(((Number)dbMap.get("id")).intValue()); indicator.setServiceInstanceId(((Number)dbMap.get("service_instance_id")).intValue()); indicator.setSummation(((Number)dbMap.get("summation")).longValue()); diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstancejvmgc/ServiceInstanceJVMGCDispatcher.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstancejvmgc/ServiceInstanceJVMGCDispatcher.java index f39e5476e..f93eb11c2 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstancejvmgc/ServiceInstanceJVMGCDispatcher.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstancejvmgc/ServiceInstanceJVMGCDispatcher.java @@ -20,7 +20,8 @@ package org.apache.skywalking.oap.server.core.analysis.generated.serviceinstance import org.apache.skywalking.oap.server.core.analysis.SourceDispatcher; import org.apache.skywalking.oap.server.core.analysis.worker.IndicatorProcess; -import org.apache.skywalking.oap.server.core.source.ServiceInstanceJVMGC; +import org.apache.skywalking.oap.server.core.analysis.indicator.expression.*; +import org.apache.skywalking.oap.server.core.source.*; /** * This class is auto generated. Please don't change this class manually. @@ -30,11 +31,15 @@ import org.apache.skywalking.oap.server.core.source.ServiceInstanceJVMGC; public class ServiceInstanceJVMGCDispatcher implements SourceDispatcher { @Override public void dispatch(ServiceInstanceJVMGC source) { - doInstanceJvmGcTime(source); + doInstanceJvmYoungGcTime(source); } - private void doInstanceJvmGcTime(ServiceInstanceJVMGC source) { - InstanceJvmGcTimeIndicator indicator = new InstanceJvmGcTimeIndicator(); + private void doInstanceJvmYoungGcTime(ServiceInstanceJVMGC source) { + InstanceJvmYoungGcTimeIndicator indicator = new InstanceJvmYoungGcTimeIndicator(); + + if (!new EqualMatch().setLeft(source.getPhrase()).setRight(GCPhrase.NEW).match()) { + return; + } indicator.setTimeBucket(source.getTimeBucket()); indicator.setId(source.getId()); diff --git 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 index c3e53cf29..643fee246 100644 --- 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 @@ -21,12 +21,15 @@ package org.apache.skywalking.oap.server.core.analysis.generated.serviceinstance import java.util.*; import lombok.*; import org.apache.skywalking.oap.server.core.Const; -import org.apache.skywalking.oap.server.core.analysis.indicator.LongAvgIndicator; +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.StorageBuilder; 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. @@ -36,7 +39,7 @@ import org.apache.skywalking.oap.server.core.storage.annotation.*; @IndicatorType @StreamData @StorageEntity(name = "instance_jvm_memory_max", builder = InstanceJvmMemoryMaxIndicator.Builder.class) -public class InstanceJvmMemoryMaxIndicator extends LongAvgIndicator { +public class InstanceJvmMemoryMaxIndicator extends LongAvgIndicator implements AlarmSupported { @Setter @Getter @Column(columnName = "id") private int id; @Setter @Getter @Column(columnName = "service_instance_id") private int serviceInstanceId; @@ -98,6 +101,10 @@ public class InstanceJvmMemoryMaxIndicator extends LongAvgIndicator { setCount(remoteData.getDataIntegers(2)); } + @Override public AlarmMeta getAlarmMeta() { + return new AlarmMeta("instance_jvm_memory_max", Scope.ServiceInstanceJVMMemory, id, serviceInstanceId); + } + public static class Builder implements StorageBuilder { @Override public Map data2Map(InstanceJvmMemoryMaxIndicator storageData) { 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 bc6f688b4..6cf7b5e14 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 @@ -20,7 +20,7 @@ package org.apache.skywalking.oap.server.core.analysis.generated.serviceinstance import org.apache.skywalking.oap.server.core.analysis.SourceDispatcher; import org.apache.skywalking.oap.server.core.analysis.worker.IndicatorProcess; -import org.apache.skywalking.oap.server.core.source.ServiceInstanceJVMMemory; +import org.apache.skywalking.oap.server.core.source.*; /** * This class is auto generated. Please don't change this class manually. @@ -36,6 +36,7 @@ public class ServiceInstanceJVMMemoryDispatcher implements SourceDispatcher { @Override public Map data2Map(InstanceJvmMemoryPoolMaxIndicator storageData) { diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstancejvmmemorypool/ServiceInstanceJVMMemoryPoolDispatcher.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstancejvmmemorypool/ServiceInstanceJVMMemoryPoolDispatcher.java index a2c6eba78..b0a4b6887 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstancejvmmemorypool/ServiceInstanceJVMMemoryPoolDispatcher.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstancejvmmemorypool/ServiceInstanceJVMMemoryPoolDispatcher.java @@ -20,7 +20,7 @@ package org.apache.skywalking.oap.server.core.analysis.generated.serviceinstance import org.apache.skywalking.oap.server.core.analysis.SourceDispatcher; import org.apache.skywalking.oap.server.core.analysis.worker.IndicatorProcess; -import org.apache.skywalking.oap.server.core.source.ServiceInstanceJVMMemoryPool; +import org.apache.skywalking.oap.server.core.source.*; /** * This class is auto generated. Please don't change this class manually. @@ -36,6 +36,7 @@ public class ServiceInstanceJVMMemoryPoolDispatcher implements SourceDispatcher< private void doInstanceJvmMemoryPoolMax(ServiceInstanceJVMMemoryPool source) { InstanceJvmMemoryPoolMaxIndicator indicator = new InstanceJvmMemoryPoolMaxIndicator(); + indicator.setTimeBucket(source.getTimeBucket()); indicator.setId(source.getId()); indicator.setServiceInstanceId(source.getServiceInstanceId());