You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@skywalking.apache.org by wu...@apache.org on 2020/04/22 02:14:23 UTC
[skywalking] branch metrics-type updated: Support typeOfMetrics
query.
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch metrics-type
in repository https://gitbox.apache.org/repos/asf/skywalking.git
The following commit(s) were added to refs/heads/metrics-type by this push:
new d31de1d Support typeOfMetrics query.
d31de1d is described below
commit d31de1ddd0acac5848f6d829fb33457eafc750bb
Author: Wu Sheng <wu...@foxmail.com>
AuthorDate: Wed Apr 22 10:12:16 2020 +0800
Support typeOfMetrics query.
---
.../skywalking/oap/server/core/analysis/metrics/ApdexMetrics.java | 2 +-
.../skywalking/oap/server/core/analysis/metrics/CPMMetrics.java | 2 +-
.../skywalking/oap/server/core/analysis/metrics/CountMetrics.java | 2 +-
.../oap/server/core/analysis/metrics/DoubleAvgMetrics.java | 2 +-
.../oap/server/core/analysis/metrics/HistogramMetrics.java | 6 +-----
.../skywalking/oap/server/core/analysis/metrics/LongAvgMetrics.java | 2 +-
.../oap/server/core/analysis/metrics/MaxDoubleMetrics.java | 2 +-
.../skywalking/oap/server/core/analysis/metrics/MaxLongMetrics.java | 2 +-
.../oap/server/core/analysis/metrics/MinDoubleMetrics.java | 2 +-
.../skywalking/oap/server/core/analysis/metrics/MinLongMetrics.java | 2 +-
.../skywalking/oap/server/core/analysis/metrics/PercentMetrics.java | 2 +-
.../oap/server/core/analysis/metrics/PercentileMetrics.java | 6 +-----
.../skywalking/oap/server/core/analysis/metrics/PxxMetrics.java | 2 +-
.../skywalking/oap/server/core/analysis/metrics/SumMetrics.java | 2 +-
.../skywalking/oap/server/core/storage/annotation/Column.java | 3 +++
.../java/org/apache/skywalking/oap/server/core/CoreModuleTest.java | 2 +-
16 files changed, 18 insertions(+), 23 deletions(-)
diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/ApdexMetrics.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/ApdexMetrics.java
index 4ec46e8..583a273 100644
--- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/ApdexMetrics.java
+++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/ApdexMetrics.java
@@ -60,7 +60,7 @@ public abstract class ApdexMetrics extends Metrics implements IntValueHolder {
private int tNum;
@Getter
@Setter
- @Column(columnName = VALUE, isValue = true, function = Function.Avg)
+ @Column(columnName = VALUE, dataType = Column.ValueDataType.COMMON_VALUE, function = Function.Avg)
private int value;
@Entrance
diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/CPMMetrics.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/CPMMetrics.java
index e360b20..56361f1 100644
--- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/CPMMetrics.java
+++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/CPMMetrics.java
@@ -34,7 +34,7 @@ public abstract class CPMMetrics extends Metrics implements LongValueHolder {
@Getter
@Setter
- @Column(columnName = VALUE, isValue = true, function = Function.Avg)
+ @Column(columnName = VALUE, dataType = Column.ValueDataType.COMMON_VALUE, function = Function.Avg)
private long value;
@Getter
@Setter
diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/CountMetrics.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/CountMetrics.java
index 2313fd0..df75eff 100644
--- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/CountMetrics.java
+++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/CountMetrics.java
@@ -33,7 +33,7 @@ public abstract class CountMetrics extends Metrics implements LongValueHolder {
@Getter
@Setter
- @Column(columnName = VALUE, isValue = true, function = Function.Sum)
+ @Column(columnName = VALUE, dataType = Column.ValueDataType.COMMON_VALUE, function = Function.Sum)
private long value;
@Entrance
diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/DoubleAvgMetrics.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/DoubleAvgMetrics.java
index 23bf84c..64ffa32 100644
--- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/DoubleAvgMetrics.java
+++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/DoubleAvgMetrics.java
@@ -44,7 +44,7 @@ public abstract class DoubleAvgMetrics extends Metrics implements DoubleValueHol
private long count;
@Getter
@Setter
- @Column(columnName = VALUE, isValue = true, function = Function.Avg)
+ @Column(columnName = VALUE, dataType = Column.ValueDataType.COMMON_VALUE, function = Function.Avg)
private double value;
@Entrance
diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/HistogramMetrics.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/HistogramMetrics.java
index 12fca97..014ccaf 100644
--- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/HistogramMetrics.java
+++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/HistogramMetrics.java
@@ -39,13 +39,9 @@ public abstract class HistogramMetrics extends Metrics {
public static final String DATASET = "dataset";
- /**
- * The special case when the column is isValue = true, but storageOnly = true, because it is {@link DataTable} type,
- * this column can't be query by the aggregation way.
- */
@Getter
@Setter
- @Column(columnName = DATASET, isValue = true, storageOnly = true)
+ @Column(columnName = DATASET, dataType = Column.ValueDataType.HISTOGRAM, storageOnly = true)
private DataTable dataset = new DataTable(30);
/**
diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/LongAvgMetrics.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/LongAvgMetrics.java
index e07383b..0298401 100644
--- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/LongAvgMetrics.java
+++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/LongAvgMetrics.java
@@ -44,7 +44,7 @@ public abstract class LongAvgMetrics extends Metrics implements LongValueHolder
private long count;
@Getter
@Setter
- @Column(columnName = VALUE, isValue = true, function = Function.Avg)
+ @Column(columnName = VALUE, dataType = Column.ValueDataType.COMMON_VALUE, function = Function.Avg)
private long value;
@Entrance
diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/MaxDoubleMetrics.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/MaxDoubleMetrics.java
index db8029e..2421881 100644
--- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/MaxDoubleMetrics.java
+++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/MaxDoubleMetrics.java
@@ -32,7 +32,7 @@ public abstract class MaxDoubleMetrics extends Metrics implements DoubleValueHol
@Getter
@Setter
- @Column(columnName = VALUE, isValue = true)
+ @Column(columnName = VALUE, dataType = Column.ValueDataType.COMMON_VALUE)
private double value;
@Entrance
diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/MaxLongMetrics.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/MaxLongMetrics.java
index ff0a8fa..4ddfc42 100644
--- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/MaxLongMetrics.java
+++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/MaxLongMetrics.java
@@ -35,7 +35,7 @@ public abstract class MaxLongMetrics extends Metrics implements LongValueHolder
@Getter
@Setter
- @Column(columnName = VALUE, isValue = true)
+ @Column(columnName = VALUE, dataType = Column.ValueDataType.COMMON_VALUE)
private long value;
@Entrance
diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/MinDoubleMetrics.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/MinDoubleMetrics.java
index d1fa0e3..d9a9a51 100644
--- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/MinDoubleMetrics.java
+++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/MinDoubleMetrics.java
@@ -32,7 +32,7 @@ public abstract class MinDoubleMetrics extends Metrics implements DoubleValueHol
@Getter
@Setter
- @Column(columnName = VALUE, isValue = true)
+ @Column(columnName = VALUE, dataType = Column.ValueDataType.COMMON_VALUE)
private double value = Double.MAX_VALUE;
@Entrance
diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/MinLongMetrics.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/MinLongMetrics.java
index 2f95895..4025ea0 100644
--- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/MinLongMetrics.java
+++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/MinLongMetrics.java
@@ -32,7 +32,7 @@ public abstract class MinLongMetrics extends Metrics implements LongValueHolder
@Getter
@Setter
- @Column(columnName = VALUE, isValue = true)
+ @Column(columnName = VALUE, dataType = Column.ValueDataType.COMMON_VALUE)
private long value = Long.MAX_VALUE;
@Entrance
diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/PercentMetrics.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/PercentMetrics.java
index e4b0d08..eed7afb 100644
--- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/PercentMetrics.java
+++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/PercentMetrics.java
@@ -38,7 +38,7 @@ public abstract class PercentMetrics extends Metrics implements IntValueHolder {
private long total;
@Getter
@Setter
- @Column(columnName = PERCENTAGE, isValue = true, function = Function.Avg)
+ @Column(columnName = PERCENTAGE, dataType = Column.ValueDataType.COMMON_VALUE, function = Function.Avg)
private int percentage;
@Getter
@Setter
diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/PercentileMetrics.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/PercentileMetrics.java
index ac3889d..d14c769 100644
--- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/PercentileMetrics.java
+++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/PercentileMetrics.java
@@ -47,13 +47,9 @@ public abstract class PercentileMetrics extends Metrics implements MultiIntValue
99
};
- /**
- * The special case when the column is isValue = true, but storageOnly = true, because it is {@link DataTable} type,
- * this column can't be query by the aggregation way.
- */
@Getter
@Setter
- @Column(columnName = VALUE, isValue = true, storageOnly = true)
+ @Column(columnName = VALUE, dataType = Column.ValueDataType.LABELED_VALUE, storageOnly = true)
private DataTable percentileValues;
@Getter
@Setter
diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/PxxMetrics.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/PxxMetrics.java
index 1f4f5c5..79da9db 100644
--- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/PxxMetrics.java
+++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/PxxMetrics.java
@@ -43,7 +43,7 @@ public abstract class PxxMetrics extends Metrics implements IntValueHolder {
@Getter
@Setter
- @Column(columnName = VALUE, isValue = true, function = Function.Avg)
+ @Column(columnName = VALUE, dataType = Column.ValueDataType.HISTOGRAM, function = Function.Avg)
private int value;
@Getter
@Setter
diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/SumMetrics.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/SumMetrics.java
index 91044b5..c57791e 100644
--- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/SumMetrics.java
+++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/SumMetrics.java
@@ -33,7 +33,7 @@ public abstract class SumMetrics extends Metrics implements LongValueHolder {
@Getter
@Setter
- @Column(columnName = VALUE, isValue = true, function = Function.Sum)
+ @Column(columnName = VALUE, dataType = Column.ValueDataType.COMMON_VALUE, function = Function.Sum)
private long value;
@Entrance
diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/annotation/Column.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/annotation/Column.java
index ce0b433..364b05e 100644
--- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/annotation/Column.java
+++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/annotation/Column.java
@@ -66,6 +66,9 @@ public @interface Column {
int length() default 200;
/**
+ * Column with data type != {@link ValueDataType#NOT_VALUE} represents this is a value column. Indicate it would be
+ * queried by UI/CLI.
+ *
* @return the data type of this value column. The value column is the query related value Set {@link
* ValueDataType#NOT_VALUE} if this is not the value column, read {@link ValueDataType} for more details.
* @since 8.0.0
diff --git a/oap-server/server-core/src/test/java/org/apache/skywalking/oap/server/core/CoreModuleTest.java b/oap-server/server-core/src/test/java/org/apache/skywalking/oap/server/core/CoreModuleTest.java
index 0094c9a..65d2fb6 100644
--- a/oap-server/server-core/src/test/java/org/apache/skywalking/oap/server/core/CoreModuleTest.java
+++ b/oap-server/server-core/src/test/java/org/apache/skywalking/oap/server/core/CoreModuleTest.java
@@ -26,6 +26,6 @@ public class CoreModuleTest {
public void testOpenServiceList() {
CoreModule coreModule = new CoreModule();
- Assert.assertEquals(27, coreModule.services().length);
+ Assert.assertEquals(28, coreModule.services().length);
}
}