This is an automated email from the ASF dual-hosted git repository. songxiaosheng 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 50798b99c7 clean code (#12403) 50798b99c7 is described below commit 50798b99c756c38e8f856d816b1299fbf90195e1 Author: wxbty <38374721+wx...@users.noreply.github.com> AuthorDate: Fri May 26 13:14:22 2023 +0800 clean code (#12403) --- .../sample/MetricThreadPoolExhaustedListener.java | 2 +- .../sample/MetricsCountSampleConfigurer.java | 22 +--------------------- .../collector/sample/MetricsCountSampler.java | 2 -- .../sample/SimpleMetricsCountSampler.java | 21 +++------------------ .../PrometheusMetricsThreadPoolTest.java | 2 +- 5 files changed, 6 insertions(+), 43 deletions(-) diff --git a/dubbo-metrics/dubbo-metrics-default/src/main/java/org/apache/dubbo/metrics/collector/sample/MetricThreadPoolExhaustedListener.java b/dubbo-metrics/dubbo-metrics-default/src/main/java/org/apache/dubbo/metrics/collector/sample/MetricThreadPoolExhaustedListener.java index 2a77b70542..07b7fc5360 100644 --- a/dubbo-metrics/dubbo-metrics-default/src/main/java/org/apache/dubbo/metrics/collector/sample/MetricThreadPoolExhaustedListener.java +++ b/dubbo-metrics/dubbo-metrics-default/src/main/java/org/apache/dubbo/metrics/collector/sample/MetricThreadPoolExhaustedListener.java @@ -38,6 +38,6 @@ public class MetricThreadPoolExhaustedListener implements ThreadPoolExhaustedLis @Override public void onEvent(ThreadPoolExhaustedEvent event) { threadRejectMetricsCountSampler.addMetricName(threadPoolExecutorName); - threadRejectMetricsCountSampler.incOnEvent(threadPoolExecutorName,threadPoolExecutorName); + threadRejectMetricsCountSampler.inc(threadPoolExecutorName,threadPoolExecutorName); } } diff --git a/dubbo-metrics/dubbo-metrics-default/src/main/java/org/apache/dubbo/metrics/collector/sample/MetricsCountSampleConfigurer.java b/dubbo-metrics/dubbo-metrics-default/src/main/java/org/apache/dubbo/metrics/collector/sample/MetricsCountSampleConfigurer.java index d66ba6021e..0bb41f0a03 100644 --- a/dubbo-metrics/dubbo-metrics-default/src/main/java/org/apache/dubbo/metrics/collector/sample/MetricsCountSampleConfigurer.java +++ b/dubbo-metrics/dubbo-metrics-default/src/main/java/org/apache/dubbo/metrics/collector/sample/MetricsCountSampleConfigurer.java @@ -18,7 +18,7 @@ package org.apache.dubbo.metrics.collector.sample; import org.apache.dubbo.metrics.model.Metric; -import java.util.function.Consumer; + import java.util.function.Function; public class MetricsCountSampleConfigurer<S,K,M extends Metric> { @@ -29,15 +29,6 @@ public class MetricsCountSampleConfigurer<S,K,M extends Metric> { public M metric; - public Long rt; - - public Consumer<MetricsCountSampleConfigurer<S,K,M>> fireEventHandler = new Consumer<MetricsCountSampleConfigurer<S, K,M>>() { - @Override - public void accept(MetricsCountSampleConfigurer<S, K,M> skMetricsCountSampleConfigure) { - - } - }; - public void setSource(S source){ this.source = source; } @@ -60,15 +51,4 @@ public class MetricsCountSampleConfigurer<S,K,M extends Metric> { return metric; } - public void setRt(Long rt) { - this.rt = rt; - } - - public Long getRt(){ - return this.rt; - } - - public Consumer<MetricsCountSampleConfigurer<S, K,M>> getFireEventHandler() { - return fireEventHandler; - } } diff --git a/dubbo-metrics/dubbo-metrics-default/src/main/java/org/apache/dubbo/metrics/collector/sample/MetricsCountSampler.java b/dubbo-metrics/dubbo-metrics-default/src/main/java/org/apache/dubbo/metrics/collector/sample/MetricsCountSampler.java index 0b561f54c0..fe746a941b 100644 --- a/dubbo-metrics/dubbo-metrics-default/src/main/java/org/apache/dubbo/metrics/collector/sample/MetricsCountSampler.java +++ b/dubbo-metrics/dubbo-metrics-default/src/main/java/org/apache/dubbo/metrics/collector/sample/MetricsCountSampler.java @@ -27,8 +27,6 @@ public interface MetricsCountSampler<S, K, M extends Metric> extends MetricsSamp void inc(S source, K metricName); - void incOnEvent(S source, K metricName); - Optional<ConcurrentMap<M, AtomicLong>> getCount(K metricName); } diff --git a/dubbo-metrics/dubbo-metrics-default/src/main/java/org/apache/dubbo/metrics/collector/sample/SimpleMetricsCountSampler.java b/dubbo-metrics/dubbo-metrics-default/src/main/java/org/apache/dubbo/metrics/collector/sample/SimpleMetricsCountSampler.java index 7f01dcd222..9c31973740 100644 --- a/dubbo-metrics/dubbo-metrics-default/src/main/java/org/apache/dubbo/metrics/collector/sample/SimpleMetricsCountSampler.java +++ b/dubbo-metrics/dubbo-metrics-default/src/main/java/org/apache/dubbo/metrics/collector/sample/SimpleMetricsCountSampler.java @@ -25,7 +25,6 @@ import java.util.Optional; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; import java.util.concurrent.atomic.AtomicLong; -import java.util.function.Function; /** * @param <S> request source @@ -41,18 +40,7 @@ public abstract class SimpleMetricsCountSampler<S, K, M extends Metric> @Override public void inc(S source, K metricName) { - doExecute(source, metricName, counter -> { - counter.incrementAndGet(); - return false; - }); - } - - @Override - public void incOnEvent(S source, K metricName) { - doExecute(source, metricName, counter -> { - counter.incrementAndGet(); - return true; - }); + getAtomicCounter(source, metricName).incrementAndGet(); } @Override @@ -64,7 +52,7 @@ public abstract class SimpleMetricsCountSampler<S, K, M extends Metric> protected abstract void countConfigure(MetricsCountSampleConfigurer<S, K, M> sampleConfigure); - private void doExecute(S source, K metricsName, Function<AtomicLong, Boolean> counter) { + private AtomicLong getAtomicCounter(S source, K metricsName) { MetricsCountSampleConfigurer<S, K, M> sampleConfigure = new MetricsCountSampleConfigurer<>(); sampleConfigure.setSource(source); sampleConfigure.setMetricsName(metricsName); @@ -84,11 +72,8 @@ public abstract class SimpleMetricsCountSampler<S, K, M extends Metric> if (atomicCounter == null) { atomicCounter = metricAtomic.computeIfAbsent(sampleConfigure.getMetric(), k -> new AtomicLong()); } - Boolean isEvent = counter.apply(atomicCounter); + return atomicCounter; - if (isEvent) { - sampleConfigure.getFireEventHandler().accept(sampleConfigure); - } } } diff --git a/dubbo-metrics/dubbo-metrics-prometheus/src/test/java/org/apache/dubbo/metrics/prometheus/PrometheusMetricsThreadPoolTest.java b/dubbo-metrics/dubbo-metrics-prometheus/src/test/java/org/apache/dubbo/metrics/prometheus/PrometheusMetricsThreadPoolTest.java index 6c73838ef1..107c09ea97 100644 --- a/dubbo-metrics/dubbo-metrics-prometheus/src/test/java/org/apache/dubbo/metrics/prometheus/PrometheusMetricsThreadPoolTest.java +++ b/dubbo-metrics/dubbo-metrics-prometheus/src/test/java/org/apache/dubbo/metrics/prometheus/PrometheusMetricsThreadPoolTest.java @@ -146,7 +146,7 @@ public class PrometheusMetricsThreadPoolTest { collector.setApplicationName(applicationModel.getApplicationName()); String threadPoolExecutorName="DubboServerHandler-20816"; ThreadRejectMetricsCountSampler threadRejectMetricsCountSampler=new ThreadRejectMetricsCountSampler(collector); - threadRejectMetricsCountSampler.incOnEvent(threadPoolExecutorName,threadPoolExecutorName); + threadRejectMetricsCountSampler.inc(threadPoolExecutorName,threadPoolExecutorName); threadRejectMetricsCountSampler.addMetricName(threadPoolExecutorName); List<MetricSample> samples = collector.collect(); for (MetricSample sample : samples) {