From 948ef6d1c4028b8c585d6ca307ab77c0a33ea981 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BD=AD=E5=8B=87=E5=8D=87=20pengys?= <8082209@qq.com> Date: Mon, 29 Oct 2018 17:31:30 +0800 Subject: [PATCH] Fixed the bugs of the OAP server running in cluster mode. (#1844) * 1. Fixed the bug of the cluster node sync failure cause by curator instance cache is null. 2. Fixed the bug of the collection in remote data builder is not initialized. * 1. Re-generate indicator. * Fixed the bug of the collection in remote data builder is not initialized. * Fixed the bug of the remote client created but not initialize. --- .../zookeeper/ZookeeperCoordinator.java | 40 ++++++++----------- .../analysis/generated/all/AllDispatcher.java | 2 +- .../generated/all/AllHeatmapIndicator.java | 13 +++--- .../generated/all/AllP50Indicator.java | 13 +++--- .../generated/all/AllP75Indicator.java | 13 +++--- .../generated/all/AllP90Indicator.java | 13 +++--- .../generated/all/AllP95Indicator.java | 13 +++--- .../generated/all/AllP99Indicator.java | 13 +++--- .../endpoint/EndpointAvgIndicator.java | 23 +++++------ .../endpoint/EndpointCpmIndicator.java | 21 +++++----- .../endpoint/EndpointDispatcher.java | 2 +- .../endpoint/EndpointP50Indicator.java | 21 +++++----- .../endpoint/EndpointP75Indicator.java | 21 +++++----- .../endpoint/EndpointP90Indicator.java | 21 +++++----- .../endpoint/EndpointP95Indicator.java | 21 +++++----- .../endpoint/EndpointP99Indicator.java | 21 +++++----- .../endpoint/EndpointSlaIndicator.java | 23 +++++------ .../EndpointRelationCpmIndicator.java | 25 ++++++------ .../EndpointRelationDispatcher.java | 2 +- .../EndpointRelationRespTimeIndicator.java | 27 ++++++------- .../service/ServiceCpmIndicator.java | 17 ++++---- .../generated/service/ServiceDispatcher.java | 2 +- .../service/ServiceP50Indicator.java | 17 ++++---- .../service/ServiceP75Indicator.java | 17 ++++---- .../service/ServiceP90Indicator.java | 17 ++++---- .../service/ServiceP95Indicator.java | 17 ++++---- .../service/ServiceP99Indicator.java | 17 ++++---- .../service/ServiceRespTimeIndicator.java | 19 +++++---- .../service/ServiceSlaIndicator.java | 19 +++++---- .../ServiceInstanceCpmIndicator.java | 19 +++++---- .../ServiceInstanceDispatcher.java | 2 +- .../ServiceInstanceRespTimeIndicator.java | 21 +++++----- .../InstanceJvmCpuIndicator.java | 21 +++++----- .../ServiceInstanceJVMCPUDispatcher.java | 2 +- .../InstanceJvmOldGcCountIndicator.java | 17 ++++---- .../InstanceJvmOldGcTimeIndicator.java | 21 +++++----- .../InstanceJvmYoungGcCountIndicator.java | 17 ++++---- .../InstanceJvmYoungGcTimeIndicator.java | 21 +++++----- .../ServiceInstanceJVMGCDispatcher.java | 2 +- .../InstanceJvmMemoryHeapIndicator.java | 21 +++++----- .../InstanceJvmMemoryHeapMaxIndicator.java | 21 +++++----- .../InstanceJvmMemoryNoheapIndicator.java | 21 +++++----- .../InstanceJvmMemoryNoheapMaxIndicator.java | 21 +++++----- .../ServiceInstanceJVMMemoryDispatcher.java | 4 +- ...erviceInstanceJVMMemoryPoolDispatcher.java | 2 +- .../ServiceInstanceRelationDispatcher.java | 2 +- ...ServiceRelationClientCallSlaIndicator.java | 19 +++++---- .../ServiceRelationClientCpmIndicator.java | 17 ++++---- ...erviceRelationClientRespTimeIndicator.java | 19 +++++---- .../ServiceRelationDispatcher.java | 2 +- ...ServiceRelationServerCallSlaIndicator.java | 19 +++++---- .../ServiceRelationServerCpmIndicator.java | 17 ++++---- ...erviceRelationServerRespTimeIndicator.java | 19 +++++---- .../EndpointRelationServerSideIndicator.java | 13 +++--- .../ServiceRelationClientSideIndicator.java | 13 +++--- .../ServiceRelationServerSideIndicator.java | 13 +++--- .../server/core/cluster/RemoteInstance.java | 2 +- .../core/register/EndpointInventory.java | 12 +++--- .../register/NetworkAddressInventory.java | 10 ++--- .../register/ServiceInstanceInventory.java | 37 ++++++++--------- .../core/register/ServiceInventory.java | 16 ++++---- .../core/remote/client/GRPCRemoteClient.java | 1 + .../remote/client/RemoteClientManager.java | 25 +++++++----- 63 files changed, 472 insertions(+), 507 deletions(-) diff --git a/oap-server/server-cluster-plugin/cluster-zookeeper-plugin/src/main/java/org/apache/skywalking/oap/server/cluster/plugin/zookeeper/ZookeeperCoordinator.java b/oap-server/server-cluster-plugin/cluster-zookeeper-plugin/src/main/java/org/apache/skywalking/oap/server/cluster/plugin/zookeeper/ZookeeperCoordinator.java index 8cd8b5955..07f53a662 100644 --- a/oap-server/server-cluster-plugin/cluster-zookeeper-plugin/src/main/java/org/apache/skywalking/oap/server/cluster/plugin/zookeeper/ZookeeperCoordinator.java +++ b/oap-server/server-cluster-plugin/cluster-zookeeper-plugin/src/main/java/org/apache/skywalking/oap/server/cluster/plugin/zookeeper/ZookeeperCoordinator.java @@ -18,18 +18,10 @@ package org.apache.skywalking.oap.server.cluster.plugin.zookeeper; -import java.util.ArrayList; -import java.util.List; -import java.util.UUID; -import org.apache.curator.x.discovery.ServiceCache; -import org.apache.curator.x.discovery.ServiceDiscovery; -import org.apache.curator.x.discovery.ServiceInstance; -import org.apache.skywalking.oap.server.core.cluster.ClusterNodesQuery; -import org.apache.skywalking.oap.server.core.cluster.ClusterRegister; -import org.apache.skywalking.oap.server.core.cluster.RemoteInstance; -import org.apache.skywalking.oap.server.core.cluster.ServiceRegisterException; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import java.util.*; +import org.apache.curator.x.discovery.*; +import org.apache.skywalking.oap.server.core.cluster.*; +import org.slf4j.*; /** * @author peng-yongsheng @@ -72,18 +64,20 @@ public class ZookeeperCoordinator implements ClusterRegister, ClusterNodesQuery } @Override public List queryRemoteNodes() { - List> serviceInstances = serviceCache.getInstances(); + List remoteInstanceDetails = new ArrayList<>(20); + if (Objects.nonNull(serviceCache)) { + List> serviceInstances = serviceCache.getInstances(); - List remoteInstanceDetails = new ArrayList<>(serviceInstances.size()); - serviceInstances.forEach(serviceInstance -> { - RemoteInstance instance = serviceInstance.getPayload(); - if (instance.equals(selfInstance)) { - instance.setSelf(true); - } else { - instance.setSelf(false); - } - remoteInstanceDetails.add(instance); - }); + serviceInstances.forEach(serviceInstance -> { + RemoteInstance instance = serviceInstance.getPayload(); + if (instance.equals(selfInstance)) { + instance.setSelf(true); + } else { + instance.setSelf(false); + } + remoteInstanceDetails.add(instance); + }); + } return remoteInstanceDetails; } } diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/all/AllDispatcher.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/all/AllDispatcher.java index 2e3dabb85..be176f18b 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/all/AllDispatcher.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/all/AllDispatcher.java @@ -20,7 +20,7 @@ package org.apache.skywalking.oap.server.core.analysis.generated.all; 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.*; +import org.apache.skywalking.oap.server.core.source.All; /** * This class is auto generated. Please don't change this class manually. diff --git 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 index a020a42ac..ef76ae90d 100644 --- 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 @@ -19,15 +19,14 @@ package org.apache.skywalking.oap.server.core.analysis.generated.all; import java.util.*; -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.alarm.*; 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; +import org.apache.skywalking.oap.server.core.storage.StorageBuilder; +import org.apache.skywalking.oap.server.core.storage.annotation.StorageEntity; /** * This class is auto generated. Please don't change this class manually. @@ -75,11 +74,11 @@ public class AllHeatmapIndicator extends ThermodynamicIndicator implements Alarm @Override public RemoteData.Builder serialize() { RemoteData.Builder remoteBuilder = RemoteData.newBuilder(); - remoteBuilder.setDataLongs(0, getTimeBucket()); + remoteBuilder.addDataLongs(getTimeBucket()); - remoteBuilder.setDataIntegers(0, getStep()); - remoteBuilder.setDataIntegers(1, getNumOfSteps()); + remoteBuilder.addDataIntegers(getStep()); + remoteBuilder.addDataIntegers(getNumOfSteps()); getDetailGroup().forEach(element -> remoteBuilder.addDataIntLongPairList(element.serialize())); return remoteBuilder; diff --git 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 index a30bcc1f5..ba2180347 100644 --- 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 @@ -19,15 +19,14 @@ package org.apache.skywalking.oap.server.core.analysis.generated.all; import java.util.*; -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.alarm.*; 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; +import org.apache.skywalking.oap.server.core.storage.StorageBuilder; +import org.apache.skywalking.oap.server.core.storage.annotation.StorageEntity; /** * This class is auto generated. Please don't change this class manually. @@ -75,11 +74,11 @@ public class AllP50Indicator extends P50Indicator implements AlarmSupported { @Override public RemoteData.Builder serialize() { RemoteData.Builder remoteBuilder = RemoteData.newBuilder(); - remoteBuilder.setDataLongs(0, getTimeBucket()); + remoteBuilder.addDataLongs(getTimeBucket()); - remoteBuilder.setDataIntegers(0, getValue()); - remoteBuilder.setDataIntegers(1, getPrecision()); + remoteBuilder.addDataIntegers(getValue()); + remoteBuilder.addDataIntegers(getPrecision()); getDetailGroup().forEach(element -> remoteBuilder.addDataIntLongPairList(element.serialize())); return remoteBuilder; diff --git 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 index 21a3f94c1..7a2004f53 100644 --- 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 @@ -19,15 +19,14 @@ package org.apache.skywalking.oap.server.core.analysis.generated.all; import java.util.*; -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.alarm.*; 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; +import org.apache.skywalking.oap.server.core.storage.StorageBuilder; +import org.apache.skywalking.oap.server.core.storage.annotation.StorageEntity; /** * This class is auto generated. Please don't change this class manually. @@ -75,11 +74,11 @@ public class AllP75Indicator extends P75Indicator implements AlarmSupported { @Override public RemoteData.Builder serialize() { RemoteData.Builder remoteBuilder = RemoteData.newBuilder(); - remoteBuilder.setDataLongs(0, getTimeBucket()); + remoteBuilder.addDataLongs(getTimeBucket()); - remoteBuilder.setDataIntegers(0, getValue()); - remoteBuilder.setDataIntegers(1, getPrecision()); + remoteBuilder.addDataIntegers(getValue()); + remoteBuilder.addDataIntegers(getPrecision()); getDetailGroup().forEach(element -> remoteBuilder.addDataIntLongPairList(element.serialize())); return remoteBuilder; diff --git 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 index 66f6fe2c1..a2add8070 100644 --- 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 @@ -19,15 +19,14 @@ package org.apache.skywalking.oap.server.core.analysis.generated.all; import java.util.*; -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.alarm.*; 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; +import org.apache.skywalking.oap.server.core.storage.StorageBuilder; +import org.apache.skywalking.oap.server.core.storage.annotation.StorageEntity; /** * This class is auto generated. Please don't change this class manually. @@ -75,11 +74,11 @@ public class AllP90Indicator extends P90Indicator implements AlarmSupported { @Override public RemoteData.Builder serialize() { RemoteData.Builder remoteBuilder = RemoteData.newBuilder(); - remoteBuilder.setDataLongs(0, getTimeBucket()); + remoteBuilder.addDataLongs(getTimeBucket()); - remoteBuilder.setDataIntegers(0, getValue()); - remoteBuilder.setDataIntegers(1, getPrecision()); + remoteBuilder.addDataIntegers(getValue()); + remoteBuilder.addDataIntegers(getPrecision()); getDetailGroup().forEach(element -> remoteBuilder.addDataIntLongPairList(element.serialize())); return remoteBuilder; diff --git 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 index 3c651a77b..5accf8596 100644 --- 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 @@ -19,15 +19,14 @@ package org.apache.skywalking.oap.server.core.analysis.generated.all; import java.util.*; -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.alarm.*; 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; +import org.apache.skywalking.oap.server.core.storage.StorageBuilder; +import org.apache.skywalking.oap.server.core.storage.annotation.StorageEntity; /** * This class is auto generated. Please don't change this class manually. @@ -75,11 +74,11 @@ public class AllP95Indicator extends P95Indicator implements AlarmSupported { @Override public RemoteData.Builder serialize() { RemoteData.Builder remoteBuilder = RemoteData.newBuilder(); - remoteBuilder.setDataLongs(0, getTimeBucket()); + remoteBuilder.addDataLongs(getTimeBucket()); - remoteBuilder.setDataIntegers(0, getValue()); - remoteBuilder.setDataIntegers(1, getPrecision()); + remoteBuilder.addDataIntegers(getValue()); + remoteBuilder.addDataIntegers(getPrecision()); getDetailGroup().forEach(element -> remoteBuilder.addDataIntLongPairList(element.serialize())); return remoteBuilder; diff --git 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 index 69c5a0bb0..827282b86 100644 --- 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 @@ -19,15 +19,14 @@ package org.apache.skywalking.oap.server.core.analysis.generated.all; import java.util.*; -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.alarm.*; 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; +import org.apache.skywalking.oap.server.core.storage.StorageBuilder; +import org.apache.skywalking.oap.server.core.storage.annotation.StorageEntity; /** * This class is auto generated. Please don't change this class manually. @@ -75,11 +74,11 @@ public class AllP99Indicator extends P99Indicator implements AlarmSupported { @Override public RemoteData.Builder serialize() { RemoteData.Builder remoteBuilder = RemoteData.newBuilder(); - remoteBuilder.setDataLongs(0, getTimeBucket()); + remoteBuilder.addDataLongs(getTimeBucket()); - remoteBuilder.setDataIntegers(0, getValue()); - remoteBuilder.setDataIntegers(1, getPrecision()); + remoteBuilder.addDataIntegers(getValue()); + remoteBuilder.addDataIntegers(getPrecision()); getDetailGroup().forEach(element -> remoteBuilder.addDataIntLongPairList(element.serialize())); return remoteBuilder; 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 586ebd4f1..88f35cbc8 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,15 +21,14 @@ 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.alarm.AlarmMeta; -import org.apache.skywalking.oap.server.core.alarm.AlarmSupported; +import org.apache.skywalking.oap.server.core.alarm.*; 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; +import org.apache.skywalking.oap.server.core.storage.StorageBuilder; +import org.apache.skywalking.oap.server.core.storage.annotation.*; /** * This class is auto generated. Please don't change this class manually. @@ -41,7 +40,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 java.lang.String entityId; + @Setter @Getter @Column(columnName = "entity_id") @IDColumn private String entityId; @Setter @Getter @Column(columnName = "service_id") private int serviceId; @Setter @Getter @Column(columnName = "service_instance_id") private int serviceInstanceId; @@ -84,16 +83,16 @@ public class EndpointAvgIndicator extends LongAvgIndicator implements AlarmSuppo @Override public RemoteData.Builder serialize() { RemoteData.Builder remoteBuilder = RemoteData.newBuilder(); - remoteBuilder.setDataStrings(0, getEntityId()); + remoteBuilder.addDataStrings(getEntityId()); - remoteBuilder.setDataLongs(0, getSummation()); - remoteBuilder.setDataLongs(1, getValue()); - remoteBuilder.setDataLongs(2, getTimeBucket()); + remoteBuilder.addDataLongs(getSummation()); + remoteBuilder.addDataLongs(getValue()); + remoteBuilder.addDataLongs(getTimeBucket()); - remoteBuilder.setDataIntegers(0, getServiceId()); - remoteBuilder.setDataIntegers(1, getServiceInstanceId()); - remoteBuilder.setDataIntegers(2, getCount()); + remoteBuilder.addDataIntegers(getServiceId()); + remoteBuilder.addDataIntegers(getServiceInstanceId()); + remoteBuilder.addDataIntegers(getCount()); return remoteBuilder; } diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/endpoint/EndpointCpmIndicator.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/endpoint/EndpointCpmIndicator.java index 2b843397d..4959f7d2b 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/endpoint/EndpointCpmIndicator.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/endpoint/EndpointCpmIndicator.java @@ -21,15 +21,14 @@ 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.alarm.AlarmMeta; -import org.apache.skywalking.oap.server.core.alarm.AlarmSupported; +import org.apache.skywalking.oap.server.core.alarm.*; 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; +import org.apache.skywalking.oap.server.core.storage.StorageBuilder; +import org.apache.skywalking.oap.server.core.storage.annotation.*; /** * This class is auto generated. Please don't change this class manually. @@ -41,7 +40,7 @@ import org.apache.skywalking.oap.server.core.source.Scope; @StorageEntity(name = "endpoint_cpm", builder = EndpointCpmIndicator.Builder.class) public class EndpointCpmIndicator extends CPMIndicator implements AlarmSupported { - @Setter @Getter @Column(columnName = "entity_id") @IDColumn private java.lang.String entityId; + @Setter @Getter @Column(columnName = "entity_id") @IDColumn private String entityId; @Setter @Getter @Column(columnName = "service_id") private int serviceId; @Setter @Getter @Column(columnName = "service_instance_id") private int serviceInstanceId; @@ -84,15 +83,15 @@ public class EndpointCpmIndicator extends CPMIndicator implements AlarmSupported @Override public RemoteData.Builder serialize() { RemoteData.Builder remoteBuilder = RemoteData.newBuilder(); - remoteBuilder.setDataStrings(0, getEntityId()); + remoteBuilder.addDataStrings(getEntityId()); - remoteBuilder.setDataLongs(0, getValue()); - remoteBuilder.setDataLongs(1, getTotal()); - remoteBuilder.setDataLongs(2, getTimeBucket()); + remoteBuilder.addDataLongs(getValue()); + remoteBuilder.addDataLongs(getTotal()); + remoteBuilder.addDataLongs(getTimeBucket()); - remoteBuilder.setDataIntegers(0, getServiceId()); - remoteBuilder.setDataIntegers(1, getServiceInstanceId()); + remoteBuilder.addDataIntegers(getServiceId()); + remoteBuilder.addDataIntegers(getServiceInstanceId()); return remoteBuilder; } 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 1b4f62185..7a84e0a16 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 @@ -20,7 +20,7 @@ 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.worker.IndicatorProcess; -import org.apache.skywalking.oap.server.core.source.*; +import org.apache.skywalking.oap.server.core.source.Endpoint; /** * This class is auto generated. Please don't change this class manually. 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 4e17585e9..2f2e74238 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 @@ -21,15 +21,14 @@ 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.alarm.AlarmMeta; -import org.apache.skywalking.oap.server.core.alarm.AlarmSupported; +import org.apache.skywalking.oap.server.core.alarm.*; 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; +import org.apache.skywalking.oap.server.core.storage.StorageBuilder; +import org.apache.skywalking.oap.server.core.storage.annotation.*; /** * This class is auto generated. Please don't change this class manually. @@ -41,7 +40,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 java.lang.String entityId; + @Setter @Getter @Column(columnName = "entity_id") @IDColumn private String entityId; @Setter @Getter @Column(columnName = "service_id") private int serviceId; @Setter @Getter @Column(columnName = "service_instance_id") private int serviceInstanceId; @@ -84,15 +83,15 @@ public class EndpointP50Indicator extends P50Indicator implements AlarmSupported @Override public RemoteData.Builder serialize() { RemoteData.Builder remoteBuilder = RemoteData.newBuilder(); - remoteBuilder.setDataStrings(0, getEntityId()); + remoteBuilder.addDataStrings(getEntityId()); - remoteBuilder.setDataLongs(0, getTimeBucket()); + remoteBuilder.addDataLongs(getTimeBucket()); - remoteBuilder.setDataIntegers(0, getServiceId()); - remoteBuilder.setDataIntegers(1, getServiceInstanceId()); - remoteBuilder.setDataIntegers(2, getValue()); - remoteBuilder.setDataIntegers(3, getPrecision()); + remoteBuilder.addDataIntegers(getServiceId()); + remoteBuilder.addDataIntegers(getServiceInstanceId()); + remoteBuilder.addDataIntegers(getValue()); + remoteBuilder.addDataIntegers(getPrecision()); getDetailGroup().forEach(element -> remoteBuilder.addDataIntLongPairList(element.serialize())); return remoteBuilder; 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 cc2524b97..61083ef75 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 @@ -21,15 +21,14 @@ 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.alarm.AlarmMeta; -import org.apache.skywalking.oap.server.core.alarm.AlarmSupported; +import org.apache.skywalking.oap.server.core.alarm.*; 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; +import org.apache.skywalking.oap.server.core.storage.StorageBuilder; +import org.apache.skywalking.oap.server.core.storage.annotation.*; /** * This class is auto generated. Please don't change this class manually. @@ -41,7 +40,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 java.lang.String entityId; + @Setter @Getter @Column(columnName = "entity_id") @IDColumn private String entityId; @Setter @Getter @Column(columnName = "service_id") private int serviceId; @Setter @Getter @Column(columnName = "service_instance_id") private int serviceInstanceId; @@ -84,15 +83,15 @@ public class EndpointP75Indicator extends P75Indicator implements AlarmSupported @Override public RemoteData.Builder serialize() { RemoteData.Builder remoteBuilder = RemoteData.newBuilder(); - remoteBuilder.setDataStrings(0, getEntityId()); + remoteBuilder.addDataStrings(getEntityId()); - remoteBuilder.setDataLongs(0, getTimeBucket()); + remoteBuilder.addDataLongs(getTimeBucket()); - remoteBuilder.setDataIntegers(0, getServiceId()); - remoteBuilder.setDataIntegers(1, getServiceInstanceId()); - remoteBuilder.setDataIntegers(2, getValue()); - remoteBuilder.setDataIntegers(3, getPrecision()); + remoteBuilder.addDataIntegers(getServiceId()); + remoteBuilder.addDataIntegers(getServiceInstanceId()); + remoteBuilder.addDataIntegers(getValue()); + remoteBuilder.addDataIntegers(getPrecision()); getDetailGroup().forEach(element -> remoteBuilder.addDataIntLongPairList(element.serialize())); return remoteBuilder; 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 ded1642d6..54d029418 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 @@ -21,15 +21,14 @@ 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.alarm.AlarmMeta; -import org.apache.skywalking.oap.server.core.alarm.AlarmSupported; +import org.apache.skywalking.oap.server.core.alarm.*; 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; +import org.apache.skywalking.oap.server.core.storage.StorageBuilder; +import org.apache.skywalking.oap.server.core.storage.annotation.*; /** * This class is auto generated. Please don't change this class manually. @@ -41,7 +40,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 java.lang.String entityId; + @Setter @Getter @Column(columnName = "entity_id") @IDColumn private String entityId; @Setter @Getter @Column(columnName = "service_id") private int serviceId; @Setter @Getter @Column(columnName = "service_instance_id") private int serviceInstanceId; @@ -84,15 +83,15 @@ public class EndpointP90Indicator extends P90Indicator implements AlarmSupported @Override public RemoteData.Builder serialize() { RemoteData.Builder remoteBuilder = RemoteData.newBuilder(); - remoteBuilder.setDataStrings(0, getEntityId()); + remoteBuilder.addDataStrings(getEntityId()); - remoteBuilder.setDataLongs(0, getTimeBucket()); + remoteBuilder.addDataLongs(getTimeBucket()); - remoteBuilder.setDataIntegers(0, getServiceId()); - remoteBuilder.setDataIntegers(1, getServiceInstanceId()); - remoteBuilder.setDataIntegers(2, getValue()); - remoteBuilder.setDataIntegers(3, getPrecision()); + remoteBuilder.addDataIntegers(getServiceId()); + remoteBuilder.addDataIntegers(getServiceInstanceId()); + remoteBuilder.addDataIntegers(getValue()); + remoteBuilder.addDataIntegers(getPrecision()); getDetailGroup().forEach(element -> remoteBuilder.addDataIntLongPairList(element.serialize())); return remoteBuilder; 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 09514053e..71e4e7a19 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 @@ -21,15 +21,14 @@ 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.alarm.AlarmMeta; -import org.apache.skywalking.oap.server.core.alarm.AlarmSupported; +import org.apache.skywalking.oap.server.core.alarm.*; 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; +import org.apache.skywalking.oap.server.core.storage.StorageBuilder; +import org.apache.skywalking.oap.server.core.storage.annotation.*; /** * This class is auto generated. Please don't change this class manually. @@ -41,7 +40,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 java.lang.String entityId; + @Setter @Getter @Column(columnName = "entity_id") @IDColumn private String entityId; @Setter @Getter @Column(columnName = "service_id") private int serviceId; @Setter @Getter @Column(columnName = "service_instance_id") private int serviceInstanceId; @@ -84,15 +83,15 @@ public class EndpointP95Indicator extends P95Indicator implements AlarmSupported @Override public RemoteData.Builder serialize() { RemoteData.Builder remoteBuilder = RemoteData.newBuilder(); - remoteBuilder.setDataStrings(0, getEntityId()); + remoteBuilder.addDataStrings(getEntityId()); - remoteBuilder.setDataLongs(0, getTimeBucket()); + remoteBuilder.addDataLongs(getTimeBucket()); - remoteBuilder.setDataIntegers(0, getServiceId()); - remoteBuilder.setDataIntegers(1, getServiceInstanceId()); - remoteBuilder.setDataIntegers(2, getValue()); - remoteBuilder.setDataIntegers(3, getPrecision()); + remoteBuilder.addDataIntegers(getServiceId()); + remoteBuilder.addDataIntegers(getServiceInstanceId()); + remoteBuilder.addDataIntegers(getValue()); + remoteBuilder.addDataIntegers(getPrecision()); getDetailGroup().forEach(element -> remoteBuilder.addDataIntLongPairList(element.serialize())); return remoteBuilder; 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 4052e18a8..f5cc29919 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 @@ -21,15 +21,14 @@ 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.alarm.AlarmMeta; -import org.apache.skywalking.oap.server.core.alarm.AlarmSupported; +import org.apache.skywalking.oap.server.core.alarm.*; 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; +import org.apache.skywalking.oap.server.core.storage.StorageBuilder; +import org.apache.skywalking.oap.server.core.storage.annotation.*; /** * This class is auto generated. Please don't change this class manually. @@ -41,7 +40,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 java.lang.String entityId; + @Setter @Getter @Column(columnName = "entity_id") @IDColumn private String entityId; @Setter @Getter @Column(columnName = "service_id") private int serviceId; @Setter @Getter @Column(columnName = "service_instance_id") private int serviceInstanceId; @@ -84,15 +83,15 @@ public class EndpointP99Indicator extends P99Indicator implements AlarmSupported @Override public RemoteData.Builder serialize() { RemoteData.Builder remoteBuilder = RemoteData.newBuilder(); - remoteBuilder.setDataStrings(0, getEntityId()); + remoteBuilder.addDataStrings(getEntityId()); - remoteBuilder.setDataLongs(0, getTimeBucket()); + remoteBuilder.addDataLongs(getTimeBucket()); - remoteBuilder.setDataIntegers(0, getServiceId()); - remoteBuilder.setDataIntegers(1, getServiceInstanceId()); - remoteBuilder.setDataIntegers(2, getValue()); - remoteBuilder.setDataIntegers(3, getPrecision()); + remoteBuilder.addDataIntegers(getServiceId()); + remoteBuilder.addDataIntegers(getServiceInstanceId()); + remoteBuilder.addDataIntegers(getValue()); + remoteBuilder.addDataIntegers(getPrecision()); getDetailGroup().forEach(element -> remoteBuilder.addDataIntLongPairList(element.serialize())); return remoteBuilder; 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 4032f962e..694562d46 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 @@ -21,15 +21,14 @@ 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.alarm.AlarmMeta; -import org.apache.skywalking.oap.server.core.alarm.AlarmSupported; +import org.apache.skywalking.oap.server.core.alarm.*; 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; +import org.apache.skywalking.oap.server.core.storage.StorageBuilder; +import org.apache.skywalking.oap.server.core.storage.annotation.*; /** * This class is auto generated. Please don't change this class manually. @@ -41,7 +40,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 java.lang.String entityId; + @Setter @Getter @Column(columnName = "entity_id") @IDColumn private String entityId; @Setter @Getter @Column(columnName = "service_id") private int serviceId; @Setter @Getter @Column(columnName = "service_instance_id") private int serviceInstanceId; @@ -84,16 +83,16 @@ public class EndpointSlaIndicator extends PercentIndicator implements AlarmSuppo @Override public RemoteData.Builder serialize() { RemoteData.Builder remoteBuilder = RemoteData.newBuilder(); - remoteBuilder.setDataStrings(0, getEntityId()); + remoteBuilder.addDataStrings(getEntityId()); - remoteBuilder.setDataLongs(0, getTotal()); - remoteBuilder.setDataLongs(1, getMatch()); - remoteBuilder.setDataLongs(2, getTimeBucket()); + remoteBuilder.addDataLongs(getTotal()); + remoteBuilder.addDataLongs(getMatch()); + remoteBuilder.addDataLongs(getTimeBucket()); - remoteBuilder.setDataIntegers(0, getServiceId()); - remoteBuilder.setDataIntegers(1, getServiceInstanceId()); - remoteBuilder.setDataIntegers(2, getPercentage()); + remoteBuilder.addDataIntegers(getServiceId()); + remoteBuilder.addDataIntegers(getServiceInstanceId()); + remoteBuilder.addDataIntegers(getPercentage()); return remoteBuilder; } 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 49a636002..b0520c703 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 @@ -21,15 +21,14 @@ package org.apache.skywalking.oap.server.core.analysis.generated.endpointrelatio 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.alarm.*; 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; +import org.apache.skywalking.oap.server.core.storage.StorageBuilder; +import org.apache.skywalking.oap.server.core.storage.annotation.*; /** * This class is auto generated. Please don't change this class manually. @@ -41,7 +40,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 java.lang.String entityId; + @Setter @Getter @Column(columnName = "entity_id") @IDColumn private 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; @@ -86,17 +85,17 @@ public class EndpointRelationCpmIndicator extends CPMIndicator implements AlarmS @Override public RemoteData.Builder serialize() { RemoteData.Builder remoteBuilder = RemoteData.newBuilder(); - remoteBuilder.setDataStrings(0, getEntityId()); + remoteBuilder.addDataStrings(getEntityId()); - remoteBuilder.setDataLongs(0, getValue()); - remoteBuilder.setDataLongs(1, getTotal()); - remoteBuilder.setDataLongs(2, getTimeBucket()); + remoteBuilder.addDataLongs(getValue()); + remoteBuilder.addDataLongs(getTotal()); + remoteBuilder.addDataLongs(getTimeBucket()); - remoteBuilder.setDataIntegers(0, getServiceId()); - remoteBuilder.setDataIntegers(1, getChildServiceId()); - remoteBuilder.setDataIntegers(2, getServiceInstanceId()); - remoteBuilder.setDataIntegers(3, getChildServiceInstanceId()); + remoteBuilder.addDataIntegers(getServiceId()); + remoteBuilder.addDataIntegers(getChildServiceId()); + remoteBuilder.addDataIntegers(getServiceInstanceId()); + remoteBuilder.addDataIntegers(getChildServiceInstanceId()); return remoteBuilder; } diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/endpointrelation/EndpointRelationDispatcher.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/endpointrelation/EndpointRelationDispatcher.java index 0d214ce0c..5d51268cb 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/endpointrelation/EndpointRelationDispatcher.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/endpointrelation/EndpointRelationDispatcher.java @@ -19,8 +19,8 @@ package org.apache.skywalking.oap.server.core.analysis.generated.endpointrelation; 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.analysis.indicator.expression.*; import org.apache.skywalking.oap.server.core.source.*; /** 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 c4bb00264..99c945563 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 @@ -21,15 +21,14 @@ package org.apache.skywalking.oap.server.core.analysis.generated.endpointrelatio 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.alarm.*; 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; +import org.apache.skywalking.oap.server.core.storage.StorageBuilder; +import org.apache.skywalking.oap.server.core.storage.annotation.*; /** * This class is auto generated. Please don't change this class manually. @@ -41,7 +40,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 java.lang.String entityId; + @Setter @Getter @Column(columnName = "entity_id") @IDColumn private 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; @@ -86,18 +85,18 @@ public class EndpointRelationRespTimeIndicator extends LongAvgIndicator implemen @Override public RemoteData.Builder serialize() { RemoteData.Builder remoteBuilder = RemoteData.newBuilder(); - remoteBuilder.setDataStrings(0, getEntityId()); + remoteBuilder.addDataStrings(getEntityId()); - remoteBuilder.setDataLongs(0, getSummation()); - remoteBuilder.setDataLongs(1, getValue()); - remoteBuilder.setDataLongs(2, getTimeBucket()); + remoteBuilder.addDataLongs(getSummation()); + remoteBuilder.addDataLongs(getValue()); + remoteBuilder.addDataLongs(getTimeBucket()); - remoteBuilder.setDataIntegers(0, getServiceId()); - remoteBuilder.setDataIntegers(1, getChildServiceId()); - remoteBuilder.setDataIntegers(2, getServiceInstanceId()); - remoteBuilder.setDataIntegers(3, getChildServiceInstanceId()); - remoteBuilder.setDataIntegers(4, getCount()); + remoteBuilder.addDataIntegers(getServiceId()); + remoteBuilder.addDataIntegers(getChildServiceId()); + remoteBuilder.addDataIntegers(getServiceInstanceId()); + remoteBuilder.addDataIntegers(getChildServiceInstanceId()); + remoteBuilder.addDataIntegers(getCount()); return remoteBuilder; } 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 3d7886703..de33a4762 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 @@ -21,15 +21,14 @@ 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.alarm.*; 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; +import org.apache.skywalking.oap.server.core.storage.StorageBuilder; +import org.apache.skywalking.oap.server.core.storage.annotation.*; /** * This class is auto generated. Please don't change this class manually. @@ -41,7 +40,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 java.lang.String entityId; + @Setter @Getter @Column(columnName = "entity_id") @IDColumn private String entityId; @Override public String id() { String splitJointId = String.valueOf(getTimeBucket()); @@ -82,11 +81,11 @@ public class ServiceCpmIndicator extends CPMIndicator implements AlarmSupported @Override public RemoteData.Builder serialize() { RemoteData.Builder remoteBuilder = RemoteData.newBuilder(); - remoteBuilder.setDataStrings(0, getEntityId()); + remoteBuilder.addDataStrings(getEntityId()); - remoteBuilder.setDataLongs(0, getValue()); - remoteBuilder.setDataLongs(1, getTotal()); - remoteBuilder.setDataLongs(2, getTimeBucket()); + remoteBuilder.addDataLongs(getValue()); + remoteBuilder.addDataLongs(getTotal()); + remoteBuilder.addDataLongs(getTimeBucket()); 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 index 22126dd4e..e1638c82b 100644 --- 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 @@ -20,7 +20,7 @@ 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.*; +import org.apache.skywalking.oap.server.core.source.Service; /** * This class is auto generated. Please don't change this class manually. 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 b3b20dfe2..95cb2121b 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 @@ -21,15 +21,14 @@ 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.alarm.*; 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; +import org.apache.skywalking.oap.server.core.storage.StorageBuilder; +import org.apache.skywalking.oap.server.core.storage.annotation.*; /** * This class is auto generated. Please don't change this class manually. @@ -41,7 +40,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 java.lang.String entityId; + @Setter @Getter @Column(columnName = "entity_id") @IDColumn private String entityId; @Override public String id() { String splitJointId = String.valueOf(getTimeBucket()); @@ -82,13 +81,13 @@ public class ServiceP50Indicator extends P50Indicator implements AlarmSupported @Override public RemoteData.Builder serialize() { RemoteData.Builder remoteBuilder = RemoteData.newBuilder(); - remoteBuilder.setDataStrings(0, getEntityId()); + remoteBuilder.addDataStrings(getEntityId()); - remoteBuilder.setDataLongs(0, getTimeBucket()); + remoteBuilder.addDataLongs(getTimeBucket()); - remoteBuilder.setDataIntegers(0, getValue()); - remoteBuilder.setDataIntegers(1, getPrecision()); + remoteBuilder.addDataIntegers(getValue()); + remoteBuilder.addDataIntegers(getPrecision()); getDetailGroup().forEach(element -> remoteBuilder.addDataIntLongPairList(element.serialize())); return remoteBuilder; 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 374d9c271..8c212e908 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 @@ -21,15 +21,14 @@ 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.alarm.*; 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; +import org.apache.skywalking.oap.server.core.storage.StorageBuilder; +import org.apache.skywalking.oap.server.core.storage.annotation.*; /** * This class is auto generated. Please don't change this class manually. @@ -41,7 +40,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 java.lang.String entityId; + @Setter @Getter @Column(columnName = "entity_id") @IDColumn private String entityId; @Override public String id() { String splitJointId = String.valueOf(getTimeBucket()); @@ -82,13 +81,13 @@ public class ServiceP75Indicator extends P75Indicator implements AlarmSupported @Override public RemoteData.Builder serialize() { RemoteData.Builder remoteBuilder = RemoteData.newBuilder(); - remoteBuilder.setDataStrings(0, getEntityId()); + remoteBuilder.addDataStrings(getEntityId()); - remoteBuilder.setDataLongs(0, getTimeBucket()); + remoteBuilder.addDataLongs(getTimeBucket()); - remoteBuilder.setDataIntegers(0, getValue()); - remoteBuilder.setDataIntegers(1, getPrecision()); + remoteBuilder.addDataIntegers(getValue()); + remoteBuilder.addDataIntegers(getPrecision()); getDetailGroup().forEach(element -> remoteBuilder.addDataIntLongPairList(element.serialize())); return remoteBuilder; 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 79cdbf907..7435b16c0 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 @@ -21,15 +21,14 @@ 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.alarm.*; 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; +import org.apache.skywalking.oap.server.core.storage.StorageBuilder; +import org.apache.skywalking.oap.server.core.storage.annotation.*; /** * This class is auto generated. Please don't change this class manually. @@ -41,7 +40,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 java.lang.String entityId; + @Setter @Getter @Column(columnName = "entity_id") @IDColumn private String entityId; @Override public String id() { String splitJointId = String.valueOf(getTimeBucket()); @@ -82,13 +81,13 @@ public class ServiceP90Indicator extends P90Indicator implements AlarmSupported @Override public RemoteData.Builder serialize() { RemoteData.Builder remoteBuilder = RemoteData.newBuilder(); - remoteBuilder.setDataStrings(0, getEntityId()); + remoteBuilder.addDataStrings(getEntityId()); - remoteBuilder.setDataLongs(0, getTimeBucket()); + remoteBuilder.addDataLongs(getTimeBucket()); - remoteBuilder.setDataIntegers(0, getValue()); - remoteBuilder.setDataIntegers(1, getPrecision()); + remoteBuilder.addDataIntegers(getValue()); + remoteBuilder.addDataIntegers(getPrecision()); getDetailGroup().forEach(element -> remoteBuilder.addDataIntLongPairList(element.serialize())); return remoteBuilder; 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 7a4603d94..c846cdd11 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 @@ -21,15 +21,14 @@ 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.alarm.*; 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; +import org.apache.skywalking.oap.server.core.storage.StorageBuilder; +import org.apache.skywalking.oap.server.core.storage.annotation.*; /** * This class is auto generated. Please don't change this class manually. @@ -41,7 +40,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 java.lang.String entityId; + @Setter @Getter @Column(columnName = "entity_id") @IDColumn private String entityId; @Override public String id() { String splitJointId = String.valueOf(getTimeBucket()); @@ -82,13 +81,13 @@ public class ServiceP95Indicator extends P95Indicator implements AlarmSupported @Override public RemoteData.Builder serialize() { RemoteData.Builder remoteBuilder = RemoteData.newBuilder(); - remoteBuilder.setDataStrings(0, getEntityId()); + remoteBuilder.addDataStrings(getEntityId()); - remoteBuilder.setDataLongs(0, getTimeBucket()); + remoteBuilder.addDataLongs(getTimeBucket()); - remoteBuilder.setDataIntegers(0, getValue()); - remoteBuilder.setDataIntegers(1, getPrecision()); + remoteBuilder.addDataIntegers(getValue()); + remoteBuilder.addDataIntegers(getPrecision()); getDetailGroup().forEach(element -> remoteBuilder.addDataIntLongPairList(element.serialize())); return remoteBuilder; 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 5f756504f..be2130f06 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 @@ -21,15 +21,14 @@ 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.alarm.*; 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; +import org.apache.skywalking.oap.server.core.storage.StorageBuilder; +import org.apache.skywalking.oap.server.core.storage.annotation.*; /** * This class is auto generated. Please don't change this class manually. @@ -41,7 +40,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 java.lang.String entityId; + @Setter @Getter @Column(columnName = "entity_id") @IDColumn private String entityId; @Override public String id() { String splitJointId = String.valueOf(getTimeBucket()); @@ -82,13 +81,13 @@ public class ServiceP99Indicator extends P99Indicator implements AlarmSupported @Override public RemoteData.Builder serialize() { RemoteData.Builder remoteBuilder = RemoteData.newBuilder(); - remoteBuilder.setDataStrings(0, getEntityId()); + remoteBuilder.addDataStrings(getEntityId()); - remoteBuilder.setDataLongs(0, getTimeBucket()); + remoteBuilder.addDataLongs(getTimeBucket()); - remoteBuilder.setDataIntegers(0, getValue()); - remoteBuilder.setDataIntegers(1, getPrecision()); + remoteBuilder.addDataIntegers(getValue()); + remoteBuilder.addDataIntegers(getPrecision()); getDetailGroup().forEach(element -> remoteBuilder.addDataIntLongPairList(element.serialize())); return remoteBuilder; 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 8a4bde0d7..ed28b1fc4 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 @@ -21,15 +21,14 @@ 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.alarm.*; 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; +import org.apache.skywalking.oap.server.core.storage.StorageBuilder; +import org.apache.skywalking.oap.server.core.storage.annotation.*; /** * This class is auto generated. Please don't change this class manually. @@ -41,7 +40,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 java.lang.String entityId; + @Setter @Getter @Column(columnName = "entity_id") @IDColumn private String entityId; @Override public String id() { String splitJointId = String.valueOf(getTimeBucket()); @@ -82,14 +81,14 @@ public class ServiceRespTimeIndicator extends LongAvgIndicator implements AlarmS @Override public RemoteData.Builder serialize() { RemoteData.Builder remoteBuilder = RemoteData.newBuilder(); - remoteBuilder.setDataStrings(0, getEntityId()); + remoteBuilder.addDataStrings(getEntityId()); - remoteBuilder.setDataLongs(0, getSummation()); - remoteBuilder.setDataLongs(1, getValue()); - remoteBuilder.setDataLongs(2, getTimeBucket()); + remoteBuilder.addDataLongs(getSummation()); + remoteBuilder.addDataLongs(getValue()); + remoteBuilder.addDataLongs(getTimeBucket()); - remoteBuilder.setDataIntegers(0, getCount()); + remoteBuilder.addDataIntegers(getCount()); return remoteBuilder; } 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 9571e3632..6b4e47a40 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 @@ -21,15 +21,14 @@ 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.alarm.*; 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; +import org.apache.skywalking.oap.server.core.storage.StorageBuilder; +import org.apache.skywalking.oap.server.core.storage.annotation.*; /** * This class is auto generated. Please don't change this class manually. @@ -41,7 +40,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 java.lang.String entityId; + @Setter @Getter @Column(columnName = "entity_id") @IDColumn private String entityId; @Override public String id() { String splitJointId = String.valueOf(getTimeBucket()); @@ -82,14 +81,14 @@ public class ServiceSlaIndicator extends PercentIndicator implements AlarmSuppor @Override public RemoteData.Builder serialize() { RemoteData.Builder remoteBuilder = RemoteData.newBuilder(); - remoteBuilder.setDataStrings(0, getEntityId()); + remoteBuilder.addDataStrings(getEntityId()); - remoteBuilder.setDataLongs(0, getTotal()); - remoteBuilder.setDataLongs(1, getMatch()); - remoteBuilder.setDataLongs(2, getTimeBucket()); + remoteBuilder.addDataLongs(getTotal()); + remoteBuilder.addDataLongs(getMatch()); + remoteBuilder.addDataLongs(getTimeBucket()); - remoteBuilder.setDataIntegers(0, getPercentage()); + remoteBuilder.addDataIntegers(getPercentage()); return remoteBuilder; } 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 2bd9d36bf..3f099fbc2 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 @@ -21,15 +21,14 @@ 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.alarm.AlarmMeta; -import org.apache.skywalking.oap.server.core.alarm.AlarmSupported; +import org.apache.skywalking.oap.server.core.alarm.*; 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; +import org.apache.skywalking.oap.server.core.storage.StorageBuilder; +import org.apache.skywalking.oap.server.core.storage.annotation.*; /** * This class is auto generated. Please don't change this class manually. @@ -41,7 +40,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 java.lang.String entityId; + @Setter @Getter @Column(columnName = "entity_id") @IDColumn private String entityId; @Setter @Getter @Column(columnName = "service_id") private int serviceId; @Override public String id() { @@ -83,14 +82,14 @@ public class ServiceInstanceCpmIndicator extends CPMIndicator implements AlarmSu @Override public RemoteData.Builder serialize() { RemoteData.Builder remoteBuilder = RemoteData.newBuilder(); - remoteBuilder.setDataStrings(0, getEntityId()); + remoteBuilder.addDataStrings(getEntityId()); - remoteBuilder.setDataLongs(0, getValue()); - remoteBuilder.setDataLongs(1, getTotal()); - remoteBuilder.setDataLongs(2, getTimeBucket()); + remoteBuilder.addDataLongs(getValue()); + remoteBuilder.addDataLongs(getTotal()); + remoteBuilder.addDataLongs(getTimeBucket()); - remoteBuilder.setDataIntegers(0, getServiceId()); + remoteBuilder.addDataIntegers(getServiceId()); return remoteBuilder; } diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstance/ServiceInstanceDispatcher.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstance/ServiceInstanceDispatcher.java index 91b32f533..43add9df6 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstance/ServiceInstanceDispatcher.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstance/ServiceInstanceDispatcher.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.*; +import org.apache.skywalking.oap.server.core.source.ServiceInstance; /** * This class is auto generated. Please don't change this class manually. 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 3b9a7d78e..d45fee5f9 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 @@ -21,15 +21,14 @@ 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.alarm.AlarmMeta; -import org.apache.skywalking.oap.server.core.alarm.AlarmSupported; +import org.apache.skywalking.oap.server.core.alarm.*; 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; +import org.apache.skywalking.oap.server.core.storage.StorageBuilder; +import org.apache.skywalking.oap.server.core.storage.annotation.*; /** * This class is auto generated. Please don't change this class manually. @@ -41,7 +40,7 @@ import org.apache.skywalking.oap.server.core.source.Scope; @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 java.lang.String entityId; + @Setter @Getter @Column(columnName = "entity_id") @IDColumn private String entityId; @Setter @Getter @Column(columnName = "service_id") private int serviceId; @Override public String id() { @@ -83,15 +82,15 @@ public class ServiceInstanceRespTimeIndicator extends LongAvgIndicator implement @Override public RemoteData.Builder serialize() { RemoteData.Builder remoteBuilder = RemoteData.newBuilder(); - remoteBuilder.setDataStrings(0, getEntityId()); + remoteBuilder.addDataStrings(getEntityId()); - remoteBuilder.setDataLongs(0, getSummation()); - remoteBuilder.setDataLongs(1, getValue()); - remoteBuilder.setDataLongs(2, getTimeBucket()); + remoteBuilder.addDataLongs(getSummation()); + remoteBuilder.addDataLongs(getValue()); + remoteBuilder.addDataLongs(getTimeBucket()); - remoteBuilder.setDataIntegers(0, getServiceId()); - remoteBuilder.setDataIntegers(1, getCount()); + remoteBuilder.addDataIntegers(getServiceId()); + remoteBuilder.addDataIntegers(getCount()); return remoteBuilder; } 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 af09d121c..cf5de1ac5 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,15 +21,14 @@ 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.alarm.AlarmMeta; -import org.apache.skywalking.oap.server.core.alarm.AlarmSupported; +import org.apache.skywalking.oap.server.core.alarm.*; 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; +import org.apache.skywalking.oap.server.core.storage.StorageBuilder; +import org.apache.skywalking.oap.server.core.storage.annotation.*; /** * This class is auto generated. Please don't change this class manually. @@ -41,7 +40,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 java.lang.String entityId; + @Setter @Getter @Column(columnName = "entity_id") @IDColumn private String entityId; @Setter @Getter @Column(columnName = "service_instance_id") private int serviceInstanceId; @Override public String id() { @@ -83,15 +82,15 @@ public class InstanceJvmCpuIndicator extends DoubleAvgIndicator implements Alarm @Override public RemoteData.Builder serialize() { RemoteData.Builder remoteBuilder = RemoteData.newBuilder(); - remoteBuilder.setDataStrings(0, getEntityId()); + remoteBuilder.addDataStrings(getEntityId()); - remoteBuilder.setDataLongs(0, getTimeBucket()); + remoteBuilder.addDataLongs(getTimeBucket()); - remoteBuilder.setDataDoubles(0, getSummation()); - remoteBuilder.setDataDoubles(1, getValue()); + remoteBuilder.addDataDoubles(getSummation()); + remoteBuilder.addDataDoubles(getValue()); - remoteBuilder.setDataIntegers(0, getServiceInstanceId()); - remoteBuilder.setDataIntegers(1, getCount()); + remoteBuilder.addDataIntegers(getServiceInstanceId()); + remoteBuilder.addDataIntegers(getCount()); return remoteBuilder; } 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 7c9386701..7e496d2c3 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.*; +import org.apache.skywalking.oap.server.core.source.ServiceInstanceJVMCPU; /** * This class is auto generated. Please don't change this class manually. 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 76661f44d..f74d916ea 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 @@ -21,15 +21,14 @@ 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.alarm.AlarmMeta; -import org.apache.skywalking.oap.server.core.alarm.AlarmSupported; +import org.apache.skywalking.oap.server.core.alarm.*; 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; +import org.apache.skywalking.oap.server.core.storage.StorageBuilder; +import org.apache.skywalking.oap.server.core.storage.annotation.*; /** * This class is auto generated. Please don't change this class manually. @@ -41,7 +40,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 java.lang.String entityId; + @Setter @Getter @Column(columnName = "entity_id") @IDColumn private String entityId; @Setter @Getter @Column(columnName = "service_instance_id") private int serviceInstanceId; @Override public String id() { @@ -83,13 +82,13 @@ public class InstanceJvmOldGcCountIndicator extends SumIndicator implements Alar @Override public RemoteData.Builder serialize() { RemoteData.Builder remoteBuilder = RemoteData.newBuilder(); - remoteBuilder.setDataStrings(0, getEntityId()); + remoteBuilder.addDataStrings(getEntityId()); - remoteBuilder.setDataLongs(0, getValue()); - remoteBuilder.setDataLongs(1, getTimeBucket()); + remoteBuilder.addDataLongs(getValue()); + remoteBuilder.addDataLongs(getTimeBucket()); - remoteBuilder.setDataIntegers(0, getServiceInstanceId()); + remoteBuilder.addDataIntegers(getServiceInstanceId()); return remoteBuilder; } 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 9cbf6c6d5..67058c966 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 @@ -21,15 +21,14 @@ 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.alarm.AlarmMeta; -import org.apache.skywalking.oap.server.core.alarm.AlarmSupported; +import org.apache.skywalking.oap.server.core.alarm.*; 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; +import org.apache.skywalking.oap.server.core.storage.StorageBuilder; +import org.apache.skywalking.oap.server.core.storage.annotation.*; /** * This class is auto generated. Please don't change this class manually. @@ -41,7 +40,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 java.lang.String entityId; + @Setter @Getter @Column(columnName = "entity_id") @IDColumn private String entityId; @Setter @Getter @Column(columnName = "service_instance_id") private int serviceInstanceId; @Override public String id() { @@ -83,15 +82,15 @@ public class InstanceJvmOldGcTimeIndicator extends LongAvgIndicator implements A @Override public RemoteData.Builder serialize() { RemoteData.Builder remoteBuilder = RemoteData.newBuilder(); - remoteBuilder.setDataStrings(0, getEntityId()); + remoteBuilder.addDataStrings(getEntityId()); - remoteBuilder.setDataLongs(0, getSummation()); - remoteBuilder.setDataLongs(1, getValue()); - remoteBuilder.setDataLongs(2, getTimeBucket()); + remoteBuilder.addDataLongs(getSummation()); + remoteBuilder.addDataLongs(getValue()); + remoteBuilder.addDataLongs(getTimeBucket()); - remoteBuilder.setDataIntegers(0, getServiceInstanceId()); - remoteBuilder.setDataIntegers(1, getCount()); + remoteBuilder.addDataIntegers(getServiceInstanceId()); + remoteBuilder.addDataIntegers(getCount()); return remoteBuilder; } 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 1e639b73d..a508169b0 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 @@ -21,15 +21,14 @@ 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.alarm.AlarmMeta; -import org.apache.skywalking.oap.server.core.alarm.AlarmSupported; +import org.apache.skywalking.oap.server.core.alarm.*; 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; +import org.apache.skywalking.oap.server.core.storage.StorageBuilder; +import org.apache.skywalking.oap.server.core.storage.annotation.*; /** * This class is auto generated. Please don't change this class manually. @@ -41,7 +40,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 java.lang.String entityId; + @Setter @Getter @Column(columnName = "entity_id") @IDColumn private String entityId; @Setter @Getter @Column(columnName = "service_instance_id") private int serviceInstanceId; @Override public String id() { @@ -83,13 +82,13 @@ public class InstanceJvmYoungGcCountIndicator extends SumIndicator implements Al @Override public RemoteData.Builder serialize() { RemoteData.Builder remoteBuilder = RemoteData.newBuilder(); - remoteBuilder.setDataStrings(0, getEntityId()); + remoteBuilder.addDataStrings(getEntityId()); - remoteBuilder.setDataLongs(0, getValue()); - remoteBuilder.setDataLongs(1, getTimeBucket()); + remoteBuilder.addDataLongs(getValue()); + remoteBuilder.addDataLongs(getTimeBucket()); - remoteBuilder.setDataIntegers(0, getServiceInstanceId()); + remoteBuilder.addDataIntegers(getServiceInstanceId()); return remoteBuilder; } 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 9ac625751..006e141e1 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 @@ -21,15 +21,14 @@ 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.alarm.AlarmMeta; -import org.apache.skywalking.oap.server.core.alarm.AlarmSupported; +import org.apache.skywalking.oap.server.core.alarm.*; 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; +import org.apache.skywalking.oap.server.core.storage.StorageBuilder; +import org.apache.skywalking.oap.server.core.storage.annotation.*; /** * This class is auto generated. Please don't change this class manually. @@ -41,7 +40,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 java.lang.String entityId; + @Setter @Getter @Column(columnName = "entity_id") @IDColumn private String entityId; @Setter @Getter @Column(columnName = "service_instance_id") private int serviceInstanceId; @Override public String id() { @@ -83,15 +82,15 @@ public class InstanceJvmYoungGcTimeIndicator extends LongAvgIndicator implements @Override public RemoteData.Builder serialize() { RemoteData.Builder remoteBuilder = RemoteData.newBuilder(); - remoteBuilder.setDataStrings(0, getEntityId()); + remoteBuilder.addDataStrings(getEntityId()); - remoteBuilder.setDataLongs(0, getSummation()); - remoteBuilder.setDataLongs(1, getValue()); - remoteBuilder.setDataLongs(2, getTimeBucket()); + remoteBuilder.addDataLongs(getSummation()); + remoteBuilder.addDataLongs(getValue()); + remoteBuilder.addDataLongs(getTimeBucket()); - remoteBuilder.setDataIntegers(0, getServiceInstanceId()); - remoteBuilder.setDataIntegers(1, getCount()); + remoteBuilder.addDataIntegers(getServiceInstanceId()); + remoteBuilder.addDataIntegers(getCount()); return remoteBuilder; } 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 d99291dde..cc631e0ff 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 @@ -19,8 +19,8 @@ package org.apache.skywalking.oap.server.core.analysis.generated.serviceinstancejvmgc; 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.analysis.indicator.expression.*; import org.apache.skywalking.oap.server.core.source.*; /** 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 8a33c8fee..ea6df4464 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 @@ -21,15 +21,14 @@ 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.alarm.AlarmMeta; -import org.apache.skywalking.oap.server.core.alarm.AlarmSupported; +import org.apache.skywalking.oap.server.core.alarm.*; 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; +import org.apache.skywalking.oap.server.core.storage.StorageBuilder; +import org.apache.skywalking.oap.server.core.storage.annotation.*; /** * This class is auto generated. Please don't change this class manually. @@ -41,7 +40,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 java.lang.String entityId; + @Setter @Getter @Column(columnName = "entity_id") @IDColumn private String entityId; @Setter @Getter @Column(columnName = "service_instance_id") private int serviceInstanceId; @Override public String id() { @@ -83,15 +82,15 @@ public class InstanceJvmMemoryHeapIndicator extends LongAvgIndicator implements @Override public RemoteData.Builder serialize() { RemoteData.Builder remoteBuilder = RemoteData.newBuilder(); - remoteBuilder.setDataStrings(0, getEntityId()); + remoteBuilder.addDataStrings(getEntityId()); - remoteBuilder.setDataLongs(0, getSummation()); - remoteBuilder.setDataLongs(1, getValue()); - remoteBuilder.setDataLongs(2, getTimeBucket()); + remoteBuilder.addDataLongs(getSummation()); + remoteBuilder.addDataLongs(getValue()); + remoteBuilder.addDataLongs(getTimeBucket()); - remoteBuilder.setDataIntegers(0, getServiceInstanceId()); - remoteBuilder.setDataIntegers(1, getCount()); + remoteBuilder.addDataIntegers(getServiceInstanceId()); + remoteBuilder.addDataIntegers(getCount()); return remoteBuilder; } 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 index a3b92bf0c..dccc2af5a 100644 --- 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 @@ -21,15 +21,14 @@ 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.alarm.AlarmMeta; -import org.apache.skywalking.oap.server.core.alarm.AlarmSupported; +import org.apache.skywalking.oap.server.core.alarm.*; 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; +import org.apache.skywalking.oap.server.core.storage.StorageBuilder; +import org.apache.skywalking.oap.server.core.storage.annotation.*; /** * This class is auto generated. Please don't change this class manually. @@ -41,7 +40,7 @@ import org.apache.skywalking.oap.server.core.source.Scope; @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 = "entity_id") @IDColumn private String entityId; @Setter @Getter @Column(columnName = "service_instance_id") private int serviceInstanceId; @Override public String id() { @@ -83,15 +82,15 @@ public class InstanceJvmMemoryHeapMaxIndicator extends LongAvgIndicator implemen @Override public RemoteData.Builder serialize() { RemoteData.Builder remoteBuilder = RemoteData.newBuilder(); - remoteBuilder.setDataStrings(0, getEntityId()); + remoteBuilder.addDataStrings(getEntityId()); - remoteBuilder.setDataLongs(0, getSummation()); - remoteBuilder.setDataLongs(1, getValue()); - remoteBuilder.setDataLongs(2, getTimeBucket()); + remoteBuilder.addDataLongs(getSummation()); + remoteBuilder.addDataLongs(getValue()); + remoteBuilder.addDataLongs(getTimeBucket()); - remoteBuilder.setDataIntegers(0, getServiceInstanceId()); - remoteBuilder.setDataIntegers(1, getCount()); + remoteBuilder.addDataIntegers(getServiceInstanceId()); + remoteBuilder.addDataIntegers(getCount()); return remoteBuilder; } 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 9ff7409ef..7245c6a7e 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 @@ -21,15 +21,14 @@ 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.alarm.AlarmMeta; -import org.apache.skywalking.oap.server.core.alarm.AlarmSupported; +import org.apache.skywalking.oap.server.core.alarm.*; 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; +import org.apache.skywalking.oap.server.core.storage.StorageBuilder; +import org.apache.skywalking.oap.server.core.storage.annotation.*; /** * This class is auto generated. Please don't change this class manually. @@ -41,7 +40,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 java.lang.String entityId; + @Setter @Getter @Column(columnName = "entity_id") @IDColumn private String entityId; @Setter @Getter @Column(columnName = "service_instance_id") private int serviceInstanceId; @Override public String id() { @@ -83,15 +82,15 @@ public class InstanceJvmMemoryNoheapIndicator extends LongAvgIndicator implement @Override public RemoteData.Builder serialize() { RemoteData.Builder remoteBuilder = RemoteData.newBuilder(); - remoteBuilder.setDataStrings(0, getEntityId()); + remoteBuilder.addDataStrings(getEntityId()); - remoteBuilder.setDataLongs(0, getSummation()); - remoteBuilder.setDataLongs(1, getValue()); - remoteBuilder.setDataLongs(2, getTimeBucket()); + remoteBuilder.addDataLongs(getSummation()); + remoteBuilder.addDataLongs(getValue()); + remoteBuilder.addDataLongs(getTimeBucket()); - remoteBuilder.setDataIntegers(0, getServiceInstanceId()); - remoteBuilder.setDataIntegers(1, getCount()); + remoteBuilder.addDataIntegers(getServiceInstanceId()); + remoteBuilder.addDataIntegers(getCount()); return remoteBuilder; } 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 index 7effa98e7..ab150a4be 100644 --- 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 @@ -21,15 +21,14 @@ 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.alarm.AlarmMeta; -import org.apache.skywalking.oap.server.core.alarm.AlarmSupported; +import org.apache.skywalking.oap.server.core.alarm.*; 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; +import org.apache.skywalking.oap.server.core.storage.StorageBuilder; +import org.apache.skywalking.oap.server.core.storage.annotation.*; /** * This class is auto generated. Please don't change this class manually. @@ -41,7 +40,7 @@ import org.apache.skywalking.oap.server.core.source.Scope; @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 = "entity_id") @IDColumn private String entityId; @Setter @Getter @Column(columnName = "service_instance_id") private int serviceInstanceId; @Override public String id() { @@ -83,15 +82,15 @@ public class InstanceJvmMemoryNoheapMaxIndicator extends LongAvgIndicator implem @Override public RemoteData.Builder serialize() { RemoteData.Builder remoteBuilder = RemoteData.newBuilder(); - remoteBuilder.setDataStrings(0, getEntityId()); + remoteBuilder.addDataStrings(getEntityId()); - remoteBuilder.setDataLongs(0, getSummation()); - remoteBuilder.setDataLongs(1, getValue()); - remoteBuilder.setDataLongs(2, getTimeBucket()); + remoteBuilder.addDataLongs(getSummation()); + remoteBuilder.addDataLongs(getValue()); + remoteBuilder.addDataLongs(getTimeBucket()); - remoteBuilder.setDataIntegers(0, getServiceInstanceId()); - remoteBuilder.setDataIntegers(1, getCount()); + remoteBuilder.addDataIntegers(getServiceInstanceId()); + remoteBuilder.addDataIntegers(getCount()); return remoteBuilder; } 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 f6c58661e..8cf86da9a 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 @@ -19,9 +19,9 @@ package org.apache.skywalking.oap.server.core.analysis.generated.serviceinstancejvmmemory; 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.analysis.indicator.expression.*; -import org.apache.skywalking.oap.server.core.source.*; +import org.apache.skywalking.oap.server.core.source.ServiceInstanceJVMMemory; /** * This class is auto generated. Please don't change this class manually. 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 409f13543..bc56cb687 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 @@ -19,7 +19,7 @@ package org.apache.skywalking.oap.server.core.analysis.generated.serviceinstancejvmmemorypool; import org.apache.skywalking.oap.server.core.analysis.SourceDispatcher; -import org.apache.skywalking.oap.server.core.source.*; +import org.apache.skywalking.oap.server.core.source.ServiceInstanceJVMMemoryPool; /** * This class is auto generated. Please don't change this class manually. diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstancerelation/ServiceInstanceRelationDispatcher.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstancerelation/ServiceInstanceRelationDispatcher.java index 15af66468..0ddd689f7 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstancerelation/ServiceInstanceRelationDispatcher.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstancerelation/ServiceInstanceRelationDispatcher.java @@ -19,7 +19,7 @@ package org.apache.skywalking.oap.server.core.analysis.generated.serviceinstancerelation; import org.apache.skywalking.oap.server.core.analysis.SourceDispatcher; -import org.apache.skywalking.oap.server.core.source.*; +import org.apache.skywalking.oap.server.core.source.ServiceInstanceRelation; /** * This class is auto generated. Please don't change this class manually. diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/servicerelation/ServiceRelationClientCallSlaIndicator.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/servicerelation/ServiceRelationClientCallSlaIndicator.java index 8b6dcfee7..4d67f8d0a 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/servicerelation/ServiceRelationClientCallSlaIndicator.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/servicerelation/ServiceRelationClientCallSlaIndicator.java @@ -21,15 +21,14 @@ package org.apache.skywalking.oap.server.core.analysis.generated.servicerelation 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.alarm.*; 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; +import org.apache.skywalking.oap.server.core.storage.StorageBuilder; +import org.apache.skywalking.oap.server.core.storage.annotation.*; /** * This class is auto generated. Please don't change this class manually. @@ -41,7 +40,7 @@ import org.apache.skywalking.oap.server.core.source.Scope; @StorageEntity(name = "service_relation_client_call_sla", builder = ServiceRelationClientCallSlaIndicator.Builder.class) public class ServiceRelationClientCallSlaIndicator extends PercentIndicator implements AlarmSupported { - @Setter @Getter @Column(columnName = "entity_id") @IDColumn private java.lang.String entityId; + @Setter @Getter @Column(columnName = "entity_id") @IDColumn private String entityId; @Override public String id() { String splitJointId = String.valueOf(getTimeBucket()); @@ -82,14 +81,14 @@ public class ServiceRelationClientCallSlaIndicator extends PercentIndicator impl @Override public RemoteData.Builder serialize() { RemoteData.Builder remoteBuilder = RemoteData.newBuilder(); - remoteBuilder.setDataStrings(0, getEntityId()); + remoteBuilder.addDataStrings(getEntityId()); - remoteBuilder.setDataLongs(0, getTotal()); - remoteBuilder.setDataLongs(1, getMatch()); - remoteBuilder.setDataLongs(2, getTimeBucket()); + remoteBuilder.addDataLongs(getTotal()); + remoteBuilder.addDataLongs(getMatch()); + remoteBuilder.addDataLongs(getTimeBucket()); - remoteBuilder.setDataIntegers(0, getPercentage()); + remoteBuilder.addDataIntegers(getPercentage()); return remoteBuilder; } diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/servicerelation/ServiceRelationClientCpmIndicator.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/servicerelation/ServiceRelationClientCpmIndicator.java index db444a98e..4cebfccf0 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/servicerelation/ServiceRelationClientCpmIndicator.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/servicerelation/ServiceRelationClientCpmIndicator.java @@ -21,15 +21,14 @@ package org.apache.skywalking.oap.server.core.analysis.generated.servicerelation 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.alarm.*; 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; +import org.apache.skywalking.oap.server.core.storage.StorageBuilder; +import org.apache.skywalking.oap.server.core.storage.annotation.*; /** * This class is auto generated. Please don't change this class manually. @@ -41,7 +40,7 @@ import org.apache.skywalking.oap.server.core.source.Scope; @StorageEntity(name = "service_relation_client_cpm", builder = ServiceRelationClientCpmIndicator.Builder.class) public class ServiceRelationClientCpmIndicator extends CPMIndicator implements AlarmSupported { - @Setter @Getter @Column(columnName = "entity_id") @IDColumn private java.lang.String entityId; + @Setter @Getter @Column(columnName = "entity_id") @IDColumn private String entityId; @Override public String id() { String splitJointId = String.valueOf(getTimeBucket()); @@ -82,11 +81,11 @@ public class ServiceRelationClientCpmIndicator extends CPMIndicator implements A @Override public RemoteData.Builder serialize() { RemoteData.Builder remoteBuilder = RemoteData.newBuilder(); - remoteBuilder.setDataStrings(0, getEntityId()); + remoteBuilder.addDataStrings(getEntityId()); - remoteBuilder.setDataLongs(0, getValue()); - remoteBuilder.setDataLongs(1, getTotal()); - remoteBuilder.setDataLongs(2, getTimeBucket()); + remoteBuilder.addDataLongs(getValue()); + remoteBuilder.addDataLongs(getTotal()); + remoteBuilder.addDataLongs(getTimeBucket()); diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/servicerelation/ServiceRelationClientRespTimeIndicator.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/servicerelation/ServiceRelationClientRespTimeIndicator.java index b866cc987..a3c3058ed 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/servicerelation/ServiceRelationClientRespTimeIndicator.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/servicerelation/ServiceRelationClientRespTimeIndicator.java @@ -21,15 +21,14 @@ package org.apache.skywalking.oap.server.core.analysis.generated.servicerelation 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.alarm.*; 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; +import org.apache.skywalking.oap.server.core.storage.StorageBuilder; +import org.apache.skywalking.oap.server.core.storage.annotation.*; /** * This class is auto generated. Please don't change this class manually. @@ -41,7 +40,7 @@ import org.apache.skywalking.oap.server.core.source.Scope; @StorageEntity(name = "service_relation_client_resp_time", builder = ServiceRelationClientRespTimeIndicator.Builder.class) public class ServiceRelationClientRespTimeIndicator extends LongAvgIndicator implements AlarmSupported { - @Setter @Getter @Column(columnName = "entity_id") @IDColumn private java.lang.String entityId; + @Setter @Getter @Column(columnName = "entity_id") @IDColumn private String entityId; @Override public String id() { String splitJointId = String.valueOf(getTimeBucket()); @@ -82,14 +81,14 @@ public class ServiceRelationClientRespTimeIndicator extends LongAvgIndicator imp @Override public RemoteData.Builder serialize() { RemoteData.Builder remoteBuilder = RemoteData.newBuilder(); - remoteBuilder.setDataStrings(0, getEntityId()); + remoteBuilder.addDataStrings(getEntityId()); - remoteBuilder.setDataLongs(0, getSummation()); - remoteBuilder.setDataLongs(1, getValue()); - remoteBuilder.setDataLongs(2, getTimeBucket()); + remoteBuilder.addDataLongs(getSummation()); + remoteBuilder.addDataLongs(getValue()); + remoteBuilder.addDataLongs(getTimeBucket()); - remoteBuilder.setDataIntegers(0, getCount()); + remoteBuilder.addDataIntegers(getCount()); return remoteBuilder; } diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/servicerelation/ServiceRelationDispatcher.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/servicerelation/ServiceRelationDispatcher.java index b61c06a98..839b49cc3 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/servicerelation/ServiceRelationDispatcher.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/servicerelation/ServiceRelationDispatcher.java @@ -19,8 +19,8 @@ package org.apache.skywalking.oap.server.core.analysis.generated.servicerelation; 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.analysis.indicator.expression.*; import org.apache.skywalking.oap.server.core.source.*; /** diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/servicerelation/ServiceRelationServerCallSlaIndicator.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/servicerelation/ServiceRelationServerCallSlaIndicator.java index cd9e529d4..ba4854c83 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/servicerelation/ServiceRelationServerCallSlaIndicator.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/servicerelation/ServiceRelationServerCallSlaIndicator.java @@ -21,15 +21,14 @@ package org.apache.skywalking.oap.server.core.analysis.generated.servicerelation 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.alarm.*; 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; +import org.apache.skywalking.oap.server.core.storage.StorageBuilder; +import org.apache.skywalking.oap.server.core.storage.annotation.*; /** * This class is auto generated. Please don't change this class manually. @@ -41,7 +40,7 @@ import org.apache.skywalking.oap.server.core.source.Scope; @StorageEntity(name = "service_relation_server_call_sla", builder = ServiceRelationServerCallSlaIndicator.Builder.class) public class ServiceRelationServerCallSlaIndicator extends PercentIndicator implements AlarmSupported { - @Setter @Getter @Column(columnName = "entity_id") @IDColumn private java.lang.String entityId; + @Setter @Getter @Column(columnName = "entity_id") @IDColumn private String entityId; @Override public String id() { String splitJointId = String.valueOf(getTimeBucket()); @@ -82,14 +81,14 @@ public class ServiceRelationServerCallSlaIndicator extends PercentIndicator impl @Override public RemoteData.Builder serialize() { RemoteData.Builder remoteBuilder = RemoteData.newBuilder(); - remoteBuilder.setDataStrings(0, getEntityId()); + remoteBuilder.addDataStrings(getEntityId()); - remoteBuilder.setDataLongs(0, getTotal()); - remoteBuilder.setDataLongs(1, getMatch()); - remoteBuilder.setDataLongs(2, getTimeBucket()); + remoteBuilder.addDataLongs(getTotal()); + remoteBuilder.addDataLongs(getMatch()); + remoteBuilder.addDataLongs(getTimeBucket()); - remoteBuilder.setDataIntegers(0, getPercentage()); + remoteBuilder.addDataIntegers(getPercentage()); return remoteBuilder; } diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/servicerelation/ServiceRelationServerCpmIndicator.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/servicerelation/ServiceRelationServerCpmIndicator.java index 8ee49210b..49e20e66f 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/servicerelation/ServiceRelationServerCpmIndicator.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/servicerelation/ServiceRelationServerCpmIndicator.java @@ -21,15 +21,14 @@ package org.apache.skywalking.oap.server.core.analysis.generated.servicerelation 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.alarm.*; 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; +import org.apache.skywalking.oap.server.core.storage.StorageBuilder; +import org.apache.skywalking.oap.server.core.storage.annotation.*; /** * This class is auto generated. Please don't change this class manually. @@ -41,7 +40,7 @@ import org.apache.skywalking.oap.server.core.source.Scope; @StorageEntity(name = "service_relation_server_cpm", builder = ServiceRelationServerCpmIndicator.Builder.class) public class ServiceRelationServerCpmIndicator extends CPMIndicator implements AlarmSupported { - @Setter @Getter @Column(columnName = "entity_id") @IDColumn private java.lang.String entityId; + @Setter @Getter @Column(columnName = "entity_id") @IDColumn private String entityId; @Override public String id() { String splitJointId = String.valueOf(getTimeBucket()); @@ -82,11 +81,11 @@ public class ServiceRelationServerCpmIndicator extends CPMIndicator implements A @Override public RemoteData.Builder serialize() { RemoteData.Builder remoteBuilder = RemoteData.newBuilder(); - remoteBuilder.setDataStrings(0, getEntityId()); + remoteBuilder.addDataStrings(getEntityId()); - remoteBuilder.setDataLongs(0, getValue()); - remoteBuilder.setDataLongs(1, getTotal()); - remoteBuilder.setDataLongs(2, getTimeBucket()); + remoteBuilder.addDataLongs(getValue()); + remoteBuilder.addDataLongs(getTotal()); + remoteBuilder.addDataLongs(getTimeBucket()); diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/servicerelation/ServiceRelationServerRespTimeIndicator.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/servicerelation/ServiceRelationServerRespTimeIndicator.java index d87ec4060..f0d73b300 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/servicerelation/ServiceRelationServerRespTimeIndicator.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/servicerelation/ServiceRelationServerRespTimeIndicator.java @@ -21,15 +21,14 @@ package org.apache.skywalking.oap.server.core.analysis.generated.servicerelation 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.alarm.*; 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; +import org.apache.skywalking.oap.server.core.storage.StorageBuilder; +import org.apache.skywalking.oap.server.core.storage.annotation.*; /** * This class is auto generated. Please don't change this class manually. @@ -41,7 +40,7 @@ import org.apache.skywalking.oap.server.core.source.Scope; @StorageEntity(name = "service_relation_server_resp_time", builder = ServiceRelationServerRespTimeIndicator.Builder.class) public class ServiceRelationServerRespTimeIndicator extends LongAvgIndicator implements AlarmSupported { - @Setter @Getter @Column(columnName = "entity_id") @IDColumn private java.lang.String entityId; + @Setter @Getter @Column(columnName = "entity_id") @IDColumn private String entityId; @Override public String id() { String splitJointId = String.valueOf(getTimeBucket()); @@ -82,14 +81,14 @@ public class ServiceRelationServerRespTimeIndicator extends LongAvgIndicator imp @Override public RemoteData.Builder serialize() { RemoteData.Builder remoteBuilder = RemoteData.newBuilder(); - remoteBuilder.setDataStrings(0, getEntityId()); + remoteBuilder.addDataStrings(getEntityId()); - remoteBuilder.setDataLongs(0, getSummation()); - remoteBuilder.setDataLongs(1, getValue()); - remoteBuilder.setDataLongs(2, getTimeBucket()); + remoteBuilder.addDataLongs(getSummation()); + remoteBuilder.addDataLongs(getValue()); + remoteBuilder.addDataLongs(getTimeBucket()); - remoteBuilder.setDataIntegers(0, getCount()); + remoteBuilder.addDataIntegers(getCount()); return remoteBuilder; } diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/endpointrelation/EndpointRelationServerSideIndicator.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/endpointrelation/EndpointRelationServerSideIndicator.java index 82aaceba9..f4da7f038 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/endpointrelation/EndpointRelationServerSideIndicator.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/endpointrelation/EndpointRelationServerSideIndicator.java @@ -101,19 +101,22 @@ public class EndpointRelationServerSideIndicator extends Indicator { setSourceEndpointId(remoteData.getDataIntegers(0)); setDestEndpointId(remoteData.getDataIntegers(1)); setComponentId(remoteData.getDataIntegers(2)); + setTimeBucket(remoteData.getDataLongs(0)); + setEntityId(remoteData.getDataStrings(0)); } @Override public RemoteData.Builder serialize() { RemoteData.Builder remoteBuilder = RemoteData.newBuilder(); - remoteBuilder.setDataIntegers(0, getSourceEndpointId()); - remoteBuilder.setDataIntegers(1, getDestEndpointId()); - remoteBuilder.setDataIntegers(2, getComponentId()); - remoteBuilder.setDataLongs(0, getTimeBucket()); - remoteBuilder.setDataStrings(0, getEntityId()); + remoteBuilder.addDataIntegers(getSourceEndpointId()); + remoteBuilder.addDataIntegers(getDestEndpointId()); + remoteBuilder.addDataIntegers(getComponentId()); + remoteBuilder.addDataLongs(getTimeBucket()); + + remoteBuilder.addDataStrings(getEntityId()); return remoteBuilder; } diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/servicerelation/ServiceRelationClientSideIndicator.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/servicerelation/ServiceRelationClientSideIndicator.java index 2e91fc826..f52a69189 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/servicerelation/ServiceRelationClientSideIndicator.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/servicerelation/ServiceRelationClientSideIndicator.java @@ -101,19 +101,22 @@ public class ServiceRelationClientSideIndicator extends Indicator { setSourceServiceId(remoteData.getDataIntegers(0)); setDestServiceId(remoteData.getDataIntegers(1)); setComponentId(remoteData.getDataIntegers(2)); + setTimeBucket(remoteData.getDataLongs(0)); + setEntityId(remoteData.getDataStrings(0)); } @Override public RemoteData.Builder serialize() { RemoteData.Builder remoteBuilder = RemoteData.newBuilder(); - remoteBuilder.setDataIntegers(1, getDestServiceId()); - remoteBuilder.setDataIntegers(0, getSourceServiceId()); - remoteBuilder.setDataIntegers(2, getComponentId()); - remoteBuilder.setDataLongs(0, getTimeBucket()); - remoteBuilder.setDataStrings(0, getEntityId()); + remoteBuilder.addDataIntegers(getSourceServiceId()); + remoteBuilder.addDataIntegers(getDestServiceId()); + remoteBuilder.addDataIntegers(getComponentId()); + remoteBuilder.addDataLongs(getTimeBucket()); + + remoteBuilder.addDataStrings(getEntityId()); return remoteBuilder; } diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/servicerelation/ServiceRelationServerSideIndicator.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/servicerelation/ServiceRelationServerSideIndicator.java index 7de0e4f85..50946e6b9 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/servicerelation/ServiceRelationServerSideIndicator.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/servicerelation/ServiceRelationServerSideIndicator.java @@ -99,21 +99,24 @@ public class ServiceRelationServerSideIndicator extends Indicator { @Override public void deserialize(RemoteData remoteData) { setEntityId(remoteData.getDataStrings(0)); + setSourceServiceId(remoteData.getDataIntegers(0)); setDestServiceId(remoteData.getDataIntegers(1)); setComponentId(remoteData.getDataIntegers(2)); + setTimeBucket(remoteData.getDataLongs(0)); } @Override public RemoteData.Builder serialize() { RemoteData.Builder remoteBuilder = RemoteData.newBuilder(); - remoteBuilder.setDataStrings(0, getEntityId()); - remoteBuilder.setDataIntegers(0, getSourceServiceId()); - remoteBuilder.setDataIntegers(1, getDestServiceId()); - remoteBuilder.setDataIntegers(2, getComponentId()); - remoteBuilder.setDataLongs(0, getTimeBucket()); + remoteBuilder.addDataIntegers(getSourceServiceId()); + remoteBuilder.addDataIntegers(getDestServiceId()); + remoteBuilder.addDataIntegers(getComponentId()); + remoteBuilder.addDataStrings(getEntityId()); + + remoteBuilder.addDataLongs(getTimeBucket()); return remoteBuilder; } diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/cluster/RemoteInstance.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/cluster/RemoteInstance.java index 1e85b3252..a3b4e62d8 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/cluster/RemoteInstance.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/cluster/RemoteInstance.java @@ -41,7 +41,7 @@ public class RemoteInstance implements Comparable { } @Override public String toString() { - return host + String.valueOf(port); + return host + ":" + String.valueOf(port); } @Override public boolean equals(Object o) { diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/register/EndpointInventory.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/register/EndpointInventory.java index a9c0d0098..029e19232 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/register/EndpointInventory.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/register/EndpointInventory.java @@ -80,14 +80,14 @@ public class EndpointInventory extends RegisterSource { @Override public RemoteData.Builder serialize() { RemoteData.Builder remoteBuilder = RemoteData.newBuilder(); - remoteBuilder.setDataIntegers(0, getSequence()); - remoteBuilder.setDataIntegers(1, serviceId); - remoteBuilder.setDataIntegers(2, detectPoint); + remoteBuilder.addDataIntegers(getSequence()); + remoteBuilder.addDataIntegers(serviceId); + remoteBuilder.addDataIntegers(detectPoint); - remoteBuilder.setDataLongs(0, getRegisterTime()); - remoteBuilder.setDataLongs(1, getHeartbeatTime()); + remoteBuilder.addDataLongs(getRegisterTime()); + remoteBuilder.addDataLongs(getHeartbeatTime()); - remoteBuilder.setDataStrings(0, name); + remoteBuilder.addDataStrings(name); return remoteBuilder; } diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/register/NetworkAddressInventory.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/register/NetworkAddressInventory.java index fadb00cb6..2ac68160a 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/register/NetworkAddressInventory.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/register/NetworkAddressInventory.java @@ -81,13 +81,13 @@ public class NetworkAddressInventory extends RegisterSource { @Override public RemoteData.Builder serialize() { RemoteData.Builder remoteBuilder = RemoteData.newBuilder(); - remoteBuilder.setDataIntegers(0, getSequence()); - remoteBuilder.setDataIntegers(1, getSrcLayer()); + remoteBuilder.addDataIntegers(getSequence()); + remoteBuilder.addDataIntegers(getSrcLayer()); - remoteBuilder.setDataLongs(0, getRegisterTime()); - remoteBuilder.setDataLongs(1, getHeartbeatTime()); + remoteBuilder.addDataLongs(getRegisterTime()); + remoteBuilder.addDataLongs(getHeartbeatTime()); - remoteBuilder.setDataStrings(0, name); + remoteBuilder.addDataStrings(name); return remoteBuilder; } diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/register/ServiceInstanceInventory.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/register/ServiceInstanceInventory.java index ba21e3cd1..a47601769 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/register/ServiceInstanceInventory.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/register/ServiceInstanceInventory.java @@ -20,20 +20,15 @@ package org.apache.skywalking.oap.server.core.register; import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import lombok.Getter; -import lombok.Setter; +import java.util.*; +import lombok.*; import org.apache.skywalking.oap.server.core.Const; import org.apache.skywalking.oap.server.core.register.annotation.InventoryType; 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.source.Scope; import org.apache.skywalking.oap.server.core.storage.StorageBuilder; -import org.apache.skywalking.oap.server.core.storage.annotation.Column; -import org.apache.skywalking.oap.server.core.storage.annotation.StorageEntity; +import org.apache.skywalking.oap.server.core.storage.annotation.*; import org.apache.skywalking.oap.server.library.util.BooleanUtils; /** @@ -117,21 +112,21 @@ public class ServiceInstanceInventory extends RegisterSource { @Override public RemoteData.Builder serialize() { RemoteData.Builder remoteBuilder = RemoteData.newBuilder(); - remoteBuilder.setDataIntegers(0, getSequence()); - remoteBuilder.setDataIntegers(1, serviceId); - remoteBuilder.setDataIntegers(2, language); - remoteBuilder.setDataIntegers(3, isAddress); - remoteBuilder.setDataIntegers(4, addressId); - remoteBuilder.setDataIntegers(5, processNo); + remoteBuilder.addDataIntegers(getSequence()); + remoteBuilder.addDataIntegers(serviceId); + remoteBuilder.addDataIntegers(language); + remoteBuilder.addDataIntegers(isAddress); + remoteBuilder.addDataIntegers(addressId); + remoteBuilder.addDataIntegers(processNo); - remoteBuilder.setDataLongs(0, getRegisterTime()); - remoteBuilder.setDataLongs(1, getHeartbeatTime()); + remoteBuilder.addDataLongs(getRegisterTime()); + remoteBuilder.addDataLongs(getHeartbeatTime()); - remoteBuilder.setDataStrings(0, name); - remoteBuilder.setDataStrings(1, osName); - remoteBuilder.setDataStrings(2, hostName); - remoteBuilder.setDataStrings(3, ipv4s); - remoteBuilder.setDataStrings(4, instanceUUID); + remoteBuilder.addDataStrings(name); + remoteBuilder.addDataStrings(osName); + remoteBuilder.addDataStrings(hostName); + remoteBuilder.addDataStrings(ipv4s); + remoteBuilder.addDataStrings(instanceUUID); return remoteBuilder; } diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/register/ServiceInventory.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/register/ServiceInventory.java index f8809a1be..460e0b97c 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/register/ServiceInventory.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/register/ServiceInventory.java @@ -96,16 +96,16 @@ public class ServiceInventory extends RegisterSource { @Override public RemoteData.Builder serialize() { RemoteData.Builder remoteBuilder = RemoteData.newBuilder(); - remoteBuilder.setDataIntegers(0, getSequence()); - remoteBuilder.setDataIntegers(1, isAddress); - remoteBuilder.setDataIntegers(2, addressId); - remoteBuilder.setDataIntegers(3, mappingServiceId); + remoteBuilder.addDataIntegers(getSequence()); + remoteBuilder.addDataIntegers(isAddress); + remoteBuilder.addDataIntegers(addressId); + remoteBuilder.addDataIntegers(mappingServiceId); - remoteBuilder.setDataLongs(0, getRegisterTime()); - remoteBuilder.setDataLongs(1, getHeartbeatTime()); - remoteBuilder.setDataLongs(2, getMappingLastUpdateTime()); + remoteBuilder.addDataLongs(getRegisterTime()); + remoteBuilder.addDataLongs(getHeartbeatTime()); + remoteBuilder.addDataLongs(getMappingLastUpdateTime()); - remoteBuilder.setDataStrings(0, name); + remoteBuilder.addDataStrings(name); return remoteBuilder; } diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/remote/client/GRPCRemoteClient.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/remote/client/GRPCRemoteClient.java index 48106ee25..104f3167c 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/remote/client/GRPCRemoteClient.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/remote/client/GRPCRemoteClient.java @@ -45,6 +45,7 @@ public class GRPCRemoteClient implements RemoteClient, Comparable("GRPCRemoteClient", channelSize, bufferSize); this.carrier.setBufferStrategy(BufferStrategy.BLOCKING); this.carrier.consume(new RemoteMessageConsumer(), 1); diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/remote/client/RemoteClientManager.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/remote/client/RemoteClientManager.java index 3c226d25e..57e2f4c55 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/remote/client/RemoteClientManager.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/remote/client/RemoteClientManager.java @@ -38,7 +38,7 @@ public class RemoteClientManager implements Service { private ClusterNodesQuery clusterNodesQuery; private final List clientsA; private final List clientsB; - private List usingClients; + private volatile List usingClients; public RemoteClientManager(ModuleManager moduleManager) { this.moduleManager = moduleManager; @@ -50,19 +50,28 @@ public class RemoteClientManager implements Service { public void start() { this.clusterNodesQuery = moduleManager.find(ClusterModule.NAME).getService(ClusterNodesQuery.class); this.streamDataClassGetter = moduleManager.find(CoreModule.NAME).getService(StreamDataClassGetter.class); - Executors.newSingleThreadScheduledExecutor().scheduleAtFixedRate(this::refresh, 1, 2, TimeUnit.SECONDS); + Executors.newSingleThreadScheduledExecutor().scheduleAtFixedRate(this::refresh, 5, 5, TimeUnit.SECONDS); } private void refresh() { if (logger.isDebugEnabled()) { logger.debug("Refresh remote nodes collection."); } - List instanceList = clusterNodesQuery.queryRemoteNodes(); - Collections.sort(instanceList); + try { + List instanceList = clusterNodesQuery.queryRemoteNodes(); + Collections.sort(instanceList); - if (!compare(instanceList)) { - buildNewClients(instanceList); + if (logger.isDebugEnabled()) { + instanceList.forEach(instance -> logger.debug("Cluster instance: {}", instance.toString())); + } + + if (!compare(instanceList)) { + buildNewClients(instanceList); + } + } catch (Throwable t) { + logger.error(t.getMessage(), t); } + } public List getRemoteClient() { @@ -89,9 +98,7 @@ public class RemoteClientManager implements Service { getFreeClients().clear(); Map currentClientsMap = new HashMap<>(); - this.usingClients.forEach(remoteClient -> { - currentClientsMap.put(address(remoteClient.getHost(), remoteClient.getPort()), remoteClient); - }); + this.usingClients.forEach(remoteClient -> currentClientsMap.put(address(remoteClient.getHost(), remoteClient.getPort()), remoteClient)); remoteInstances.forEach(remoteInstance -> { String address = address(remoteInstance.getHost(), remoteInstance.getPort());