Isolate MAL CounterWindow cache by metric name.

docs/en/changes/changes.md

@@ -37,6 +37,7 @@
 * Support output key parameters in the booting logs.
 * Fix cannot query zipkin traces with `annotationQuery` parameter in the JDBC related storage.
 * Fix `limit` doesn't work for `findEndpoint` API in ES storage.
+* Isolate MAL CounterWindow cache by metric name.
 
 #### UI
 

oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/Analyzer.java

@@ -84,7 +84,7 @@ public static Analyzer build(final String metricName,
                                  final String filterExpression,
                                  final String expression,
                                  final MeterSystem meterSystem) {
-        Expression e = DSL.parse(expression);
+        Expression e = DSL.parse(metricName, expression);
         FilterExpression filter = null;
         if (!Strings.isNullOrEmpty(filterExpression)) {
             filter = new FilterExpression(filterExpression);

oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/MetricConvert.java

@@ -120,7 +120,7 @@ private String formatMetricName(MetricRuleConfig rule, String meterRuleName) {
     }
 
     private void handleInitExp(String exp) {
-        Expression e = DSL.parse(exp);
+        Expression e = DSL.parse(null, exp);
         final Result result = e.run(ImmutableMap.of());
         if (!result.isSuccess() && result.isThrowable()) {
             throw new ExpressionParsingException(

oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/dsl/DSL.java

@@ -46,10 +46,11 @@ public final class DSL {
     /**
      * Parse string literal to Expression object, which can be reused.
      *
+     * @param metricName the name of metric defined in mal rule
      * @param expression string literal represents the DSL expression.
      * @return Expression object could be executed.
      */
-    public static Expression parse(final String expression) {
+    public static Expression parse(final String metricName, final String expression) {
         CompilerConfiguration cc = new CompilerConfiguration();
         cc.setScriptBaseClass(DelegatingScript.class.getName());
         ImportCustomizer icz = new ImportCustomizer();
@@ -82,6 +83,6 @@ public static Expression parse(final String expression) {
 
         GroovyShell sh = new GroovyShell(new Binding(), cc);
         DelegatingScript script = (DelegatingScript) sh.parse(expression);
-        return new Expression(expression, script);
+        return new Expression(metricName, expression, script);
     }
 }

oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/dsl/Expression.java

@@ -36,11 +36,14 @@
 public class Expression {
     private static final ThreadLocal<Map<String, SampleFamily>> PROPERTY_REPOSITORY = new ThreadLocal<>();
 
+    private final String metricName;
+
     private final String literal;
 
     private final DelegatingScript expression;
 
-    public Expression(final String literal, final DelegatingScript expression) {
+    public Expression(final String metricName, final String literal, final DelegatingScript expression) {
+        this.metricName = metricName;
         this.literal = literal;
         this.expression = expression;
         this.empower();
@@ -94,7 +97,7 @@ public Result run(final Map<String, SampleFamily> sampleFamilies) {
     }
 
     private void empower() {
-        expression.setDelegate(new ExpressionDelegate(literal));
+        expression.setDelegate(new ExpressionDelegate(metricName, literal));
         extendNumber(Number.class);
     }
 
@@ -115,23 +118,26 @@ private static class ExpressionDelegate extends GroovyObjectSupport {
         public static final DownsamplingType LATEST = DownsamplingType.LATEST;
         public static final DownsamplingType SUM_PER_MIN = DownsamplingType.SUM_PER_MIN;
 
+        private final String metricName;
         private final String literal;
 
-        public SampleFamily propertyMissing(String metricName) {
+        public SampleFamily propertyMissing(String sampleName) {
             ExpressionParsingContext.get().ifPresent(ctx -> {
-                if (!ctx.samples.contains(metricName)) {
-                    ctx.samples.add(metricName);
+                if (!ctx.samples.contains(sampleName)) {
+                    ctx.samples.add(sampleName);
                 }
             });
             Map<String, SampleFamily> sampleFamilies = PROPERTY_REPOSITORY.get();
             if (sampleFamilies == null) {
                 return SampleFamily.EMPTY;
             }
-            if (sampleFamilies.containsKey(metricName)) {
-                return sampleFamilies.get(metricName);
+            if (sampleFamilies.containsKey(sampleName)) {
+                SampleFamily sampleFamily = sampleFamilies.get(sampleName);
+                sampleFamily.context.setMetricName(this.metricName);
+                return sampleFamily;
             }
-            if (!ExpressionParsingContext.get().isPresent()) {
-                log.warn("{} referred by \"{}\" doesn't exist in {}", metricName, literal, sampleFamilies.keySet());
+            if (ExpressionParsingContext.get().isEmpty()) {
+                log.warn("{} referred by \"{}\" doesn't exist in {}", sampleName, literal, sampleFamilies.keySet());
             }
             return SampleFamily.EMPTY;
         }

oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/dsl/Sample.java

@@ -46,14 +46,14 @@ Sample newValue(Function<Double, Double> transform) {
         return toBuilder().value(transform.apply(value)).build();
     }
 
-    Sample increase(String range, Function2<Double, Long, Double> transform) {
-        Tuple2<Long, Double> i = CounterWindow.INSTANCE.increase(name, labels, value, Duration.parse(range).toMillis(), timestamp);
+    Sample increase(String range, String metricName, Function2<Double, Long, Double> transform) {
+        Tuple2<Long, Double> i = CounterWindow.INSTANCE.increase(metricName, labels, value, Duration.parse(range).toMillis(), timestamp);
         double nv = transform.apply(i._2, i._1);
         return newValue(ignored -> nv);
     }
 
-    Sample increase(Function2<Double, Long, Double> transform) {
-        Tuple2<Long, Double> i = CounterWindow.INSTANCE.pop(name, labels, value, timestamp);
+    Sample increase(String metricName, Function2<Double, Long, Double> transform) {
+        Tuple2<Long, Double> i = CounterWindow.INSTANCE.pop(metricName, labels, value, timestamp);
         double nv = transform.apply(i._2, i._1);
         return newValue(ignored -> nv);
     }

oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/dsl/SampleFamily.java

@@ -276,7 +276,11 @@ public SampleFamily increase(String range) {
         return SampleFamily.build(
             this.context,
             Arrays.stream(samples)
-                  .map(sample -> sample.increase(range, (lowerBoundValue, unused) -> sample.value - lowerBoundValue))
+                  .map(sample -> sample.increase(
+                      range,
+                      context.metricName,
+                      (lowerBoundValue, unused) -> sample.value - lowerBoundValue
+                  ))
                   .toArray(Sample[]::new)
         );
     }
@@ -291,6 +295,7 @@ public SampleFamily rate(String range) {
             Arrays.stream(samples)
                   .map(sample -> sample.increase(
                       range,
+                      context.metricName,
                       (lowerBoundValue, lowerBoundTime) -> {
                           final long timeDiff = (sample.timestamp - lowerBoundTime) / 1000;
                           return timeDiff < 1L ? 0.0 : (sample.value - lowerBoundValue) / timeDiff;
@@ -308,6 +313,7 @@ public SampleFamily irate() {
             this.context,
             Arrays.stream(samples)
                   .map(sample -> sample.increase(
+                      context.metricName,
                       (lowerBoundValue, lowerBoundTime) -> {
                           final long timeDiff = (sample.timestamp - lowerBoundTime) / 1000;
                           return timeDiff < 1L ? 0.0 : (sample.value - lowerBoundValue) / timeDiff;
@@ -637,7 +643,7 @@ public SampleFamily downsampling(final DownsamplingType type) {
      * The parsing context holds key results more than sample collection.
      */
     @ToString
-    @EqualsAndHashCode
+    @EqualsAndHashCode(exclude = "metricName")
     @Getter
     @Setter
     @Builder
@@ -651,6 +657,8 @@ static RunningContext instance() {
                                  .build();
         }
 
+        private String metricName;
+
         @Builder.Default
         private Map<MeterEntity, Sample[]> meterSamples = new HashMap<>();
 

oap-server/analyzer/meter-analyzer/src/test/java/org/apache/skywalking/oap/meter/analyzer/dsl/AggregationTest.java

@@ -157,7 +157,7 @@ public void test(String name,
                      String expression,
                      Result want,
                      boolean isThrow) {
-        Expression e = DSL.parse(expression);
+        Expression e = DSL.parse(name, expression);
         Result r = null;
         try {
             r = e.run(input);

oap-server/analyzer/meter-analyzer/src/test/java/org/apache/skywalking/oap/meter/analyzer/dsl/ArithmeticTest.java

@@ -453,7 +453,7 @@ public void test(String name,
                      String expression,
                      Result want,
                      boolean isThrow) {
-        Expression e = DSL.parse(expression);
+        Expression e = DSL.parse(name, expression);
         Result r = null;
         try {
             r = e.run(input);

oap-server/analyzer/meter-analyzer/src/test/java/org/apache/skywalking/oap/meter/analyzer/dsl/BasicTest.java

@@ -58,7 +58,7 @@ public void test(String name,
                      String expression,
                      Result want,
                      boolean isThrow) {
-        Expression e = DSL.parse(expression);
+        Expression e = DSL.parse(name, expression);
         Result r = null;
         try {
             r = e.run(input);

oap-server/analyzer/meter-analyzer/src/test/java/org/apache/skywalking/oap/meter/analyzer/dsl/ExpressionParsingTest.java

@@ -95,7 +95,7 @@ public void test(String name,
                      String expression,
                      ExpressionParsingContext want,
                      boolean isThrow) {
-        Expression e = DSL.parse(expression);
+        Expression e = DSL.parse(name, expression);
         ExpressionParsingContext r = null;
         try {
             r = e.parse();

oap-server/analyzer/meter-analyzer/src/test/java/org/apache/skywalking/oap/meter/analyzer/dsl/FilterTest.java

@@ -85,7 +85,7 @@ public void test(String name,
                      ImmutableMap<String, SampleFamily> input,
                      String expression,
                      Result want) {
-        Expression e = DSL.parse(expression);
+        Expression e = DSL.parse(name, expression);
         Result r = e.run(input);
         assertThat(r).isEqualTo(want);
     }

oap-server/analyzer/meter-analyzer/src/test/java/org/apache/skywalking/oap/meter/analyzer/dsl/FunctionTest.java

@@ -122,7 +122,7 @@ public void test(String name,
                      String expression,
                      Result want,
                      boolean isThrow) {
-        Expression e = DSL.parse(expression);
+        Expression e = DSL.parse(name, expression);
         Result r = null;
         try {
             r = e.run(input);

oap-server/analyzer/meter-analyzer/src/test/java/org/apache/skywalking/oap/meter/analyzer/dsl/IncreaseTest.java

@@ -218,7 +218,7 @@ public void test(String name,
                      String expression,
                      List<Result> want,
                      boolean isThrow) {
-        Expression e = DSL.parse(expression);
+        Expression e = DSL.parse(name, expression);
         CounterWindow.INSTANCE.reset();
         for (int i = 0; i < input.size(); i++) {
             Result r = null;

oap-server/analyzer/meter-analyzer/src/test/java/org/apache/skywalking/oap/meter/analyzer/dsl/K8sTagTest.java

@@ -270,7 +270,7 @@ public void test(String name,
                      String expression,
                      Result want,
                      boolean isThrow) {
-        Expression e = DSL.parse(expression);
+        Expression e = DSL.parse(name, expression);
         Result r = null;
         try {
             r = e.run(input);

oap-server/analyzer/meter-analyzer/src/test/java/org/apache/skywalking/oap/meter/analyzer/dsl/ScopeTest.java

@@ -614,7 +614,7 @@ public void test(final String name,
                      final String expression,
                      final boolean isThrow,
                      final Map<MeterEntity, Sample[]> want) {
-        Expression e = DSL.parse(expression);
+        Expression e = DSL.parse(name, expression);
         Result r = null;
         try {
             r = e.run(input);

oap-server/analyzer/meter-analyzer/src/test/java/org/apache/skywalking/oap/meter/analyzer/dsl/TagFilterTest.java

@@ -120,7 +120,7 @@ public void test(String name,
                      String expression,
                      Result want,
                      boolean isThrow) {
-        Expression e = DSL.parse(expression);
+        Expression e = DSL.parse(name, expression);
         Result r = null;
         try {
             r = e.run(input);

oap-server/analyzer/meter-analyzer/src/test/java/org/apache/skywalking/oap/meter/analyzer/dsl/ValueFilterTest.java

@@ -128,7 +128,7 @@ public void test(final String name,
                      final String expression,
                      final Result want,
                      final boolean isThrow) {
-        Expression e = DSL.parse(expression);
+        Expression e = DSL.parse(name, expression);
         Result r = null;
         try {
             r = e.run(input);