This is an automated email from the ASF dual-hosted git repository.
albumenj pushed a commit to branch 3.3
in repository https://gitbox.apache.org/repos/asf/dubbo.git
The following commit(s) were added to refs/heads/3.3 by this push:
new 7e6a32ba68 * Fix conflict (#12991)
7e6a32ba68 is described below
commit 7e6a32ba68eddf1f966ba7ee74990528c1e1c42c
Author: namelessssssssssss
<[email protected]>
AuthorDate: Fri Sep 1 10:26:02 2023 +0800
* Fix conflict (#12991)
---
.../dubbo/metrics/collector/sample/SimpleMetricsCountSampler.java | 4 ----
.../metrics/collector/sample/ThreadRejectMetricsCountSampler.java | 1 -
2 files changed, 5 deletions(-)
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 337dff901b..666af13f30 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
@@ -51,10 +51,6 @@ public abstract class SimpleMetricsCountSampler<S, K, M
extends Metric>
metricCounter.get(metricName));
}
- protected void initMetricsCounter(S source, K metricsName){
- getAtomicCounter(source,metricsName);
- }
-
protected abstract void countConfigure(MetricsCountSampleConfigurer<S, K,
M> sampleConfigure);
private AtomicLong getAtomicCounter(S source, K metricsName) {
diff --git
a/dubbo-metrics/dubbo-metrics-default/src/main/java/org/apache/dubbo/metrics/collector/sample/ThreadRejectMetricsCountSampler.java
b/dubbo-metrics/dubbo-metrics-default/src/main/java/org/apache/dubbo/metrics/collector/sample/ThreadRejectMetricsCountSampler.java
index e5b214a7a4..2638777574 100644
---
a/dubbo-metrics/dubbo-metrics-default/src/main/java/org/apache/dubbo/metrics/collector/sample/ThreadRejectMetricsCountSampler.java
+++
b/dubbo-metrics/dubbo-metrics-default/src/main/java/org/apache/dubbo/metrics/collector/sample/ThreadRejectMetricsCountSampler.java
@@ -32,7 +32,6 @@ public class ThreadRejectMetricsCountSampler extends
MetricsNameCountSampler<Str
public ThreadRejectMetricsCountSampler(DefaultMetricsCollector collector) {
super(collector,
THREAD_POOL,MetricsKey.THREAD_POOL_THREAD_REJECT_COUNT);
- this.initMetricsCounter(name,name);
}
@Override