You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@skywalking.apache.org by GitBox <gi...@apache.org> on 2018/10/22 18:37:47 UTC
[GitHub] wu-sheng closed pull request #1797: Provide auto delete history
data service.
wu-sheng closed pull request #1797: Provide auto delete history data service.
URL: https://github.com/apache/incubator-skywalking/pull/1797
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
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 d918f8569..62a329ec8 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
@@ -33,8 +33,23 @@
@Setter private String gRPCHost;
@Setter private int gRPCPort;
private final List<String> downsampling;
+ @Setter private int recordDataTTL;
+ @Setter private int minuteMetricsDataTTL;
+ @Setter private int hourMetricsDataTTL;
+ @Setter private int dayMetricsDataTTL;
+ @Setter private int monthMetricsDataTTL;
CoreModuleConfig() {
this.downsampling = new ArrayList<>();
}
+
+ public DataTTL getDataTTL() {
+ DataTTL dataTTL = new DataTTL();
+ dataTTL.setRecordDataTTL(recordDataTTL);
+ dataTTL.setMinuteMetricsDataTTL(minuteMetricsDataTTL);
+ dataTTL.setHourMetricsDataTTL(hourMetricsDataTTL);
+ dataTTL.setDayMetricsDataTTL(dayMetricsDataTTL);
+ dataTTL.setMonthMetricsDataTTL(monthMetricsDataTTL);
+ return dataTTL;
+ }
}
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 1f85ce243..2ed633dfe 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
@@ -36,6 +36,7 @@
import org.apache.skywalking.oap.server.core.storage.PersistenceTimer;
import org.apache.skywalking.oap.server.core.storage.annotation.StorageAnnotationListener;
import org.apache.skywalking.oap.server.core.storage.model.IModelGetter;
+import org.apache.skywalking.oap.server.core.storage.ttl.DataTTLKeeperTimer;
import org.apache.skywalking.oap.server.library.module.*;
import org.apache.skywalking.oap.server.library.server.ServerException;
import org.apache.skywalking.oap.server.library.server.grpc.GRPCServer;
@@ -154,6 +155,9 @@ public CoreModuleProvider() {
this.getManager().find(ClusterModule.NAME).getService(ClusterRegister.class).registerRemote(gRPCServerInstance);
PersistenceTimer.INSTANCE.start(getManager());
+
+ DataTTLKeeperTimer.INSTANCE.setDataTTL(moduleConfig.getDataTTL());
+ DataTTLKeeperTimer.INSTANCE.start(getManager());
}
@Override
diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/DataTTL.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/DataTTL.java
new file mode 100644
index 000000000..a9a0de1af
--- /dev/null
+++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/DataTTL.java
@@ -0,0 +1,34 @@
+/*
+ * 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;
+
+import lombok.*;
+
+/**
+ * @author peng-yongsheng
+ */
+@Setter
+@Getter
+public class DataTTL {
+ private int recordDataTTL;
+ private int minuteMetricsDataTTL;
+ private int hourMetricsDataTTL;
+ private int dayMetricsDataTTL;
+ private int monthMetricsDataTTL;
+}
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 fc0947b0a..a020a42ac 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
@@ -51,7 +51,6 @@
return result;
}
-
@Override public int remoteHashCode() {
int result = 17;
return result;
@@ -108,30 +107,36 @@
@Override
public Indicator toHour() {
AllHeatmapIndicator indicator = new AllHeatmapIndicator();
- indicator.setTimeBucket(toTimeBucketInHour());
indicator.setStep(this.getStep());
indicator.setNumOfSteps(this.getNumOfSteps());
- indicator.setDetailGroup(this.getDetailGroup());
+ org.apache.skywalking.oap.server.core.analysis.indicator.IntKeyLongValueArray newValue = new org.apache.skywalking.oap.server.core.analysis.indicator.IntKeyLongValueArray();
+ newValue.copyFrom(this.getDetailGroup());
+ indicator.setDetailGroup(newValue);
+ indicator.setTimeBucket(toTimeBucketInHour());
return indicator;
}
@Override
public Indicator toDay() {
AllHeatmapIndicator indicator = new AllHeatmapIndicator();
- indicator.setTimeBucket(toTimeBucketInDay());
indicator.setStep(this.getStep());
indicator.setNumOfSteps(this.getNumOfSteps());
- indicator.setDetailGroup(this.getDetailGroup());
+ org.apache.skywalking.oap.server.core.analysis.indicator.IntKeyLongValueArray newValue = new org.apache.skywalking.oap.server.core.analysis.indicator.IntKeyLongValueArray();
+ newValue.copyFrom(this.getDetailGroup());
+ indicator.setDetailGroup(newValue);
+ indicator.setTimeBucket(toTimeBucketInDay());
return indicator;
}
@Override
public Indicator toMonth() {
AllHeatmapIndicator indicator = new AllHeatmapIndicator();
- indicator.setTimeBucket(toTimeBucketInMonth());
indicator.setStep(this.getStep());
indicator.setNumOfSteps(this.getNumOfSteps());
- indicator.setDetailGroup(this.getDetailGroup());
+ org.apache.skywalking.oap.server.core.analysis.indicator.IntKeyLongValueArray newValue = new org.apache.skywalking.oap.server.core.analysis.indicator.IntKeyLongValueArray();
+ newValue.copyFrom(this.getDetailGroup());
+ indicator.setDetailGroup(newValue);
+ indicator.setTimeBucket(toTimeBucketInMonth());
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 0220536e1..a30bcc1f5 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
@@ -51,7 +51,6 @@
return result;
}
-
@Override public int remoteHashCode() {
int result = 17;
return result;
@@ -108,30 +107,36 @@
@Override
public Indicator toHour() {
AllP50Indicator indicator = new AllP50Indicator();
- indicator.setTimeBucket(toTimeBucketInHour());
indicator.setValue(this.getValue());
indicator.setPrecision(this.getPrecision());
- indicator.setDetailGroup(this.getDetailGroup());
+ org.apache.skywalking.oap.server.core.analysis.indicator.IntKeyLongValueArray newValue = new org.apache.skywalking.oap.server.core.analysis.indicator.IntKeyLongValueArray();
+ newValue.copyFrom(this.getDetailGroup());
+ indicator.setDetailGroup(newValue);
+ indicator.setTimeBucket(toTimeBucketInHour());
return indicator;
}
@Override
public Indicator toDay() {
AllP50Indicator indicator = new AllP50Indicator();
- indicator.setTimeBucket(toTimeBucketInDay());
indicator.setValue(this.getValue());
indicator.setPrecision(this.getPrecision());
- indicator.setDetailGroup(this.getDetailGroup());
+ org.apache.skywalking.oap.server.core.analysis.indicator.IntKeyLongValueArray newValue = new org.apache.skywalking.oap.server.core.analysis.indicator.IntKeyLongValueArray();
+ newValue.copyFrom(this.getDetailGroup());
+ indicator.setDetailGroup(newValue);
+ indicator.setTimeBucket(toTimeBucketInDay());
return indicator;
}
@Override
public Indicator toMonth() {
AllP50Indicator indicator = new AllP50Indicator();
- indicator.setTimeBucket(toTimeBucketInMonth());
indicator.setValue(this.getValue());
indicator.setPrecision(this.getPrecision());
- indicator.setDetailGroup(this.getDetailGroup());
+ org.apache.skywalking.oap.server.core.analysis.indicator.IntKeyLongValueArray newValue = new org.apache.skywalking.oap.server.core.analysis.indicator.IntKeyLongValueArray();
+ newValue.copyFrom(this.getDetailGroup());
+ indicator.setDetailGroup(newValue);
+ indicator.setTimeBucket(toTimeBucketInMonth());
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 09fc0687e..21a3f94c1 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
@@ -51,7 +51,6 @@
return result;
}
-
@Override public int remoteHashCode() {
int result = 17;
return result;
@@ -108,30 +107,36 @@
@Override
public Indicator toHour() {
AllP75Indicator indicator = new AllP75Indicator();
- indicator.setTimeBucket(toTimeBucketInHour());
indicator.setValue(this.getValue());
indicator.setPrecision(this.getPrecision());
- indicator.setDetailGroup(this.getDetailGroup());
+ org.apache.skywalking.oap.server.core.analysis.indicator.IntKeyLongValueArray newValue = new org.apache.skywalking.oap.server.core.analysis.indicator.IntKeyLongValueArray();
+ newValue.copyFrom(this.getDetailGroup());
+ indicator.setDetailGroup(newValue);
+ indicator.setTimeBucket(toTimeBucketInHour());
return indicator;
}
@Override
public Indicator toDay() {
AllP75Indicator indicator = new AllP75Indicator();
- indicator.setTimeBucket(toTimeBucketInDay());
indicator.setValue(this.getValue());
indicator.setPrecision(this.getPrecision());
- indicator.setDetailGroup(this.getDetailGroup());
+ org.apache.skywalking.oap.server.core.analysis.indicator.IntKeyLongValueArray newValue = new org.apache.skywalking.oap.server.core.analysis.indicator.IntKeyLongValueArray();
+ newValue.copyFrom(this.getDetailGroup());
+ indicator.setDetailGroup(newValue);
+ indicator.setTimeBucket(toTimeBucketInDay());
return indicator;
}
@Override
public Indicator toMonth() {
AllP75Indicator indicator = new AllP75Indicator();
- indicator.setTimeBucket(toTimeBucketInMonth());
indicator.setValue(this.getValue());
indicator.setPrecision(this.getPrecision());
- indicator.setDetailGroup(this.getDetailGroup());
+ org.apache.skywalking.oap.server.core.analysis.indicator.IntKeyLongValueArray newValue = new org.apache.skywalking.oap.server.core.analysis.indicator.IntKeyLongValueArray();
+ newValue.copyFrom(this.getDetailGroup());
+ indicator.setDetailGroup(newValue);
+ indicator.setTimeBucket(toTimeBucketInMonth());
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 12f39edc3..66f6fe2c1 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
@@ -51,7 +51,6 @@
return result;
}
-
@Override public int remoteHashCode() {
int result = 17;
return result;
@@ -108,30 +107,36 @@
@Override
public Indicator toHour() {
AllP90Indicator indicator = new AllP90Indicator();
- indicator.setTimeBucket(toTimeBucketInHour());
indicator.setValue(this.getValue());
indicator.setPrecision(this.getPrecision());
- indicator.setDetailGroup(this.getDetailGroup());
+ org.apache.skywalking.oap.server.core.analysis.indicator.IntKeyLongValueArray newValue = new org.apache.skywalking.oap.server.core.analysis.indicator.IntKeyLongValueArray();
+ newValue.copyFrom(this.getDetailGroup());
+ indicator.setDetailGroup(newValue);
+ indicator.setTimeBucket(toTimeBucketInHour());
return indicator;
}
@Override
public Indicator toDay() {
AllP90Indicator indicator = new AllP90Indicator();
- indicator.setTimeBucket(toTimeBucketInDay());
indicator.setValue(this.getValue());
indicator.setPrecision(this.getPrecision());
- indicator.setDetailGroup(this.getDetailGroup());
+ org.apache.skywalking.oap.server.core.analysis.indicator.IntKeyLongValueArray newValue = new org.apache.skywalking.oap.server.core.analysis.indicator.IntKeyLongValueArray();
+ newValue.copyFrom(this.getDetailGroup());
+ indicator.setDetailGroup(newValue);
+ indicator.setTimeBucket(toTimeBucketInDay());
return indicator;
}
@Override
public Indicator toMonth() {
AllP90Indicator indicator = new AllP90Indicator();
- indicator.setTimeBucket(toTimeBucketInMonth());
indicator.setValue(this.getValue());
indicator.setPrecision(this.getPrecision());
- indicator.setDetailGroup(this.getDetailGroup());
+ org.apache.skywalking.oap.server.core.analysis.indicator.IntKeyLongValueArray newValue = new org.apache.skywalking.oap.server.core.analysis.indicator.IntKeyLongValueArray();
+ newValue.copyFrom(this.getDetailGroup());
+ indicator.setDetailGroup(newValue);
+ indicator.setTimeBucket(toTimeBucketInMonth());
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 64f3734fa..3c651a77b 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
@@ -51,7 +51,6 @@
return result;
}
-
@Override public int remoteHashCode() {
int result = 17;
return result;
@@ -108,30 +107,36 @@
@Override
public Indicator toHour() {
AllP95Indicator indicator = new AllP95Indicator();
- indicator.setTimeBucket(toTimeBucketInHour());
indicator.setValue(this.getValue());
indicator.setPrecision(this.getPrecision());
- indicator.setDetailGroup(this.getDetailGroup());
+ org.apache.skywalking.oap.server.core.analysis.indicator.IntKeyLongValueArray newValue = new org.apache.skywalking.oap.server.core.analysis.indicator.IntKeyLongValueArray();
+ newValue.copyFrom(this.getDetailGroup());
+ indicator.setDetailGroup(newValue);
+ indicator.setTimeBucket(toTimeBucketInHour());
return indicator;
}
@Override
public Indicator toDay() {
AllP95Indicator indicator = new AllP95Indicator();
- indicator.setTimeBucket(toTimeBucketInDay());
indicator.setValue(this.getValue());
indicator.setPrecision(this.getPrecision());
- indicator.setDetailGroup(this.getDetailGroup());
+ org.apache.skywalking.oap.server.core.analysis.indicator.IntKeyLongValueArray newValue = new org.apache.skywalking.oap.server.core.analysis.indicator.IntKeyLongValueArray();
+ newValue.copyFrom(this.getDetailGroup());
+ indicator.setDetailGroup(newValue);
+ indicator.setTimeBucket(toTimeBucketInDay());
return indicator;
}
@Override
public Indicator toMonth() {
AllP95Indicator indicator = new AllP95Indicator();
- indicator.setTimeBucket(toTimeBucketInMonth());
indicator.setValue(this.getValue());
indicator.setPrecision(this.getPrecision());
- indicator.setDetailGroup(this.getDetailGroup());
+ org.apache.skywalking.oap.server.core.analysis.indicator.IntKeyLongValueArray newValue = new org.apache.skywalking.oap.server.core.analysis.indicator.IntKeyLongValueArray();
+ newValue.copyFrom(this.getDetailGroup());
+ indicator.setDetailGroup(newValue);
+ indicator.setTimeBucket(toTimeBucketInMonth());
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 f9054a3d1..69c5a0bb0 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
@@ -51,7 +51,6 @@
return result;
}
-
@Override public int remoteHashCode() {
int result = 17;
return result;
@@ -108,30 +107,36 @@
@Override
public Indicator toHour() {
AllP99Indicator indicator = new AllP99Indicator();
- indicator.setTimeBucket(toTimeBucketInHour());
indicator.setValue(this.getValue());
indicator.setPrecision(this.getPrecision());
- indicator.setDetailGroup(this.getDetailGroup());
+ org.apache.skywalking.oap.server.core.analysis.indicator.IntKeyLongValueArray newValue = new org.apache.skywalking.oap.server.core.analysis.indicator.IntKeyLongValueArray();
+ newValue.copyFrom(this.getDetailGroup());
+ indicator.setDetailGroup(newValue);
+ indicator.setTimeBucket(toTimeBucketInHour());
return indicator;
}
@Override
public Indicator toDay() {
AllP99Indicator indicator = new AllP99Indicator();
- indicator.setTimeBucket(toTimeBucketInDay());
indicator.setValue(this.getValue());
indicator.setPrecision(this.getPrecision());
- indicator.setDetailGroup(this.getDetailGroup());
+ org.apache.skywalking.oap.server.core.analysis.indicator.IntKeyLongValueArray newValue = new org.apache.skywalking.oap.server.core.analysis.indicator.IntKeyLongValueArray();
+ newValue.copyFrom(this.getDetailGroup());
+ indicator.setDetailGroup(newValue);
+ indicator.setTimeBucket(toTimeBucketInDay());
return indicator;
}
@Override
public Indicator toMonth() {
AllP99Indicator indicator = new AllP99Indicator();
- indicator.setTimeBucket(toTimeBucketInMonth());
indicator.setValue(this.getValue());
indicator.setPrecision(this.getPrecision());
- indicator.setDetailGroup(this.getDetailGroup());
+ org.apache.skywalking.oap.server.core.analysis.indicator.IntKeyLongValueArray newValue = new org.apache.skywalking.oap.server.core.analysis.indicator.IntKeyLongValueArray();
+ newValue.copyFrom(this.getDetailGroup());
+ indicator.setDetailGroup(newValue);
+ indicator.setTimeBucket(toTimeBucketInMonth());
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 41b270c91..586ebd4f1 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
@@ -58,7 +58,6 @@
return result;
}
-
@Override public int remoteHashCode() {
int result = 17;
result = 31 * result + entityId.hashCode();
@@ -121,39 +120,39 @@
@Override
public Indicator toHour() {
EndpointAvgIndicator indicator = new EndpointAvgIndicator();
- indicator.setTimeBucket(toTimeBucketInHour());
indicator.setEntityId(this.getEntityId());
indicator.setServiceId(this.getServiceId());
indicator.setServiceInstanceId(this.getServiceInstanceId());
indicator.setSummation(this.getSummation());
indicator.setCount(this.getCount());
indicator.setValue(this.getValue());
+ indicator.setTimeBucket(toTimeBucketInHour());
return indicator;
}
@Override
public Indicator toDay() {
EndpointAvgIndicator indicator = new EndpointAvgIndicator();
- indicator.setTimeBucket(toTimeBucketInDay());
indicator.setEntityId(this.getEntityId());
indicator.setServiceId(this.getServiceId());
indicator.setServiceInstanceId(this.getServiceInstanceId());
indicator.setSummation(this.getSummation());
indicator.setCount(this.getCount());
indicator.setValue(this.getValue());
+ indicator.setTimeBucket(toTimeBucketInDay());
return indicator;
}
@Override
public Indicator toMonth() {
EndpointAvgIndicator indicator = new EndpointAvgIndicator();
- indicator.setTimeBucket(toTimeBucketInMonth());
indicator.setEntityId(this.getEntityId());
indicator.setServiceId(this.getServiceId());
indicator.setServiceInstanceId(this.getServiceInstanceId());
indicator.setSummation(this.getSummation());
indicator.setCount(this.getCount());
indicator.setValue(this.getValue());
+ indicator.setTimeBucket(toTimeBucketInMonth());
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 ffbd64fe0..2b843397d 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
@@ -58,7 +58,6 @@
return result;
}
-
@Override public int remoteHashCode() {
int result = 17;
result = 31 * result + entityId.hashCode();
@@ -119,36 +118,36 @@
@Override
public Indicator toHour() {
EndpointCpmIndicator indicator = new EndpointCpmIndicator();
- indicator.setTimeBucket(toTimeBucketInHour());
indicator.setEntityId(this.getEntityId());
indicator.setServiceId(this.getServiceId());
indicator.setServiceInstanceId(this.getServiceInstanceId());
indicator.setValue(this.getValue());
indicator.setTotal(this.getTotal());
+ indicator.setTimeBucket(toTimeBucketInHour());
return indicator;
}
@Override
public Indicator toDay() {
EndpointCpmIndicator indicator = new EndpointCpmIndicator();
- indicator.setTimeBucket(toTimeBucketInDay());
indicator.setEntityId(this.getEntityId());
indicator.setServiceId(this.getServiceId());
indicator.setServiceInstanceId(this.getServiceInstanceId());
indicator.setValue(this.getValue());
indicator.setTotal(this.getTotal());
+ indicator.setTimeBucket(toTimeBucketInDay());
return indicator;
}
@Override
public Indicator toMonth() {
EndpointCpmIndicator indicator = new EndpointCpmIndicator();
- indicator.setTimeBucket(toTimeBucketInMonth());
indicator.setEntityId(this.getEntityId());
indicator.setServiceId(this.getServiceId());
indicator.setServiceInstanceId(this.getServiceInstanceId());
indicator.setValue(this.getValue());
indicator.setTotal(this.getTotal());
+ indicator.setTimeBucket(toTimeBucketInMonth());
return indicator;
}
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 1a44a7e0e..4e17585e9 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
@@ -58,7 +58,6 @@
return result;
}
-
@Override public int remoteHashCode() {
int result = 17;
result = 31 * result + entityId.hashCode();
@@ -124,39 +123,45 @@
@Override
public Indicator toHour() {
EndpointP50Indicator indicator = new EndpointP50Indicator();
- indicator.setTimeBucket(toTimeBucketInHour());
indicator.setEntityId(this.getEntityId());
indicator.setServiceId(this.getServiceId());
indicator.setServiceInstanceId(this.getServiceInstanceId());
indicator.setValue(this.getValue());
indicator.setPrecision(this.getPrecision());
- indicator.setDetailGroup(this.getDetailGroup());
+ org.apache.skywalking.oap.server.core.analysis.indicator.IntKeyLongValueArray newValue = new org.apache.skywalking.oap.server.core.analysis.indicator.IntKeyLongValueArray();
+ newValue.copyFrom(this.getDetailGroup());
+ indicator.setDetailGroup(newValue);
+ indicator.setTimeBucket(toTimeBucketInHour());
return indicator;
}
@Override
public Indicator toDay() {
EndpointP50Indicator indicator = new EndpointP50Indicator();
- indicator.setTimeBucket(toTimeBucketInDay());
indicator.setEntityId(this.getEntityId());
indicator.setServiceId(this.getServiceId());
indicator.setServiceInstanceId(this.getServiceInstanceId());
indicator.setValue(this.getValue());
indicator.setPrecision(this.getPrecision());
- indicator.setDetailGroup(this.getDetailGroup());
+ org.apache.skywalking.oap.server.core.analysis.indicator.IntKeyLongValueArray newValue = new org.apache.skywalking.oap.server.core.analysis.indicator.IntKeyLongValueArray();
+ newValue.copyFrom(this.getDetailGroup());
+ indicator.setDetailGroup(newValue);
+ indicator.setTimeBucket(toTimeBucketInDay());
return indicator;
}
@Override
public Indicator toMonth() {
EndpointP50Indicator indicator = new EndpointP50Indicator();
- indicator.setTimeBucket(toTimeBucketInMonth());
indicator.setEntityId(this.getEntityId());
indicator.setServiceId(this.getServiceId());
indicator.setServiceInstanceId(this.getServiceInstanceId());
indicator.setValue(this.getValue());
indicator.setPrecision(this.getPrecision());
- indicator.setDetailGroup(this.getDetailGroup());
+ org.apache.skywalking.oap.server.core.analysis.indicator.IntKeyLongValueArray newValue = new org.apache.skywalking.oap.server.core.analysis.indicator.IntKeyLongValueArray();
+ newValue.copyFrom(this.getDetailGroup());
+ indicator.setDetailGroup(newValue);
+ indicator.setTimeBucket(toTimeBucketInMonth());
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 87db4af7c..cc2524b97 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
@@ -58,7 +58,6 @@
return result;
}
-
@Override public int remoteHashCode() {
int result = 17;
result = 31 * result + entityId.hashCode();
@@ -124,39 +123,45 @@
@Override
public Indicator toHour() {
EndpointP75Indicator indicator = new EndpointP75Indicator();
- indicator.setTimeBucket(toTimeBucketInHour());
indicator.setEntityId(this.getEntityId());
indicator.setServiceId(this.getServiceId());
indicator.setServiceInstanceId(this.getServiceInstanceId());
indicator.setValue(this.getValue());
indicator.setPrecision(this.getPrecision());
- indicator.setDetailGroup(this.getDetailGroup());
+ org.apache.skywalking.oap.server.core.analysis.indicator.IntKeyLongValueArray newValue = new org.apache.skywalking.oap.server.core.analysis.indicator.IntKeyLongValueArray();
+ newValue.copyFrom(this.getDetailGroup());
+ indicator.setDetailGroup(newValue);
+ indicator.setTimeBucket(toTimeBucketInHour());
return indicator;
}
@Override
public Indicator toDay() {
EndpointP75Indicator indicator = new EndpointP75Indicator();
- indicator.setTimeBucket(toTimeBucketInDay());
indicator.setEntityId(this.getEntityId());
indicator.setServiceId(this.getServiceId());
indicator.setServiceInstanceId(this.getServiceInstanceId());
indicator.setValue(this.getValue());
indicator.setPrecision(this.getPrecision());
- indicator.setDetailGroup(this.getDetailGroup());
+ org.apache.skywalking.oap.server.core.analysis.indicator.IntKeyLongValueArray newValue = new org.apache.skywalking.oap.server.core.analysis.indicator.IntKeyLongValueArray();
+ newValue.copyFrom(this.getDetailGroup());
+ indicator.setDetailGroup(newValue);
+ indicator.setTimeBucket(toTimeBucketInDay());
return indicator;
}
@Override
public Indicator toMonth() {
EndpointP75Indicator indicator = new EndpointP75Indicator();
- indicator.setTimeBucket(toTimeBucketInMonth());
indicator.setEntityId(this.getEntityId());
indicator.setServiceId(this.getServiceId());
indicator.setServiceInstanceId(this.getServiceInstanceId());
indicator.setValue(this.getValue());
indicator.setPrecision(this.getPrecision());
- indicator.setDetailGroup(this.getDetailGroup());
+ org.apache.skywalking.oap.server.core.analysis.indicator.IntKeyLongValueArray newValue = new org.apache.skywalking.oap.server.core.analysis.indicator.IntKeyLongValueArray();
+ newValue.copyFrom(this.getDetailGroup());
+ indicator.setDetailGroup(newValue);
+ indicator.setTimeBucket(toTimeBucketInMonth());
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 cf65588e3..ded1642d6 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
@@ -58,7 +58,6 @@
return result;
}
-
@Override public int remoteHashCode() {
int result = 17;
result = 31 * result + entityId.hashCode();
@@ -124,39 +123,45 @@
@Override
public Indicator toHour() {
EndpointP90Indicator indicator = new EndpointP90Indicator();
- indicator.setTimeBucket(toTimeBucketInHour());
indicator.setEntityId(this.getEntityId());
indicator.setServiceId(this.getServiceId());
indicator.setServiceInstanceId(this.getServiceInstanceId());
indicator.setValue(this.getValue());
indicator.setPrecision(this.getPrecision());
- indicator.setDetailGroup(this.getDetailGroup());
+ org.apache.skywalking.oap.server.core.analysis.indicator.IntKeyLongValueArray newValue = new org.apache.skywalking.oap.server.core.analysis.indicator.IntKeyLongValueArray();
+ newValue.copyFrom(this.getDetailGroup());
+ indicator.setDetailGroup(newValue);
+ indicator.setTimeBucket(toTimeBucketInHour());
return indicator;
}
@Override
public Indicator toDay() {
EndpointP90Indicator indicator = new EndpointP90Indicator();
- indicator.setTimeBucket(toTimeBucketInDay());
indicator.setEntityId(this.getEntityId());
indicator.setServiceId(this.getServiceId());
indicator.setServiceInstanceId(this.getServiceInstanceId());
indicator.setValue(this.getValue());
indicator.setPrecision(this.getPrecision());
- indicator.setDetailGroup(this.getDetailGroup());
+ org.apache.skywalking.oap.server.core.analysis.indicator.IntKeyLongValueArray newValue = new org.apache.skywalking.oap.server.core.analysis.indicator.IntKeyLongValueArray();
+ newValue.copyFrom(this.getDetailGroup());
+ indicator.setDetailGroup(newValue);
+ indicator.setTimeBucket(toTimeBucketInDay());
return indicator;
}
@Override
public Indicator toMonth() {
EndpointP90Indicator indicator = new EndpointP90Indicator();
- indicator.setTimeBucket(toTimeBucketInMonth());
indicator.setEntityId(this.getEntityId());
indicator.setServiceId(this.getServiceId());
indicator.setServiceInstanceId(this.getServiceInstanceId());
indicator.setValue(this.getValue());
indicator.setPrecision(this.getPrecision());
- indicator.setDetailGroup(this.getDetailGroup());
+ org.apache.skywalking.oap.server.core.analysis.indicator.IntKeyLongValueArray newValue = new org.apache.skywalking.oap.server.core.analysis.indicator.IntKeyLongValueArray();
+ newValue.copyFrom(this.getDetailGroup());
+ indicator.setDetailGroup(newValue);
+ indicator.setTimeBucket(toTimeBucketInMonth());
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 cf76238d7..09514053e 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
@@ -58,7 +58,6 @@
return result;
}
-
@Override public int remoteHashCode() {
int result = 17;
result = 31 * result + entityId.hashCode();
@@ -124,39 +123,45 @@
@Override
public Indicator toHour() {
EndpointP95Indicator indicator = new EndpointP95Indicator();
- indicator.setTimeBucket(toTimeBucketInHour());
indicator.setEntityId(this.getEntityId());
indicator.setServiceId(this.getServiceId());
indicator.setServiceInstanceId(this.getServiceInstanceId());
indicator.setValue(this.getValue());
indicator.setPrecision(this.getPrecision());
- indicator.setDetailGroup(this.getDetailGroup());
+ org.apache.skywalking.oap.server.core.analysis.indicator.IntKeyLongValueArray newValue = new org.apache.skywalking.oap.server.core.analysis.indicator.IntKeyLongValueArray();
+ newValue.copyFrom(this.getDetailGroup());
+ indicator.setDetailGroup(newValue);
+ indicator.setTimeBucket(toTimeBucketInHour());
return indicator;
}
@Override
public Indicator toDay() {
EndpointP95Indicator indicator = new EndpointP95Indicator();
- indicator.setTimeBucket(toTimeBucketInDay());
indicator.setEntityId(this.getEntityId());
indicator.setServiceId(this.getServiceId());
indicator.setServiceInstanceId(this.getServiceInstanceId());
indicator.setValue(this.getValue());
indicator.setPrecision(this.getPrecision());
- indicator.setDetailGroup(this.getDetailGroup());
+ org.apache.skywalking.oap.server.core.analysis.indicator.IntKeyLongValueArray newValue = new org.apache.skywalking.oap.server.core.analysis.indicator.IntKeyLongValueArray();
+ newValue.copyFrom(this.getDetailGroup());
+ indicator.setDetailGroup(newValue);
+ indicator.setTimeBucket(toTimeBucketInDay());
return indicator;
}
@Override
public Indicator toMonth() {
EndpointP95Indicator indicator = new EndpointP95Indicator();
- indicator.setTimeBucket(toTimeBucketInMonth());
indicator.setEntityId(this.getEntityId());
indicator.setServiceId(this.getServiceId());
indicator.setServiceInstanceId(this.getServiceInstanceId());
indicator.setValue(this.getValue());
indicator.setPrecision(this.getPrecision());
- indicator.setDetailGroup(this.getDetailGroup());
+ org.apache.skywalking.oap.server.core.analysis.indicator.IntKeyLongValueArray newValue = new org.apache.skywalking.oap.server.core.analysis.indicator.IntKeyLongValueArray();
+ newValue.copyFrom(this.getDetailGroup());
+ indicator.setDetailGroup(newValue);
+ indicator.setTimeBucket(toTimeBucketInMonth());
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 60c0768cd..4052e18a8 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
@@ -58,7 +58,6 @@
return result;
}
-
@Override public int remoteHashCode() {
int result = 17;
result = 31 * result + entityId.hashCode();
@@ -124,39 +123,45 @@
@Override
public Indicator toHour() {
EndpointP99Indicator indicator = new EndpointP99Indicator();
- indicator.setTimeBucket(toTimeBucketInHour());
indicator.setEntityId(this.getEntityId());
indicator.setServiceId(this.getServiceId());
indicator.setServiceInstanceId(this.getServiceInstanceId());
indicator.setValue(this.getValue());
indicator.setPrecision(this.getPrecision());
- indicator.setDetailGroup(this.getDetailGroup());
+ org.apache.skywalking.oap.server.core.analysis.indicator.IntKeyLongValueArray newValue = new org.apache.skywalking.oap.server.core.analysis.indicator.IntKeyLongValueArray();
+ newValue.copyFrom(this.getDetailGroup());
+ indicator.setDetailGroup(newValue);
+ indicator.setTimeBucket(toTimeBucketInHour());
return indicator;
}
@Override
public Indicator toDay() {
EndpointP99Indicator indicator = new EndpointP99Indicator();
- indicator.setTimeBucket(toTimeBucketInDay());
indicator.setEntityId(this.getEntityId());
indicator.setServiceId(this.getServiceId());
indicator.setServiceInstanceId(this.getServiceInstanceId());
indicator.setValue(this.getValue());
indicator.setPrecision(this.getPrecision());
- indicator.setDetailGroup(this.getDetailGroup());
+ org.apache.skywalking.oap.server.core.analysis.indicator.IntKeyLongValueArray newValue = new org.apache.skywalking.oap.server.core.analysis.indicator.IntKeyLongValueArray();
+ newValue.copyFrom(this.getDetailGroup());
+ indicator.setDetailGroup(newValue);
+ indicator.setTimeBucket(toTimeBucketInDay());
return indicator;
}
@Override
public Indicator toMonth() {
EndpointP99Indicator indicator = new EndpointP99Indicator();
- indicator.setTimeBucket(toTimeBucketInMonth());
indicator.setEntityId(this.getEntityId());
indicator.setServiceId(this.getServiceId());
indicator.setServiceInstanceId(this.getServiceInstanceId());
indicator.setValue(this.getValue());
indicator.setPrecision(this.getPrecision());
- indicator.setDetailGroup(this.getDetailGroup());
+ org.apache.skywalking.oap.server.core.analysis.indicator.IntKeyLongValueArray newValue = new org.apache.skywalking.oap.server.core.analysis.indicator.IntKeyLongValueArray();
+ newValue.copyFrom(this.getDetailGroup());
+ indicator.setDetailGroup(newValue);
+ indicator.setTimeBucket(toTimeBucketInMonth());
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 20a6bd1d0..4032f962e 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
@@ -58,7 +58,6 @@
return result;
}
-
@Override public int remoteHashCode() {
int result = 17;
result = 31 * result + entityId.hashCode();
@@ -121,39 +120,39 @@
@Override
public Indicator toHour() {
EndpointSlaIndicator indicator = new EndpointSlaIndicator();
- indicator.setTimeBucket(toTimeBucketInHour());
indicator.setEntityId(this.getEntityId());
indicator.setServiceId(this.getServiceId());
indicator.setServiceInstanceId(this.getServiceInstanceId());
indicator.setTotal(this.getTotal());
indicator.setPercentage(this.getPercentage());
indicator.setMatch(this.getMatch());
+ indicator.setTimeBucket(toTimeBucketInHour());
return indicator;
}
@Override
public Indicator toDay() {
EndpointSlaIndicator indicator = new EndpointSlaIndicator();
- indicator.setTimeBucket(toTimeBucketInDay());
indicator.setEntityId(this.getEntityId());
indicator.setServiceId(this.getServiceId());
indicator.setServiceInstanceId(this.getServiceInstanceId());
indicator.setTotal(this.getTotal());
indicator.setPercentage(this.getPercentage());
indicator.setMatch(this.getMatch());
+ indicator.setTimeBucket(toTimeBucketInDay());
return indicator;
}
@Override
public Indicator toMonth() {
EndpointSlaIndicator indicator = new EndpointSlaIndicator();
- indicator.setTimeBucket(toTimeBucketInMonth());
indicator.setEntityId(this.getEntityId());
indicator.setServiceId(this.getServiceId());
indicator.setServiceInstanceId(this.getServiceInstanceId());
indicator.setTotal(this.getTotal());
indicator.setPercentage(this.getPercentage());
indicator.setMatch(this.getMatch());
+ indicator.setTimeBucket(toTimeBucketInMonth());
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 9b890d233..49a636002 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
@@ -60,7 +60,6 @@
return result;
}
-
@Override public int remoteHashCode() {
int result = 17;
result = 31 * result + entityId.hashCode();
@@ -125,7 +124,6 @@
@Override
public Indicator toHour() {
EndpointRelationCpmIndicator indicator = new EndpointRelationCpmIndicator();
- indicator.setTimeBucket(toTimeBucketInHour());
indicator.setEntityId(this.getEntityId());
indicator.setServiceId(this.getServiceId());
indicator.setChildServiceId(this.getChildServiceId());
@@ -133,13 +131,13 @@ public Indicator toHour() {
indicator.setChildServiceInstanceId(this.getChildServiceInstanceId());
indicator.setValue(this.getValue());
indicator.setTotal(this.getTotal());
+ indicator.setTimeBucket(toTimeBucketInHour());
return indicator;
}
@Override
public Indicator toDay() {
EndpointRelationCpmIndicator indicator = new EndpointRelationCpmIndicator();
- indicator.setTimeBucket(toTimeBucketInDay());
indicator.setEntityId(this.getEntityId());
indicator.setServiceId(this.getServiceId());
indicator.setChildServiceId(this.getChildServiceId());
@@ -147,13 +145,13 @@ public Indicator toDay() {
indicator.setChildServiceInstanceId(this.getChildServiceInstanceId());
indicator.setValue(this.getValue());
indicator.setTotal(this.getTotal());
+ indicator.setTimeBucket(toTimeBucketInDay());
return indicator;
}
@Override
public Indicator toMonth() {
EndpointRelationCpmIndicator indicator = new EndpointRelationCpmIndicator();
- indicator.setTimeBucket(toTimeBucketInMonth());
indicator.setEntityId(this.getEntityId());
indicator.setServiceId(this.getServiceId());
indicator.setChildServiceId(this.getChildServiceId());
@@ -161,6 +159,7 @@ public Indicator toMonth() {
indicator.setChildServiceInstanceId(this.getChildServiceInstanceId());
indicator.setValue(this.getValue());
indicator.setTotal(this.getTotal());
+ indicator.setTimeBucket(toTimeBucketInMonth());
return indicator;
}
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 8682119b0..c4bb00264 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
@@ -60,7 +60,6 @@
return result;
}
-
@Override public int remoteHashCode() {
int result = 17;
result = 31 * result + entityId.hashCode();
@@ -127,7 +126,6 @@
@Override
public Indicator toHour() {
EndpointRelationRespTimeIndicator indicator = new EndpointRelationRespTimeIndicator();
- indicator.setTimeBucket(toTimeBucketInHour());
indicator.setEntityId(this.getEntityId());
indicator.setServiceId(this.getServiceId());
indicator.setChildServiceId(this.getChildServiceId());
@@ -136,13 +134,13 @@ public Indicator toHour() {
indicator.setSummation(this.getSummation());
indicator.setCount(this.getCount());
indicator.setValue(this.getValue());
+ indicator.setTimeBucket(toTimeBucketInHour());
return indicator;
}
@Override
public Indicator toDay() {
EndpointRelationRespTimeIndicator indicator = new EndpointRelationRespTimeIndicator();
- indicator.setTimeBucket(toTimeBucketInDay());
indicator.setEntityId(this.getEntityId());
indicator.setServiceId(this.getServiceId());
indicator.setChildServiceId(this.getChildServiceId());
@@ -151,13 +149,13 @@ public Indicator toDay() {
indicator.setSummation(this.getSummation());
indicator.setCount(this.getCount());
indicator.setValue(this.getValue());
+ indicator.setTimeBucket(toTimeBucketInDay());
return indicator;
}
@Override
public Indicator toMonth() {
EndpointRelationRespTimeIndicator indicator = new EndpointRelationRespTimeIndicator();
- indicator.setTimeBucket(toTimeBucketInMonth());
indicator.setEntityId(this.getEntityId());
indicator.setServiceId(this.getServiceId());
indicator.setChildServiceId(this.getChildServiceId());
@@ -166,6 +164,7 @@ public Indicator toMonth() {
indicator.setSummation(this.getSummation());
indicator.setCount(this.getCount());
indicator.setValue(this.getValue());
+ indicator.setTimeBucket(toTimeBucketInMonth());
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 c2c00459d..3d7886703 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
@@ -56,7 +56,6 @@
return result;
}
-
@Override public int remoteHashCode() {
int result = 17;
result = 31 * result + entityId.hashCode();
@@ -113,30 +112,30 @@
@Override
public Indicator toHour() {
ServiceCpmIndicator indicator = new ServiceCpmIndicator();
- indicator.setTimeBucket(toTimeBucketInHour());
indicator.setEntityId(this.getEntityId());
indicator.setValue(this.getValue());
indicator.setTotal(this.getTotal());
+ indicator.setTimeBucket(toTimeBucketInHour());
return indicator;
}
@Override
public Indicator toDay() {
ServiceCpmIndicator indicator = new ServiceCpmIndicator();
- indicator.setTimeBucket(toTimeBucketInDay());
indicator.setEntityId(this.getEntityId());
indicator.setValue(this.getValue());
indicator.setTotal(this.getTotal());
+ indicator.setTimeBucket(toTimeBucketInDay());
return indicator;
}
@Override
public Indicator toMonth() {
ServiceCpmIndicator indicator = new ServiceCpmIndicator();
- indicator.setTimeBucket(toTimeBucketInMonth());
indicator.setEntityId(this.getEntityId());
indicator.setValue(this.getValue());
indicator.setTotal(this.getTotal());
+ indicator.setTimeBucket(toTimeBucketInMonth());
return indicator;
}
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 b050e8eb3..b3b20dfe2 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
@@ -56,7 +56,6 @@
return result;
}
-
@Override public int remoteHashCode() {
int result = 17;
result = 31 * result + entityId.hashCode();
@@ -118,33 +117,39 @@
@Override
public Indicator toHour() {
ServiceP50Indicator indicator = new ServiceP50Indicator();
- indicator.setTimeBucket(toTimeBucketInHour());
indicator.setEntityId(this.getEntityId());
indicator.setValue(this.getValue());
indicator.setPrecision(this.getPrecision());
- indicator.setDetailGroup(this.getDetailGroup());
+ org.apache.skywalking.oap.server.core.analysis.indicator.IntKeyLongValueArray newValue = new org.apache.skywalking.oap.server.core.analysis.indicator.IntKeyLongValueArray();
+ newValue.copyFrom(this.getDetailGroup());
+ indicator.setDetailGroup(newValue);
+ indicator.setTimeBucket(toTimeBucketInHour());
return indicator;
}
@Override
public Indicator toDay() {
ServiceP50Indicator indicator = new ServiceP50Indicator();
- indicator.setTimeBucket(toTimeBucketInDay());
indicator.setEntityId(this.getEntityId());
indicator.setValue(this.getValue());
indicator.setPrecision(this.getPrecision());
- indicator.setDetailGroup(this.getDetailGroup());
+ org.apache.skywalking.oap.server.core.analysis.indicator.IntKeyLongValueArray newValue = new org.apache.skywalking.oap.server.core.analysis.indicator.IntKeyLongValueArray();
+ newValue.copyFrom(this.getDetailGroup());
+ indicator.setDetailGroup(newValue);
+ indicator.setTimeBucket(toTimeBucketInDay());
return indicator;
}
@Override
public Indicator toMonth() {
ServiceP50Indicator indicator = new ServiceP50Indicator();
- indicator.setTimeBucket(toTimeBucketInMonth());
indicator.setEntityId(this.getEntityId());
indicator.setValue(this.getValue());
indicator.setPrecision(this.getPrecision());
- indicator.setDetailGroup(this.getDetailGroup());
+ org.apache.skywalking.oap.server.core.analysis.indicator.IntKeyLongValueArray newValue = new org.apache.skywalking.oap.server.core.analysis.indicator.IntKeyLongValueArray();
+ newValue.copyFrom(this.getDetailGroup());
+ indicator.setDetailGroup(newValue);
+ indicator.setTimeBucket(toTimeBucketInMonth());
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 5a7015990..374d9c271 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
@@ -56,7 +56,6 @@
return result;
}
-
@Override public int remoteHashCode() {
int result = 17;
result = 31 * result + entityId.hashCode();
@@ -118,33 +117,39 @@
@Override
public Indicator toHour() {
ServiceP75Indicator indicator = new ServiceP75Indicator();
- indicator.setTimeBucket(toTimeBucketInHour());
indicator.setEntityId(this.getEntityId());
indicator.setValue(this.getValue());
indicator.setPrecision(this.getPrecision());
- indicator.setDetailGroup(this.getDetailGroup());
+ org.apache.skywalking.oap.server.core.analysis.indicator.IntKeyLongValueArray newValue = new org.apache.skywalking.oap.server.core.analysis.indicator.IntKeyLongValueArray();
+ newValue.copyFrom(this.getDetailGroup());
+ indicator.setDetailGroup(newValue);
+ indicator.setTimeBucket(toTimeBucketInHour());
return indicator;
}
@Override
public Indicator toDay() {
ServiceP75Indicator indicator = new ServiceP75Indicator();
- indicator.setTimeBucket(toTimeBucketInDay());
indicator.setEntityId(this.getEntityId());
indicator.setValue(this.getValue());
indicator.setPrecision(this.getPrecision());
- indicator.setDetailGroup(this.getDetailGroup());
+ org.apache.skywalking.oap.server.core.analysis.indicator.IntKeyLongValueArray newValue = new org.apache.skywalking.oap.server.core.analysis.indicator.IntKeyLongValueArray();
+ newValue.copyFrom(this.getDetailGroup());
+ indicator.setDetailGroup(newValue);
+ indicator.setTimeBucket(toTimeBucketInDay());
return indicator;
}
@Override
public Indicator toMonth() {
ServiceP75Indicator indicator = new ServiceP75Indicator();
- indicator.setTimeBucket(toTimeBucketInMonth());
indicator.setEntityId(this.getEntityId());
indicator.setValue(this.getValue());
indicator.setPrecision(this.getPrecision());
- indicator.setDetailGroup(this.getDetailGroup());
+ org.apache.skywalking.oap.server.core.analysis.indicator.IntKeyLongValueArray newValue = new org.apache.skywalking.oap.server.core.analysis.indicator.IntKeyLongValueArray();
+ newValue.copyFrom(this.getDetailGroup());
+ indicator.setDetailGroup(newValue);
+ indicator.setTimeBucket(toTimeBucketInMonth());
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 7b4deb6cd..79cdbf907 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
@@ -56,7 +56,6 @@
return result;
}
-
@Override public int remoteHashCode() {
int result = 17;
result = 31 * result + entityId.hashCode();
@@ -118,33 +117,39 @@
@Override
public Indicator toHour() {
ServiceP90Indicator indicator = new ServiceP90Indicator();
- indicator.setTimeBucket(toTimeBucketInHour());
indicator.setEntityId(this.getEntityId());
indicator.setValue(this.getValue());
indicator.setPrecision(this.getPrecision());
- indicator.setDetailGroup(this.getDetailGroup());
+ org.apache.skywalking.oap.server.core.analysis.indicator.IntKeyLongValueArray newValue = new org.apache.skywalking.oap.server.core.analysis.indicator.IntKeyLongValueArray();
+ newValue.copyFrom(this.getDetailGroup());
+ indicator.setDetailGroup(newValue);
+ indicator.setTimeBucket(toTimeBucketInHour());
return indicator;
}
@Override
public Indicator toDay() {
ServiceP90Indicator indicator = new ServiceP90Indicator();
- indicator.setTimeBucket(toTimeBucketInDay());
indicator.setEntityId(this.getEntityId());
indicator.setValue(this.getValue());
indicator.setPrecision(this.getPrecision());
- indicator.setDetailGroup(this.getDetailGroup());
+ org.apache.skywalking.oap.server.core.analysis.indicator.IntKeyLongValueArray newValue = new org.apache.skywalking.oap.server.core.analysis.indicator.IntKeyLongValueArray();
+ newValue.copyFrom(this.getDetailGroup());
+ indicator.setDetailGroup(newValue);
+ indicator.setTimeBucket(toTimeBucketInDay());
return indicator;
}
@Override
public Indicator toMonth() {
ServiceP90Indicator indicator = new ServiceP90Indicator();
- indicator.setTimeBucket(toTimeBucketInMonth());
indicator.setEntityId(this.getEntityId());
indicator.setValue(this.getValue());
indicator.setPrecision(this.getPrecision());
- indicator.setDetailGroup(this.getDetailGroup());
+ org.apache.skywalking.oap.server.core.analysis.indicator.IntKeyLongValueArray newValue = new org.apache.skywalking.oap.server.core.analysis.indicator.IntKeyLongValueArray();
+ newValue.copyFrom(this.getDetailGroup());
+ indicator.setDetailGroup(newValue);
+ indicator.setTimeBucket(toTimeBucketInMonth());
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 212eb92af..7a4603d94 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
@@ -56,7 +56,6 @@
return result;
}
-
@Override public int remoteHashCode() {
int result = 17;
result = 31 * result + entityId.hashCode();
@@ -118,33 +117,39 @@
@Override
public Indicator toHour() {
ServiceP95Indicator indicator = new ServiceP95Indicator();
- indicator.setTimeBucket(toTimeBucketInHour());
indicator.setEntityId(this.getEntityId());
indicator.setValue(this.getValue());
indicator.setPrecision(this.getPrecision());
- indicator.setDetailGroup(this.getDetailGroup());
+ org.apache.skywalking.oap.server.core.analysis.indicator.IntKeyLongValueArray newValue = new org.apache.skywalking.oap.server.core.analysis.indicator.IntKeyLongValueArray();
+ newValue.copyFrom(this.getDetailGroup());
+ indicator.setDetailGroup(newValue);
+ indicator.setTimeBucket(toTimeBucketInHour());
return indicator;
}
@Override
public Indicator toDay() {
ServiceP95Indicator indicator = new ServiceP95Indicator();
- indicator.setTimeBucket(toTimeBucketInDay());
indicator.setEntityId(this.getEntityId());
indicator.setValue(this.getValue());
indicator.setPrecision(this.getPrecision());
- indicator.setDetailGroup(this.getDetailGroup());
+ org.apache.skywalking.oap.server.core.analysis.indicator.IntKeyLongValueArray newValue = new org.apache.skywalking.oap.server.core.analysis.indicator.IntKeyLongValueArray();
+ newValue.copyFrom(this.getDetailGroup());
+ indicator.setDetailGroup(newValue);
+ indicator.setTimeBucket(toTimeBucketInDay());
return indicator;
}
@Override
public Indicator toMonth() {
ServiceP95Indicator indicator = new ServiceP95Indicator();
- indicator.setTimeBucket(toTimeBucketInMonth());
indicator.setEntityId(this.getEntityId());
indicator.setValue(this.getValue());
indicator.setPrecision(this.getPrecision());
- indicator.setDetailGroup(this.getDetailGroup());
+ org.apache.skywalking.oap.server.core.analysis.indicator.IntKeyLongValueArray newValue = new org.apache.skywalking.oap.server.core.analysis.indicator.IntKeyLongValueArray();
+ newValue.copyFrom(this.getDetailGroup());
+ indicator.setDetailGroup(newValue);
+ indicator.setTimeBucket(toTimeBucketInMonth());
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 2f9d317b7..5f756504f 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
@@ -56,7 +56,6 @@
return result;
}
-
@Override public int remoteHashCode() {
int result = 17;
result = 31 * result + entityId.hashCode();
@@ -118,33 +117,39 @@
@Override
public Indicator toHour() {
ServiceP99Indicator indicator = new ServiceP99Indicator();
- indicator.setTimeBucket(toTimeBucketInHour());
indicator.setEntityId(this.getEntityId());
indicator.setValue(this.getValue());
indicator.setPrecision(this.getPrecision());
- indicator.setDetailGroup(this.getDetailGroup());
+ org.apache.skywalking.oap.server.core.analysis.indicator.IntKeyLongValueArray newValue = new org.apache.skywalking.oap.server.core.analysis.indicator.IntKeyLongValueArray();
+ newValue.copyFrom(this.getDetailGroup());
+ indicator.setDetailGroup(newValue);
+ indicator.setTimeBucket(toTimeBucketInHour());
return indicator;
}
@Override
public Indicator toDay() {
ServiceP99Indicator indicator = new ServiceP99Indicator();
- indicator.setTimeBucket(toTimeBucketInDay());
indicator.setEntityId(this.getEntityId());
indicator.setValue(this.getValue());
indicator.setPrecision(this.getPrecision());
- indicator.setDetailGroup(this.getDetailGroup());
+ org.apache.skywalking.oap.server.core.analysis.indicator.IntKeyLongValueArray newValue = new org.apache.skywalking.oap.server.core.analysis.indicator.IntKeyLongValueArray();
+ newValue.copyFrom(this.getDetailGroup());
+ indicator.setDetailGroup(newValue);
+ indicator.setTimeBucket(toTimeBucketInDay());
return indicator;
}
@Override
public Indicator toMonth() {
ServiceP99Indicator indicator = new ServiceP99Indicator();
- indicator.setTimeBucket(toTimeBucketInMonth());
indicator.setEntityId(this.getEntityId());
indicator.setValue(this.getValue());
indicator.setPrecision(this.getPrecision());
- indicator.setDetailGroup(this.getDetailGroup());
+ org.apache.skywalking.oap.server.core.analysis.indicator.IntKeyLongValueArray newValue = new org.apache.skywalking.oap.server.core.analysis.indicator.IntKeyLongValueArray();
+ newValue.copyFrom(this.getDetailGroup());
+ indicator.setDetailGroup(newValue);
+ indicator.setTimeBucket(toTimeBucketInMonth());
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 60ae6c2ce..8a4bde0d7 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
@@ -56,7 +56,6 @@
return result;
}
-
@Override public int remoteHashCode() {
int result = 17;
result = 31 * result + entityId.hashCode();
@@ -115,33 +114,33 @@
@Override
public Indicator toHour() {
ServiceRespTimeIndicator indicator = new ServiceRespTimeIndicator();
- indicator.setTimeBucket(toTimeBucketInHour());
indicator.setEntityId(this.getEntityId());
indicator.setSummation(this.getSummation());
indicator.setCount(this.getCount());
indicator.setValue(this.getValue());
+ indicator.setTimeBucket(toTimeBucketInHour());
return indicator;
}
@Override
public Indicator toDay() {
ServiceRespTimeIndicator indicator = new ServiceRespTimeIndicator();
- indicator.setTimeBucket(toTimeBucketInDay());
indicator.setEntityId(this.getEntityId());
indicator.setSummation(this.getSummation());
indicator.setCount(this.getCount());
indicator.setValue(this.getValue());
+ indicator.setTimeBucket(toTimeBucketInDay());
return indicator;
}
@Override
public Indicator toMonth() {
ServiceRespTimeIndicator indicator = new ServiceRespTimeIndicator();
- indicator.setTimeBucket(toTimeBucketInMonth());
indicator.setEntityId(this.getEntityId());
indicator.setSummation(this.getSummation());
indicator.setCount(this.getCount());
indicator.setValue(this.getValue());
+ indicator.setTimeBucket(toTimeBucketInMonth());
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 68f023ab6..9571e3632 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
@@ -56,7 +56,6 @@
return result;
}
-
@Override public int remoteHashCode() {
int result = 17;
result = 31 * result + entityId.hashCode();
@@ -115,33 +114,33 @@
@Override
public Indicator toHour() {
ServiceSlaIndicator indicator = new ServiceSlaIndicator();
- indicator.setTimeBucket(toTimeBucketInHour());
indicator.setEntityId(this.getEntityId());
indicator.setTotal(this.getTotal());
indicator.setPercentage(this.getPercentage());
indicator.setMatch(this.getMatch());
+ indicator.setTimeBucket(toTimeBucketInHour());
return indicator;
}
@Override
public Indicator toDay() {
ServiceSlaIndicator indicator = new ServiceSlaIndicator();
- indicator.setTimeBucket(toTimeBucketInDay());
indicator.setEntityId(this.getEntityId());
indicator.setTotal(this.getTotal());
indicator.setPercentage(this.getPercentage());
indicator.setMatch(this.getMatch());
+ indicator.setTimeBucket(toTimeBucketInDay());
return indicator;
}
@Override
public Indicator toMonth() {
ServiceSlaIndicator indicator = new ServiceSlaIndicator();
- indicator.setTimeBucket(toTimeBucketInMonth());
indicator.setEntityId(this.getEntityId());
indicator.setTotal(this.getTotal());
indicator.setPercentage(this.getPercentage());
indicator.setMatch(this.getMatch());
+ indicator.setTimeBucket(toTimeBucketInMonth());
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 dc9669a66..2bd9d36bf 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
@@ -57,7 +57,6 @@
return result;
}
-
@Override public int remoteHashCode() {
int result = 17;
result = 31 * result + entityId.hashCode();
@@ -116,33 +115,33 @@
@Override
public Indicator toHour() {
ServiceInstanceCpmIndicator indicator = new ServiceInstanceCpmIndicator();
- indicator.setTimeBucket(toTimeBucketInHour());
indicator.setEntityId(this.getEntityId());
indicator.setServiceId(this.getServiceId());
indicator.setValue(this.getValue());
indicator.setTotal(this.getTotal());
+ indicator.setTimeBucket(toTimeBucketInHour());
return indicator;
}
@Override
public Indicator toDay() {
ServiceInstanceCpmIndicator indicator = new ServiceInstanceCpmIndicator();
- indicator.setTimeBucket(toTimeBucketInDay());
indicator.setEntityId(this.getEntityId());
indicator.setServiceId(this.getServiceId());
indicator.setValue(this.getValue());
indicator.setTotal(this.getTotal());
+ indicator.setTimeBucket(toTimeBucketInDay());
return indicator;
}
@Override
public Indicator toMonth() {
ServiceInstanceCpmIndicator indicator = new ServiceInstanceCpmIndicator();
- indicator.setTimeBucket(toTimeBucketInMonth());
indicator.setEntityId(this.getEntityId());
indicator.setServiceId(this.getServiceId());
indicator.setValue(this.getValue());
indicator.setTotal(this.getTotal());
+ indicator.setTimeBucket(toTimeBucketInMonth());
return indicator;
}
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 39a6ac1e4..3b9a7d78e 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
@@ -57,7 +57,6 @@
return result;
}
-
@Override public int remoteHashCode() {
int result = 17;
result = 31 * result + entityId.hashCode();
@@ -118,36 +117,36 @@
@Override
public Indicator toHour() {
ServiceInstanceRespTimeIndicator indicator = new ServiceInstanceRespTimeIndicator();
- indicator.setTimeBucket(toTimeBucketInHour());
indicator.setEntityId(this.getEntityId());
indicator.setServiceId(this.getServiceId());
indicator.setSummation(this.getSummation());
indicator.setCount(this.getCount());
indicator.setValue(this.getValue());
+ indicator.setTimeBucket(toTimeBucketInHour());
return indicator;
}
@Override
public Indicator toDay() {
ServiceInstanceRespTimeIndicator indicator = new ServiceInstanceRespTimeIndicator();
- indicator.setTimeBucket(toTimeBucketInDay());
indicator.setEntityId(this.getEntityId());
indicator.setServiceId(this.getServiceId());
indicator.setSummation(this.getSummation());
indicator.setCount(this.getCount());
indicator.setValue(this.getValue());
+ indicator.setTimeBucket(toTimeBucketInDay());
return indicator;
}
@Override
public Indicator toMonth() {
ServiceInstanceRespTimeIndicator indicator = new ServiceInstanceRespTimeIndicator();
- indicator.setTimeBucket(toTimeBucketInMonth());
indicator.setEntityId(this.getEntityId());
indicator.setServiceId(this.getServiceId());
indicator.setSummation(this.getSummation());
indicator.setCount(this.getCount());
indicator.setValue(this.getValue());
+ indicator.setTimeBucket(toTimeBucketInMonth());
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 99fe1085d..af09d121c 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
@@ -57,7 +57,6 @@
return result;
}
-
@Override public int remoteHashCode() {
int result = 17;
result = 31 * result + entityId.hashCode();
@@ -118,36 +117,36 @@
@Override
public Indicator toHour() {
InstanceJvmCpuIndicator indicator = new InstanceJvmCpuIndicator();
- indicator.setTimeBucket(toTimeBucketInHour());
indicator.setEntityId(this.getEntityId());
indicator.setServiceInstanceId(this.getServiceInstanceId());
indicator.setSummation(this.getSummation());
indicator.setCount(this.getCount());
indicator.setValue(this.getValue());
+ indicator.setTimeBucket(toTimeBucketInHour());
return indicator;
}
@Override
public Indicator toDay() {
InstanceJvmCpuIndicator indicator = new InstanceJvmCpuIndicator();
- indicator.setTimeBucket(toTimeBucketInDay());
indicator.setEntityId(this.getEntityId());
indicator.setServiceInstanceId(this.getServiceInstanceId());
indicator.setSummation(this.getSummation());
indicator.setCount(this.getCount());
indicator.setValue(this.getValue());
+ indicator.setTimeBucket(toTimeBucketInDay());
return indicator;
}
@Override
public Indicator toMonth() {
InstanceJvmCpuIndicator indicator = new InstanceJvmCpuIndicator();
- indicator.setTimeBucket(toTimeBucketInMonth());
indicator.setEntityId(this.getEntityId());
indicator.setServiceInstanceId(this.getServiceInstanceId());
indicator.setSummation(this.getSummation());
indicator.setCount(this.getCount());
indicator.setValue(this.getValue());
+ indicator.setTimeBucket(toTimeBucketInMonth());
return indicator;
}
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 f5f8a36c6..76661f44d 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
@@ -57,7 +57,6 @@
return result;
}
-
@Override public int remoteHashCode() {
int result = 17;
result = 31 * result + entityId.hashCode();
@@ -114,30 +113,30 @@
@Override
public Indicator toHour() {
InstanceJvmOldGcCountIndicator indicator = new InstanceJvmOldGcCountIndicator();
- indicator.setTimeBucket(toTimeBucketInHour());
indicator.setEntityId(this.getEntityId());
indicator.setServiceInstanceId(this.getServiceInstanceId());
indicator.setValue(this.getValue());
+ indicator.setTimeBucket(toTimeBucketInHour());
return indicator;
}
@Override
public Indicator toDay() {
InstanceJvmOldGcCountIndicator indicator = new InstanceJvmOldGcCountIndicator();
- indicator.setTimeBucket(toTimeBucketInDay());
indicator.setEntityId(this.getEntityId());
indicator.setServiceInstanceId(this.getServiceInstanceId());
indicator.setValue(this.getValue());
+ indicator.setTimeBucket(toTimeBucketInDay());
return indicator;
}
@Override
public Indicator toMonth() {
InstanceJvmOldGcCountIndicator indicator = new InstanceJvmOldGcCountIndicator();
- indicator.setTimeBucket(toTimeBucketInMonth());
indicator.setEntityId(this.getEntityId());
indicator.setServiceInstanceId(this.getServiceInstanceId());
indicator.setValue(this.getValue());
+ indicator.setTimeBucket(toTimeBucketInMonth());
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 4c4d5afd4..9cbf6c6d5 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
@@ -57,7 +57,6 @@
return result;
}
-
@Override public int remoteHashCode() {
int result = 17;
result = 31 * result + entityId.hashCode();
@@ -118,36 +117,36 @@
@Override
public Indicator toHour() {
InstanceJvmOldGcTimeIndicator indicator = new InstanceJvmOldGcTimeIndicator();
- indicator.setTimeBucket(toTimeBucketInHour());
indicator.setEntityId(this.getEntityId());
indicator.setServiceInstanceId(this.getServiceInstanceId());
indicator.setSummation(this.getSummation());
indicator.setCount(this.getCount());
indicator.setValue(this.getValue());
+ indicator.setTimeBucket(toTimeBucketInHour());
return indicator;
}
@Override
public Indicator toDay() {
InstanceJvmOldGcTimeIndicator indicator = new InstanceJvmOldGcTimeIndicator();
- indicator.setTimeBucket(toTimeBucketInDay());
indicator.setEntityId(this.getEntityId());
indicator.setServiceInstanceId(this.getServiceInstanceId());
indicator.setSummation(this.getSummation());
indicator.setCount(this.getCount());
indicator.setValue(this.getValue());
+ indicator.setTimeBucket(toTimeBucketInDay());
return indicator;
}
@Override
public Indicator toMonth() {
InstanceJvmOldGcTimeIndicator indicator = new InstanceJvmOldGcTimeIndicator();
- indicator.setTimeBucket(toTimeBucketInMonth());
indicator.setEntityId(this.getEntityId());
indicator.setServiceInstanceId(this.getServiceInstanceId());
indicator.setSummation(this.getSummation());
indicator.setCount(this.getCount());
indicator.setValue(this.getValue());
+ indicator.setTimeBucket(toTimeBucketInMonth());
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 614e02ece..1e639b73d 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
@@ -57,7 +57,6 @@
return result;
}
-
@Override public int remoteHashCode() {
int result = 17;
result = 31 * result + entityId.hashCode();
@@ -114,30 +113,30 @@
@Override
public Indicator toHour() {
InstanceJvmYoungGcCountIndicator indicator = new InstanceJvmYoungGcCountIndicator();
- indicator.setTimeBucket(toTimeBucketInHour());
indicator.setEntityId(this.getEntityId());
indicator.setServiceInstanceId(this.getServiceInstanceId());
indicator.setValue(this.getValue());
+ indicator.setTimeBucket(toTimeBucketInHour());
return indicator;
}
@Override
public Indicator toDay() {
InstanceJvmYoungGcCountIndicator indicator = new InstanceJvmYoungGcCountIndicator();
- indicator.setTimeBucket(toTimeBucketInDay());
indicator.setEntityId(this.getEntityId());
indicator.setServiceInstanceId(this.getServiceInstanceId());
indicator.setValue(this.getValue());
+ indicator.setTimeBucket(toTimeBucketInDay());
return indicator;
}
@Override
public Indicator toMonth() {
InstanceJvmYoungGcCountIndicator indicator = new InstanceJvmYoungGcCountIndicator();
- indicator.setTimeBucket(toTimeBucketInMonth());
indicator.setEntityId(this.getEntityId());
indicator.setServiceInstanceId(this.getServiceInstanceId());
indicator.setValue(this.getValue());
+ indicator.setTimeBucket(toTimeBucketInMonth());
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 e017f65dd..9ac625751 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
@@ -57,7 +57,6 @@
return result;
}
-
@Override public int remoteHashCode() {
int result = 17;
result = 31 * result + entityId.hashCode();
@@ -118,36 +117,36 @@
@Override
public Indicator toHour() {
InstanceJvmYoungGcTimeIndicator indicator = new InstanceJvmYoungGcTimeIndicator();
- indicator.setTimeBucket(toTimeBucketInHour());
indicator.setEntityId(this.getEntityId());
indicator.setServiceInstanceId(this.getServiceInstanceId());
indicator.setSummation(this.getSummation());
indicator.setCount(this.getCount());
indicator.setValue(this.getValue());
+ indicator.setTimeBucket(toTimeBucketInHour());
return indicator;
}
@Override
public Indicator toDay() {
InstanceJvmYoungGcTimeIndicator indicator = new InstanceJvmYoungGcTimeIndicator();
- indicator.setTimeBucket(toTimeBucketInDay());
indicator.setEntityId(this.getEntityId());
indicator.setServiceInstanceId(this.getServiceInstanceId());
indicator.setSummation(this.getSummation());
indicator.setCount(this.getCount());
indicator.setValue(this.getValue());
+ indicator.setTimeBucket(toTimeBucketInDay());
return indicator;
}
@Override
public Indicator toMonth() {
InstanceJvmYoungGcTimeIndicator indicator = new InstanceJvmYoungGcTimeIndicator();
- indicator.setTimeBucket(toTimeBucketInMonth());
indicator.setEntityId(this.getEntityId());
indicator.setServiceInstanceId(this.getServiceInstanceId());
indicator.setSummation(this.getSummation());
indicator.setCount(this.getCount());
indicator.setValue(this.getValue());
+ indicator.setTimeBucket(toTimeBucketInMonth());
return indicator;
}
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 2480f8420..8a33c8fee 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
@@ -57,7 +57,6 @@
return result;
}
-
@Override public int remoteHashCode() {
int result = 17;
result = 31 * result + entityId.hashCode();
@@ -118,36 +117,36 @@
@Override
public Indicator toHour() {
InstanceJvmMemoryHeapIndicator indicator = new InstanceJvmMemoryHeapIndicator();
- indicator.setTimeBucket(toTimeBucketInHour());
indicator.setEntityId(this.getEntityId());
indicator.setServiceInstanceId(this.getServiceInstanceId());
indicator.setSummation(this.getSummation());
indicator.setCount(this.getCount());
indicator.setValue(this.getValue());
+ indicator.setTimeBucket(toTimeBucketInHour());
return indicator;
}
@Override
public Indicator toDay() {
InstanceJvmMemoryHeapIndicator indicator = new InstanceJvmMemoryHeapIndicator();
- indicator.setTimeBucket(toTimeBucketInDay());
indicator.setEntityId(this.getEntityId());
indicator.setServiceInstanceId(this.getServiceInstanceId());
indicator.setSummation(this.getSummation());
indicator.setCount(this.getCount());
indicator.setValue(this.getValue());
+ indicator.setTimeBucket(toTimeBucketInDay());
return indicator;
}
@Override
public Indicator toMonth() {
InstanceJvmMemoryHeapIndicator indicator = new InstanceJvmMemoryHeapIndicator();
- indicator.setTimeBucket(toTimeBucketInMonth());
indicator.setEntityId(this.getEntityId());
indicator.setServiceInstanceId(this.getServiceInstanceId());
indicator.setSummation(this.getSummation());
indicator.setCount(this.getCount());
indicator.setValue(this.getValue());
+ indicator.setTimeBucket(toTimeBucketInMonth());
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 0e070d46a..a3b92bf0c 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
@@ -57,7 +57,6 @@
return result;
}
-
@Override public int remoteHashCode() {
int result = 17;
result = 31 * result + entityId.hashCode();
@@ -118,36 +117,36 @@
@Override
public Indicator toHour() {
InstanceJvmMemoryHeapMaxIndicator indicator = new InstanceJvmMemoryHeapMaxIndicator();
- indicator.setTimeBucket(toTimeBucketInHour());
indicator.setEntityId(this.getEntityId());
indicator.setServiceInstanceId(this.getServiceInstanceId());
indicator.setSummation(this.getSummation());
indicator.setCount(this.getCount());
indicator.setValue(this.getValue());
+ indicator.setTimeBucket(toTimeBucketInHour());
return indicator;
}
@Override
public Indicator toDay() {
InstanceJvmMemoryHeapMaxIndicator indicator = new InstanceJvmMemoryHeapMaxIndicator();
- indicator.setTimeBucket(toTimeBucketInDay());
indicator.setEntityId(this.getEntityId());
indicator.setServiceInstanceId(this.getServiceInstanceId());
indicator.setSummation(this.getSummation());
indicator.setCount(this.getCount());
indicator.setValue(this.getValue());
+ indicator.setTimeBucket(toTimeBucketInDay());
return indicator;
}
@Override
public Indicator toMonth() {
InstanceJvmMemoryHeapMaxIndicator indicator = new InstanceJvmMemoryHeapMaxIndicator();
- indicator.setTimeBucket(toTimeBucketInMonth());
indicator.setEntityId(this.getEntityId());
indicator.setServiceInstanceId(this.getServiceInstanceId());
indicator.setSummation(this.getSummation());
indicator.setCount(this.getCount());
indicator.setValue(this.getValue());
+ indicator.setTimeBucket(toTimeBucketInMonth());
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 a426d98f3..9ff7409ef 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
@@ -57,7 +57,6 @@
return result;
}
-
@Override public int remoteHashCode() {
int result = 17;
result = 31 * result + entityId.hashCode();
@@ -118,36 +117,36 @@
@Override
public Indicator toHour() {
InstanceJvmMemoryNoheapIndicator indicator = new InstanceJvmMemoryNoheapIndicator();
- indicator.setTimeBucket(toTimeBucketInHour());
indicator.setEntityId(this.getEntityId());
indicator.setServiceInstanceId(this.getServiceInstanceId());
indicator.setSummation(this.getSummation());
indicator.setCount(this.getCount());
indicator.setValue(this.getValue());
+ indicator.setTimeBucket(toTimeBucketInHour());
return indicator;
}
@Override
public Indicator toDay() {
InstanceJvmMemoryNoheapIndicator indicator = new InstanceJvmMemoryNoheapIndicator();
- indicator.setTimeBucket(toTimeBucketInDay());
indicator.setEntityId(this.getEntityId());
indicator.setServiceInstanceId(this.getServiceInstanceId());
indicator.setSummation(this.getSummation());
indicator.setCount(this.getCount());
indicator.setValue(this.getValue());
+ indicator.setTimeBucket(toTimeBucketInDay());
return indicator;
}
@Override
public Indicator toMonth() {
InstanceJvmMemoryNoheapIndicator indicator = new InstanceJvmMemoryNoheapIndicator();
- indicator.setTimeBucket(toTimeBucketInMonth());
indicator.setEntityId(this.getEntityId());
indicator.setServiceInstanceId(this.getServiceInstanceId());
indicator.setSummation(this.getSummation());
indicator.setCount(this.getCount());
indicator.setValue(this.getValue());
+ indicator.setTimeBucket(toTimeBucketInMonth());
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 375eb7fc1..7effa98e7 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
@@ -57,7 +57,6 @@
return result;
}
-
@Override public int remoteHashCode() {
int result = 17;
result = 31 * result + entityId.hashCode();
@@ -118,36 +117,36 @@
@Override
public Indicator toHour() {
InstanceJvmMemoryNoheapMaxIndicator indicator = new InstanceJvmMemoryNoheapMaxIndicator();
- indicator.setTimeBucket(toTimeBucketInHour());
indicator.setEntityId(this.getEntityId());
indicator.setServiceInstanceId(this.getServiceInstanceId());
indicator.setSummation(this.getSummation());
indicator.setCount(this.getCount());
indicator.setValue(this.getValue());
+ indicator.setTimeBucket(toTimeBucketInHour());
return indicator;
}
@Override
public Indicator toDay() {
InstanceJvmMemoryNoheapMaxIndicator indicator = new InstanceJvmMemoryNoheapMaxIndicator();
- indicator.setTimeBucket(toTimeBucketInDay());
indicator.setEntityId(this.getEntityId());
indicator.setServiceInstanceId(this.getServiceInstanceId());
indicator.setSummation(this.getSummation());
indicator.setCount(this.getCount());
indicator.setValue(this.getValue());
+ indicator.setTimeBucket(toTimeBucketInDay());
return indicator;
}
@Override
public Indicator toMonth() {
InstanceJvmMemoryNoheapMaxIndicator indicator = new InstanceJvmMemoryNoheapMaxIndicator();
- indicator.setTimeBucket(toTimeBucketInMonth());
indicator.setEntityId(this.getEntityId());
indicator.setServiceInstanceId(this.getServiceInstanceId());
indicator.setSummation(this.getSummation());
indicator.setCount(this.getCount());
indicator.setValue(this.getValue());
+ indicator.setTimeBucket(toTimeBucketInMonth());
return indicator;
}
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 272e34019..8b6dcfee7 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
@@ -56,7 +56,6 @@
return result;
}
-
@Override public int remoteHashCode() {
int result = 17;
result = 31 * result + entityId.hashCode();
@@ -115,33 +114,33 @@
@Override
public Indicator toHour() {
ServiceRelationClientCallSlaIndicator indicator = new ServiceRelationClientCallSlaIndicator();
- indicator.setTimeBucket(toTimeBucketInHour());
indicator.setEntityId(this.getEntityId());
indicator.setTotal(this.getTotal());
indicator.setPercentage(this.getPercentage());
indicator.setMatch(this.getMatch());
+ indicator.setTimeBucket(toTimeBucketInHour());
return indicator;
}
@Override
public Indicator toDay() {
ServiceRelationClientCallSlaIndicator indicator = new ServiceRelationClientCallSlaIndicator();
- indicator.setTimeBucket(toTimeBucketInDay());
indicator.setEntityId(this.getEntityId());
indicator.setTotal(this.getTotal());
indicator.setPercentage(this.getPercentage());
indicator.setMatch(this.getMatch());
+ indicator.setTimeBucket(toTimeBucketInDay());
return indicator;
}
@Override
public Indicator toMonth() {
ServiceRelationClientCallSlaIndicator indicator = new ServiceRelationClientCallSlaIndicator();
- indicator.setTimeBucket(toTimeBucketInMonth());
indicator.setEntityId(this.getEntityId());
indicator.setTotal(this.getTotal());
indicator.setPercentage(this.getPercentage());
indicator.setMatch(this.getMatch());
+ indicator.setTimeBucket(toTimeBucketInMonth());
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 ad1c6776a..db444a98e 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
@@ -56,7 +56,6 @@
return result;
}
-
@Override public int remoteHashCode() {
int result = 17;
result = 31 * result + entityId.hashCode();
@@ -113,30 +112,30 @@
@Override
public Indicator toHour() {
ServiceRelationClientCpmIndicator indicator = new ServiceRelationClientCpmIndicator();
- indicator.setTimeBucket(toTimeBucketInHour());
indicator.setEntityId(this.getEntityId());
indicator.setValue(this.getValue());
indicator.setTotal(this.getTotal());
+ indicator.setTimeBucket(toTimeBucketInHour());
return indicator;
}
@Override
public Indicator toDay() {
ServiceRelationClientCpmIndicator indicator = new ServiceRelationClientCpmIndicator();
- indicator.setTimeBucket(toTimeBucketInDay());
indicator.setEntityId(this.getEntityId());
indicator.setValue(this.getValue());
indicator.setTotal(this.getTotal());
+ indicator.setTimeBucket(toTimeBucketInDay());
return indicator;
}
@Override
public Indicator toMonth() {
ServiceRelationClientCpmIndicator indicator = new ServiceRelationClientCpmIndicator();
- indicator.setTimeBucket(toTimeBucketInMonth());
indicator.setEntityId(this.getEntityId());
indicator.setValue(this.getValue());
indicator.setTotal(this.getTotal());
+ indicator.setTimeBucket(toTimeBucketInMonth());
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 2f536b803..b866cc987 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
@@ -56,7 +56,6 @@
return result;
}
-
@Override public int remoteHashCode() {
int result = 17;
result = 31 * result + entityId.hashCode();
@@ -115,33 +114,33 @@
@Override
public Indicator toHour() {
ServiceRelationClientRespTimeIndicator indicator = new ServiceRelationClientRespTimeIndicator();
- indicator.setTimeBucket(toTimeBucketInHour());
indicator.setEntityId(this.getEntityId());
indicator.setSummation(this.getSummation());
indicator.setCount(this.getCount());
indicator.setValue(this.getValue());
+ indicator.setTimeBucket(toTimeBucketInHour());
return indicator;
}
@Override
public Indicator toDay() {
ServiceRelationClientRespTimeIndicator indicator = new ServiceRelationClientRespTimeIndicator();
- indicator.setTimeBucket(toTimeBucketInDay());
indicator.setEntityId(this.getEntityId());
indicator.setSummation(this.getSummation());
indicator.setCount(this.getCount());
indicator.setValue(this.getValue());
+ indicator.setTimeBucket(toTimeBucketInDay());
return indicator;
}
@Override
public Indicator toMonth() {
ServiceRelationClientRespTimeIndicator indicator = new ServiceRelationClientRespTimeIndicator();
- indicator.setTimeBucket(toTimeBucketInMonth());
indicator.setEntityId(this.getEntityId());
indicator.setSummation(this.getSummation());
indicator.setCount(this.getCount());
indicator.setValue(this.getValue());
+ indicator.setTimeBucket(toTimeBucketInMonth());
return indicator;
}
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 159b7eadf..cd9e529d4 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
@@ -56,7 +56,6 @@
return result;
}
-
@Override public int remoteHashCode() {
int result = 17;
result = 31 * result + entityId.hashCode();
@@ -115,33 +114,33 @@
@Override
public Indicator toHour() {
ServiceRelationServerCallSlaIndicator indicator = new ServiceRelationServerCallSlaIndicator();
- indicator.setTimeBucket(toTimeBucketInHour());
indicator.setEntityId(this.getEntityId());
indicator.setTotal(this.getTotal());
indicator.setPercentage(this.getPercentage());
indicator.setMatch(this.getMatch());
+ indicator.setTimeBucket(toTimeBucketInHour());
return indicator;
}
@Override
public Indicator toDay() {
ServiceRelationServerCallSlaIndicator indicator = new ServiceRelationServerCallSlaIndicator();
- indicator.setTimeBucket(toTimeBucketInDay());
indicator.setEntityId(this.getEntityId());
indicator.setTotal(this.getTotal());
indicator.setPercentage(this.getPercentage());
indicator.setMatch(this.getMatch());
+ indicator.setTimeBucket(toTimeBucketInDay());
return indicator;
}
@Override
public Indicator toMonth() {
ServiceRelationServerCallSlaIndicator indicator = new ServiceRelationServerCallSlaIndicator();
- indicator.setTimeBucket(toTimeBucketInMonth());
indicator.setEntityId(this.getEntityId());
indicator.setTotal(this.getTotal());
indicator.setPercentage(this.getPercentage());
indicator.setMatch(this.getMatch());
+ indicator.setTimeBucket(toTimeBucketInMonth());
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 8255b7f91..8ee49210b 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
@@ -56,7 +56,6 @@
return result;
}
-
@Override public int remoteHashCode() {
int result = 17;
result = 31 * result + entityId.hashCode();
@@ -113,30 +112,30 @@
@Override
public Indicator toHour() {
ServiceRelationServerCpmIndicator indicator = new ServiceRelationServerCpmIndicator();
- indicator.setTimeBucket(toTimeBucketInHour());
indicator.setEntityId(this.getEntityId());
indicator.setValue(this.getValue());
indicator.setTotal(this.getTotal());
+ indicator.setTimeBucket(toTimeBucketInHour());
return indicator;
}
@Override
public Indicator toDay() {
ServiceRelationServerCpmIndicator indicator = new ServiceRelationServerCpmIndicator();
- indicator.setTimeBucket(toTimeBucketInDay());
indicator.setEntityId(this.getEntityId());
indicator.setValue(this.getValue());
indicator.setTotal(this.getTotal());
+ indicator.setTimeBucket(toTimeBucketInDay());
return indicator;
}
@Override
public Indicator toMonth() {
ServiceRelationServerCpmIndicator indicator = new ServiceRelationServerCpmIndicator();
- indicator.setTimeBucket(toTimeBucketInMonth());
indicator.setEntityId(this.getEntityId());
indicator.setValue(this.getValue());
indicator.setTotal(this.getTotal());
+ indicator.setTimeBucket(toTimeBucketInMonth());
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 ffc9d53b5..d87ec4060 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
@@ -56,7 +56,6 @@
return result;
}
-
@Override public int remoteHashCode() {
int result = 17;
result = 31 * result + entityId.hashCode();
@@ -115,33 +114,33 @@
@Override
public Indicator toHour() {
ServiceRelationServerRespTimeIndicator indicator = new ServiceRelationServerRespTimeIndicator();
- indicator.setTimeBucket(toTimeBucketInHour());
indicator.setEntityId(this.getEntityId());
indicator.setSummation(this.getSummation());
indicator.setCount(this.getCount());
indicator.setValue(this.getValue());
+ indicator.setTimeBucket(toTimeBucketInHour());
return indicator;
}
@Override
public Indicator toDay() {
ServiceRelationServerRespTimeIndicator indicator = new ServiceRelationServerRespTimeIndicator();
- indicator.setTimeBucket(toTimeBucketInDay());
indicator.setEntityId(this.getEntityId());
indicator.setSummation(this.getSummation());
indicator.setCount(this.getCount());
indicator.setValue(this.getValue());
+ indicator.setTimeBucket(toTimeBucketInDay());
return indicator;
}
@Override
public Indicator toMonth() {
ServiceRelationServerRespTimeIndicator indicator = new ServiceRelationServerRespTimeIndicator();
- indicator.setTimeBucket(toTimeBucketInMonth());
indicator.setEntityId(this.getEntityId());
indicator.setSummation(this.getSummation());
indicator.setCount(this.getCount());
indicator.setValue(this.getValue());
+ indicator.setTimeBucket(toTimeBucketInMonth());
return indicator;
}
diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/indicator/Indicator.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/indicator/Indicator.java
index 235d2a107..42d4af1a5 100644
--- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/indicator/Indicator.java
+++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/indicator/Indicator.java
@@ -18,18 +18,17 @@
package org.apache.skywalking.oap.server.core.analysis.indicator;
-import lombok.Getter;
-import lombok.Setter;
+import lombok.*;
import org.apache.skywalking.oap.server.core.remote.data.StreamData;
import org.apache.skywalking.oap.server.core.storage.StorageData;
import org.apache.skywalking.oap.server.core.storage.annotation.Column;
-import org.joda.time.format.DateTimeFormat;
-import org.joda.time.format.DateTimeFormatter;
+import org.joda.time.format.*;
/**
* @author peng-yongsheng
*/
public abstract class Indicator extends StreamData implements StorageData {
+
private static DateTimeFormatter TIME_BUCKET_MONTH_FORMATTER = DateTimeFormat.forPattern("yyyyMM");
public static final String TIME_BUCKET = "time_bucket";
diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/indicator/IntKeyLongValue.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/indicator/IntKeyLongValue.java
index f3fcdc075..cd7d179d5 100644
--- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/indicator/IntKeyLongValue.java
+++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/indicator/IntKeyLongValue.java
@@ -83,4 +83,10 @@ public void deserialize(IntKeyLongValuePair pair) {
this.key = Integer.valueOf(keyValue[0]);
this.value = Long.valueOf(keyValue[1]);
}
+
+ @Override public void copyFrom(Object source) {
+ IntKeyLongValue value = (IntKeyLongValue)source;
+ this.key = value.key;
+ this.value = value.value;
+ }
}
diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/indicator/IntKeyLongValueArray.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/indicator/IntKeyLongValueArray.java
index d102d8515..8f8c7c05e 100644
--- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/indicator/IntKeyLongValueArray.java
+++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/indicator/IntKeyLongValueArray.java
@@ -31,6 +31,10 @@ public IntKeyLongValueArray(int initialCapacity) {
super(initialCapacity);
}
+ public IntKeyLongValueArray() {
+ super(30);
+ }
+
public IntKeyLongValueArray(String data) {
super();
toObject(data);
@@ -56,4 +60,13 @@ public IntKeyLongValueArray(String data) {
this.add(value);
}
}
+
+ @Override public void copyFrom(Object source) {
+ IntKeyLongValueArray valueArray = (IntKeyLongValueArray)source;
+ valueArray.forEach(value -> {
+ IntKeyLongValue newValue = new IntKeyLongValue();
+ newValue.copyFrom(value);
+ this.add(newValue);
+ });
+ }
}
diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/segment/SegmentRecord.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/segment/SegmentRecord.java
index d5a842a5e..12d2496ee 100644
--- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/segment/SegmentRecord.java
+++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/segment/SegmentRecord.java
@@ -32,7 +32,7 @@
* @author peng-yongsheng
*/
@RecordType
-@StorageEntity(name = SegmentRecord.INDEX_NAME, builder = SegmentRecord.Builder.class)
+@StorageEntity(name = SegmentRecord.INDEX_NAME, builder = SegmentRecord.Builder.class, deleteHistory = false)
public class SegmentRecord extends Record {
public static final String INDEX_NAME = "segment";
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 e06e0677d..efecef967 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
@@ -19,7 +19,9 @@
package org.apache.skywalking.oap.server.core.analysis.worker;
import java.util.*;
-import org.apache.skywalking.oap.server.core.analysis.data.MergeDataCache;
+import org.apache.skywalking.apm.commons.datacarrier.DataCarrier;
+import org.apache.skywalking.apm.commons.datacarrier.consumer.IConsumer;
+import org.apache.skywalking.oap.server.core.analysis.data.*;
import org.apache.skywalking.oap.server.core.analysis.indicator.Indicator;
import org.apache.skywalking.oap.server.core.storage.IIndicatorDAO;
import org.apache.skywalking.oap.server.core.worker.AbstractWorker;
@@ -39,6 +41,7 @@
private final MergeDataCache<Indicator> mergeDataCache;
private final IIndicatorDAO indicatorDAO;
private final AbstractWorker<Indicator> nextWorker;
+ private final DataCarrier<Indicator> dataCarrier;
IndicatorPersistentWorker(int workerId, String modelName, int batchSize, ModuleManager moduleManager,
IIndicatorDAO indicatorDAO, AbstractWorker<Indicator> nextWorker) {
@@ -47,6 +50,13 @@
this.mergeDataCache = new MergeDataCache<>();
this.indicatorDAO = indicatorDAO;
this.nextWorker = nextWorker;
+ this.dataCarrier = new DataCarrier<>(1, 10000);
+ this.dataCarrier.consume(new IndicatorPersistentWorker.PersistentConsumer(this), 1);
+ }
+
+ @Override public void in(Indicator indicator) {
+ indicator.setEndOfBatchContext(new EndOfBatchContext(false));
+ dataCarrier.produce(indicator);
}
@Override public MergeDataCache<Indicator> getCache() {
@@ -106,4 +116,38 @@ public boolean flushAndSwitch() {
mergeDataCache.finishWriting();
}
+
+ private class PersistentConsumer implements IConsumer<Indicator> {
+
+ private final IndicatorPersistentWorker persistent;
+
+ private PersistentConsumer(IndicatorPersistentWorker persistent) {
+ this.persistent = persistent;
+ }
+
+ @Override public void init() {
+
+ }
+
+ @Override public void consume(List<Indicator> data) {
+ Iterator<Indicator> inputIterator = data.iterator();
+
+ int i = 0;
+ while (inputIterator.hasNext()) {
+ Indicator indicator = inputIterator.next();
+ i++;
+ if (i == data.size()) {
+ indicator.getEndOfBatchContext().setEndOfBatch(true);
+ }
+ persistent.onWork(indicator);
+ }
+ }
+
+ @Override public void onError(List<Indicator> data, Throwable t) {
+ logger.error(t.getMessage(), t);
+ }
+
+ @Override public void onExit() {
+ }
+ }
}
diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/worker/PersistenceWorker.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/worker/PersistenceWorker.java
index d731c733a..d559ef82c 100644
--- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/worker/PersistenceWorker.java
+++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/worker/PersistenceWorker.java
@@ -41,7 +41,7 @@
this.batchDAO = moduleManager.find(StorageModule.NAME).getService(IBatchDAO.class);
}
- @Override public final void in(INPUT input) {
+ final void onWork(INPUT input) {
if (getCache().currentCollectionSize() >= batchSize) {
try {
if (getCache().trySwitchPointer()) {
diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/worker/RecordPersistentWorker.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/worker/RecordPersistentWorker.java
index ea8a47d2e..8d291d758 100644
--- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/worker/RecordPersistentWorker.java
+++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/worker/RecordPersistentWorker.java
@@ -19,6 +19,8 @@
package org.apache.skywalking.oap.server.core.analysis.worker;
import java.util.*;
+import org.apache.skywalking.apm.commons.datacarrier.DataCarrier;
+import org.apache.skywalking.apm.commons.datacarrier.consumer.IConsumer;
import org.apache.skywalking.oap.server.core.analysis.data.NonMergeDataCache;
import org.apache.skywalking.oap.server.core.analysis.record.Record;
import org.apache.skywalking.oap.server.core.storage.IRecordDAO;
@@ -35,6 +37,7 @@
private final String modelName;
private final NonMergeDataCache<Record> nonMergeDataCache;
private final IRecordDAO recordDAO;
+ private final DataCarrier<Record> dataCarrier;
RecordPersistentWorker(int workerId, String modelName, int batchSize, ModuleManager moduleManager,
IRecordDAO recordDAO) {
@@ -42,6 +45,12 @@
this.modelName = modelName;
this.nonMergeDataCache = new NonMergeDataCache<>();
this.recordDAO = recordDAO;
+ this.dataCarrier = new DataCarrier<>(1, 10000);
+ this.dataCarrier.consume(new RecordPersistentWorker.PersistentConsumer(this), 1);
+ }
+
+ @Override public void in(Record record) {
+ dataCarrier.produce(record);
}
@Override public NonMergeDataCache<Record> getCache() {
@@ -65,4 +74,30 @@
nonMergeDataCache.add(input);
nonMergeDataCache.finishWriting();
}
+
+ private class PersistentConsumer implements IConsumer<Record> {
+
+ private final RecordPersistentWorker persistent;
+
+ private PersistentConsumer(RecordPersistentWorker persistent) {
+ this.persistent = persistent;
+ }
+
+ @Override public void init() {
+
+ }
+
+ @Override public void consume(List<Record> data) {
+ for (Record record : data) {
+ persistent.onWork(record);
+ }
+ }
+
+ @Override public void onError(List<Record> data, Throwable t) {
+ logger.error(t.getMessage(), t);
+ }
+
+ @Override public void onExit() {
+ }
+ }
}
diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/register/EndpointInventory.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/register/EndpointInventory.java
index 7286b0dd1..cb954406b 100644
--- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/register/EndpointInventory.java
+++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/register/EndpointInventory.java
@@ -33,7 +33,7 @@
*/
@InventoryType(scope = Scope.Endpoint)
@StreamData
-@StorageEntity(name = EndpointInventory.MODEL_NAME, builder = EndpointInventory.Builder.class)
+@StorageEntity(name = EndpointInventory.MODEL_NAME, builder = EndpointInventory.Builder.class, deleteHistory = false)
public class EndpointInventory extends RegisterSource {
public static final String MODEL_NAME = "endpoint_inventory";
diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/register/NetworkAddressInventory.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/register/NetworkAddressInventory.java
index 801355ece..8afe1f9b6 100644
--- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/register/NetworkAddressInventory.java
+++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/register/NetworkAddressInventory.java
@@ -33,7 +33,7 @@
*/
@InventoryType(scope = Scope.NetworkAddress)
@StreamData
-@StorageEntity(name = NetworkAddressInventory.MODEL_NAME, builder = NetworkAddressInventory.Builder.class)
+@StorageEntity(name = NetworkAddressInventory.MODEL_NAME, builder = NetworkAddressInventory.Builder.class, deleteHistory = false)
public class NetworkAddressInventory extends RegisterSource {
public static final String MODEL_NAME = "network_address_inventory";
diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/register/ServiceInstanceInventory.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/register/ServiceInstanceInventory.java
index 4f864591f..7e6956c51 100644
--- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/register/ServiceInstanceInventory.java
+++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/register/ServiceInstanceInventory.java
@@ -36,7 +36,7 @@
*/
@InventoryType(scope = Scope.ServiceInstance)
@StreamData
-@StorageEntity(name = ServiceInstanceInventory.MODEL_NAME, builder = ServiceInstanceInventory.Builder.class)
+@StorageEntity(name = ServiceInstanceInventory.MODEL_NAME, builder = ServiceInstanceInventory.Builder.class, deleteHistory = false)
public class ServiceInstanceInventory extends RegisterSource {
public static final String MODEL_NAME = "service_instance_inventory";
diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/register/ServiceInventory.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/register/ServiceInventory.java
index 978fb8bce..7e195ba58 100644
--- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/register/ServiceInventory.java
+++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/register/ServiceInventory.java
@@ -34,7 +34,7 @@
*/
@InventoryType(scope = Scope.Service)
@StreamData
-@StorageEntity(name = ServiceInventory.MODEL_NAME, builder = ServiceInventory.Builder.class)
+@StorageEntity(name = ServiceInventory.MODEL_NAME, builder = ServiceInventory.Builder.class, deleteHistory = false)
public class ServiceInventory extends RegisterSource {
public static final String MODEL_NAME = "service_inventory";
diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/remote/RemoteSenderService.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/remote/RemoteSenderService.java
index d05fcb265..e91e45e2f 100644
--- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/remote/RemoteSenderService.java
+++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/remote/RemoteSenderService.java
@@ -19,8 +19,8 @@
package org.apache.skywalking.oap.server.core.remote;
import org.apache.skywalking.oap.server.core.CoreModule;
-import org.apache.skywalking.oap.server.core.remote.data.StreamData;
import org.apache.skywalking.oap.server.core.remote.client.*;
+import org.apache.skywalking.oap.server.core.remote.data.StreamData;
import org.apache.skywalking.oap.server.core.remote.selector.*;
import org.apache.skywalking.oap.server.library.module.*;
@@ -49,12 +49,15 @@ public void send(int nextWorkId, StreamData streamData, Selector selector) {
case HashCode:
remoteClient = hashCodeSelector.select(clientManager.getRemoteClient(), streamData);
remoteClient.push(nextWorkId, streamData);
+ break;
case Rolling:
remoteClient = rollingSelector.select(clientManager.getRemoteClient(), streamData);
remoteClient.push(nextWorkId, streamData);
+ break;
case ForeverFirst:
remoteClient = foreverFirstSelector.select(clientManager.getRemoteClient(), streamData);
remoteClient.push(nextWorkId, streamData);
+ break;
}
}
}
diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/IHistoryDeleteDAO.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/IHistoryDeleteDAO.java
new file mode 100644
index 000000000..382d7dd67
--- /dev/null
+++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/IHistoryDeleteDAO.java
@@ -0,0 +1,29 @@
+/*
+ * 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.storage;
+
+import java.io.IOException;
+
+/**
+ * @author peng-yongsheng
+ */
+public interface IHistoryDeleteDAO extends DAO {
+
+ void deleteHistory(String modelName, String timeBucketColumnName, Long timeBucketBefore) throws IOException;
+}
diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/IIndicatorDAO.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/IIndicatorDAO.java
index 3dbf34806..146ac0af0 100644
--- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/IIndicatorDAO.java
+++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/IIndicatorDAO.java
@@ -31,6 +31,4 @@
INSERT prepareBatchInsert(String modelName, Indicator indicator) throws IOException;
UPDATE prepareBatchUpdate(String modelName, Indicator indicator) throws IOException;
-
- void deleteHistory(String modelName, Long timeBucketBefore);
}
diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/IRecordDAO.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/IRecordDAO.java
index d5e156f39..0b4488404 100644
--- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/IRecordDAO.java
+++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/IRecordDAO.java
@@ -27,6 +27,4 @@
public interface IRecordDAO<INSERT> extends DAO {
INSERT prepareBatchInsert(String modelName, Record record) throws IOException;
-
- void deleteHistory(String modelName, Long timeBucketBefore);
}
diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/StorageModule.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/StorageModule.java
index 488661f4e..1665cc12f 100644
--- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/StorageModule.java
+++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/StorageModule.java
@@ -36,6 +36,7 @@
@Override public Class[] services() {
return new Class[] {
IBatchDAO.class, StorageDAO.class, IRegisterLockDAO.class,
+ IHistoryDeleteDAO.class,
IServiceInventoryCacheDAO.class, IServiceInstanceInventoryCacheDAO.class,
IEndpointInventoryCacheDAO.class, INetworkAddressInventoryCacheDAO.class,
ITopologyQueryDAO.class, IMetricQueryDAO.class, ITraceQueryDAO.class, IMetadataQueryDAO.class, IAggregationQueryDAO.class, IAlarmQueryDAO.class};
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 a728e1e87..0ca3b82bc 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
@@ -48,11 +48,12 @@ public StorageAnnotationListener() {
logger.info("The owner class of storage annotation, class name: {}", aClass.getName());
String modelName = StorageEntityAnnotationUtils.getModelName(aClass);
+ boolean deleteHistory = StorageEntityAnnotationUtils.getDeleteHistory(aClass);
boolean isIndicator = IndicatorAnnotationUtils.isIndicator(aClass);
List<ModelColumn> modelColumns = new LinkedList<>();
retrieval(aClass, modelName, modelColumns);
- models.add(new Model(modelName, modelColumns, isIndicator));
+ models.add(new Model(modelName, modelColumns, isIndicator, deleteHistory));
}
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/annotation/StorageEntity.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/annotation/StorageEntity.java
index 7bf8cab97..d3e77f488 100644
--- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/annotation/StorageEntity.java
+++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/annotation/StorageEntity.java
@@ -30,4 +30,6 @@
String name();
Class<? extends StorageBuilder> builder();
+
+ boolean deleteHistory() default true;
}
diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/annotation/StorageEntityAnnotationUtils.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/annotation/StorageEntityAnnotationUtils.java
index b754039de..b271d91fa 100644
--- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/annotation/StorageEntityAnnotationUtils.java
+++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/annotation/StorageEntityAnnotationUtils.java
@@ -35,6 +35,15 @@ public static String getModelName(Class aClass) {
}
}
+ public static boolean getDeleteHistory(Class aClass) {
+ if (aClass.isAnnotationPresent(StorageEntity.class)) {
+ StorageEntity annotation = (StorageEntity)aClass.getAnnotation(StorageEntity.class);
+ return annotation.deleteHistory();
+ } else {
+ throw new UnexpectedException("");
+ }
+ }
+
public static Class<? extends StorageBuilder> getBuilder(Class aClass) {
if (aClass.isAnnotationPresent(StorageEntity.class)) {
StorageEntity annotation = (StorageEntity)aClass.getAnnotation(StorageEntity.class);
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 0c2dc4726..6a2a854bc 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
@@ -28,15 +28,17 @@
public class Model {
private final String name;
private final boolean isIndicator;
+ private final boolean deleteHistory;
private final List<ModelColumn> columns;
- public Model(String name, List<ModelColumn> columns, boolean isIndicator) {
+ public Model(String name, List<ModelColumn> columns, boolean isIndicator, boolean deleteHistory) {
this.name = name;
this.columns = columns;
this.isIndicator = isIndicator;
+ this.deleteHistory = deleteHistory;
}
public Model copy(String name) {
- return new Model(name, columns, isIndicator);
+ return new Model(name, columns, isIndicator, deleteHistory);
}
}
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 681ed738b..bba466b4f 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
@@ -58,11 +58,11 @@ public final void install(Client client) throws StorageException {
}
}
});
- models.addAll(downsamplingModels);
+ downsamplingModels.addAll(models);
boolean debug = System.getProperty("debug") != null;
- for (Model model : models) {
+ for (Model model : downsamplingModels) {
if (!isExists(client, model)) {
logger.info("table: {} not exists", model.getName());
createTable(client, model);
diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/ttl/DataTTLKeeperTimer.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/ttl/DataTTLKeeperTimer.java
new file mode 100644
index 000000000..98a08b3eb
--- /dev/null
+++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/ttl/DataTTLKeeperTimer.java
@@ -0,0 +1,122 @@
+/*
+ * 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.storage.ttl;
+
+import java.io.IOException;
+import java.util.List;
+import java.util.concurrent.*;
+import lombok.Setter;
+import org.apache.skywalking.apm.util.RunnableWithExceptionProtection;
+import org.apache.skywalking.oap.server.core.*;
+import org.apache.skywalking.oap.server.core.analysis.indicator.Indicator;
+import org.apache.skywalking.oap.server.core.analysis.record.Record;
+import org.apache.skywalking.oap.server.core.cluster.*;
+import org.apache.skywalking.oap.server.core.config.DownsamplingConfigService;
+import org.apache.skywalking.oap.server.core.storage.*;
+import org.apache.skywalking.oap.server.core.storage.model.*;
+import org.apache.skywalking.oap.server.library.module.ModuleManager;
+import org.apache.skywalking.oap.server.library.util.CollectionUtils;
+import org.joda.time.DateTime;
+import org.slf4j.*;
+
+/**
+ * @author peng-yongsheng
+ */
+public enum DataTTLKeeperTimer {
+ INSTANCE;
+
+ private static final Logger logger = LoggerFactory.getLogger(DataTTLKeeperTimer.class);
+
+ private ModuleManager moduleManager;
+ private ClusterNodesQuery clusterNodesQuery;
+ @Setter private DataTTL dataTTL;
+
+ public void start(ModuleManager moduleManager) {
+ this.moduleManager = moduleManager;
+ this.clusterNodesQuery = moduleManager.find(ClusterModule.NAME).getService(ClusterNodesQuery.class);
+
+ Executors.newSingleThreadScheduledExecutor().scheduleAtFixedRate(
+ new RunnableWithExceptionProtection(this::delete,
+ t -> logger.error("Remove data in background failure.", t)), 1, 5, TimeUnit.MINUTES);
+ }
+
+ private void delete() {
+ List<RemoteInstance> remoteInstances = clusterNodesQuery.queryRemoteNodes();
+ if (CollectionUtils.isNotEmpty(remoteInstances) && !remoteInstances.get(0).isSelf()) {
+ logger.info("The selected first address is {}. Skip.", remoteInstances.get(0).toString());
+ return;
+ }
+
+ TimeBuckets timeBuckets = convertTimeBucket(new DateTime());
+ logger.info("Beginning to remove expired metrics from the storage.");
+ logger.info("Metrics in minute dimension before {}, are going to be removed.", timeBuckets.minuteTimeBucketBefore);
+ logger.info("Metrics in hour dimension before {}, are going to be removed.", timeBuckets.hourTimeBucketBefore);
+ logger.info("Metrics in day dimension before {}, are going to be removed.", timeBuckets.dayTimeBucketBefore);
+ logger.info("Metrics in month dimension before {}, are going to be removed.", timeBuckets.monthTimeBucketBefore);
+
+ IModelGetter modelGetter = moduleManager.find(CoreModule.NAME).getService(IModelGetter.class);
+ DownsamplingConfigService downsamplingConfigService = moduleManager.find(CoreModule.NAME).getService(DownsamplingConfigService.class);
+ List<Model> models = modelGetter.getModels();
+ models.forEach(model -> {
+ if (model.isIndicator()) {
+ execute(model.getName(), timeBuckets.minuteTimeBucketBefore, Indicator.TIME_BUCKET);
+
+ if (downsamplingConfigService.shouldToHour()) {
+ execute(model.getName() + Const.ID_SPLIT + Downsampling.Hour.getName(), timeBuckets.hourTimeBucketBefore, Indicator.TIME_BUCKET);
+ }
+ if (downsamplingConfigService.shouldToDay()) {
+ execute(model.getName() + Const.ID_SPLIT + Downsampling.Day.getName(), timeBuckets.dayTimeBucketBefore, Indicator.TIME_BUCKET);
+ }
+ if (downsamplingConfigService.shouldToMonth()) {
+ execute(model.getName() + Const.ID_SPLIT + Downsampling.Month.getName(), timeBuckets.monthTimeBucketBefore, Indicator.TIME_BUCKET);
+ }
+ } else {
+ execute(model.getName(), timeBuckets.recordDataTTL, Record.TIME_BUCKET);
+ }
+ });
+ }
+
+ TimeBuckets convertTimeBucket(DateTime currentTime) {
+ TimeBuckets timeBuckets = new TimeBuckets();
+
+ timeBuckets.recordDataTTL = Long.valueOf(currentTime.plusMinutes(0 - dataTTL.getRecordDataTTL()).toString("yyyyMMddHHmm"));
+ timeBuckets.minuteTimeBucketBefore = Long.valueOf(currentTime.plusMinutes(0 - dataTTL.getMinuteMetricsDataTTL()).toString("yyyyMMddHHmm"));
+ timeBuckets.hourTimeBucketBefore = Long.valueOf(currentTime.plusHours(0 - dataTTL.getHourMetricsDataTTL()).toString("yyyyMMddHH"));
+ timeBuckets.dayTimeBucketBefore = Long.valueOf(currentTime.plusDays(0 - dataTTL.getDayMetricsDataTTL()).toString("yyyyMMdd"));
+ timeBuckets.monthTimeBucketBefore = Long.valueOf(currentTime.plusMonths(0 - dataTTL.getMonthMetricsDataTTL()).toString("yyyyMM"));
+
+ return timeBuckets;
+ }
+
+ private void execute(String modelName, long timeBucketBefore, String timeBucketColumnName) {
+ try {
+ moduleManager.find(StorageModule.NAME).getService(IHistoryDeleteDAO.class).deleteHistory(modelName, timeBucketColumnName, timeBucketBefore);
+ } catch (IOException e) {
+ logger.warn("History delete failure, error message: {}", e.getMessage());
+ }
+ }
+
+ class TimeBuckets {
+ private long recordDataTTL;
+ private long minuteTimeBucketBefore;
+ private long hourTimeBucketBefore;
+ private long dayTimeBucketBefore;
+ private long monthTimeBucketBefore;
+ }
+}
\ No newline at end of file
diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/type/StorageDataType.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/type/StorageDataType.java
index 4545d9e0f..7b440d5f3 100644
--- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/type/StorageDataType.java
+++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/type/StorageDataType.java
@@ -26,4 +26,6 @@
String toStorageData();
void toObject(String data);
+
+ void copyFrom(Object source);
}
diff --git a/oap-server/server-library/library-client/src/main/java/org/apache/skywalking/oap/server/library/client/elasticsearch/ElasticSearchClient.java b/oap-server/server-library/library-client/src/main/java/org/apache/skywalking/oap/server/library/client/elasticsearch/ElasticSearchClient.java
index 7dd9adf6c..45df02479 100644
--- a/oap-server/server-library/library-client/src/main/java/org/apache/skywalking/oap/server/library/client/elasticsearch/ElasticSearchClient.java
+++ b/oap-server/server-library/library-client/src/main/java/org/apache/skywalking/oap/server/library/client/elasticsearch/ElasticSearchClient.java
@@ -166,22 +166,21 @@ public UpdateRequest prepareUpdate(String indexName, String id, XContentBuilder
return new UpdateRequest(indexName, TYPE, id).doc(source);
}
- public void delete(String indexName, String timeBucketColumnName, long startTimeBucket,
- long endTimeBucket) throws IOException {
+ public int delete(String indexName, String timeBucketColumnName, long endTimeBucket) throws IOException {
indexName = formatIndexName(indexName);
- Map<String, String> params = Collections.singletonMap("pretty", "true");
+ Map<String, String> params = Collections.singletonMap("conflicts", "proceed");
String jsonString = "{" +
" \"query\": {" +
" \"range\": {" +
" \"" + timeBucketColumnName + "\": {" +
- " \"gte\": " + startTimeBucket + "," +
- " \"lte\": " + endTimeBucket + "" +
+ " \"lte\": " + endTimeBucket +
" }" +
" }" +
" }" +
"}";
HttpEntity entity = new NStringEntity(jsonString, ContentType.APPLICATION_JSON);
- client.getLowLevelClient().performRequest("POST", "/" + indexName + "/_delete_by_query", params, entity);
+ Response response = client.getLowLevelClient().performRequest("POST", "/" + indexName + "/_delete_by_query", params, entity);
+ return response.getStatusLine().getStatusCode();
}
private String formatIndexName(String indexName) {
diff --git a/oap-server/server-starter/src/main/resources/application.yml b/oap-server/server-starter/src/main/resources/application.yml
index ae772c790..9fac3e79b 100644
--- a/oap-server/server-starter/src/main/resources/application.yml
+++ b/oap-server/server-starter/src/main/resources/application.yml
@@ -34,9 +34,15 @@ core:
gRPCHost: 0.0.0.0
gRPCPort: 11800
downsampling:
- - Hour
- - Day
- - Month
+ - Hour
+ - Day
+ - Month
+ # Set a timeout on metric data. After the timeout has expired, the metric data will automatically be deleted.
+ recordDataTTL: 90 # Unit is minute
+ minuteMetricsDataTTL: 90 # Unit is minute
+ hourMetricsDataTTL: 36 # Unit is hour
+ dayMetricsDataTTL: 45 # Unit is day
+ monthMetricsDataTTL: 18 # Unit is month
storage:
elasticsearch:
clusterNodes: localhost:9200
@@ -47,12 +53,6 @@ storage:
bulkSize: 20 # flush the bulk every 20mb
flushInterval: 10 # flush the bulk every 10 seconds whatever the number of requests
concurrentRequests: 2 # the number of concurrent requests
- # Set a timeout on metric data. After the timeout has expired, the metric data will automatically be deleted.
- traceDataTTL: 90 # Unit is minute
- minuteMetricDataTTL: 90 # Unit is minute
- hourMetricDataTTL: 36 # Unit is hour
- dayMetricDataTTL: 45 # Unit is day
- monthMetricDataTTL: 18 # Unit is month
receiver-register:
default:
receiver-trace:
diff --git a/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/StorageModuleElasticsearchProvider.java b/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/StorageModuleElasticsearchProvider.java
index e6b9eb453..40d5416e2 100644
--- a/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/StorageModuleElasticsearchProvider.java
+++ b/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/StorageModuleElasticsearchProvider.java
@@ -69,6 +69,7 @@ public void prepare() throws ServiceNotProvidedException {
this.registerServiceImplementation(IBatchDAO.class, new BatchProcessEsDAO(elasticSearchClient, config.getBulkActions(), config.getBulkSize(), config.getFlushInterval(), config.getConcurrentRequests()));
this.registerServiceImplementation(StorageDAO.class, new StorageEsDAO(elasticSearchClient));
this.registerServiceImplementation(IRegisterLockDAO.class, new RegisterLockDAOImpl(elasticSearchClient, 1000));
+ this.registerServiceImplementation(IHistoryDeleteDAO.class, new HistoryDeleteEsDAO(elasticSearchClient));
this.registerServiceImplementation(IServiceInventoryCacheDAO.class, new ServiceInventoryCacheEsDAO(elasticSearchClient));
this.registerServiceImplementation(IServiceInstanceInventoryCacheDAO.class, new ServiceInstanceInventoryCacheDAO(elasticSearchClient));
diff --git a/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/base/HistoryDeleteEsDAO.java b/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/base/HistoryDeleteEsDAO.java
new file mode 100644
index 000000000..d105fddd2
--- /dev/null
+++ b/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/base/HistoryDeleteEsDAO.java
@@ -0,0 +1,45 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package org.apache.skywalking.oap.server.storage.plugin.elasticsearch.base;
+
+import java.io.IOException;
+import org.apache.skywalking.oap.server.core.analysis.indicator.Indicator;
+import org.apache.skywalking.oap.server.core.storage.IHistoryDeleteDAO;
+import org.apache.skywalking.oap.server.library.client.elasticsearch.ElasticSearchClient;
+import org.slf4j.*;
+
+/**
+ * @author peng-yongsheng
+ */
+public class HistoryDeleteEsDAO extends EsDAO implements IHistoryDeleteDAO {
+
+ private static final Logger logger = LoggerFactory.getLogger(HistoryDeleteEsDAO.class);
+
+ public HistoryDeleteEsDAO(ElasticSearchClient client) {
+ super(client);
+ }
+
+ @Override
+ public void deleteHistory(String modelName, String timeBucketColumnName, Long timeBucketBefore) throws IOException {
+ int statusCode = getClient().delete(modelName, Indicator.TIME_BUCKET, timeBucketBefore);
+ if (logger.isDebugEnabled()) {
+ logger.debug("Delete history from {} index, status code {}", modelName, statusCode);
+ }
+ }
+}
diff --git a/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/base/IndicatorEsDAO.java b/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/base/IndicatorEsDAO.java
index 8bfb6d46b..6e855d645 100644
--- a/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/base/IndicatorEsDAO.java
+++ b/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/base/IndicatorEsDAO.java
@@ -28,12 +28,15 @@
import org.elasticsearch.action.index.IndexRequest;
import org.elasticsearch.action.update.UpdateRequest;
import org.elasticsearch.common.xcontent.*;
+import org.slf4j.*;
/**
* @author peng-yongsheng
*/
public class IndicatorEsDAO extends EsDAO implements IIndicatorDAO<IndexRequest, UpdateRequest> {
+ private static final Logger logger = LoggerFactory.getLogger(IndicatorEsDAO.class);
+
private final StorageBuilder<Indicator> storageBuilder;
public IndicatorEsDAO(ElasticSearchClient client, StorageBuilder<Indicator> storageBuilder) {
@@ -81,7 +84,4 @@ public IndicatorEsDAO(ElasticSearchClient client, StorageBuilder<Indicator> stor
builder.endObject();
return getClient().prepareUpdate(modelName, indicator.id(), builder);
}
-
- @Override public void deleteHistory(String modelName, Long timeBucketBefore) {
- }
}
diff --git a/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/base/RecordEsDAO.java b/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/base/RecordEsDAO.java
index bec4cabaf..4a1c1d47c 100644
--- a/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/base/RecordEsDAO.java
+++ b/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/base/RecordEsDAO.java
@@ -54,7 +54,4 @@ public RecordEsDAO(ElasticSearchClient client, StorageBuilder<Record> storageBui
builder.endObject();
return getClient().prepareInsert(modelName, record.id(), builder);
}
-
- @Override public void deleteHistory(String modelName, Long timeBucketBefore) {
- }
}
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services