You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@skywalking.apache.org by wu...@apache.org on 2018/09/11 03:07:11 UTC
[incubator-skywalking] branch extend-indicator updated: Fix CI and
add P99/95/90/75/50 to source ALL.
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch extend-indicator
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking.git
The following commit(s) were added to refs/heads/extend-indicator by this push:
new b0f48e6 Fix CI and add P99/95/90/75/50 to source ALL.
b0f48e6 is described below
commit b0f48e6d9c91d655f23edc30220b981fb112bb01
Author: Wu Sheng <wu...@foxmail.com>
AuthorDate: Tue Sep 11 11:07:05 2018 +0800
Fix CI and add P99/95/90/75/50 to source ALL.
---
.../core/analysis/generated/all/AllDispatcher.java | 38 +++++++++++++++++++++-
.../{AllP99Indicator.java => AllP50Indicator.java} | 18 +++++-----
.../{AllP99Indicator.java => AllP75Indicator.java} | 18 +++++-----
.../{AllP99Indicator.java => AllP90Indicator.java} | 18 +++++-----
.../{AllP99Indicator.java => AllP95Indicator.java} | 18 +++++-----
.../analysis/generated/all/AllP99Indicator.java | 2 --
.../core/analysis/indicator/PxxIndicator.java | 3 --
7 files changed, 69 insertions(+), 46 deletions(-)
diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/all/AllDispatcher.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/all/AllDispatcher.java
index fbec133..486e518 100644
--- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/all/AllDispatcher.java
+++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/all/AllDispatcher.java
@@ -31,10 +31,46 @@ public class AllDispatcher implements SourceDispatcher<All> {
@Override public void dispatch(All source) {
doAllP99(source);
+ doAllP95(source);
+ doAllP90(source);
+ doAllP75(source);
+ doAllP50(source);
}
private void doAllP99(All source) {
- AllP99Indicator indicator = new AllP99Indicator();
+ AllP99Indicator indicator = new AllP99Indicator();
+
+
+ indicator.setTimeBucket(source.getTimeBucket());
+ indicator.combine(source.getLatency(), 10);
+ IndicatorProcess.INSTANCE.in(indicator);
+ }
+ private void doAllP95(All source) {
+ AllP95Indicator indicator = new AllP95Indicator();
+
+
+ indicator.setTimeBucket(source.getTimeBucket());
+ indicator.combine(source.getLatency(), 10);
+ IndicatorProcess.INSTANCE.in(indicator);
+ }
+ private void doAllP90(All source) {
+ AllP90Indicator indicator = new AllP90Indicator();
+
+
+ indicator.setTimeBucket(source.getTimeBucket());
+ indicator.combine(source.getLatency(), 10);
+ IndicatorProcess.INSTANCE.in(indicator);
+ }
+ private void doAllP75(All source) {
+ AllP75Indicator indicator = new AllP75Indicator();
+
+
+ indicator.setTimeBucket(source.getTimeBucket());
+ indicator.combine(source.getLatency(), 10);
+ IndicatorProcess.INSTANCE.in(indicator);
+ }
+ private void doAllP50(All source) {
+ AllP50Indicator indicator = new AllP50Indicator();
indicator.setTimeBucket(source.getTimeBucket());
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/AllP50Indicator.java
similarity index 87%
copy from oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/all/AllP99Indicator.java
copy to oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/all/AllP50Indicator.java
index 31080ce..6602815 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/AllP50Indicator.java
@@ -19,8 +19,6 @@
package org.apache.skywalking.oap.server.core.analysis.generated.all;
import java.util.*;
-import lombok.*;
-import org.apache.skywalking.oap.server.core.Const;
import org.apache.skywalking.oap.server.core.alarm.AlarmMeta;
import org.apache.skywalking.oap.server.core.alarm.AlarmSupported;
import org.apache.skywalking.oap.server.core.analysis.indicator.*;
@@ -38,8 +36,8 @@ import org.apache.skywalking.oap.server.core.source.Scope;
*/
@IndicatorType
@StreamData
-@StorageEntity(name = "all_p99", builder = AllP99Indicator.Builder.class)
-public class AllP99Indicator extends P99Indicator implements AlarmSupported {
+@StorageEntity(name = "all_p50", builder = AllP50Indicator.Builder.class)
+public class AllP50Indicator extends P50Indicator implements AlarmSupported {
@Override public String id() {
@@ -61,7 +59,7 @@ public class AllP99Indicator extends P99Indicator implements AlarmSupported {
if (getClass() != obj.getClass())
return false;
- AllP99Indicator indicator = (AllP99Indicator)obj;
+ AllP50Indicator indicator = (AllP50Indicator)obj;
if (getTimeBucket() != indicator.getTimeBucket())
return false;
@@ -98,12 +96,12 @@ public class AllP99Indicator extends P99Indicator implements AlarmSupported {
}
@Override public AlarmMeta getAlarmMeta() {
- return new AlarmMeta("All_p99", Scope.All);
+ return new AlarmMeta("All_p50", Scope.All);
}
- public static class Builder implements StorageBuilder<AllP99Indicator> {
+ public static class Builder implements StorageBuilder<AllP50Indicator> {
- @Override public Map<String, Object> data2Map(AllP99Indicator storageData) {
+ @Override public Map<String, Object> data2Map(AllP50Indicator storageData) {
Map<String, Object> map = new HashMap<>();
map.put("value", storageData.getValue());
map.put("precision", storageData.getPrecision());
@@ -112,8 +110,8 @@ public class AllP99Indicator extends P99Indicator implements AlarmSupported {
return map;
}
- @Override public AllP99Indicator map2Data(Map<String, Object> dbMap) {
- AllP99Indicator indicator = new AllP99Indicator();
+ @Override public AllP50Indicator map2Data(Map<String, Object> dbMap) {
+ AllP50Indicator indicator = new AllP50Indicator();
indicator.setValue(((Number)dbMap.get("value")).intValue());
indicator.setPrecision(((Number)dbMap.get("precision")).intValue());
indicator.setDetailGroup((List)dbMap.get("detail_group"));
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/AllP75Indicator.java
similarity index 87%
copy from oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/all/AllP99Indicator.java
copy to oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/all/AllP75Indicator.java
index 31080ce..2a36fa2 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/AllP75Indicator.java
@@ -19,8 +19,6 @@
package org.apache.skywalking.oap.server.core.analysis.generated.all;
import java.util.*;
-import lombok.*;
-import org.apache.skywalking.oap.server.core.Const;
import org.apache.skywalking.oap.server.core.alarm.AlarmMeta;
import org.apache.skywalking.oap.server.core.alarm.AlarmSupported;
import org.apache.skywalking.oap.server.core.analysis.indicator.*;
@@ -38,8 +36,8 @@ import org.apache.skywalking.oap.server.core.source.Scope;
*/
@IndicatorType
@StreamData
-@StorageEntity(name = "all_p99", builder = AllP99Indicator.Builder.class)
-public class AllP99Indicator extends P99Indicator implements AlarmSupported {
+@StorageEntity(name = "all_p75", builder = AllP75Indicator.Builder.class)
+public class AllP75Indicator extends P75Indicator implements AlarmSupported {
@Override public String id() {
@@ -61,7 +59,7 @@ public class AllP99Indicator extends P99Indicator implements AlarmSupported {
if (getClass() != obj.getClass())
return false;
- AllP99Indicator indicator = (AllP99Indicator)obj;
+ AllP75Indicator indicator = (AllP75Indicator)obj;
if (getTimeBucket() != indicator.getTimeBucket())
return false;
@@ -98,12 +96,12 @@ public class AllP99Indicator extends P99Indicator implements AlarmSupported {
}
@Override public AlarmMeta getAlarmMeta() {
- return new AlarmMeta("All_p99", Scope.All);
+ return new AlarmMeta("All_p75", Scope.All);
}
- public static class Builder implements StorageBuilder<AllP99Indicator> {
+ public static class Builder implements StorageBuilder<AllP75Indicator> {
- @Override public Map<String, Object> data2Map(AllP99Indicator storageData) {
+ @Override public Map<String, Object> data2Map(AllP75Indicator storageData) {
Map<String, Object> map = new HashMap<>();
map.put("value", storageData.getValue());
map.put("precision", storageData.getPrecision());
@@ -112,8 +110,8 @@ public class AllP99Indicator extends P99Indicator implements AlarmSupported {
return map;
}
- @Override public AllP99Indicator map2Data(Map<String, Object> dbMap) {
- AllP99Indicator indicator = new AllP99Indicator();
+ @Override public AllP75Indicator map2Data(Map<String, Object> dbMap) {
+ AllP75Indicator indicator = new AllP75Indicator();
indicator.setValue(((Number)dbMap.get("value")).intValue());
indicator.setPrecision(((Number)dbMap.get("precision")).intValue());
indicator.setDetailGroup((List)dbMap.get("detail_group"));
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/AllP90Indicator.java
similarity index 87%
copy from oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/all/AllP99Indicator.java
copy to oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/all/AllP90Indicator.java
index 31080ce..1384e35 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/AllP90Indicator.java
@@ -19,8 +19,6 @@
package org.apache.skywalking.oap.server.core.analysis.generated.all;
import java.util.*;
-import lombok.*;
-import org.apache.skywalking.oap.server.core.Const;
import org.apache.skywalking.oap.server.core.alarm.AlarmMeta;
import org.apache.skywalking.oap.server.core.alarm.AlarmSupported;
import org.apache.skywalking.oap.server.core.analysis.indicator.*;
@@ -38,8 +36,8 @@ import org.apache.skywalking.oap.server.core.source.Scope;
*/
@IndicatorType
@StreamData
-@StorageEntity(name = "all_p99", builder = AllP99Indicator.Builder.class)
-public class AllP99Indicator extends P99Indicator implements AlarmSupported {
+@StorageEntity(name = "all_p90", builder = AllP90Indicator.Builder.class)
+public class AllP90Indicator extends P90Indicator implements AlarmSupported {
@Override public String id() {
@@ -61,7 +59,7 @@ public class AllP99Indicator extends P99Indicator implements AlarmSupported {
if (getClass() != obj.getClass())
return false;
- AllP99Indicator indicator = (AllP99Indicator)obj;
+ AllP90Indicator indicator = (AllP90Indicator)obj;
if (getTimeBucket() != indicator.getTimeBucket())
return false;
@@ -98,12 +96,12 @@ public class AllP99Indicator extends P99Indicator implements AlarmSupported {
}
@Override public AlarmMeta getAlarmMeta() {
- return new AlarmMeta("All_p99", Scope.All);
+ return new AlarmMeta("All_p90", Scope.All);
}
- public static class Builder implements StorageBuilder<AllP99Indicator> {
+ public static class Builder implements StorageBuilder<AllP90Indicator> {
- @Override public Map<String, Object> data2Map(AllP99Indicator storageData) {
+ @Override public Map<String, Object> data2Map(AllP90Indicator storageData) {
Map<String, Object> map = new HashMap<>();
map.put("value", storageData.getValue());
map.put("precision", storageData.getPrecision());
@@ -112,8 +110,8 @@ public class AllP99Indicator extends P99Indicator implements AlarmSupported {
return map;
}
- @Override public AllP99Indicator map2Data(Map<String, Object> dbMap) {
- AllP99Indicator indicator = new AllP99Indicator();
+ @Override public AllP90Indicator map2Data(Map<String, Object> dbMap) {
+ AllP90Indicator indicator = new AllP90Indicator();
indicator.setValue(((Number)dbMap.get("value")).intValue());
indicator.setPrecision(((Number)dbMap.get("precision")).intValue());
indicator.setDetailGroup((List)dbMap.get("detail_group"));
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/AllP95Indicator.java
similarity index 87%
copy from oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/all/AllP99Indicator.java
copy to oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/all/AllP95Indicator.java
index 31080ce..4f6598a 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/AllP95Indicator.java
@@ -19,8 +19,6 @@
package org.apache.skywalking.oap.server.core.analysis.generated.all;
import java.util.*;
-import lombok.*;
-import org.apache.skywalking.oap.server.core.Const;
import org.apache.skywalking.oap.server.core.alarm.AlarmMeta;
import org.apache.skywalking.oap.server.core.alarm.AlarmSupported;
import org.apache.skywalking.oap.server.core.analysis.indicator.*;
@@ -38,8 +36,8 @@ import org.apache.skywalking.oap.server.core.source.Scope;
*/
@IndicatorType
@StreamData
-@StorageEntity(name = "all_p99", builder = AllP99Indicator.Builder.class)
-public class AllP99Indicator extends P99Indicator implements AlarmSupported {
+@StorageEntity(name = "all_p95", builder = AllP95Indicator.Builder.class)
+public class AllP95Indicator extends P95Indicator implements AlarmSupported {
@Override public String id() {
@@ -61,7 +59,7 @@ public class AllP99Indicator extends P99Indicator implements AlarmSupported {
if (getClass() != obj.getClass())
return false;
- AllP99Indicator indicator = (AllP99Indicator)obj;
+ AllP95Indicator indicator = (AllP95Indicator)obj;
if (getTimeBucket() != indicator.getTimeBucket())
return false;
@@ -98,12 +96,12 @@ public class AllP99Indicator extends P99Indicator implements AlarmSupported {
}
@Override public AlarmMeta getAlarmMeta() {
- return new AlarmMeta("All_p99", Scope.All);
+ return new AlarmMeta("All_p95", Scope.All);
}
- public static class Builder implements StorageBuilder<AllP99Indicator> {
+ public static class Builder implements StorageBuilder<AllP95Indicator> {
- @Override public Map<String, Object> data2Map(AllP99Indicator storageData) {
+ @Override public Map<String, Object> data2Map(AllP95Indicator storageData) {
Map<String, Object> map = new HashMap<>();
map.put("value", storageData.getValue());
map.put("precision", storageData.getPrecision());
@@ -112,8 +110,8 @@ public class AllP99Indicator extends P99Indicator implements AlarmSupported {
return map;
}
- @Override public AllP99Indicator map2Data(Map<String, Object> dbMap) {
- AllP99Indicator indicator = new AllP99Indicator();
+ @Override public AllP95Indicator map2Data(Map<String, Object> dbMap) {
+ AllP95Indicator indicator = new AllP95Indicator();
indicator.setValue(((Number)dbMap.get("value")).intValue());
indicator.setPrecision(((Number)dbMap.get("precision")).intValue());
indicator.setDetailGroup((List)dbMap.get("detail_group"));
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 31080ce..1ed1477 100644
--- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/all/AllP99Indicator.java
+++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/all/AllP99Indicator.java
@@ -19,8 +19,6 @@
package org.apache.skywalking.oap.server.core.analysis.generated.all;
import java.util.*;
-import lombok.*;
-import org.apache.skywalking.oap.server.core.Const;
import org.apache.skywalking.oap.server.core.alarm.AlarmMeta;
import org.apache.skywalking.oap.server.core.alarm.AlarmSupported;
import org.apache.skywalking.oap.server.core.analysis.indicator.*;
diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/indicator/PxxIndicator.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/indicator/PxxIndicator.java
index fab4497..282b877 100644
--- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/indicator/PxxIndicator.java
+++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/indicator/PxxIndicator.java
@@ -29,8 +29,6 @@ import org.apache.skywalking.oap.server.core.analysis.indicator.annotation.Arg;
import org.apache.skywalking.oap.server.core.analysis.indicator.annotation.Entrance;
import org.apache.skywalking.oap.server.core.analysis.indicator.annotation.IndicatorOperator;
import org.apache.skywalking.oap.server.core.analysis.indicator.annotation.SourceFrom;
-import org.apache.skywalking.oap.server.core.remote.grpc.proto.IntKeyLongValuePair;
-import org.apache.skywalking.oap.server.core.remote.grpc.proto.RemoteData;
import org.apache.skywalking.oap.server.core.storage.annotation.Column;
/**
@@ -111,7 +109,6 @@ public abstract class PxxIndicator extends Indicator implements IntValueHolder {
return;
}
}
- detailGroup.forEach(element -> RemoteData.newBuilder().addDataIntLongPairList(element.serialize()));
}
@Override