You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dubbo.apache.org by al...@apache.org on 2023/09/19 02:23:30 UTC
[dubbo] branch 3.2 updated: Fix qps time window unit (#13077)
This is an automated email from the ASF dual-hosted git repository.
albumenj pushed a commit to branch 3.2
in repository https://gitbox.apache.org/repos/asf/dubbo.git
The following commit(s) were added to refs/heads/3.2 by this push:
new 139a62ebb9 Fix qps time window unit (#13077)
139a62ebb9 is described below
commit 139a62ebb953bbef3cf46d9e9358f81947acc1f3
Author: Albumen Kevin <jh...@gmail.com>
AuthorDate: Tue Sep 19 10:23:24 2023 +0800
Fix qps time window unit (#13077)
---
.../java/org/apache/dubbo/metrics/aggregate/TimeWindowCounter.java | 2 +-
.../org/apache/dubbo/metrics/collector/AggregateMetricsCollector.java | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/dubbo-metrics/dubbo-metrics-api/src/main/java/org/apache/dubbo/metrics/aggregate/TimeWindowCounter.java b/dubbo-metrics/dubbo-metrics-api/src/main/java/org/apache/dubbo/metrics/aggregate/TimeWindowCounter.java
index 32f4e63235..8cf70c7fed 100644
--- a/dubbo-metrics/dubbo-metrics-api/src/main/java/org/apache/dubbo/metrics/aggregate/TimeWindowCounter.java
+++ b/dubbo-metrics/dubbo-metrics-api/src/main/java/org/apache/dubbo/metrics/aggregate/TimeWindowCounter.java
@@ -28,7 +28,7 @@ public class TimeWindowCounter {
private final LongAdderSlidingWindow slidingWindow;
- public TimeWindowCounter(int bucketNum, int timeWindowSeconds) {
+ public TimeWindowCounter(int bucketNum, long timeWindowSeconds) {
this.slidingWindow = new LongAdderSlidingWindow(bucketNum, TimeUnit.SECONDS.toMillis(timeWindowSeconds));
}
diff --git a/dubbo-metrics/dubbo-metrics-default/src/main/java/org/apache/dubbo/metrics/collector/AggregateMetricsCollector.java b/dubbo-metrics/dubbo-metrics-default/src/main/java/org/apache/dubbo/metrics/collector/AggregateMetricsCollector.java
index 7dc9117af5..5cc6aec5d9 100644
--- a/dubbo-metrics/dubbo-metrics-default/src/main/java/org/apache/dubbo/metrics/collector/AggregateMetricsCollector.java
+++ b/dubbo-metrics/dubbo-metrics-default/src/main/java/org/apache/dubbo/metrics/collector/AggregateMetricsCollector.java
@@ -43,6 +43,7 @@ import java.util.Map;
import java.util.Optional;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.TimeUnit;
import static org.apache.dubbo.common.constants.CommonConstants.CONSUMER_SIDE;
import static org.apache.dubbo.common.constants.CommonConstants.PROVIDER_SIDE;
@@ -127,7 +128,7 @@ public class AggregateMetricsCollector implements MetricsCollector<RequestEvent>
if (enableQps) {
MethodMetric metric = calcWindowCounter(event, MetricsKey.METRIC_REQUESTS);
TimeWindowCounter qpsCounter = ConcurrentHashMapUtils.computeIfAbsent(qps, metric,
- methodMetric -> new TimeWindowCounter(bucketNum, qpsTimeWindowMillSeconds));
+ methodMetric -> new TimeWindowCounter(bucketNum, TimeUnit.MILLISECONDS.toSeconds(qpsTimeWindowMillSeconds)));
qpsCounter.increment();
}
}