You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@skywalking.apache.org by pe...@apache.org on 2018/10/15 07:27:42 UTC
[incubator-skywalking] branch master updated: Support metrics
downsampling. (#1765)
This is an automated email from the ASF dual-hosted git repository.
pengys pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking.git
The following commit(s) were added to refs/heads/master by this push:
new b426390 Support metrics downsampling. (#1765)
b426390 is described below
commit b426390b792edfdc25dd4a1e791e815d5028feef
Author: 彭勇升 pengys <80...@qq.com>
AuthorDate: Mon Oct 15 15:27:38 2018 +0800
Support metrics downsampling. (#1765)
* Support metrics downsampling.
* Fixed a check style error.
---
.../skywalking/oap/server/core/CoreModule.java | 3 +-
.../oap/server/core/CoreModuleConfig.java | 17 ++++--
.../oap/server/core/CoreModuleProvider.java | 2 +
.../core/analysis/generated/all/AllDispatcher.java | 2 +-
.../generated/all/AllHeatmapIndicator.java | 10 +---
.../analysis/generated/all/AllP50Indicator.java | 10 +---
.../analysis/generated/all/AllP75Indicator.java | 10 +---
.../analysis/generated/all/AllP90Indicator.java | 10 +---
.../analysis/generated/all/AllP95Indicator.java | 10 +---
.../analysis/generated/all/AllP99Indicator.java | 10 +---
.../generated/endpoint/EndpointAvgIndicator.java | 12 ++--
.../generated/endpoint/EndpointCpmIndicator.java | 12 ++--
.../generated/endpoint/EndpointDispatcher.java | 2 +-
.../generated/endpoint/EndpointP50Indicator.java | 12 ++--
.../generated/endpoint/EndpointP75Indicator.java | 12 ++--
.../generated/endpoint/EndpointP90Indicator.java | 12 ++--
.../generated/endpoint/EndpointP95Indicator.java | 12 ++--
.../generated/endpoint/EndpointP99Indicator.java | 12 ++--
.../generated/endpoint/EndpointSlaIndicator.java | 12 ++--
.../EndpointRelationCpmIndicator.java | 12 ++--
.../EndpointRelationDispatcher.java | 2 +-
.../EndpointRelationRespTimeIndicator.java | 12 ++--
.../generated/service/ServiceCpmIndicator.java | 12 ++--
.../generated/service/ServiceDispatcher.java | 2 +-
.../generated/service/ServiceP50Indicator.java | 12 ++--
.../generated/service/ServiceP75Indicator.java | 12 ++--
.../generated/service/ServiceP90Indicator.java | 12 ++--
.../generated/service/ServiceP95Indicator.java | 12 ++--
.../generated/service/ServiceP99Indicator.java | 12 ++--
.../service/ServiceRespTimeIndicator.java | 12 ++--
.../generated/service/ServiceSlaIndicator.java | 12 ++--
.../ServiceInstanceCpmIndicator.java | 12 ++--
.../serviceinstance/ServiceInstanceDispatcher.java | 2 +-
.../ServiceInstanceRespTimeIndicator.java | 12 ++--
.../InstanceJvmCpuIndicator.java | 12 ++--
.../ServiceInstanceJVMCPUDispatcher.java | 2 +-
.../InstanceJvmOldGcCountIndicator.java | 12 ++--
.../InstanceJvmOldGcTimeIndicator.java | 12 ++--
.../InstanceJvmYoungGcCountIndicator.java | 12 ++--
.../InstanceJvmYoungGcTimeIndicator.java | 12 ++--
.../ServiceInstanceJVMGCDispatcher.java | 2 +-
.../InstanceJvmMemoryHeapIndicator.java | 12 ++--
.../InstanceJvmMemoryHeapMaxIndicator.java | 12 ++--
.../InstanceJvmMemoryNoheapIndicator.java | 12 ++--
.../InstanceJvmMemoryNoheapMaxIndicator.java | 12 ++--
.../ServiceInstanceJVMMemoryDispatcher.java | 4 +-
.../ServiceInstanceJVMMemoryPoolDispatcher.java | 2 +-
.../ServiceInstanceRelationDispatcher.java | 2 +-
.../ServiceRelationClientCallSlaIndicator.java | 12 ++--
.../ServiceRelationClientCpmIndicator.java | 12 ++--
.../ServiceRelationClientRespTimeIndicator.java | 12 ++--
.../servicerelation/ServiceRelationDispatcher.java | 2 +-
.../ServiceRelationServerCallSlaIndicator.java | 12 ++--
.../ServiceRelationServerCpmIndicator.java | 12 ++--
.../ServiceRelationServerRespTimeIndicator.java | 12 ++--
.../annotation/IndicatorAnnotationUtils.java} | 15 ++---
.../analysis/worker/IndicatorPersistentWorker.java | 4 +-
.../core/analysis/worker/IndicatorProcess.java | 39 ++++++++++---
.../core/analysis/worker/IndicatorTransWorker.java | 64 ++++++++++++++++++++++
.../core/config/DownsamplingConfigService.java | 57 +++++++++++++++++++
...der.java => DownsampleingModelNameBuilder.java} | 14 ++---
.../{TimePyramid.java => Downsampling.java} | 4 +-
.../annotation/StorageAnnotationListener.java | 5 +-
.../oap/server/core/storage/model/Model.java | 8 ++-
.../server/core/storage/model/ModelInstaller.java | 24 +++++++-
.../src/main/resources/application.yml | 4 ++
.../elasticsearch/query/AggregationQueryEsDAO.java | 12 ++--
.../elasticsearch/query/MetricQueryEsDAO.java | 8 +--
.../elasticsearch/query/TopologyQueryEsDAO.java | 18 +++---
69 files changed, 408 insertions(+), 394 deletions(-)
diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/CoreModule.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/CoreModule.java
index 66cac8d..d720cb6 100644
--- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/CoreModule.java
+++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/CoreModule.java
@@ -20,7 +20,7 @@ package org.apache.skywalking.oap.server.core;
import java.util.*;
import org.apache.skywalking.oap.server.core.cache.*;
-import org.apache.skywalking.oap.server.core.config.IComponentLibraryCatalogService;
+import org.apache.skywalking.oap.server.core.config.*;
import org.apache.skywalking.oap.server.core.query.*;
import org.apache.skywalking.oap.server.core.register.service.*;
import org.apache.skywalking.oap.server.core.remote.RemoteSenderService;
@@ -44,6 +44,7 @@ public class CoreModule extends ModuleDefine {
@Override public Class[] services() {
List<Class> classes = new ArrayList<>();
+ classes.add(DownsamplingConfigService.class);
classes.add(IComponentLibraryCatalogService.class);
addServerInterface(classes);
diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/CoreModuleConfig.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/CoreModuleConfig.java
index f781a8c..d918f85 100644
--- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/CoreModuleConfig.java
+++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/CoreModuleConfig.java
@@ -18,16 +18,23 @@
package org.apache.skywalking.oap.server.core;
+import java.util.*;
import lombok.*;
import org.apache.skywalking.oap.server.library.module.ModuleConfig;
/**
* @author peng-yongsheng
*/
+@Getter
public class CoreModuleConfig extends ModuleConfig {
- @Setter @Getter private String restHost;
- @Setter @Getter private int restPort;
- @Setter @Getter private String restContextPath;
- @Setter @Getter private String gRPCHost;
- @Setter @Getter private int gRPCPort;
+ @Setter private String restHost;
+ @Setter private int restPort;
+ @Setter private String restContextPath;
+ @Setter private String gRPCHost;
+ @Setter private int gRPCPort;
+ private final List<String> downsampling;
+
+ CoreModuleConfig() {
+ this.downsampling = new ArrayList<>();
+ }
}
diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/CoreModuleProvider.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/CoreModuleProvider.java
index 84435a9..1f85ce2 100644
--- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/CoreModuleProvider.java
+++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/CoreModuleProvider.java
@@ -86,6 +86,8 @@ public class CoreModuleProvider extends ModuleProvider {
jettyServer = new JettyServer(moduleConfig.getRestHost(), moduleConfig.getRestPort(), moduleConfig.getRestContextPath());
jettyServer.initialize();
+ this.registerServiceImplementation(DownsamplingConfigService.class, new DownsamplingConfigService(moduleConfig.getDownsampling()));
+
this.registerServiceImplementation(GRPCHandlerRegister.class, new GRPCHandlerRegisterImpl(grpcServer));
this.registerServiceImplementation(JettyHandlerRegister.class, new JettyHandlerRegisterImpl(jettyServer));
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 2e3dabb..be176f1 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 731dd9d..596e90b 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.
@@ -112,7 +111,6 @@ public class AllHeatmapIndicator extends ThermodynamicIndicator implements Alarm
indicator.setStep(this.getStep());
indicator.setNumOfSteps(this.getNumOfSteps());
indicator.setDetailGroup(this.getDetailGroup());
- indicator.setTimeBucket(this.getTimeBucket());
return indicator;
}
@@ -123,7 +121,6 @@ public class AllHeatmapIndicator extends ThermodynamicIndicator implements Alarm
indicator.setStep(this.getStep());
indicator.setNumOfSteps(this.getNumOfSteps());
indicator.setDetailGroup(this.getDetailGroup());
- indicator.setTimeBucket(this.getTimeBucket());
return indicator;
}
@@ -134,7 +131,6 @@ public class AllHeatmapIndicator extends ThermodynamicIndicator implements Alarm
indicator.setStep(this.getStep());
indicator.setNumOfSteps(this.getNumOfSteps());
indicator.setDetailGroup(this.getDetailGroup());
- indicator.setTimeBucket(this.getTimeBucket());
return indicator;
}
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 068e2e5..8981e0c 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.
@@ -112,7 +111,6 @@ public class AllP50Indicator extends P50Indicator implements AlarmSupported {
indicator.setValue(this.getValue());
indicator.setPrecision(this.getPrecision());
indicator.setDetailGroup(this.getDetailGroup());
- indicator.setTimeBucket(this.getTimeBucket());
return indicator;
}
@@ -123,7 +121,6 @@ public class AllP50Indicator extends P50Indicator implements AlarmSupported {
indicator.setValue(this.getValue());
indicator.setPrecision(this.getPrecision());
indicator.setDetailGroup(this.getDetailGroup());
- indicator.setTimeBucket(this.getTimeBucket());
return indicator;
}
@@ -134,7 +131,6 @@ public class AllP50Indicator extends P50Indicator implements AlarmSupported {
indicator.setValue(this.getValue());
indicator.setPrecision(this.getPrecision());
indicator.setDetailGroup(this.getDetailGroup());
- indicator.setTimeBucket(this.getTimeBucket());
return indicator;
}
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 b235c4f..8c89779 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.
@@ -112,7 +111,6 @@ public class AllP75Indicator extends P75Indicator implements AlarmSupported {
indicator.setValue(this.getValue());
indicator.setPrecision(this.getPrecision());
indicator.setDetailGroup(this.getDetailGroup());
- indicator.setTimeBucket(this.getTimeBucket());
return indicator;
}
@@ -123,7 +121,6 @@ public class AllP75Indicator extends P75Indicator implements AlarmSupported {
indicator.setValue(this.getValue());
indicator.setPrecision(this.getPrecision());
indicator.setDetailGroup(this.getDetailGroup());
- indicator.setTimeBucket(this.getTimeBucket());
return indicator;
}
@@ -134,7 +131,6 @@ public class AllP75Indicator extends P75Indicator implements AlarmSupported {
indicator.setValue(this.getValue());
indicator.setPrecision(this.getPrecision());
indicator.setDetailGroup(this.getDetailGroup());
- indicator.setTimeBucket(this.getTimeBucket());
return indicator;
}
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 3cf4ac0..86f2c02 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.
@@ -112,7 +111,6 @@ public class AllP90Indicator extends P90Indicator implements AlarmSupported {
indicator.setValue(this.getValue());
indicator.setPrecision(this.getPrecision());
indicator.setDetailGroup(this.getDetailGroup());
- indicator.setTimeBucket(this.getTimeBucket());
return indicator;
}
@@ -123,7 +121,6 @@ public class AllP90Indicator extends P90Indicator implements AlarmSupported {
indicator.setValue(this.getValue());
indicator.setPrecision(this.getPrecision());
indicator.setDetailGroup(this.getDetailGroup());
- indicator.setTimeBucket(this.getTimeBucket());
return indicator;
}
@@ -134,7 +131,6 @@ public class AllP90Indicator extends P90Indicator implements AlarmSupported {
indicator.setValue(this.getValue());
indicator.setPrecision(this.getPrecision());
indicator.setDetailGroup(this.getDetailGroup());
- indicator.setTimeBucket(this.getTimeBucket());
return indicator;
}
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 8355de3..4a77b28 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.
@@ -112,7 +111,6 @@ public class AllP95Indicator extends P95Indicator implements AlarmSupported {
indicator.setValue(this.getValue());
indicator.setPrecision(this.getPrecision());
indicator.setDetailGroup(this.getDetailGroup());
- indicator.setTimeBucket(this.getTimeBucket());
return indicator;
}
@@ -123,7 +121,6 @@ public class AllP95Indicator extends P95Indicator implements AlarmSupported {
indicator.setValue(this.getValue());
indicator.setPrecision(this.getPrecision());
indicator.setDetailGroup(this.getDetailGroup());
- indicator.setTimeBucket(this.getTimeBucket());
return indicator;
}
@@ -134,7 +131,6 @@ public class AllP95Indicator extends P95Indicator implements AlarmSupported {
indicator.setValue(this.getValue());
indicator.setPrecision(this.getPrecision());
indicator.setDetailGroup(this.getDetailGroup());
- indicator.setTimeBucket(this.getTimeBucket());
return indicator;
}
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 85d5023..b069175 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.
@@ -112,7 +111,6 @@ public class AllP99Indicator extends P99Indicator implements AlarmSupported {
indicator.setValue(this.getValue());
indicator.setPrecision(this.getPrecision());
indicator.setDetailGroup(this.getDetailGroup());
- indicator.setTimeBucket(this.getTimeBucket());
return indicator;
}
@@ -123,7 +121,6 @@ public class AllP99Indicator extends P99Indicator implements AlarmSupported {
indicator.setValue(this.getValue());
indicator.setPrecision(this.getPrecision());
indicator.setDetailGroup(this.getDetailGroup());
- indicator.setTimeBucket(this.getTimeBucket());
return indicator;
}
@@ -134,7 +131,6 @@ public class AllP99Indicator extends P99Indicator implements AlarmSupported {
indicator.setValue(this.getValue());
indicator.setPrecision(this.getPrecision());
indicator.setDetailGroup(this.getDetailGroup());
- indicator.setTimeBucket(this.getTimeBucket());
return indicator;
}
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 1fec151..8c43abb 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;
@@ -128,7 +127,6 @@ public class EndpointAvgIndicator extends LongAvgIndicator implements AlarmSuppo
indicator.setSummation(this.getSummation());
indicator.setCount(this.getCount());
indicator.setValue(this.getValue());
- indicator.setTimeBucket(this.getTimeBucket());
return indicator;
}
@@ -142,7 +140,6 @@ public class EndpointAvgIndicator extends LongAvgIndicator implements AlarmSuppo
indicator.setSummation(this.getSummation());
indicator.setCount(this.getCount());
indicator.setValue(this.getValue());
- indicator.setTimeBucket(this.getTimeBucket());
return indicator;
}
@@ -156,7 +153,6 @@ public class EndpointAvgIndicator extends LongAvgIndicator implements AlarmSuppo
indicator.setSummation(this.getSummation());
indicator.setCount(this.getCount());
indicator.setValue(this.getValue());
- indicator.setTimeBucket(this.getTimeBucket());
return indicator;
}
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 fe4b3a9..add7f73 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;
@@ -125,7 +124,6 @@ public class EndpointCpmIndicator extends CPMIndicator implements AlarmSupported
indicator.setServiceInstanceId(this.getServiceInstanceId());
indicator.setValue(this.getValue());
indicator.setTotal(this.getTotal());
- indicator.setTimeBucket(this.getTimeBucket());
return indicator;
}
@@ -138,7 +136,6 @@ public class EndpointCpmIndicator extends CPMIndicator implements AlarmSupported
indicator.setServiceInstanceId(this.getServiceInstanceId());
indicator.setValue(this.getValue());
indicator.setTotal(this.getTotal());
- indicator.setTimeBucket(this.getTimeBucket());
return indicator;
}
@@ -151,7 +148,6 @@ public class EndpointCpmIndicator extends CPMIndicator implements AlarmSupported
indicator.setServiceInstanceId(this.getServiceInstanceId());
indicator.setValue(this.getValue());
indicator.setTotal(this.getTotal());
- indicator.setTimeBucket(this.getTimeBucket());
return indicator;
}
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 1b4f621..7a84e0a 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 dd1086b..52abc44 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;
@@ -131,7 +130,6 @@ public class EndpointP50Indicator extends P50Indicator implements AlarmSupported
indicator.setValue(this.getValue());
indicator.setPrecision(this.getPrecision());
indicator.setDetailGroup(this.getDetailGroup());
- indicator.setTimeBucket(this.getTimeBucket());
return indicator;
}
@@ -145,7 +143,6 @@ public class EndpointP50Indicator extends P50Indicator implements AlarmSupported
indicator.setValue(this.getValue());
indicator.setPrecision(this.getPrecision());
indicator.setDetailGroup(this.getDetailGroup());
- indicator.setTimeBucket(this.getTimeBucket());
return indicator;
}
@@ -159,7 +156,6 @@ public class EndpointP50Indicator extends P50Indicator implements AlarmSupported
indicator.setValue(this.getValue());
indicator.setPrecision(this.getPrecision());
indicator.setDetailGroup(this.getDetailGroup());
- indicator.setTimeBucket(this.getTimeBucket());
return indicator;
}
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 301482c..9f2d026 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;
@@ -131,7 +130,6 @@ public class EndpointP75Indicator extends P75Indicator implements AlarmSupported
indicator.setValue(this.getValue());
indicator.setPrecision(this.getPrecision());
indicator.setDetailGroup(this.getDetailGroup());
- indicator.setTimeBucket(this.getTimeBucket());
return indicator;
}
@@ -145,7 +143,6 @@ public class EndpointP75Indicator extends P75Indicator implements AlarmSupported
indicator.setValue(this.getValue());
indicator.setPrecision(this.getPrecision());
indicator.setDetailGroup(this.getDetailGroup());
- indicator.setTimeBucket(this.getTimeBucket());
return indicator;
}
@@ -159,7 +156,6 @@ public class EndpointP75Indicator extends P75Indicator implements AlarmSupported
indicator.setValue(this.getValue());
indicator.setPrecision(this.getPrecision());
indicator.setDetailGroup(this.getDetailGroup());
- indicator.setTimeBucket(this.getTimeBucket());
return indicator;
}
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 712d1af..5d1620b 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;
@@ -131,7 +130,6 @@ public class EndpointP90Indicator extends P90Indicator implements AlarmSupported
indicator.setValue(this.getValue());
indicator.setPrecision(this.getPrecision());
indicator.setDetailGroup(this.getDetailGroup());
- indicator.setTimeBucket(this.getTimeBucket());
return indicator;
}
@@ -145,7 +143,6 @@ public class EndpointP90Indicator extends P90Indicator implements AlarmSupported
indicator.setValue(this.getValue());
indicator.setPrecision(this.getPrecision());
indicator.setDetailGroup(this.getDetailGroup());
- indicator.setTimeBucket(this.getTimeBucket());
return indicator;
}
@@ -159,7 +156,6 @@ public class EndpointP90Indicator extends P90Indicator implements AlarmSupported
indicator.setValue(this.getValue());
indicator.setPrecision(this.getPrecision());
indicator.setDetailGroup(this.getDetailGroup());
- indicator.setTimeBucket(this.getTimeBucket());
return indicator;
}
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 f924853..3c4fc1a 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;
@@ -131,7 +130,6 @@ public class EndpointP95Indicator extends P95Indicator implements AlarmSupported
indicator.setValue(this.getValue());
indicator.setPrecision(this.getPrecision());
indicator.setDetailGroup(this.getDetailGroup());
- indicator.setTimeBucket(this.getTimeBucket());
return indicator;
}
@@ -145,7 +143,6 @@ public class EndpointP95Indicator extends P95Indicator implements AlarmSupported
indicator.setValue(this.getValue());
indicator.setPrecision(this.getPrecision());
indicator.setDetailGroup(this.getDetailGroup());
- indicator.setTimeBucket(this.getTimeBucket());
return indicator;
}
@@ -159,7 +156,6 @@ public class EndpointP95Indicator extends P95Indicator implements AlarmSupported
indicator.setValue(this.getValue());
indicator.setPrecision(this.getPrecision());
indicator.setDetailGroup(this.getDetailGroup());
- indicator.setTimeBucket(this.getTimeBucket());
return indicator;
}
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 73b313c..aadf677 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;
@@ -131,7 +130,6 @@ public class EndpointP99Indicator extends P99Indicator implements AlarmSupported
indicator.setValue(this.getValue());
indicator.setPrecision(this.getPrecision());
indicator.setDetailGroup(this.getDetailGroup());
- indicator.setTimeBucket(this.getTimeBucket());
return indicator;
}
@@ -145,7 +143,6 @@ public class EndpointP99Indicator extends P99Indicator implements AlarmSupported
indicator.setValue(this.getValue());
indicator.setPrecision(this.getPrecision());
indicator.setDetailGroup(this.getDetailGroup());
- indicator.setTimeBucket(this.getTimeBucket());
return indicator;
}
@@ -159,7 +156,6 @@ public class EndpointP99Indicator extends P99Indicator implements AlarmSupported
indicator.setValue(this.getValue());
indicator.setPrecision(this.getPrecision());
indicator.setDetailGroup(this.getDetailGroup());
- indicator.setTimeBucket(this.getTimeBucket());
return indicator;
}
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 86e12fa..2175c87 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;
@@ -128,7 +127,6 @@ public class EndpointSlaIndicator extends PercentIndicator implements AlarmSuppo
indicator.setTotal(this.getTotal());
indicator.setPercentage(this.getPercentage());
indicator.setMatch(this.getMatch());
- indicator.setTimeBucket(this.getTimeBucket());
return indicator;
}
@@ -142,7 +140,6 @@ public class EndpointSlaIndicator extends PercentIndicator implements AlarmSuppo
indicator.setTotal(this.getTotal());
indicator.setPercentage(this.getPercentage());
indicator.setMatch(this.getMatch());
- indicator.setTimeBucket(this.getTimeBucket());
return indicator;
}
@@ -156,7 +153,6 @@ public class EndpointSlaIndicator extends PercentIndicator implements AlarmSuppo
indicator.setTotal(this.getTotal());
indicator.setPercentage(this.getPercentage());
indicator.setMatch(this.getMatch());
- indicator.setTimeBucket(this.getTimeBucket());
return indicator;
}
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 1651e0c..71f83c3 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;
@@ -133,7 +132,6 @@ public class EndpointRelationCpmIndicator extends CPMIndicator implements AlarmS
indicator.setChildServiceInstanceId(this.getChildServiceInstanceId());
indicator.setValue(this.getValue());
indicator.setTotal(this.getTotal());
- indicator.setTimeBucket(this.getTimeBucket());
return indicator;
}
@@ -148,7 +146,6 @@ public class EndpointRelationCpmIndicator extends CPMIndicator implements AlarmS
indicator.setChildServiceInstanceId(this.getChildServiceInstanceId());
indicator.setValue(this.getValue());
indicator.setTotal(this.getTotal());
- indicator.setTimeBucket(this.getTimeBucket());
return indicator;
}
@@ -163,7 +160,6 @@ public class EndpointRelationCpmIndicator extends CPMIndicator implements AlarmS
indicator.setChildServiceInstanceId(this.getChildServiceInstanceId());
indicator.setValue(this.getValue());
indicator.setTotal(this.getTotal());
- indicator.setTimeBucket(this.getTimeBucket());
return indicator;
}
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 0d214ce..5d51268 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 7b66108..ab55202 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;
@@ -136,7 +135,6 @@ public class EndpointRelationRespTimeIndicator extends LongAvgIndicator implemen
indicator.setSummation(this.getSummation());
indicator.setCount(this.getCount());
indicator.setValue(this.getValue());
- indicator.setTimeBucket(this.getTimeBucket());
return indicator;
}
@@ -152,7 +150,6 @@ public class EndpointRelationRespTimeIndicator extends LongAvgIndicator implemen
indicator.setSummation(this.getSummation());
indicator.setCount(this.getCount());
indicator.setValue(this.getValue());
- indicator.setTimeBucket(this.getTimeBucket());
return indicator;
}
@@ -168,7 +165,6 @@ public class EndpointRelationRespTimeIndicator extends LongAvgIndicator implemen
indicator.setSummation(this.getSummation());
indicator.setCount(this.getCount());
indicator.setValue(this.getValue());
- indicator.setTimeBucket(this.getTimeBucket());
return indicator;
}
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 da2c379..08dfc3b 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());
@@ -117,7 +116,6 @@ public class ServiceCpmIndicator extends CPMIndicator implements AlarmSupported
indicator.setEntityId(this.getEntityId());
indicator.setValue(this.getValue());
indicator.setTotal(this.getTotal());
- indicator.setTimeBucket(this.getTimeBucket());
return indicator;
}
@@ -128,7 +126,6 @@ public class ServiceCpmIndicator extends CPMIndicator implements AlarmSupported
indicator.setEntityId(this.getEntityId());
indicator.setValue(this.getValue());
indicator.setTotal(this.getTotal());
- indicator.setTimeBucket(this.getTimeBucket());
return indicator;
}
@@ -139,7 +136,6 @@ public class ServiceCpmIndicator extends CPMIndicator implements AlarmSupported
indicator.setEntityId(this.getEntityId());
indicator.setValue(this.getValue());
indicator.setTotal(this.getTotal());
- indicator.setTimeBucket(this.getTimeBucket());
return indicator;
}
diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/service/ServiceDispatcher.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/service/ServiceDispatcher.java
index 22126dd..e1638c8 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 30fab81..a283ecb 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());
@@ -123,7 +122,6 @@ public class ServiceP50Indicator extends P50Indicator implements AlarmSupported
indicator.setValue(this.getValue());
indicator.setPrecision(this.getPrecision());
indicator.setDetailGroup(this.getDetailGroup());
- indicator.setTimeBucket(this.getTimeBucket());
return indicator;
}
@@ -135,7 +133,6 @@ public class ServiceP50Indicator extends P50Indicator implements AlarmSupported
indicator.setValue(this.getValue());
indicator.setPrecision(this.getPrecision());
indicator.setDetailGroup(this.getDetailGroup());
- indicator.setTimeBucket(this.getTimeBucket());
return indicator;
}
@@ -147,7 +144,6 @@ public class ServiceP50Indicator extends P50Indicator implements AlarmSupported
indicator.setValue(this.getValue());
indicator.setPrecision(this.getPrecision());
indicator.setDetailGroup(this.getDetailGroup());
- indicator.setTimeBucket(this.getTimeBucket());
return indicator;
}
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 78b716d..d69742d 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());
@@ -123,7 +122,6 @@ public class ServiceP75Indicator extends P75Indicator implements AlarmSupported
indicator.setValue(this.getValue());
indicator.setPrecision(this.getPrecision());
indicator.setDetailGroup(this.getDetailGroup());
- indicator.setTimeBucket(this.getTimeBucket());
return indicator;
}
@@ -135,7 +133,6 @@ public class ServiceP75Indicator extends P75Indicator implements AlarmSupported
indicator.setValue(this.getValue());
indicator.setPrecision(this.getPrecision());
indicator.setDetailGroup(this.getDetailGroup());
- indicator.setTimeBucket(this.getTimeBucket());
return indicator;
}
@@ -147,7 +144,6 @@ public class ServiceP75Indicator extends P75Indicator implements AlarmSupported
indicator.setValue(this.getValue());
indicator.setPrecision(this.getPrecision());
indicator.setDetailGroup(this.getDetailGroup());
- indicator.setTimeBucket(this.getTimeBucket());
return indicator;
}
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 0754d0e..d638bd1 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());
@@ -123,7 +122,6 @@ public class ServiceP90Indicator extends P90Indicator implements AlarmSupported
indicator.setValue(this.getValue());
indicator.setPrecision(this.getPrecision());
indicator.setDetailGroup(this.getDetailGroup());
- indicator.setTimeBucket(this.getTimeBucket());
return indicator;
}
@@ -135,7 +133,6 @@ public class ServiceP90Indicator extends P90Indicator implements AlarmSupported
indicator.setValue(this.getValue());
indicator.setPrecision(this.getPrecision());
indicator.setDetailGroup(this.getDetailGroup());
- indicator.setTimeBucket(this.getTimeBucket());
return indicator;
}
@@ -147,7 +144,6 @@ public class ServiceP90Indicator extends P90Indicator implements AlarmSupported
indicator.setValue(this.getValue());
indicator.setPrecision(this.getPrecision());
indicator.setDetailGroup(this.getDetailGroup());
- indicator.setTimeBucket(this.getTimeBucket());
return indicator;
}
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 3be4020..526c0e1 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());
@@ -123,7 +122,6 @@ public class ServiceP95Indicator extends P95Indicator implements AlarmSupported
indicator.setValue(this.getValue());
indicator.setPrecision(this.getPrecision());
indicator.setDetailGroup(this.getDetailGroup());
- indicator.setTimeBucket(this.getTimeBucket());
return indicator;
}
@@ -135,7 +133,6 @@ public class ServiceP95Indicator extends P95Indicator implements AlarmSupported
indicator.setValue(this.getValue());
indicator.setPrecision(this.getPrecision());
indicator.setDetailGroup(this.getDetailGroup());
- indicator.setTimeBucket(this.getTimeBucket());
return indicator;
}
@@ -147,7 +144,6 @@ public class ServiceP95Indicator extends P95Indicator implements AlarmSupported
indicator.setValue(this.getValue());
indicator.setPrecision(this.getPrecision());
indicator.setDetailGroup(this.getDetailGroup());
- indicator.setTimeBucket(this.getTimeBucket());
return indicator;
}
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 76e23d8..5a661cc 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());
@@ -123,7 +122,6 @@ public class ServiceP99Indicator extends P99Indicator implements AlarmSupported
indicator.setValue(this.getValue());
indicator.setPrecision(this.getPrecision());
indicator.setDetailGroup(this.getDetailGroup());
- indicator.setTimeBucket(this.getTimeBucket());
return indicator;
}
@@ -135,7 +133,6 @@ public class ServiceP99Indicator extends P99Indicator implements AlarmSupported
indicator.setValue(this.getValue());
indicator.setPrecision(this.getPrecision());
indicator.setDetailGroup(this.getDetailGroup());
- indicator.setTimeBucket(this.getTimeBucket());
return indicator;
}
@@ -147,7 +144,6 @@ public class ServiceP99Indicator extends P99Indicator implements AlarmSupported
indicator.setValue(this.getValue());
indicator.setPrecision(this.getPrecision());
indicator.setDetailGroup(this.getDetailGroup());
- indicator.setTimeBucket(this.getTimeBucket());
return indicator;
}
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 46cef31..5de6eaa 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());
@@ -120,7 +119,6 @@ public class ServiceRespTimeIndicator extends LongAvgIndicator implements AlarmS
indicator.setSummation(this.getSummation());
indicator.setCount(this.getCount());
indicator.setValue(this.getValue());
- indicator.setTimeBucket(this.getTimeBucket());
return indicator;
}
@@ -132,7 +130,6 @@ public class ServiceRespTimeIndicator extends LongAvgIndicator implements AlarmS
indicator.setSummation(this.getSummation());
indicator.setCount(this.getCount());
indicator.setValue(this.getValue());
- indicator.setTimeBucket(this.getTimeBucket());
return indicator;
}
@@ -144,7 +141,6 @@ public class ServiceRespTimeIndicator extends LongAvgIndicator implements AlarmS
indicator.setSummation(this.getSummation());
indicator.setCount(this.getCount());
indicator.setValue(this.getValue());
- indicator.setTimeBucket(this.getTimeBucket());
return indicator;
}
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 a77f30b..fa2e8b9 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());
@@ -120,7 +119,6 @@ public class ServiceSlaIndicator extends PercentIndicator implements AlarmSuppor
indicator.setTotal(this.getTotal());
indicator.setPercentage(this.getPercentage());
indicator.setMatch(this.getMatch());
- indicator.setTimeBucket(this.getTimeBucket());
return indicator;
}
@@ -132,7 +130,6 @@ public class ServiceSlaIndicator extends PercentIndicator implements AlarmSuppor
indicator.setTotal(this.getTotal());
indicator.setPercentage(this.getPercentage());
indicator.setMatch(this.getMatch());
- indicator.setTimeBucket(this.getTimeBucket());
return indicator;
}
@@ -144,7 +141,6 @@ public class ServiceSlaIndicator extends PercentIndicator implements AlarmSuppor
indicator.setTotal(this.getTotal());
indicator.setPercentage(this.getPercentage());
indicator.setMatch(this.getMatch());
- indicator.setTimeBucket(this.getTimeBucket());
return indicator;
}
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 b850f40..fa26f5d 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() {
@@ -121,7 +120,6 @@ public class ServiceInstanceCpmIndicator extends CPMIndicator implements AlarmSu
indicator.setServiceId(this.getServiceId());
indicator.setValue(this.getValue());
indicator.setTotal(this.getTotal());
- indicator.setTimeBucket(this.getTimeBucket());
return indicator;
}
@@ -133,7 +131,6 @@ public class ServiceInstanceCpmIndicator extends CPMIndicator implements AlarmSu
indicator.setServiceId(this.getServiceId());
indicator.setValue(this.getValue());
indicator.setTotal(this.getTotal());
- indicator.setTimeBucket(this.getTimeBucket());
return indicator;
}
@@ -145,7 +142,6 @@ public class ServiceInstanceCpmIndicator extends CPMIndicator implements AlarmSu
indicator.setServiceId(this.getServiceId());
indicator.setValue(this.getValue());
indicator.setTotal(this.getTotal());
- indicator.setTimeBucket(this.getTimeBucket());
return indicator;
}
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 91b32f5..43add9d 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 4225fb8..aa0468e 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() {
@@ -124,7 +123,6 @@ public class ServiceInstanceRespTimeIndicator extends LongAvgIndicator implement
indicator.setSummation(this.getSummation());
indicator.setCount(this.getCount());
indicator.setValue(this.getValue());
- indicator.setTimeBucket(this.getTimeBucket());
return indicator;
}
@@ -137,7 +135,6 @@ public class ServiceInstanceRespTimeIndicator extends LongAvgIndicator implement
indicator.setSummation(this.getSummation());
indicator.setCount(this.getCount());
indicator.setValue(this.getValue());
- indicator.setTimeBucket(this.getTimeBucket());
return indicator;
}
@@ -150,7 +147,6 @@ public class ServiceInstanceRespTimeIndicator extends LongAvgIndicator implement
indicator.setSummation(this.getSummation());
indicator.setCount(this.getCount());
indicator.setValue(this.getValue());
- indicator.setTimeBucket(this.getTimeBucket());
return indicator;
}
diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstancejvmcpu/InstanceJvmCpuIndicator.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstancejvmcpu/InstanceJvmCpuIndicator.java
index 8e743e0..040278a 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() {
@@ -124,7 +123,6 @@ public class InstanceJvmCpuIndicator extends DoubleAvgIndicator implements Alarm
indicator.setSummation(this.getSummation());
indicator.setCount(this.getCount());
indicator.setValue(this.getValue());
- indicator.setTimeBucket(this.getTimeBucket());
return indicator;
}
@@ -137,7 +135,6 @@ public class InstanceJvmCpuIndicator extends DoubleAvgIndicator implements Alarm
indicator.setSummation(this.getSummation());
indicator.setCount(this.getCount());
indicator.setValue(this.getValue());
- indicator.setTimeBucket(this.getTimeBucket());
return indicator;
}
@@ -150,7 +147,6 @@ public class InstanceJvmCpuIndicator extends DoubleAvgIndicator implements Alarm
indicator.setSummation(this.getSummation());
indicator.setCount(this.getCount());
indicator.setValue(this.getValue());
- indicator.setTimeBucket(this.getTimeBucket());
return indicator;
}
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 7c93867..7e496d2 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 8917f70..792e6fc 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() {
@@ -118,7 +117,6 @@ public class InstanceJvmOldGcCountIndicator extends SumIndicator implements Alar
indicator.setEntityId(this.getEntityId());
indicator.setServiceInstanceId(this.getServiceInstanceId());
indicator.setValue(this.getValue());
- indicator.setTimeBucket(this.getTimeBucket());
return indicator;
}
@@ -129,7 +127,6 @@ public class InstanceJvmOldGcCountIndicator extends SumIndicator implements Alar
indicator.setEntityId(this.getEntityId());
indicator.setServiceInstanceId(this.getServiceInstanceId());
indicator.setValue(this.getValue());
- indicator.setTimeBucket(this.getTimeBucket());
return indicator;
}
@@ -140,7 +137,6 @@ public class InstanceJvmOldGcCountIndicator extends SumIndicator implements Alar
indicator.setEntityId(this.getEntityId());
indicator.setServiceInstanceId(this.getServiceInstanceId());
indicator.setValue(this.getValue());
- indicator.setTimeBucket(this.getTimeBucket());
return indicator;
}
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 0f6eb1b..af1a9bd 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() {
@@ -124,7 +123,6 @@ public class InstanceJvmOldGcTimeIndicator extends LongAvgIndicator implements A
indicator.setSummation(this.getSummation());
indicator.setCount(this.getCount());
indicator.setValue(this.getValue());
- indicator.setTimeBucket(this.getTimeBucket());
return indicator;
}
@@ -137,7 +135,6 @@ public class InstanceJvmOldGcTimeIndicator extends LongAvgIndicator implements A
indicator.setSummation(this.getSummation());
indicator.setCount(this.getCount());
indicator.setValue(this.getValue());
- indicator.setTimeBucket(this.getTimeBucket());
return indicator;
}
@@ -150,7 +147,6 @@ public class InstanceJvmOldGcTimeIndicator extends LongAvgIndicator implements A
indicator.setSummation(this.getSummation());
indicator.setCount(this.getCount());
indicator.setValue(this.getValue());
- indicator.setTimeBucket(this.getTimeBucket());
return indicator;
}
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 5076a99..b29c61d 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() {
@@ -118,7 +117,6 @@ public class InstanceJvmYoungGcCountIndicator extends SumIndicator implements Al
indicator.setEntityId(this.getEntityId());
indicator.setServiceInstanceId(this.getServiceInstanceId());
indicator.setValue(this.getValue());
- indicator.setTimeBucket(this.getTimeBucket());
return indicator;
}
@@ -129,7 +127,6 @@ public class InstanceJvmYoungGcCountIndicator extends SumIndicator implements Al
indicator.setEntityId(this.getEntityId());
indicator.setServiceInstanceId(this.getServiceInstanceId());
indicator.setValue(this.getValue());
- indicator.setTimeBucket(this.getTimeBucket());
return indicator;
}
@@ -140,7 +137,6 @@ public class InstanceJvmYoungGcCountIndicator extends SumIndicator implements Al
indicator.setEntityId(this.getEntityId());
indicator.setServiceInstanceId(this.getServiceInstanceId());
indicator.setValue(this.getValue());
- indicator.setTimeBucket(this.getTimeBucket());
return indicator;
}
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 56da0cc..092a559 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() {
@@ -124,7 +123,6 @@ public class InstanceJvmYoungGcTimeIndicator extends LongAvgIndicator implements
indicator.setSummation(this.getSummation());
indicator.setCount(this.getCount());
indicator.setValue(this.getValue());
- indicator.setTimeBucket(this.getTimeBucket());
return indicator;
}
@@ -137,7 +135,6 @@ public class InstanceJvmYoungGcTimeIndicator extends LongAvgIndicator implements
indicator.setSummation(this.getSummation());
indicator.setCount(this.getCount());
indicator.setValue(this.getValue());
- indicator.setTimeBucket(this.getTimeBucket());
return indicator;
}
@@ -150,7 +147,6 @@ public class InstanceJvmYoungGcTimeIndicator extends LongAvgIndicator implements
indicator.setSummation(this.getSummation());
indicator.setCount(this.getCount());
indicator.setValue(this.getValue());
- indicator.setTimeBucket(this.getTimeBucket());
return indicator;
}
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 d99291d..cc631e0 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 815b9d5..ccfb6ee 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() {
@@ -124,7 +123,6 @@ public class InstanceJvmMemoryHeapIndicator extends LongAvgIndicator implements
indicator.setSummation(this.getSummation());
indicator.setCount(this.getCount());
indicator.setValue(this.getValue());
- indicator.setTimeBucket(this.getTimeBucket());
return indicator;
}
@@ -137,7 +135,6 @@ public class InstanceJvmMemoryHeapIndicator extends LongAvgIndicator implements
indicator.setSummation(this.getSummation());
indicator.setCount(this.getCount());
indicator.setValue(this.getValue());
- indicator.setTimeBucket(this.getTimeBucket());
return indicator;
}
@@ -150,7 +147,6 @@ public class InstanceJvmMemoryHeapIndicator extends LongAvgIndicator implements
indicator.setSummation(this.getSummation());
indicator.setCount(this.getCount());
indicator.setValue(this.getValue());
- indicator.setTimeBucket(this.getTimeBucket());
return indicator;
}
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 f6c63d3..8860586 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() {
@@ -124,7 +123,6 @@ public class InstanceJvmMemoryHeapMaxIndicator extends LongAvgIndicator implemen
indicator.setSummation(this.getSummation());
indicator.setCount(this.getCount());
indicator.setValue(this.getValue());
- indicator.setTimeBucket(this.getTimeBucket());
return indicator;
}
@@ -137,7 +135,6 @@ public class InstanceJvmMemoryHeapMaxIndicator extends LongAvgIndicator implemen
indicator.setSummation(this.getSummation());
indicator.setCount(this.getCount());
indicator.setValue(this.getValue());
- indicator.setTimeBucket(this.getTimeBucket());
return indicator;
}
@@ -150,7 +147,6 @@ public class InstanceJvmMemoryHeapMaxIndicator extends LongAvgIndicator implemen
indicator.setSummation(this.getSummation());
indicator.setCount(this.getCount());
indicator.setValue(this.getValue());
- indicator.setTimeBucket(this.getTimeBucket());
return indicator;
}
diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstancejvmmemory/InstanceJvmMemoryNoheapIndicator.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstancejvmmemory/InstanceJvmMemoryNoheapIndicator.java
index 4d847d1..b66fcf9 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() {
@@ -124,7 +123,6 @@ public class InstanceJvmMemoryNoheapIndicator extends LongAvgIndicator implement
indicator.setSummation(this.getSummation());
indicator.setCount(this.getCount());
indicator.setValue(this.getValue());
- indicator.setTimeBucket(this.getTimeBucket());
return indicator;
}
@@ -137,7 +135,6 @@ public class InstanceJvmMemoryNoheapIndicator extends LongAvgIndicator implement
indicator.setSummation(this.getSummation());
indicator.setCount(this.getCount());
indicator.setValue(this.getValue());
- indicator.setTimeBucket(this.getTimeBucket());
return indicator;
}
@@ -150,7 +147,6 @@ public class InstanceJvmMemoryNoheapIndicator extends LongAvgIndicator implement
indicator.setSummation(this.getSummation());
indicator.setCount(this.getCount());
indicator.setValue(this.getValue());
- indicator.setTimeBucket(this.getTimeBucket());
return indicator;
}
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 6e831d4..8c4ff87 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() {
@@ -124,7 +123,6 @@ public class InstanceJvmMemoryNoheapMaxIndicator extends LongAvgIndicator implem
indicator.setSummation(this.getSummation());
indicator.setCount(this.getCount());
indicator.setValue(this.getValue());
- indicator.setTimeBucket(this.getTimeBucket());
return indicator;
}
@@ -137,7 +135,6 @@ public class InstanceJvmMemoryNoheapMaxIndicator extends LongAvgIndicator implem
indicator.setSummation(this.getSummation());
indicator.setCount(this.getCount());
indicator.setValue(this.getValue());
- indicator.setTimeBucket(this.getTimeBucket());
return indicator;
}
@@ -150,7 +147,6 @@ public class InstanceJvmMemoryNoheapMaxIndicator extends LongAvgIndicator implem
indicator.setSummation(this.getSummation());
indicator.setCount(this.getCount());
indicator.setValue(this.getValue());
- indicator.setTimeBucket(this.getTimeBucket());
return indicator;
}
diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstancejvmmemory/ServiceInstanceJVMMemoryDispatcher.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstancejvmmemory/ServiceInstanceJVMMemoryDispatcher.java
index f6c5866..8cf86da 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 409f135..bc56cb6 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 15af664..0ddd689 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 eb02c71..3035818 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());
@@ -120,7 +119,6 @@ public class ServiceRelationClientCallSlaIndicator extends PercentIndicator impl
indicator.setTotal(this.getTotal());
indicator.setPercentage(this.getPercentage());
indicator.setMatch(this.getMatch());
- indicator.setTimeBucket(this.getTimeBucket());
return indicator;
}
@@ -132,7 +130,6 @@ public class ServiceRelationClientCallSlaIndicator extends PercentIndicator impl
indicator.setTotal(this.getTotal());
indicator.setPercentage(this.getPercentage());
indicator.setMatch(this.getMatch());
- indicator.setTimeBucket(this.getTimeBucket());
return indicator;
}
@@ -144,7 +141,6 @@ public class ServiceRelationClientCallSlaIndicator extends PercentIndicator impl
indicator.setTotal(this.getTotal());
indicator.setPercentage(this.getPercentage());
indicator.setMatch(this.getMatch());
- indicator.setTimeBucket(this.getTimeBucket());
return indicator;
}
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 2c5b18d..cb2f822 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());
@@ -117,7 +116,6 @@ public class ServiceRelationClientCpmIndicator extends CPMIndicator implements A
indicator.setEntityId(this.getEntityId());
indicator.setValue(this.getValue());
indicator.setTotal(this.getTotal());
- indicator.setTimeBucket(this.getTimeBucket());
return indicator;
}
@@ -128,7 +126,6 @@ public class ServiceRelationClientCpmIndicator extends CPMIndicator implements A
indicator.setEntityId(this.getEntityId());
indicator.setValue(this.getValue());
indicator.setTotal(this.getTotal());
- indicator.setTimeBucket(this.getTimeBucket());
return indicator;
}
@@ -139,7 +136,6 @@ public class ServiceRelationClientCpmIndicator extends CPMIndicator implements A
indicator.setEntityId(this.getEntityId());
indicator.setValue(this.getValue());
indicator.setTotal(this.getTotal());
- indicator.setTimeBucket(this.getTimeBucket());
return indicator;
}
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 a01878a..97310ea 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());
@@ -120,7 +119,6 @@ public class ServiceRelationClientRespTimeIndicator extends LongAvgIndicator imp
indicator.setSummation(this.getSummation());
indicator.setCount(this.getCount());
indicator.setValue(this.getValue());
- indicator.setTimeBucket(this.getTimeBucket());
return indicator;
}
@@ -132,7 +130,6 @@ public class ServiceRelationClientRespTimeIndicator extends LongAvgIndicator imp
indicator.setSummation(this.getSummation());
indicator.setCount(this.getCount());
indicator.setValue(this.getValue());
- indicator.setTimeBucket(this.getTimeBucket());
return indicator;
}
@@ -144,7 +141,6 @@ public class ServiceRelationClientRespTimeIndicator extends LongAvgIndicator imp
indicator.setSummation(this.getSummation());
indicator.setCount(this.getCount());
indicator.setValue(this.getValue());
- indicator.setTimeBucket(this.getTimeBucket());
return indicator;
}
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 b61c06a..839b49c 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 72228e0..1dc46e7 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());
@@ -120,7 +119,6 @@ public class ServiceRelationServerCallSlaIndicator extends PercentIndicator impl
indicator.setTotal(this.getTotal());
indicator.setPercentage(this.getPercentage());
indicator.setMatch(this.getMatch());
- indicator.setTimeBucket(this.getTimeBucket());
return indicator;
}
@@ -132,7 +130,6 @@ public class ServiceRelationServerCallSlaIndicator extends PercentIndicator impl
indicator.setTotal(this.getTotal());
indicator.setPercentage(this.getPercentage());
indicator.setMatch(this.getMatch());
- indicator.setTimeBucket(this.getTimeBucket());
return indicator;
}
@@ -144,7 +141,6 @@ public class ServiceRelationServerCallSlaIndicator extends PercentIndicator impl
indicator.setTotal(this.getTotal());
indicator.setPercentage(this.getPercentage());
indicator.setMatch(this.getMatch());
- indicator.setTimeBucket(this.getTimeBucket());
return indicator;
}
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 0541f63..4a1f317 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());
@@ -117,7 +116,6 @@ public class ServiceRelationServerCpmIndicator extends CPMIndicator implements A
indicator.setEntityId(this.getEntityId());
indicator.setValue(this.getValue());
indicator.setTotal(this.getTotal());
- indicator.setTimeBucket(this.getTimeBucket());
return indicator;
}
@@ -128,7 +126,6 @@ public class ServiceRelationServerCpmIndicator extends CPMIndicator implements A
indicator.setEntityId(this.getEntityId());
indicator.setValue(this.getValue());
indicator.setTotal(this.getTotal());
- indicator.setTimeBucket(this.getTimeBucket());
return indicator;
}
@@ -139,7 +136,6 @@ public class ServiceRelationServerCpmIndicator extends CPMIndicator implements A
indicator.setEntityId(this.getEntityId());
indicator.setValue(this.getValue());
indicator.setTotal(this.getTotal());
- indicator.setTimeBucket(this.getTimeBucket());
return indicator;
}
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 ec33ced..a67e634 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());
@@ -120,7 +119,6 @@ public class ServiceRelationServerRespTimeIndicator extends LongAvgIndicator imp
indicator.setSummation(this.getSummation());
indicator.setCount(this.getCount());
indicator.setValue(this.getValue());
- indicator.setTimeBucket(this.getTimeBucket());
return indicator;
}
@@ -132,7 +130,6 @@ public class ServiceRelationServerRespTimeIndicator extends LongAvgIndicator imp
indicator.setSummation(this.getSummation());
indicator.setCount(this.getCount());
indicator.setValue(this.getValue());
- indicator.setTimeBucket(this.getTimeBucket());
return indicator;
}
@@ -144,7 +141,6 @@ public class ServiceRelationServerRespTimeIndicator extends LongAvgIndicator imp
indicator.setSummation(this.getSummation());
indicator.setCount(this.getCount());
indicator.setValue(this.getValue());
- indicator.setTimeBucket(this.getTimeBucket());
return indicator;
}
diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/model/Model.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/indicator/annotation/IndicatorAnnotationUtils.java
similarity index 72%
copy from oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/model/Model.java
copy to oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/indicator/annotation/IndicatorAnnotationUtils.java
index a35aa5e..c3ee516 100644
--- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/model/Model.java
+++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/indicator/annotation/IndicatorAnnotationUtils.java
@@ -16,21 +16,14 @@
*
*/
-package org.apache.skywalking.oap.server.core.storage.model;
-
-import java.util.List;
-import lombok.Getter;
+package org.apache.skywalking.oap.server.core.analysis.indicator.annotation;
/**
* @author peng-yongsheng
*/
-@Getter
-public class Model {
- private final String name;
- private final List<ModelColumn> columns;
+public class IndicatorAnnotationUtils {
- public Model(String name, List<ModelColumn> columns) {
- this.name = name;
- this.columns = columns;
+ public static boolean isIndicator(Class aClass) {
+ return aClass.isAnnotationPresent(IndicatorType.class);
}
}
diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/worker/IndicatorPersistentWorker.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/worker/IndicatorPersistentWorker.java
index 6a614a0..e06e067 100644
--- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/worker/IndicatorPersistentWorker.java
+++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/worker/IndicatorPersistentWorker.java
@@ -82,7 +82,9 @@ public class IndicatorPersistentWorker extends PersistenceWorker<Indicator, Merg
batchCollection.add(indicatorDAO.prepareBatchInsert(modelName, data));
}
- nextWorker.in(data);
+ if (Objects.nonNull(nextWorker)) {
+ nextWorker.in(data);
+ }
} catch (Throwable t) {
logger.error(t.getMessage(), t);
}
diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/worker/IndicatorProcess.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/worker/IndicatorProcess.java
index b87a83c..64e8f31 100644
--- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/worker/IndicatorProcess.java
+++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/worker/IndicatorProcess.java
@@ -20,7 +20,7 @@ package org.apache.skywalking.oap.server.core.analysis.worker;
import java.util.*;
import lombok.Getter;
-import org.apache.skywalking.oap.server.core.UnexpectedException;
+import org.apache.skywalking.oap.server.core.*;
import org.apache.skywalking.oap.server.core.analysis.indicator.Indicator;
import org.apache.skywalking.oap.server.core.storage.*;
import org.apache.skywalking.oap.server.core.storage.annotation.StorageEntityAnnotationUtils;
@@ -52,15 +52,15 @@ public enum IndicatorProcess {
throw new UnexpectedException("");
}
- AlarmNotifyWorker alarmNotifyWorker = new AlarmNotifyWorker(WorkerIdGenerator.INSTANCES.generate(), moduleManager);
- WorkerInstances.INSTANCES.put(alarmNotifyWorker.getWorkerId(), alarmNotifyWorker);
+ IndicatorPersistentWorker minutePersistentWorker = minutePersistentWorker(moduleManager, indicatorDAO, modelName);
+ IndicatorPersistentWorker hourPersistentWorker = worker(moduleManager, indicatorDAO, modelName + Const.ID_SPLIT + Downsampling.Hour.getName());
+ IndicatorPersistentWorker dayPersistentWorker = worker(moduleManager, indicatorDAO, modelName + Const.ID_SPLIT + Downsampling.Day.getName());
+ IndicatorPersistentWorker monthPersistentWorker = worker(moduleManager, indicatorDAO, modelName + Const.ID_SPLIT + Downsampling.Month.getName());
- IndicatorPersistentWorker persistentWorker = new IndicatorPersistentWorker(WorkerIdGenerator.INSTANCES.generate(), modelName,
- 1000, moduleManager, indicatorDAO, alarmNotifyWorker);
- WorkerInstances.INSTANCES.put(persistentWorker.getWorkerId(), persistentWorker);
- persistentWorkers.add(persistentWorker);
+ IndicatorTransWorker transWorker = new IndicatorTransWorker(WorkerIdGenerator.INSTANCES.generate(), minutePersistentWorker, hourPersistentWorker, dayPersistentWorker, monthPersistentWorker);
+ WorkerInstances.INSTANCES.put(transWorker.getWorkerId(), transWorker);
- IndicatorRemoteWorker remoteWorker = new IndicatorRemoteWorker(WorkerIdGenerator.INSTANCES.generate(), moduleManager, persistentWorker);
+ IndicatorRemoteWorker remoteWorker = new IndicatorRemoteWorker(WorkerIdGenerator.INSTANCES.generate(), moduleManager, transWorker);
WorkerInstances.INSTANCES.put(remoteWorker.getWorkerId(), remoteWorker);
IndicatorAggregateWorker aggregateWorker = new IndicatorAggregateWorker(WorkerIdGenerator.INSTANCES.generate(), remoteWorker);
@@ -68,4 +68,27 @@ public enum IndicatorProcess {
entryWorkers.put(indicatorClass, aggregateWorker);
}
+
+ private IndicatorPersistentWorker minutePersistentWorker(ModuleManager moduleManager,
+ IIndicatorDAO indicatorDAO, String modelName) {
+ AlarmNotifyWorker alarmNotifyWorker = new AlarmNotifyWorker(WorkerIdGenerator.INSTANCES.generate(), moduleManager);
+ WorkerInstances.INSTANCES.put(alarmNotifyWorker.getWorkerId(), alarmNotifyWorker);
+
+ IndicatorPersistentWorker minutePersistentWorker = new IndicatorPersistentWorker(WorkerIdGenerator.INSTANCES.generate(), modelName,
+ 1000, moduleManager, indicatorDAO, alarmNotifyWorker);
+ WorkerInstances.INSTANCES.put(minutePersistentWorker.getWorkerId(), minutePersistentWorker);
+ persistentWorkers.add(minutePersistentWorker);
+
+ return minutePersistentWorker;
+ }
+
+ private IndicatorPersistentWorker worker(ModuleManager moduleManager,
+ IIndicatorDAO indicatorDAO, String modelName) {
+ IndicatorPersistentWorker persistentWorker = new IndicatorPersistentWorker(WorkerIdGenerator.INSTANCES.generate(), modelName,
+ 1000, moduleManager, indicatorDAO, null);
+ WorkerInstances.INSTANCES.put(persistentWorker.getWorkerId(), persistentWorker);
+ persistentWorkers.add(persistentWorker);
+
+ return persistentWorker;
+ }
}
diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/worker/IndicatorTransWorker.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/worker/IndicatorTransWorker.java
new file mode 100644
index 0000000..b49814c
--- /dev/null
+++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/worker/IndicatorTransWorker.java
@@ -0,0 +1,64 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package org.apache.skywalking.oap.server.core.analysis.worker;
+
+import java.util.Objects;
+import org.apache.skywalking.oap.server.core.analysis.indicator.Indicator;
+import org.apache.skywalking.oap.server.core.worker.AbstractWorker;
+import org.slf4j.*;
+
+/**
+ * @author peng-yongsheng
+ */
+public class IndicatorTransWorker extends AbstractWorker<Indicator> {
+
+ private static final Logger logger = LoggerFactory.getLogger(IndicatorTransWorker.class);
+
+ private final IndicatorPersistentWorker minutePersistenceWorker;
+ private final IndicatorPersistentWorker hourPersistenceWorker;
+ private final IndicatorPersistentWorker dayPersistenceWorker;
+ private final IndicatorPersistentWorker monthPersistenceWorker;
+
+ public IndicatorTransWorker(int workerId,
+ IndicatorPersistentWorker minutePersistenceWorker,
+ IndicatorPersistentWorker hourPersistenceWorker,
+ IndicatorPersistentWorker dayPersistenceWorker,
+ IndicatorPersistentWorker monthPersistenceWorker) {
+ super(workerId);
+ this.minutePersistenceWorker = minutePersistenceWorker;
+ this.hourPersistenceWorker = hourPersistenceWorker;
+ this.dayPersistenceWorker = dayPersistenceWorker;
+ this.monthPersistenceWorker = monthPersistenceWorker;
+ }
+
+ @Override public void in(Indicator indicator) {
+ if (Objects.nonNull(minutePersistenceWorker)) {
+ minutePersistenceWorker.in(indicator);
+ }
+ if (Objects.nonNull(hourPersistenceWorker)) {
+ hourPersistenceWorker.in(indicator.toHour());
+ }
+ if (Objects.nonNull(dayPersistenceWorker)) {
+ dayPersistenceWorker.in(indicator.toDay());
+ }
+ if (Objects.nonNull(monthPersistenceWorker)) {
+ monthPersistenceWorker.in(indicator.toMonth());
+ }
+ }
+}
diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/config/DownsamplingConfigService.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/config/DownsamplingConfigService.java
new file mode 100644
index 0000000..703cd71
--- /dev/null
+++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/config/DownsamplingConfigService.java
@@ -0,0 +1,57 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package org.apache.skywalking.oap.server.core.config;
+
+import java.util.List;
+import org.apache.skywalking.oap.server.core.storage.Downsampling;
+import org.apache.skywalking.oap.server.library.module.Service;
+
+/**
+ * @author peng-yongsheng
+ */
+public class DownsamplingConfigService implements Service {
+
+ private boolean shouldToHour = false;
+ private boolean shouldToDay = false;
+ private boolean shouldToMonth = false;
+
+ public DownsamplingConfigService(List<String> downsampling) {
+ downsampling.forEach(value -> {
+ if (Downsampling.Hour.getName().toLowerCase().equals(value.toLowerCase())) {
+ shouldToHour = true;
+ } else if (Downsampling.Day.getName().toLowerCase().equals(value.toLowerCase())) {
+ shouldToDay = true;
+ } else if (Downsampling.Month.getName().toLowerCase().equals(value.toLowerCase())) {
+ shouldToMonth = true;
+ }
+ });
+ }
+
+ public boolean shouldToHour() {
+ return shouldToHour;
+ }
+
+ public boolean shouldToDay() {
+ return shouldToDay;
+ }
+
+ public boolean shouldToMonth() {
+ return shouldToMonth;
+ }
+}
diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/TimePyramidTableNameBuilder.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/DownsampleingModelNameBuilder.java
similarity index 73%
rename from oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/TimePyramidTableNameBuilder.java
rename to oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/DownsampleingModelNameBuilder.java
index f7f0708..11a25e4 100644
--- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/TimePyramidTableNameBuilder.java
+++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/DownsampleingModelNameBuilder.java
@@ -24,23 +24,23 @@ import org.apache.skywalking.oap.server.core.query.entity.Step;
/**
* @author peng-yongsheng
*/
-public class TimePyramidTableNameBuilder {
+public class DownsampleingModelNameBuilder {
- private TimePyramidTableNameBuilder() {
+ private DownsampleingModelNameBuilder() {
}
- public static String build(Step step, String tableName) {
+ public static String build(Step step, String modelName) {
switch (step) {
case MONTH:
- tableName = tableName + Const.ID_SPLIT + TimePyramid.Month.getName();
+ modelName = modelName + Const.ID_SPLIT + Downsampling.Month.getName();
break;
case DAY:
- tableName = tableName + Const.ID_SPLIT + TimePyramid.Day.getName();
+ modelName = modelName + Const.ID_SPLIT + Downsampling.Day.getName();
break;
case HOUR:
- tableName = tableName + Const.ID_SPLIT + TimePyramid.Hour.getName();
+ modelName = modelName + Const.ID_SPLIT + Downsampling.Hour.getName();
break;
}
- return tableName;
+ return modelName;
}
}
diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/TimePyramid.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/Downsampling.java
similarity index 94%
rename from oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/TimePyramid.java
rename to oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/Downsampling.java
index 786167e..8431231 100644
--- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/TimePyramid.java
+++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/Downsampling.java
@@ -21,13 +21,13 @@ package org.apache.skywalking.oap.server.core.storage;
/**
* @author peng-yongsheng
*/
-public enum TimePyramid {
+public enum Downsampling {
Second(0, "second"), Minute(1, "minute"), Hour(2, "hour"), Day(3, "day"), Month(4, "month");
private final int value;
private final String name;
- TimePyramid(int value, String name) {
+ Downsampling(int value, String name) {
this.value = value;
this.name = name;
}
diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/annotation/StorageAnnotationListener.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/annotation/StorageAnnotationListener.java
index ce61737..a728e1e 100644
--- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/annotation/StorageAnnotationListener.java
+++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/annotation/StorageAnnotationListener.java
@@ -22,6 +22,7 @@ import java.lang.annotation.Annotation;
import java.lang.reflect.Field;
import java.util.*;
import lombok.Getter;
+import org.apache.skywalking.oap.server.core.analysis.indicator.annotation.IndicatorAnnotationUtils;
import org.apache.skywalking.oap.server.core.annotation.AnnotationListener;
import org.apache.skywalking.oap.server.core.storage.model.*;
import org.slf4j.*;
@@ -47,11 +48,11 @@ public class StorageAnnotationListener implements AnnotationListener, IModelGett
logger.info("The owner class of storage annotation, class name: {}", aClass.getName());
String modelName = StorageEntityAnnotationUtils.getModelName(aClass);
-
+ boolean isIndicator = IndicatorAnnotationUtils.isIndicator(aClass);
List<ModelColumn> modelColumns = new LinkedList<>();
retrieval(aClass, modelName, modelColumns);
- models.add(new Model(modelName, modelColumns));
+ models.add(new Model(modelName, modelColumns, isIndicator));
}
private void retrieval(Class clazz, String modelName, List<ModelColumn> modelColumns) {
diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/model/Model.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/model/Model.java
index a35aa5e..0c2dc47 100644
--- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/model/Model.java
+++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/model/Model.java
@@ -27,10 +27,16 @@ import lombok.Getter;
@Getter
public class Model {
private final String name;
+ private final boolean isIndicator;
private final List<ModelColumn> columns;
- public Model(String name, List<ModelColumn> columns) {
+ public Model(String name, List<ModelColumn> columns, boolean isIndicator) {
this.name = name;
this.columns = columns;
+ this.isIndicator = isIndicator;
+ }
+
+ public Model copy(String name) {
+ return new Model(name, columns, isIndicator);
}
}
diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/model/ModelInstaller.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/model/ModelInstaller.java
index b3808b8..681ed73 100644
--- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/model/ModelInstaller.java
+++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/model/ModelInstaller.java
@@ -18,9 +18,10 @@
package org.apache.skywalking.oap.server.core.storage.model;
-import java.util.List;
-import org.apache.skywalking.oap.server.core.CoreModule;
-import org.apache.skywalking.oap.server.core.storage.StorageException;
+import java.util.*;
+import org.apache.skywalking.oap.server.core.*;
+import org.apache.skywalking.oap.server.core.config.DownsamplingConfigService;
+import org.apache.skywalking.oap.server.core.storage.*;
import org.apache.skywalking.oap.server.library.client.Client;
import org.apache.skywalking.oap.server.library.module.ModuleManager;
import org.slf4j.*;
@@ -40,7 +41,24 @@ public abstract class ModelInstaller {
public final void install(Client client) throws StorageException {
IModelGetter modelGetter = moduleManager.find(CoreModule.NAME).getService(IModelGetter.class);
+ DownsamplingConfigService downsamplingConfigService = moduleManager.find(CoreModule.NAME).getService(DownsamplingConfigService.class);
+
List<Model> models = modelGetter.getModels();
+ List<Model> downsamplingModels = new ArrayList<>();
+ models.forEach(model -> {
+ if (model.isIndicator()) {
+ if (downsamplingConfigService.shouldToHour()) {
+ downsamplingModels.add(model.copy(model.getName() + Const.ID_SPLIT + Downsampling.Hour.getName()));
+ }
+ if (downsamplingConfigService.shouldToDay()) {
+ downsamplingModels.add(model.copy(model.getName() + Const.ID_SPLIT + Downsampling.Day.getName()));
+ }
+ if (downsamplingConfigService.shouldToMonth()) {
+ downsamplingModels.add(model.copy(model.getName() + Const.ID_SPLIT + Downsampling.Month.getName()));
+ }
+ }
+ });
+ models.addAll(downsamplingModels);
boolean debug = System.getProperty("debug") != null;
diff --git a/oap-server/server-starter/src/main/resources/application.yml b/oap-server/server-starter/src/main/resources/application.yml
index 625aac6..ae772c7 100644
--- a/oap-server/server-starter/src/main/resources/application.yml
+++ b/oap-server/server-starter/src/main/resources/application.yml
@@ -33,6 +33,10 @@ core:
restContextPath: /
gRPCHost: 0.0.0.0
gRPCPort: 11800
+ downsampling:
+ - Hour
+ - Day
+ - Month
storage:
elasticsearch:
clusterNodes: localhost:9200
diff --git a/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/AggregationQueryEsDAO.java b/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/AggregationQueryEsDAO.java
index eecd4ce..bbff00d 100644
--- a/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/AggregationQueryEsDAO.java
+++ b/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/AggregationQueryEsDAO.java
@@ -23,7 +23,7 @@ import java.util.*;
import org.apache.skywalking.oap.server.core.analysis.indicator.Indicator;
import org.apache.skywalking.oap.server.core.query.entity.*;
import org.apache.skywalking.oap.server.core.register.*;
-import org.apache.skywalking.oap.server.core.storage.TimePyramidTableNameBuilder;
+import org.apache.skywalking.oap.server.core.storage.DownsampleingModelNameBuilder;
import org.apache.skywalking.oap.server.core.storage.query.IAggregationQueryDAO;
import org.apache.skywalking.oap.server.library.client.elasticsearch.ElasticSearchClient;
import org.apache.skywalking.oap.server.storage.plugin.elasticsearch.base.EsDAO;
@@ -46,7 +46,7 @@ public class AggregationQueryEsDAO extends EsDAO implements IAggregationQueryDAO
@Override
public List<TopNEntity> getServiceTopN(String indName, String valueCName, int topN, Step step, long startTB,
long endTB, Order order) throws IOException {
- String indexName = TimePyramidTableNameBuilder.build(step, indName);
+ String indexName = DownsampleingModelNameBuilder.build(step, indName);
SearchSourceBuilder sourceBuilder = SearchSourceBuilder.searchSource();
sourceBuilder.query(QueryBuilders.rangeQuery(Indicator.TIME_BUCKET).lte(endTB).gte(startTB));
@@ -55,7 +55,7 @@ public class AggregationQueryEsDAO extends EsDAO implements IAggregationQueryDAO
@Override public List<TopNEntity> getAllServiceInstanceTopN(String indName, String valueCName, int topN, Step step,
long startTB, long endTB, Order order) throws IOException {
- String indexName = TimePyramidTableNameBuilder.build(step, indName);
+ String indexName = DownsampleingModelNameBuilder.build(step, indName);
SearchSourceBuilder sourceBuilder = SearchSourceBuilder.searchSource();
sourceBuilder.query(QueryBuilders.rangeQuery(Indicator.TIME_BUCKET).lte(endTB).gte(startTB));
@@ -64,7 +64,7 @@ public class AggregationQueryEsDAO extends EsDAO implements IAggregationQueryDAO
@Override public List<TopNEntity> getServiceInstanceTopN(int serviceId, String indName, String valueCName, int topN,
Step step, long startTB, long endTB, Order order) throws IOException {
- String indexName = TimePyramidTableNameBuilder.build(step, indName);
+ String indexName = DownsampleingModelNameBuilder.build(step, indName);
SearchSourceBuilder sourceBuilder = SearchSourceBuilder.searchSource();
@@ -80,7 +80,7 @@ public class AggregationQueryEsDAO extends EsDAO implements IAggregationQueryDAO
@Override
public List<TopNEntity> getAllEndpointTopN(String indName, String valueCName, int topN, Step step, long startTB,
long endTB, Order order) throws IOException {
- String indexName = TimePyramidTableNameBuilder.build(step, indName);
+ String indexName = DownsampleingModelNameBuilder.build(step, indName);
SearchSourceBuilder sourceBuilder = SearchSourceBuilder.searchSource();
sourceBuilder.query(QueryBuilders.rangeQuery(Indicator.TIME_BUCKET).lte(endTB).gte(startTB));
@@ -90,7 +90,7 @@ public class AggregationQueryEsDAO extends EsDAO implements IAggregationQueryDAO
@Override
public List<TopNEntity> getEndpointTopN(int serviceId, String indName, String valueCName, int topN, Step step,
long startTB, long endTB, Order order) throws IOException {
- String indexName = TimePyramidTableNameBuilder.build(step, indName);
+ String indexName = DownsampleingModelNameBuilder.build(step, indName);
SearchSourceBuilder sourceBuilder = SearchSourceBuilder.searchSource();
diff --git a/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/MetricQueryEsDAO.java b/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/MetricQueryEsDAO.java
index f460f2f..ad897b6 100644
--- a/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/MetricQueryEsDAO.java
+++ b/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/MetricQueryEsDAO.java
@@ -23,7 +23,7 @@ import java.util.*;
import org.apache.skywalking.oap.server.core.analysis.indicator.*;
import org.apache.skywalking.oap.server.core.query.entity.*;
import org.apache.skywalking.oap.server.core.query.sql.*;
-import org.apache.skywalking.oap.server.core.storage.TimePyramidTableNameBuilder;
+import org.apache.skywalking.oap.server.core.storage.DownsampleingModelNameBuilder;
import org.apache.skywalking.oap.server.core.storage.query.IMetricQueryDAO;
import org.apache.skywalking.oap.server.library.client.elasticsearch.ElasticSearchClient;
import org.apache.skywalking.oap.server.storage.plugin.elasticsearch.base.EsDAO;
@@ -46,7 +46,7 @@ public class MetricQueryEsDAO extends EsDAO implements IMetricQueryDAO {
public IntValues getValues(String indName, Step step, long startTB, long endTB, Where where, String valueCName,
Function function) throws IOException {
- String indexName = TimePyramidTableNameBuilder.build(step, indName);
+ String indexName = DownsampleingModelNameBuilder.build(step, indName);
SearchSourceBuilder sourceBuilder = SearchSourceBuilder.searchSource();
queryBuild(sourceBuilder, where, startTB, endTB);
@@ -101,7 +101,7 @@ public class MetricQueryEsDAO extends EsDAO implements IMetricQueryDAO {
@Override public IntValues getLinearIntValues(String indName, Step step, List<String> ids,
String valueCName) throws IOException {
- String indexName = TimePyramidTableNameBuilder.build(step, indName);
+ String indexName = DownsampleingModelNameBuilder.build(step, indName);
MultiGetResponse response = getClient().multiGet(indexName, ids);
@@ -122,7 +122,7 @@ public class MetricQueryEsDAO extends EsDAO implements IMetricQueryDAO {
@Override public Thermodynamic getThermodynamic(String indName, Step step, List<String> ids,
String valueCName) throws IOException {
- String indexName = TimePyramidTableNameBuilder.build(step, indName);
+ String indexName = DownsampleingModelNameBuilder.build(step, indName);
MultiGetResponse response = getClient().multiGet(indexName, ids);
diff --git a/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/TopologyQueryEsDAO.java b/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/TopologyQueryEsDAO.java
index f9a0371..b9d6093 100644
--- a/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/TopologyQueryEsDAO.java
+++ b/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/TopologyQueryEsDAO.java
@@ -26,7 +26,7 @@ import org.apache.skywalking.oap.server.core.analysis.manual.service.*;
import org.apache.skywalking.oap.server.core.analysis.manual.servicerelation.*;
import org.apache.skywalking.oap.server.core.query.entity.*;
import org.apache.skywalking.oap.server.core.source.*;
-import org.apache.skywalking.oap.server.core.storage.TimePyramidTableNameBuilder;
+import org.apache.skywalking.oap.server.core.storage.DownsampleingModelNameBuilder;
import org.apache.skywalking.oap.server.core.storage.query.ITopologyQueryDAO;
import org.apache.skywalking.oap.server.library.client.elasticsearch.ElasticSearchClient;
import org.apache.skywalking.oap.server.library.util.CollectionUtils;
@@ -57,7 +57,7 @@ public class TopologyQueryEsDAO extends EsDAO implements ITopologyQueryDAO {
sourceBuilder.size(0);
setQueryCondition(sourceBuilder, startTB, endTB, serviceIds);
- String indexName = TimePyramidTableNameBuilder.build(step, ServiceRelationServerSideIndicator.INDEX_NAME);
+ String indexName = DownsampleingModelNameBuilder.build(step, ServiceRelationServerSideIndicator.INDEX_NAME);
return load(sourceBuilder, indexName, ServiceRelationServerSideIndicator.SOURCE_SERVICE_ID, ServiceRelationServerSideIndicator.DEST_SERVICE_ID, Source.Service);
}
@@ -72,7 +72,7 @@ public class TopologyQueryEsDAO extends EsDAO implements ITopologyQueryDAO {
sourceBuilder.size(0);
setQueryCondition(sourceBuilder, startTB, endTB, serviceIds);
- String indexName = TimePyramidTableNameBuilder.build(step, ServiceRelationClientSideIndicator.INDEX_NAME);
+ String indexName = DownsampleingModelNameBuilder.build(step, ServiceRelationClientSideIndicator.INDEX_NAME);
return load(sourceBuilder, indexName, ServiceRelationClientSideIndicator.SOURCE_SERVICE_ID, ServiceRelationClientSideIndicator.DEST_SERVICE_ID, Source.Service);
}
@@ -95,7 +95,7 @@ public class TopologyQueryEsDAO extends EsDAO implements ITopologyQueryDAO {
}
@Override public List<Call> loadServerSideServiceRelations(Step step, long startTB, long endTB) throws IOException {
- String indexName = TimePyramidTableNameBuilder.build(step, ServiceRelationServerSideIndicator.INDEX_NAME);
+ String indexName = DownsampleingModelNameBuilder.build(step, ServiceRelationServerSideIndicator.INDEX_NAME);
SearchSourceBuilder sourceBuilder = SearchSourceBuilder.searchSource();
sourceBuilder.query(QueryBuilders.rangeQuery(ServiceRelationServerSideIndicator.TIME_BUCKET).gte(startTB).lte(endTB));
sourceBuilder.size(0);
@@ -104,7 +104,7 @@ public class TopologyQueryEsDAO extends EsDAO implements ITopologyQueryDAO {
}
@Override public List<Call> loadClientSideServiceRelations(Step step, long startTB, long endTB) throws IOException {
- String indexName = TimePyramidTableNameBuilder.build(step, ServiceRelationClientSideIndicator.INDEX_NAME);
+ String indexName = DownsampleingModelNameBuilder.build(step, ServiceRelationClientSideIndicator.INDEX_NAME);
SearchSourceBuilder sourceBuilder = SearchSourceBuilder.searchSource();
sourceBuilder.query(QueryBuilders.rangeQuery(ServiceRelationServerSideIndicator.TIME_BUCKET).gte(startTB).lte(endTB));
sourceBuilder.size(0);
@@ -113,7 +113,7 @@ public class TopologyQueryEsDAO extends EsDAO implements ITopologyQueryDAO {
}
@Override public List<ServiceMapping> loadServiceMappings(Step step, long startTB, long endTB) throws IOException {
- String indexName = TimePyramidTableNameBuilder.build(step, ServiceMappingIndicator.INDEX_NAME);
+ String indexName = DownsampleingModelNameBuilder.build(step, ServiceMappingIndicator.INDEX_NAME);
SearchSourceBuilder sourceBuilder = SearchSourceBuilder.searchSource();
sourceBuilder.query(QueryBuilders.rangeQuery(ServiceMappingIndicator.TIME_BUCKET).gte(startTB).lte(endTB));
sourceBuilder.size(0);
@@ -140,7 +140,7 @@ public class TopologyQueryEsDAO extends EsDAO implements ITopologyQueryDAO {
@Override
public List<ServiceComponent> loadServiceComponents(Step step, long startTB, long endTB) throws IOException {
- String indexName = TimePyramidTableNameBuilder.build(step, ServiceComponentIndicator.INDEX_NAME);
+ String indexName = DownsampleingModelNameBuilder.build(step, ServiceComponentIndicator.INDEX_NAME);
SearchSourceBuilder sourceBuilder = SearchSourceBuilder.searchSource();
sourceBuilder.query(QueryBuilders.rangeQuery(ServiceComponentIndicator.TIME_BUCKET).gte(startTB).lte(endTB));
sourceBuilder.size(0);
@@ -168,7 +168,7 @@ public class TopologyQueryEsDAO extends EsDAO implements ITopologyQueryDAO {
@Override
public List<Call> loadSpecifiedDestOfServerSideEndpointRelations(Step step, long startTB, long endTB,
int destEndpointId) throws IOException {
- String indexName = TimePyramidTableNameBuilder.build(step, EndpointRelationServerSideIndicator.INDEX_NAME);
+ String indexName = DownsampleingModelNameBuilder.build(step, EndpointRelationServerSideIndicator.INDEX_NAME);
SearchSourceBuilder sourceBuilder = SearchSourceBuilder.searchSource();
sourceBuilder.size(0);
@@ -184,7 +184,7 @@ public class TopologyQueryEsDAO extends EsDAO implements ITopologyQueryDAO {
@Override
public List<Call> loadSpecifiedSourceOfClientSideEndpointRelations(Step step, long startTB, long endTB,
int sourceEndpointId) throws IOException {
- String indexName = TimePyramidTableNameBuilder.build(step, EndpointRelationClientSideIndicator.INDEX_NAME);
+ String indexName = DownsampleingModelNameBuilder.build(step, EndpointRelationClientSideIndicator.INDEX_NAME);
SearchSourceBuilder sourceBuilder = SearchSourceBuilder.searchSource();
sourceBuilder.size(0);