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 2024/01/16 02:25:32 UTC
(skywalking) branch master updated: Remove unnecessary annotations and functions from Meter Functions. (#11781)
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/skywalking.git
The following commit(s) were added to refs/heads/master by this push:
new 811b9c1000 Remove unnecessary annotations and functions from Meter Functions. (#11781)
811b9c1000 is described below
commit 811b9c1000277724762cc372bbd7cb9ecc5c4043
Author: 吴晟 Wu Sheng <wu...@foxmail.com>
AuthorDate: Tue Jan 16 10:25:27 2024 +0800
Remove unnecessary annotations and functions from Meter Functions. (#11781)
---
docs/en/changes/changes.md | 1 +
.../core/analysis/meter/function/avg/AvgFunction.java | 15 +++------------
.../analysis/meter/function/latest/LatestFunction.java | 12 ++----------
.../core/analysis/meter/function/sum/SumFunction.java | 12 ++----------
.../analysis/meter/function/sum/SumLabeledFunction.java | 9 +--------
.../meter/function/sumpermin/SumPerMinFunction.java | 12 ++----------
.../function/sumpermin/SumPerMinLabeledFunction.java | 12 ++----------
.../server/core/analysis/metrics/annotation/Entrance.java | 4 ++++
8 files changed, 17 insertions(+), 60 deletions(-)
diff --git a/docs/en/changes/changes.md b/docs/en/changes/changes.md
index ed5d032240..394b99dc04 100644
--- a/docs/en/changes/changes.md
+++ b/docs/en/changes/changes.md
@@ -21,6 +21,7 @@
* Fix log query by traceId in `JDBCLogQueryDAO`.
* Support handler eBPF access log protocol.
* Fix SumPerMinFunctionTest error function.
+* Remove unnecessary annotations and functions from Meter Functions.
#### UI
diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/meter/function/avg/AvgFunction.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/meter/function/avg/AvgFunction.java
index 254a2627f1..03ef71c22a 100644
--- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/meter/function/avg/AvgFunction.java
+++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/meter/function/avg/AvgFunction.java
@@ -18,6 +18,7 @@
package org.apache.skywalking.oap.server.core.analysis.meter.function.avg;
+import java.util.Objects;
import lombok.Getter;
import lombok.Setter;
import lombok.ToString;
@@ -29,9 +30,6 @@ import org.apache.skywalking.oap.server.core.analysis.meter.function.AcceptableV
import org.apache.skywalking.oap.server.core.analysis.meter.function.MeterFunction;
import org.apache.skywalking.oap.server.core.analysis.metrics.LongValueHolder;
import org.apache.skywalking.oap.server.core.analysis.metrics.Metrics;
-import org.apache.skywalking.oap.server.core.analysis.metrics.annotation.ConstOne;
-import org.apache.skywalking.oap.server.core.analysis.metrics.annotation.Entrance;
-import org.apache.skywalking.oap.server.core.analysis.metrics.annotation.SourceFrom;
import org.apache.skywalking.oap.server.core.query.sql.Function;
import org.apache.skywalking.oap.server.core.remote.grpc.proto.RemoteData;
import org.apache.skywalking.oap.server.core.storage.StorageID;
@@ -41,8 +39,6 @@ import org.apache.skywalking.oap.server.core.storage.type.Convert2Entity;
import org.apache.skywalking.oap.server.core.storage.type.Convert2Storage;
import org.apache.skywalking.oap.server.core.storage.type.StorageBuilder;
-import java.util.Objects;
-
@MeterFunction(functionName = "avg")
@ToString
public abstract class AvgFunction extends Meter implements AcceptableValue<Long>, LongValueHolder {
@@ -80,16 +76,11 @@ public abstract class AvgFunction extends Meter implements AcceptableValue<Long>
@BanyanDB.MeasureField
private long value;
- @Entrance
- public final void combine(@SourceFrom long summation, @ConstOne long count) {
- this.summation += summation;
- this.count += count;
- }
-
@Override
public final boolean combine(Metrics metrics) {
AvgFunction longAvgMetrics = (AvgFunction) metrics;
- combine(longAvgMetrics.summation, longAvgMetrics.count);
+ this.summation += longAvgMetrics.summation;
+ this.count += longAvgMetrics.count;
return true;
}
diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/meter/function/latest/LatestFunction.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/meter/function/latest/LatestFunction.java
index e0f73e4eb3..307acb725c 100644
--- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/meter/function/latest/LatestFunction.java
+++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/meter/function/latest/LatestFunction.java
@@ -18,6 +18,7 @@
package org.apache.skywalking.oap.server.core.analysis.meter.function.latest;
+import java.util.Objects;
import lombok.Getter;
import lombok.Setter;
import lombok.ToString;
@@ -29,8 +30,6 @@ import org.apache.skywalking.oap.server.core.analysis.meter.function.AcceptableV
import org.apache.skywalking.oap.server.core.analysis.meter.function.MeterFunction;
import org.apache.skywalking.oap.server.core.analysis.metrics.LongValueHolder;
import org.apache.skywalking.oap.server.core.analysis.metrics.Metrics;
-import org.apache.skywalking.oap.server.core.analysis.metrics.annotation.Entrance;
-import org.apache.skywalking.oap.server.core.analysis.metrics.annotation.SourceFrom;
import org.apache.skywalking.oap.server.core.query.sql.Function;
import org.apache.skywalking.oap.server.core.remote.grpc.proto.RemoteData;
import org.apache.skywalking.oap.server.core.storage.StorageID;
@@ -40,8 +39,6 @@ import org.apache.skywalking.oap.server.core.storage.type.Convert2Entity;
import org.apache.skywalking.oap.server.core.storage.type.Convert2Storage;
import org.apache.skywalking.oap.server.core.storage.type.StorageBuilder;
-import java.util.Objects;
-
@MeterFunction(functionName = "latest")
@ToString
public abstract class LatestFunction extends Meter implements AcceptableValue<Long>, LongValueHolder {
@@ -74,15 +71,10 @@ public abstract class LatestFunction extends Meter implements AcceptableValue<Lo
this.value = value;
}
- @Entrance
- public final void combine(@SourceFrom long value) {
- this.value = value;
- }
-
@Override
public final boolean combine(Metrics metrics) {
LatestFunction latestFunction = (LatestFunction) metrics;
- combine(latestFunction.value);
+ this.value = latestFunction.value;
return true;
}
diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/meter/function/sum/SumFunction.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/meter/function/sum/SumFunction.java
index fb946dc853..59aa4816cc 100644
--- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/meter/function/sum/SumFunction.java
+++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/meter/function/sum/SumFunction.java
@@ -18,6 +18,7 @@
package org.apache.skywalking.oap.server.core.analysis.meter.function.sum;
+import java.util.Objects;
import lombok.Getter;
import lombok.Setter;
import lombok.ToString;
@@ -29,8 +30,6 @@ import org.apache.skywalking.oap.server.core.analysis.meter.function.AcceptableV
import org.apache.skywalking.oap.server.core.analysis.meter.function.MeterFunction;
import org.apache.skywalking.oap.server.core.analysis.metrics.LongValueHolder;
import org.apache.skywalking.oap.server.core.analysis.metrics.Metrics;
-import org.apache.skywalking.oap.server.core.analysis.metrics.annotation.Entrance;
-import org.apache.skywalking.oap.server.core.analysis.metrics.annotation.SourceFrom;
import org.apache.skywalking.oap.server.core.query.sql.Function;
import org.apache.skywalking.oap.server.core.remote.grpc.proto.RemoteData;
import org.apache.skywalking.oap.server.core.storage.StorageID;
@@ -40,8 +39,6 @@ import org.apache.skywalking.oap.server.core.storage.type.Convert2Entity;
import org.apache.skywalking.oap.server.core.storage.type.Convert2Storage;
import org.apache.skywalking.oap.server.core.storage.type.StorageBuilder;
-import java.util.Objects;
-
@ToString
@MeterFunction(functionName = "sum")
public abstract class SumFunction extends Meter implements AcceptableValue<Long>, LongValueHolder {
@@ -64,15 +61,10 @@ public abstract class SumFunction extends Meter implements AcceptableValue<Long>
@BanyanDB.MeasureField
private long value;
- @Entrance
- public final void combine(@SourceFrom long value) {
- setValue(this.value + value);
- }
-
@Override
public final boolean combine(Metrics metrics) {
final SumFunction sumFunc = (SumFunction) metrics;
- combine(sumFunc.getValue());
+ this.value += sumFunc.getValue();
return true;
}
diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/meter/function/sum/SumLabeledFunction.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/meter/function/sum/SumLabeledFunction.java
index cf9b8e61e7..53019a5c03 100644
--- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/meter/function/sum/SumLabeledFunction.java
+++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/meter/function/sum/SumLabeledFunction.java
@@ -31,8 +31,6 @@ import org.apache.skywalking.oap.server.core.analysis.meter.function.MeterFuncti
import org.apache.skywalking.oap.server.core.analysis.metrics.DataTable;
import org.apache.skywalking.oap.server.core.analysis.metrics.LabeledValueHolder;
import org.apache.skywalking.oap.server.core.analysis.metrics.Metrics;
-import org.apache.skywalking.oap.server.core.analysis.metrics.annotation.Entrance;
-import org.apache.skywalking.oap.server.core.analysis.metrics.annotation.SourceFrom;
import org.apache.skywalking.oap.server.core.remote.grpc.proto.RemoteData;
import org.apache.skywalking.oap.server.core.storage.StorageID;
import org.apache.skywalking.oap.server.core.storage.annotation.BanyanDB;
@@ -64,15 +62,10 @@ public abstract class SumLabeledFunction extends Meter implements AcceptableValu
@BanyanDB.MeasureField
private DataTable value = new DataTable(30);
- @Entrance
- public final void combine(@SourceFrom DataTable value) {
- this.value.append(value);
- }
-
@Override
public final boolean combine(Metrics metrics) {
SumLabeledFunction sumLabeledFunction = (SumLabeledFunction) metrics;
- value.append(sumLabeledFunction.value);
+ this.value.append(sumLabeledFunction.value);
return true;
}
diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/meter/function/sumpermin/SumPerMinFunction.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/meter/function/sumpermin/SumPerMinFunction.java
index 5ad8150f36..d8e652faf6 100644
--- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/meter/function/sumpermin/SumPerMinFunction.java
+++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/meter/function/sumpermin/SumPerMinFunction.java
@@ -18,6 +18,7 @@
package org.apache.skywalking.oap.server.core.analysis.meter.function.sumpermin;
+import java.util.Objects;
import lombok.Getter;
import lombok.Setter;
import lombok.ToString;
@@ -29,8 +30,6 @@ import org.apache.skywalking.oap.server.core.analysis.meter.function.AcceptableV
import org.apache.skywalking.oap.server.core.analysis.meter.function.MeterFunction;
import org.apache.skywalking.oap.server.core.analysis.metrics.LongValueHolder;
import org.apache.skywalking.oap.server.core.analysis.metrics.Metrics;
-import org.apache.skywalking.oap.server.core.analysis.metrics.annotation.Entrance;
-import org.apache.skywalking.oap.server.core.analysis.metrics.annotation.SourceFrom;
import org.apache.skywalking.oap.server.core.query.sql.Function;
import org.apache.skywalking.oap.server.core.remote.grpc.proto.RemoteData;
import org.apache.skywalking.oap.server.core.storage.StorageID;
@@ -40,8 +39,6 @@ import org.apache.skywalking.oap.server.core.storage.type.Convert2Entity;
import org.apache.skywalking.oap.server.core.storage.type.Convert2Storage;
import org.apache.skywalking.oap.server.core.storage.type.StorageBuilder;
-import java.util.Objects;
-
@ToString
@MeterFunction(functionName = "sumPerMin")
public abstract class SumPerMinFunction extends Meter implements AcceptableValue<Long>, LongValueHolder {
@@ -71,15 +68,10 @@ public abstract class SumPerMinFunction extends Meter implements AcceptableValue
@BanyanDB.MeasureField
private long total;
- @Entrance
- public final void combine(@SourceFrom long value) {
- this.total += value;
- }
-
@Override
public boolean combine(Metrics metrics) {
final SumPerMinFunction sumPerMinFunction = (SumPerMinFunction) metrics;
- combine(sumPerMinFunction.getTotal());
+ this.total += sumPerMinFunction.getTotal();
return true;
}
diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/meter/function/sumpermin/SumPerMinLabeledFunction.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/meter/function/sumpermin/SumPerMinLabeledFunction.java
index 16fbe73895..ea8fa05b65 100644
--- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/meter/function/sumpermin/SumPerMinLabeledFunction.java
+++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/meter/function/sumpermin/SumPerMinLabeledFunction.java
@@ -18,6 +18,7 @@
package org.apache.skywalking.oap.server.core.analysis.meter.function.sumpermin;
+import java.util.Objects;
import lombok.Getter;
import lombok.Setter;
import org.apache.skywalking.oap.server.core.UnexpectedException;
@@ -29,8 +30,6 @@ import org.apache.skywalking.oap.server.core.analysis.meter.function.MeterFuncti
import org.apache.skywalking.oap.server.core.analysis.metrics.DataTable;
import org.apache.skywalking.oap.server.core.analysis.metrics.LabeledValueHolder;
import org.apache.skywalking.oap.server.core.analysis.metrics.Metrics;
-import org.apache.skywalking.oap.server.core.analysis.metrics.annotation.Entrance;
-import org.apache.skywalking.oap.server.core.analysis.metrics.annotation.SourceFrom;
import org.apache.skywalking.oap.server.core.remote.grpc.proto.RemoteData;
import org.apache.skywalking.oap.server.core.storage.StorageID;
import org.apache.skywalking.oap.server.core.storage.annotation.BanyanDB;
@@ -39,8 +38,6 @@ import org.apache.skywalking.oap.server.core.storage.type.Convert2Entity;
import org.apache.skywalking.oap.server.core.storage.type.Convert2Storage;
import org.apache.skywalking.oap.server.core.storage.type.StorageBuilder;
-import java.util.Objects;
-
@MeterFunction(functionName = "sumPerMinLabeled")
public abstract class SumPerMinLabeledFunction extends Meter implements AcceptableValue<DataTable>, LabeledValueHolder {
@@ -70,11 +67,6 @@ public abstract class SumPerMinLabeledFunction extends Meter implements Acceptab
@BanyanDB.MeasureField
private DataTable total = new DataTable(30);
- @Entrance
- public final void combine(@SourceFrom DataTable value) {
- this.total.append(value);
- }
-
@Override
public void accept(MeterEntity entity, DataTable value) {
setEntityId(entity.id());
@@ -90,7 +82,7 @@ public abstract class SumPerMinLabeledFunction extends Meter implements Acceptab
@Override
public boolean combine(Metrics metrics) {
final SumPerMinLabeledFunction sumPerMinLabeledFunction = (SumPerMinLabeledFunction) metrics;
- combine(sumPerMinLabeledFunction.getTotal());
+ this.total.append(sumPerMinLabeledFunction.getTotal());
return true;
}
diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/annotation/Entrance.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/annotation/Entrance.java
index 584dd9af30..0890fdc82c 100644
--- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/annotation/Entrance.java
+++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/annotation/Entrance.java
@@ -22,7 +22,11 @@ import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
+import org.apache.skywalking.oap.server.core.analysis.metrics.Metrics;
+/**
+ * The annotation indicates the entrance function of the OAL {@link Metrics} function
+ */
@Target(ElementType.METHOD)
@Retention(RetentionPolicy.RUNTIME)
public @interface Entrance {