This is an automated email from the ASF dual-hosted git repository.
panjuan pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git
The following commit(s) were added to refs/heads/master by this push:
new a5bf03ce0c0 Remove useless method on MetricsWrapper (#23601)
a5bf03ce0c0 is described below
commit a5bf03ce0c09e8ba37ed65ebadb7f900e3d08202
Author: Liang Zhang <[email protected]>
AuthorDate: Tue Jan 17 13:41:50 2023 +0800
Remove useless method on MetricsWrapper (#23601)
---
.../agent/plugin/metrics/core/MetricsWrapper.java | 38 ----------------------
.../plugin/metrics/core/MetricsWrapperTest.java | 27 ++++-----------
.../metrics/core/fixture/FixtureWrapper.java | 16 ++++-----
.../prometheus/wrapper/type/CounterWrapper.java | 8 ++---
.../prometheus/wrapper/type/GaugeWrapper.java | 16 ++++-----
.../wrapper/type/CounterWrapperTest.java | 3 +-
.../prometheus/wrapper/type/GaugeWrapperTest.java | 3 +-
7 files changed, 29 insertions(+), 82 deletions(-)
diff --git
a/agent/plugins/metrics/core/src/main/java/org/apache/shardingsphere/agent/plugin/metrics/core/MetricsWrapper.java
b/agent/plugins/metrics/core/src/main/java/org/apache/shardingsphere/agent/plugin/metrics/core/MetricsWrapper.java
index 0e1d797aa57..f0b8962dfb9 100644
---
a/agent/plugins/metrics/core/src/main/java/org/apache/shardingsphere/agent/plugin/metrics/core/MetricsWrapper.java
+++
b/agent/plugins/metrics/core/src/main/java/org/apache/shardingsphere/agent/plugin/metrics/core/MetricsWrapper.java
@@ -26,15 +26,6 @@ public interface MetricsWrapper {
* Metric increase.
*/
default void inc() {
- inc(1);
- }
-
- /**
- * Metric increase by value.
- *
- * @param value value
- */
- default void inc(double value) {
}
/**
@@ -43,31 +34,12 @@ public interface MetricsWrapper {
* @param labels labels
*/
default void inc(String... labels) {
- inc(1, labels);
- }
-
- /**
- * Metric increase by value with labels.
- *
- * @param value value
- * @param labels labels
- */
- default void inc(double value, String... labels) {
}
/**
* Metric decrease.
*/
default void dec() {
- dec(1);
- }
-
- /**
- * Metric decrease by value.
- *
- * @param value value
- */
- default void dec(double value) {
}
/**
@@ -76,16 +48,6 @@ public interface MetricsWrapper {
* @param labels counter labels
*/
default void dec(String... labels) {
- dec(1, labels);
- }
-
- /**
- * Metric decrease by value with labels.
- *
- * @param value value
- * @param labels labels
- */
- default void dec(double value, String... labels) {
}
/**
diff --git
a/agent/plugins/metrics/core/src/test/java/org/apache/shardingsphere/agent/plugin/metrics/core/MetricsWrapperTest.java
b/agent/plugins/metrics/core/src/test/java/org/apache/shardingsphere/agent/plugin/metrics/core/MetricsWrapperTest.java
index 3d5dff1e10c..81a6fbb572a 100644
---
a/agent/plugins/metrics/core/src/test/java/org/apache/shardingsphere/agent/plugin/metrics/core/MetricsWrapperTest.java
+++
b/agent/plugins/metrics/core/src/test/java/org/apache/shardingsphere/agent/plugin/metrics/core/MetricsWrapperTest.java
@@ -20,6 +20,7 @@ package org.apache.shardingsphere.agent.plugin.metrics.core;
import
org.apache.shardingsphere.agent.plugin.metrics.core.fixture.FixtureWrapper;
import org.junit.Test;
+import static org.hamcrest.Matchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
public final class MetricsWrapperTest {
@@ -28,30 +29,16 @@ public final class MetricsWrapperTest {
public void assertCreate() {
FixtureWrapper metricsWrapper = new FixtureWrapper();
metricsWrapper.inc();
- assertThat(metricsWrapper.getFixtureValue(),
org.hamcrest.Matchers.is(1.0d));
- metricsWrapper.inc(1);
- assertThat(metricsWrapper.getFixtureValue(),
org.hamcrest.Matchers.is(2.0d));
+ assertThat(metricsWrapper.getFixtureValue(), is(1d));
metricsWrapper.inc("a");
- assertThat(metricsWrapper.getFixtureValue(),
org.hamcrest.Matchers.is(3.0d));
- metricsWrapper.inc(1, "b");
- assertThat(metricsWrapper.getFixtureValue(),
org.hamcrest.Matchers.is(4.0d));
- metricsWrapper.inc();
- assertThat(metricsWrapper.getFixtureValue(),
org.hamcrest.Matchers.is(5.0d));
+ assertThat(metricsWrapper.getFixtureValue(), is(2d));
metricsWrapper.dec();
- assertThat(metricsWrapper.getFixtureValue(),
org.hamcrest.Matchers.is(4.0d));
- metricsWrapper.inc(1);
- assertThat(metricsWrapper.getFixtureValue(),
org.hamcrest.Matchers.is(5.0d));
- metricsWrapper.dec(1);
- assertThat(metricsWrapper.getFixtureValue(),
org.hamcrest.Matchers.is(4.0d));
- metricsWrapper.dec(1);
- assertThat(metricsWrapper.getFixtureValue(),
org.hamcrest.Matchers.is(3.0d));
+ assertThat(metricsWrapper.getFixtureValue(), is(1d));
metricsWrapper.dec("c");
- assertThat(metricsWrapper.getFixtureValue(),
org.hamcrest.Matchers.is(2.0d));
- metricsWrapper.dec(1, "d");
- assertThat(metricsWrapper.getFixtureValue(),
org.hamcrest.Matchers.is(1.0d));
+ assertThat(metricsWrapper.getFixtureValue(), is(0d));
metricsWrapper.observe(2);
- assertThat(metricsWrapper.getFixtureValue(),
org.hamcrest.Matchers.is(2.0d));
+ assertThat(metricsWrapper.getFixtureValue(), is(2.0d));
metricsWrapper.observe(3);
- assertThat(metricsWrapper.getFixtureValue(),
org.hamcrest.Matchers.is(3.0d));
+ assertThat(metricsWrapper.getFixtureValue(), is(3.0d));
}
}
diff --git
a/agent/plugins/metrics/core/src/test/java/org/apache/shardingsphere/agent/plugin/metrics/core/fixture/FixtureWrapper.java
b/agent/plugins/metrics/core/src/test/java/org/apache/shardingsphere/agent/plugin/metrics/core/fixture/FixtureWrapper.java
index 6f0a25e5fbd..4b21c14ded8 100644
---
a/agent/plugins/metrics/core/src/test/java/org/apache/shardingsphere/agent/plugin/metrics/core/fixture/FixtureWrapper.java
+++
b/agent/plugins/metrics/core/src/test/java/org/apache/shardingsphere/agent/plugin/metrics/core/fixture/FixtureWrapper.java
@@ -29,23 +29,23 @@ public final class FixtureWrapper implements MetricsWrapper
{
private Double fixtureValue = 0d;
@Override
- public void inc(final double value) {
- fixtureValue += value;
+ public void inc() {
+ fixtureValue++;
}
@Override
- public void inc(final double value, final String... labels) {
- fixtureValue += value;
+ public void inc(final String... labels) {
+ fixtureValue++;
}
@Override
- public void dec(final double value) {
- fixtureValue -= value;
+ public void dec() {
+ fixtureValue--;
}
@Override
- public void dec(final double value, final String... labels) {
- fixtureValue -= value;
+ public void dec(final String... labels) {
+ fixtureValue--;
}
@Override
diff --git
a/agent/plugins/metrics/type/prometheus/src/main/java/org/apache/shardingsphere/agent/plugin/metrics/prometheus/wrapper/type/CounterWrapper.java
b/agent/plugins/metrics/type/prometheus/src/main/java/org/apache/shardingsphere/agent/plugin/metrics/prometheus/wrapper/type/CounterWrapper.java
index 6f5e84ba621..8c81afefafc 100644
---
a/agent/plugins/metrics/type/prometheus/src/main/java/org/apache/shardingsphere/agent/plugin/metrics/prometheus/wrapper/type/CounterWrapper.java
+++
b/agent/plugins/metrics/type/prometheus/src/main/java/org/apache/shardingsphere/agent/plugin/metrics/prometheus/wrapper/type/CounterWrapper.java
@@ -30,12 +30,12 @@ public final class CounterWrapper implements MetricsWrapper
{
private final Counter counter;
@Override
- public void inc(final double value) {
- counter.inc(value);
+ public void inc() {
+ counter.inc(1d);
}
@Override
- public void inc(final double value, final String... labels) {
- counter.labels(labels).inc(value);
+ public void inc(final String... labels) {
+ counter.labels(labels).inc(1d);
}
}
diff --git
a/agent/plugins/metrics/type/prometheus/src/main/java/org/apache/shardingsphere/agent/plugin/metrics/prometheus/wrapper/type/GaugeWrapper.java
b/agent/plugins/metrics/type/prometheus/src/main/java/org/apache/shardingsphere/agent/plugin/metrics/prometheus/wrapper/type/GaugeWrapper.java
index a51dbc399c2..d3c7db897df 100644
---
a/agent/plugins/metrics/type/prometheus/src/main/java/org/apache/shardingsphere/agent/plugin/metrics/prometheus/wrapper/type/GaugeWrapper.java
+++
b/agent/plugins/metrics/type/prometheus/src/main/java/org/apache/shardingsphere/agent/plugin/metrics/prometheus/wrapper/type/GaugeWrapper.java
@@ -30,22 +30,22 @@ public final class GaugeWrapper implements MetricsWrapper {
private final Gauge gauge;
@Override
- public void inc(final double value) {
- gauge.inc(value);
+ public void inc() {
+ gauge.inc(1d);
}
@Override
- public void inc(final double value, final String... labels) {
- gauge.labels(labels).inc(value);
+ public void inc(final String... labels) {
+ gauge.labels(labels).inc(1d);
}
@Override
- public void dec(final double value) {
- gauge.dec(value);
+ public void dec() {
+ gauge.dec(1d);
}
@Override
- public void dec(final double value, final String... labels) {
- gauge.labels(labels).dec(value);
+ public void dec(final String... labels) {
+ gauge.labels(labels).dec(1d);
}
}
diff --git
a/agent/plugins/metrics/type/prometheus/src/test/java/org/apache/shardingsphere/agent/plugin/metrics/prometheus/wrapper/type/CounterWrapperTest.java
b/agent/plugins/metrics/type/prometheus/src/test/java/org/apache/shardingsphere/agent/plugin/metrics/prometheus/wrapper/type/CounterWrapperTest.java
index 7f918c04665..2607f102fed 100644
---
a/agent/plugins/metrics/type/prometheus/src/test/java/org/apache/shardingsphere/agent/plugin/metrics/prometheus/wrapper/type/CounterWrapperTest.java
+++
b/agent/plugins/metrics/type/prometheus/src/test/java/org/apache/shardingsphere/agent/plugin/metrics/prometheus/wrapper/type/CounterWrapperTest.java
@@ -31,8 +31,7 @@ public final class CounterWrapperTest {
Counter counter = Counter.build().name("a").help("help").create();
CounterWrapper counterWrapper = new CounterWrapper(counter);
counterWrapper.inc();
- counterWrapper.inc(1);
counter = (Counter)
Plugins.getMemberAccessor().get(CounterWrapper.class.getDeclaredField("counter"),
counterWrapper);
- assertThat(counter.get(), is(2.0));
+ assertThat(counter.get(), is(1d));
}
}
diff --git
a/agent/plugins/metrics/type/prometheus/src/test/java/org/apache/shardingsphere/agent/plugin/metrics/prometheus/wrapper/type/GaugeWrapperTest.java
b/agent/plugins/metrics/type/prometheus/src/test/java/org/apache/shardingsphere/agent/plugin/metrics/prometheus/wrapper/type/GaugeWrapperTest.java
index a875eb09c56..c5a304cea82 100644
---
a/agent/plugins/metrics/type/prometheus/src/test/java/org/apache/shardingsphere/agent/plugin/metrics/prometheus/wrapper/type/GaugeWrapperTest.java
+++
b/agent/plugins/metrics/type/prometheus/src/test/java/org/apache/shardingsphere/agent/plugin/metrics/prometheus/wrapper/type/GaugeWrapperTest.java
@@ -31,8 +31,7 @@ public final class GaugeWrapperTest {
Gauge gauge = Gauge.build().name("a").help("help").create();
GaugeWrapper gaugeWrapper = new GaugeWrapper(gauge);
gaugeWrapper.inc();
- gaugeWrapper.inc(1);
gauge = (Gauge)
Plugins.getMemberAccessor().get(GaugeWrapper.class.getDeclaredField("gauge"),
gaugeWrapper);
- assertThat(gauge.get(), is(2.0));
+ assertThat(gauge.get(), is(1d));
}
}
