wu-sheng commented on code in PR #13723: URL: https://github.com/apache/skywalking/pull/13723#discussion_r2883874532
########## oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/v2/dsl/counter/CounterWindow.java: ########## @@ -0,0 +1,88 @@ +/* + * 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.meter.analyzer.v2.dsl.counter; + +import com.google.common.collect.ImmutableMap; +import io.vavr.Tuple; +import io.vavr.Tuple2; +import java.util.Map; +import java.util.PriorityQueue; +import java.util.Queue; +import java.util.concurrent.ConcurrentHashMap; +import lombok.AccessLevel; +import lombok.EqualsAndHashCode; +import lombok.RequiredArgsConstructor; +import lombok.ToString; + +/** + * CounterWindow stores a series of counter samples in order to calculate the increase + * or instant rate of increase. + * + */ +@RequiredArgsConstructor(access = AccessLevel.PRIVATE) +@ToString +@EqualsAndHashCode +public class CounterWindow { + + public static final CounterWindow INSTANCE = new CounterWindow(); + + private final Map<ID, Tuple2<Long, Double>> lastElementMap = new ConcurrentHashMap<>(); + private final Map<ID, Queue<Tuple2<Long, Double>>> windows = new ConcurrentHashMap<>(); + + public Tuple2<Long, Double> increase(String name, ImmutableMap<String, String> labels, Double value, long windowSize, long now) { + ID id = new ID(name, labels); + Queue<Tuple2<Long, Double>> window = windows.computeIfAbsent(id, unused -> new PriorityQueue<>()); + synchronized (window) { + window.offer(Tuple.of(now, value)); + long waterLevel = now - windowSize; + Tuple2<Long, Double> peek = window.peek(); + if (peek._1 > waterLevel) { + return peek; + } + + Tuple2<Long, Double> result = peek; + while (peek._1 < waterLevel) { + result = window.poll(); + peek = window.element(); + } Review Comment: This is a direct port of the v1 `CounterWindow` which has been running in production. `Tuple2` from `io.vavr` implements `Comparable`, and the queue typically holds a single element per key. No change needed. ########## oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/v2/dsl/counter/CounterWindow.java: ########## @@ -0,0 +1,88 @@ +/* + * 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.meter.analyzer.v2.dsl.counter; + +import com.google.common.collect.ImmutableMap; +import io.vavr.Tuple; +import io.vavr.Tuple2; +import java.util.Map; +import java.util.PriorityQueue; +import java.util.Queue; +import java.util.concurrent.ConcurrentHashMap; +import lombok.AccessLevel; +import lombok.EqualsAndHashCode; +import lombok.RequiredArgsConstructor; +import lombok.ToString; + +/** + * CounterWindow stores a series of counter samples in order to calculate the increase + * or instant rate of increase. + * + */ +@RequiredArgsConstructor(access = AccessLevel.PRIVATE) +@ToString +@EqualsAndHashCode +public class CounterWindow { + + public static final CounterWindow INSTANCE = new CounterWindow(); + + private final Map<ID, Tuple2<Long, Double>> lastElementMap = new ConcurrentHashMap<>(); + private final Map<ID, Queue<Tuple2<Long, Double>>> windows = new ConcurrentHashMap<>(); + + public Tuple2<Long, Double> increase(String name, ImmutableMap<String, String> labels, Double value, long windowSize, long now) { + ID id = new ID(name, labels); + Queue<Tuple2<Long, Double>> window = windows.computeIfAbsent(id, unused -> new PriorityQueue<>()); + synchronized (window) { + window.offer(Tuple.of(now, value)); + long waterLevel = now - windowSize; + Tuple2<Long, Double> peek = window.peek(); + if (peek._1 > waterLevel) { + return peek; + } + + Tuple2<Long, Double> result = peek; + while (peek._1 < waterLevel) { + result = window.poll(); + peek = window.element(); + } + + // Choose the closed slot to the expected timestamp + if (waterLevel - result._1 <= peek._1 - waterLevel) { + return result; + } + + return peek; + } + } + + public Tuple2<Long, Double> pop(String name, ImmutableMap<String, String> labels, Double value, long now) { + ID id = new ID(name, labels); + + Tuple2<Long, Double> element = Tuple.of(now, value); + Tuple2<Long, Double> result = lastElementMap.put(id, element); + if (result == null) { + return element; + } + return result; + } + + public void reset() { + windows.clear(); Review Comment: Intentional v1 behavior. `lastElementMap` must survive `reset()` because `pop()` computes deltas (`current - last`). Clearing it would break `increase()`/`rate()` calculations across reset boundaries. ########## oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/v2/dsl/ExpressionMetadata.java: ########## @@ -0,0 +1,66 @@ +/* + * 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.meter.analyzer.v2.dsl; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.Set; +import lombok.Getter; +import org.apache.skywalking.oap.server.core.analysis.meter.ScopeType; + +/** + * Immutable metadata extracted from a MAL expression at compile time. + * Replaces the ThreadLocal-based {@code ExpressionParsingContext} pattern. + */ +@Getter +public class ExpressionMetadata { + + private final List<String> samples; + private final ScopeType scopeType; + private final Set<String> scopeLabels; + private final Set<String> aggregationLabels; + private final DownsamplingType downsampling; + private final boolean isHistogram; + private final int[] percentiles; + + public ExpressionMetadata(final List<String> samples, + final ScopeType scopeType, + final Set<String> scopeLabels, + final Set<String> aggregationLabels, + final DownsamplingType downsampling, + final boolean isHistogram, + final int[] percentiles) { + this.samples = Collections.unmodifiableList(samples); + this.scopeType = scopeType; + this.scopeLabels = Collections.unmodifiableSet(scopeLabels); + this.aggregationLabels = Collections.unmodifiableSet(aggregationLabels); + this.downsampling = downsampling; + this.isHistogram = isHistogram; + this.percentiles = percentiles; + } Review Comment: This is an internal compile-time metadata class, not a public API. All callers are generated code under our control. Defensive copies would add overhead with no practical benefit. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected]
