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 8714b98 Rename MetricsHandlerFacade.counterInc, gaugeInc and gaugeDec
#6406 (#6409)
8714b98 is described below
commit 8714b9819a5b489a4c9b322572bc77bb895cba25
Author: jiang2015 <[email protected]>
AuthorDate: Thu Jul 23 12:43:51 2020 +0800
Rename MetricsHandlerFacade.counterInc, gaugeInc and gaugeDec #6406 (#6409)
---
.../control/panel/spi/metrics/MetricsHandlerFacade.java | 6 +++---
.../control/panel/spi/fixture/FirstMetricsTrackerFacade.java | 6 +++---
.../metrics/facade/MetricsTrackerHandlerFacade.java | 6 +++---
.../metrics/facade/MetricsTrackerHandlerFacadeTest.java | 12 ++++++------
.../communication/jdbc/execute/JDBCExecuteEngine.java | 4 ++--
.../shardingsphere/proxy/backend/metrics/MetricsUtils.java | 8 ++++----
.../proxy/frontend/netty/FrontendChannelInboundHandler.java | 6 +++---
7 files changed, 24 insertions(+), 24 deletions(-)
diff --git
a/shardingsphere-control-panel/shardingsphere-control-panel-spi/src/main/java/org/apache/shardingsphere/control/panel/spi/metrics/MetricsHandlerFacade.java
b/shardingsphere-control-panel/shardingsphere-control-panel-spi/src/main/java/org/apache/shardingsphere/control/panel/spi/metrics/MetricsHandlerFacade.java
index df8edf5..96a6c3f 100644
---
a/shardingsphere-control-panel/shardingsphere-control-panel-spi/src/main/java/org/apache/shardingsphere/control/panel/spi/metrics/MetricsHandlerFacade.java
+++
b/shardingsphere-control-panel/shardingsphere-control-panel-spi/src/main/java/org/apache/shardingsphere/control/panel/spi/metrics/MetricsHandlerFacade.java
@@ -30,7 +30,7 @@ public interface MetricsHandlerFacade {
* @param metricsLabel metrics label
* @param labelValues label values
*/
- void counterInc(String metricsLabel, String... labelValues);
+ void counterIncrement(String metricsLabel, String... labelValues);
/**
* Increment of gauge metrics tracker.
@@ -38,7 +38,7 @@ public interface MetricsHandlerFacade {
* @param metricsLabel metrics label
* @param labelValues label values
*/
- void gaugeInc(String metricsLabel, String... labelValues);
+ void gaugeIncrement(String metricsLabel, String... labelValues);
/**
* Decrement of gauge metrics tracker.
@@ -46,7 +46,7 @@ public interface MetricsHandlerFacade {
* @param metricsLabel metrics label
* @param labelValues label values
*/
- void gaugeDec(String metricsLabel, String... labelValues);
+ void gaugeDecrement(String metricsLabel, String... labelValues);
/**
* Start timer of histogram metrics tracker.
diff --git
a/shardingsphere-control-panel/shardingsphere-control-panel-spi/src/test/java/org/apache/shardingsphere/control/panel/spi/fixture/FirstMetricsTrackerFacade.java
b/shardingsphere-control-panel/shardingsphere-control-panel-spi/src/test/java/org/apache/shardingsphere/control/panel/spi/fixture/FirstMetricsTrackerFacade.java
index 8408e1b..f675e47 100644
---
a/shardingsphere-control-panel/shardingsphere-control-panel-spi/src/test/java/org/apache/shardingsphere/control/panel/spi/fixture/FirstMetricsTrackerFacade.java
+++
b/shardingsphere-control-panel/shardingsphere-control-panel-spi/src/test/java/org/apache/shardingsphere/control/panel/spi/fixture/FirstMetricsTrackerFacade.java
@@ -23,15 +23,15 @@ import
org.apache.shardingsphere.control.panel.spi.metrics.MetricsHandlerFacade;
public class FirstMetricsTrackerFacade implements MetricsHandlerFacade {
@Override
- public void counterInc(final String metricsLabel, final String...
labelValues) {
+ public void counterIncrement(final String metricsLabel, final String...
labelValues) {
}
@Override
- public void gaugeInc(final String metricsLabel, final String...
labelValues) {
+ public void gaugeIncrement(final String metricsLabel, final String...
labelValues) {
}
@Override
- public void gaugeDec(final String metricsLabel, final String...
labelValues) {
+ public void gaugeDecrement(final String metricsLabel, final String...
labelValues) {
}
@Override
diff --git
a/shardingsphere-control-panel/shardingsphere-metrics/shardingsphere-metrics-facade/src/main/java/org/apache/shardingsphere/metrics/facade/MetricsTrackerHandlerFacade.java
b/shardingsphere-control-panel/shardingsphere-metrics/shardingsphere-metrics-facade/src/main/java/org/apache/shardingsphere/metrics/facade/MetricsTrackerHandlerFacade.java
index 93d615f..ae26ec9 100644
---
a/shardingsphere-control-panel/shardingsphere-metrics/shardingsphere-metrics-facade/src/main/java/org/apache/shardingsphere/metrics/facade/MetricsTrackerHandlerFacade.java
+++
b/shardingsphere-control-panel/shardingsphere-metrics/shardingsphere-metrics-facade/src/main/java/org/apache/shardingsphere/metrics/facade/MetricsTrackerHandlerFacade.java
@@ -32,21 +32,21 @@ import
org.apache.shardingsphere.metrics.facade.handler.MetricsTrackerHandler;
public final class MetricsTrackerHandlerFacade implements MetricsHandlerFacade
{
@Override
- public void counterInc(final String metricsLabel, final String...
labelValues) {
+ public void counterIncrement(final String metricsLabel, final String...
labelValues) {
if (MetricsTrackerManagerFacade.getEnabled()) {
MetricsTrackerHandler.getInstance().counterInc(metricsLabel,
labelValues);
}
}
@Override
- public void gaugeInc(final String metricsLabel, final String...
labelValues) {
+ public void gaugeIncrement(final String metricsLabel, final String...
labelValues) {
if (MetricsTrackerManagerFacade.getEnabled()) {
MetricsTrackerHandler.getInstance().gaugeInc(metricsLabel,
labelValues);
}
}
@Override
- public void gaugeDec(final String metricsLabel, final String...
labelValues) {
+ public void gaugeDecrement(final String metricsLabel, final String...
labelValues) {
if (MetricsTrackerManagerFacade.getEnabled()) {
MetricsTrackerHandler.getInstance().gaugeDec(metricsLabel,
labelValues);
}
diff --git
a/shardingsphere-control-panel/shardingsphere-metrics/shardingsphere-metrics-facade/src/test/java/org/apache/shardingsphere/metrics/facade/MetricsTrackerHandlerFacadeTest.java
b/shardingsphere-control-panel/shardingsphere-metrics/shardingsphere-metrics-facade/src/test/java/org/apache/shardingsphere/metrics/facade/MetricsTrackerHandlerFacadeTest.java
index e113772..b1401ac 100644
---
a/shardingsphere-control-panel/shardingsphere-metrics/shardingsphere-metrics-facade/src/test/java/org/apache/shardingsphere/metrics/facade/MetricsTrackerHandlerFacadeTest.java
+++
b/shardingsphere-control-panel/shardingsphere-metrics/shardingsphere-metrics-facade/src/test/java/org/apache/shardingsphere/metrics/facade/MetricsTrackerHandlerFacadeTest.java
@@ -36,18 +36,18 @@ public final class MetricsTrackerHandlerFacadeTest {
private final MetricsTrackerHandlerFacade metricsTrackerHandlerFacade =
new MetricsTrackerHandlerFacade();
@Test
- public void assertCounterInc() {
- metricsTrackerHandlerFacade.counterInc("request_total");
+ public void assertCounterIncrement() {
+ metricsTrackerHandlerFacade.counterIncrement("request_total");
}
@Test
- public void assertGaugeInc() {
- metricsTrackerHandlerFacade.gaugeInc("request_total");
+ public void assertGaugeIncrement() {
+ metricsTrackerHandlerFacade.gaugeIncrement("request_total");
}
@Test
- public void assertGaugeDec() {
- metricsTrackerHandlerFacade.gaugeDec("request_total");
+ public void assertGaugeDecrement() {
+ metricsTrackerHandlerFacade.gaugeDecrement("request_total");
}
@Test
diff --git
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/jdbc/execute/JDBCExecuteEngine.java
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/jdbc/execute/JDBCExecuteEngine.java
index ee3df6b..81449a5 100644
---
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/jdbc/execute/JDBCExecuteEngine.java
+++
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/jdbc/execute/JDBCExecuteEngine.java
@@ -102,7 +102,7 @@ public final class JDBCExecuteEngine implements
SQLExecuteEngine {
}
ExecuteResult executeResult = executeResults.iterator().next();
if (executeResult instanceof ExecuteQueryResult) {
-
SingletonFacadeEngine.buildMetrics().ifPresent(metricsHandlerFacade ->
metricsHandlerFacade.counterInc(MetricsLabelEnum.SQL_STATEMENT_COUNT.getName(),
"SELECT"));
+
SingletonFacadeEngine.buildMetrics().ifPresent(metricsHandlerFacade ->
metricsHandlerFacade.counterIncrement(MetricsLabelEnum.SQL_STATEMENT_COUNT.getName(),
"SELECT"));
return getExecuteQueryResponse(((ExecuteQueryResult)
executeResult).getQueryHeaders(), executeResults);
} else {
UpdateResponse updateResponse = new UpdateResponse(executeResults);
@@ -114,7 +114,7 @@ public final class JDBCExecuteEngine implements
SQLExecuteEngine {
updateResponse.setType("UPDATE");
}
if (!Strings.isNullOrEmpty(updateResponse.getType())) {
-
SingletonFacadeEngine.buildMetrics().ifPresent(metricsHandlerFacade ->
metricsHandlerFacade.counterInc(MetricsLabelEnum.SQL_STATEMENT_COUNT.getName(),
updateResponse.getType()));
+
SingletonFacadeEngine.buildMetrics().ifPresent(metricsHandlerFacade ->
metricsHandlerFacade.counterIncrement(MetricsLabelEnum.SQL_STATEMENT_COUNT.getName(),
updateResponse.getType()));
}
return updateResponse;
}
diff --git
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/metrics/MetricsUtils.java
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/metrics/MetricsUtils.java
index e08d81c..d3f4a52 100644
---
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/metrics/MetricsUtils.java
+++
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/metrics/MetricsUtils.java
@@ -43,9 +43,9 @@ public final class MetricsUtils {
Collection<RouteMapper> tableMappers = each.getTableMappers();
RouteMapper dataSourceMapper = each.getDataSourceMapper();
SingletonFacadeEngine.buildMetrics()
- .ifPresent(metricsHandlerFacade ->
metricsHandlerFacade.counterInc(MetricsLabelEnum.SHARDING_DATASOURCE.getName(),
dataSourceMapper.getActualName()));
+ .ifPresent(metricsHandlerFacade ->
metricsHandlerFacade.counterIncrement(MetricsLabelEnum.SHARDING_DATASOURCE.getName(),
dataSourceMapper.getActualName()));
for (RouteMapper table : tableMappers) {
-
SingletonFacadeEngine.buildMetrics().ifPresent(metricsHandlerFacade ->
metricsHandlerFacade.counterInc(MetricsLabelEnum.SHARDING_TABLE.getName(),
table.getActualName()));
+
SingletonFacadeEngine.buildMetrics().ifPresent(metricsHandlerFacade ->
metricsHandlerFacade.counterIncrement(MetricsLabelEnum.SHARDING_TABLE.getName(),
table.getActualName()));
}
}
}
@@ -57,7 +57,7 @@ public final class MetricsUtils {
* @param labelValue label value
*/
public static void buriedTransactionMetric(final String labelValue) {
- SingletonFacadeEngine.buildMetrics().ifPresent(metricsHandlerFacade ->
metricsHandlerFacade.counterInc(MetricsLabelEnum.TRANSACTION.getName(),
labelValue));
+ SingletonFacadeEngine.buildMetrics().ifPresent(metricsHandlerFacade ->
metricsHandlerFacade.counterIncrement(MetricsLabelEnum.TRANSACTION.getName(),
labelValue));
}
/**
@@ -69,7 +69,7 @@ public final class MetricsUtils {
public static void buriedShardingRuleMetrics(final RouteContext
routeContext, final Collection<ShardingSphereRule> rules) {
routeContext.getRouteResult().getActualDataSourceNames().forEach(dataSourceName
-> rules.forEach(each -> {
if (each instanceof ShadowRule && ((ShadowRule)
each).getShadowMappings().containsValue(dataSourceName)) {
-
SingletonFacadeEngine.buildMetrics().ifPresent(metricsHandlerFacade ->
metricsHandlerFacade.counterInc(MetricsLabelEnum.SHADOW_HIT_TOTAL.getName()));
+
SingletonFacadeEngine.buildMetrics().ifPresent(metricsHandlerFacade ->
metricsHandlerFacade.counterIncrement(MetricsLabelEnum.SHADOW_HIT_TOTAL.getName()));
}
}));
}
diff --git
a/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-core/src/main/java/org/apache/shardingsphere/proxy/frontend/netty/FrontendChannelInboundHandler.java
b/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-core/src/main/java/org/apache/shardingsphere/proxy/frontend/netty/FrontendChannelInboundHandler.java
index f8c8aef..1b9b228 100644
---
a/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-core/src/main/java/org/apache/shardingsphere/proxy/frontend/netty/FrontendChannelInboundHandler.java
+++
b/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-core/src/main/java/org/apache/shardingsphere/proxy/frontend/netty/FrontendChannelInboundHandler.java
@@ -55,7 +55,7 @@ public final class FrontendChannelInboundHandler extends
ChannelInboundHandlerAd
public void channelActive(final ChannelHandlerContext context) {
ChannelThreadExecutorGroup.getInstance().register(context.channel().id());
databaseProtocolFrontendEngine.getAuthEngine().handshake(context,
backendConnection);
- SingletonFacadeEngine.buildMetrics().ifPresent(metricsHandlerFacade ->
metricsHandlerFacade.gaugeInc(MetricsLabelEnum.CHANNEL_COUNT.getName()));
+ SingletonFacadeEngine.buildMetrics().ifPresent(metricsHandlerFacade ->
metricsHandlerFacade.gaugeIncrement(MetricsLabelEnum.CHANNEL_COUNT.getName()));
}
@Override
@@ -64,7 +64,7 @@ public final class FrontendChannelInboundHandler extends
ChannelInboundHandlerAd
authorized = auth(context, (ByteBuf) message);
return;
}
- SingletonFacadeEngine.buildMetrics().ifPresent(metricsHandlerFacade ->
metricsHandlerFacade.counterInc(MetricsLabelEnum.REQUEST_TOTAL.getName()));
+ SingletonFacadeEngine.buildMetrics().ifPresent(metricsHandlerFacade ->
metricsHandlerFacade.counterIncrement(MetricsLabelEnum.REQUEST_TOTAL.getName()));
CommandExecutorSelector.getExecutor(databaseProtocolFrontendEngine.getFrontendContext().isOccupyThreadForPerConnection(),
backendConnection.isSupportHint(),
backendConnection.getTransactionType(),
context.channel().id()).execute(new
CommandExecutorTask(databaseProtocolFrontendEngine, backendConnection, context,
message));
}
@@ -87,7 +87,7 @@ public final class FrontendChannelInboundHandler extends
ChannelInboundHandlerAd
databaseProtocolFrontendEngine.release(backendConnection);
backendConnection.close(true);
ChannelThreadExecutorGroup.getInstance().unregister(context.channel().id());
- SingletonFacadeEngine.buildMetrics().ifPresent(metricsHandlerFacade ->
metricsHandlerFacade.gaugeDec(MetricsLabelEnum.CHANNEL_COUNT.getName()));
+ SingletonFacadeEngine.buildMetrics().ifPresent(metricsHandlerFacade ->
metricsHandlerFacade.gaugeDecrement(MetricsLabelEnum.CHANNEL_COUNT.getName()));
}
@Override
