You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicecomb.apache.org by li...@apache.org on 2020/03/30 10:03:38 UTC
[servicecomb-java-chassis] branch master updated: [SCB-1839] SDK
metrics move remote to the last column
This is an automated email from the ASF dual-hosted git repository.
liubao pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/servicecomb-java-chassis.git
The following commit(s) were added to refs/heads/master by this push:
new b8b2abc [SCB-1839] SDK metrics move remote to the last column
b8b2abc is described below
commit b8b2abc08e7afad11bc211a0add71b58f4af48cc
Author: heyile <25...@qq.com>
AuthorDate: Mon Mar 30 15:31:58 2020 +0800
[SCB-1839] SDK metrics move remote to the last column
---
.../metrics/core/publish/ClientEndpointsLogPublisher.java | 14 +++++++-------
.../metrics/core/publish/ServerEndpointsLogPublisher.java | 14 +++++++-------
.../metrics/core/TestVertxMetersInitializer.java | 12 ++++++------
3 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/metrics/metrics-core/src/main/java/org/apache/servicecomb/metrics/core/publish/ClientEndpointsLogPublisher.java b/metrics/metrics-core/src/main/java/org/apache/servicecomb/metrics/core/publish/ClientEndpointsLogPublisher.java
index 81c64af..6b6b482 100644
--- a/metrics/metrics-core/src/main/java/org/apache/servicecomb/metrics/core/publish/ClientEndpointsLogPublisher.java
+++ b/metrics/metrics-core/src/main/java/org/apache/servicecomb/metrics/core/publish/ClientEndpointsLogPublisher.java
@@ -33,7 +33,7 @@ public class ClientEndpointsLogPublisher extends AbstractMeasurementNodeLogPubli
@Override
public void print(boolean printDetail) {
appendLine(sb, " client.endpoints:");
- appendLine(sb, " remote connectCount disconnectCount queue connections send(Bps) receive(Bps)");
+ appendLine(sb, " connectCount disconnectCount queue connections send(Bps) receive(Bps) remote");
double connect = 0;
double disconnect = 0;
@@ -50,26 +50,26 @@ public class ClientEndpointsLogPublisher extends AbstractMeasurementNodeLogPubli
writeSize += address.findChild(EndpointMeter.BYTES_WRITTEN).summary();
if (printDetail) {
- appendLine(sb, " %-21s %-12.0f %-15.0f %-13.0f %-11.0f %-9s %s",
- address.getName(),
+ appendLine(sb, " %-12.0f %-15.0f %-13.0f %-11.0f %-9s %-12s %s",
address.findChild(EndpointMeter.CONNECT_COUNT).summary(),
address.findChild(EndpointMeter.DISCONNECT_COUNT).summary(),
address.findChild(HttpClientEndpointMeter.QUEUE_COUNT).summary(),
address.findChild(EndpointMeter.CONNECTIONS).summary(),
NetUtils.humanReadableBytes((long) address.findChild(EndpointMeter.BYTES_WRITTEN).summary()),
- NetUtils.humanReadableBytes((long) address.findChild(EndpointMeter.BYTES_READ).summary())
+ NetUtils.humanReadableBytes((long) address.findChild(EndpointMeter.BYTES_READ).summary()),
+ address.getName()
);
}
}
- appendLine(sb, " %-21s %-12.0f %-15.0f %-13.0f %-11.0f %-9s %s",
- "(summary)",
+ appendLine(sb, " %-12.0f %-15.0f %-13.0f %-11.0f %-9s %-12s %s",
connect,
disconnect,
queue,
connections,
NetUtils.humanReadableBytes((long) writeSize),
- NetUtils.humanReadableBytes((long) readSize)
+ NetUtils.humanReadableBytes((long) readSize),
+ "(summary)"
);
}
}
diff --git a/metrics/metrics-core/src/main/java/org/apache/servicecomb/metrics/core/publish/ServerEndpointsLogPublisher.java b/metrics/metrics-core/src/main/java/org/apache/servicecomb/metrics/core/publish/ServerEndpointsLogPublisher.java
index 206af03..bcf35dc 100644
--- a/metrics/metrics-core/src/main/java/org/apache/servicecomb/metrics/core/publish/ServerEndpointsLogPublisher.java
+++ b/metrics/metrics-core/src/main/java/org/apache/servicecomb/metrics/core/publish/ServerEndpointsLogPublisher.java
@@ -34,7 +34,7 @@ public class ServerEndpointsLogPublisher extends AbstractMeasurementNodeLogPubli
public void print(boolean printDetail) {
appendLine(sb, " server.endpoints:");
appendLine(sb,
- " listen connectCount disconnectCount rejectByLimit connections send(Bps) receive(Bps)");
+ " connectCount disconnectCount rejectByLimit connections send(Bps) receive(Bps) listen");
double connect = 0;
double disconnect = 0;
@@ -51,26 +51,26 @@ public class ServerEndpointsLogPublisher extends AbstractMeasurementNodeLogPubli
writeSize += address.findChild(EndpointMeter.BYTES_WRITTEN).summary();
if (printDetail) {
- appendLine(sb, " %-21s %-12.0f %-15.0f %-13.0f %-11.0f %-9s %s",
- address.getName(),
+ appendLine(sb, " %-12.0f %-15.0f %-13.0f %-11.0f %-9s %-12s %s",
address.findChild(EndpointMeter.CONNECT_COUNT).summary(),
address.findChild(EndpointMeter.DISCONNECT_COUNT).summary(),
address.findChild(ServerEndpointMeter.REJECT_BY_CONNECTION_LIMIT).summary(),
address.findChild(EndpointMeter.CONNECTIONS).summary(),
NetUtils.humanReadableBytes((long) address.findChild(EndpointMeter.BYTES_WRITTEN).summary()),
- NetUtils.humanReadableBytes((long) address.findChild(EndpointMeter.BYTES_READ).summary())
+ NetUtils.humanReadableBytes((long) address.findChild(EndpointMeter.BYTES_READ).summary()),
+ address.getName()
);
}
}
- appendLine(sb, " %-21s %-12.0f %-15.0f %-13.0f %-11.0f %-9s %s",
- "(summary)",
+ appendLine(sb, " %-12.0f %-15.0f %-13.0f %-11.0f %-9s %-12s %s",
connect,
disconnect,
reject,
connections,
NetUtils.humanReadableBytes((long) writeSize),
- NetUtils.humanReadableBytes((long) readSize)
+ NetUtils.humanReadableBytes((long) readSize),
+ "(summary)"
);
}
}
diff --git a/metrics/metrics-core/src/test/java/org/apache/servicecomb/metrics/core/TestVertxMetersInitializer.java b/metrics/metrics-core/src/test/java/org/apache/servicecomb/metrics/core/TestVertxMetersInitializer.java
index 329b32c..4301313 100644
--- a/metrics/metrics-core/src/test/java/org/apache/servicecomb/metrics/core/TestVertxMetersInitializer.java
+++ b/metrics/metrics-core/src/test/java/org/apache/servicecomb/metrics/core/TestVertxMetersInitializer.java
@@ -171,18 +171,18 @@ public class TestVertxMetersInitializer {
+ " transport 0\n"
+ " transport:\n"
+ " client.endpoints:\n"
- + " remote connectCount disconnectCount queue connections send(Bps) receive(Bps)\n";
+ + " connectCount disconnectCount queue connections send(Bps) receive(Bps) remote\n";
if (printDetail) {
expect += String.format(
- " 127.0.0.1:%-5s 1 0 0 1 4 21\n",
+ " 1 0 0 1 4 21 127.0.0.1:%-5s\n",
port);
}
expect += ""
- + " (summary) 1 0 0 1 4 21\n"
+ + " 1 0 0 1 4 21 (summary)\n"
+ " server.endpoints:\n"
- + " listen connectCount disconnectCount rejectByLimit connections send(Bps) receive(Bps)\n"
- + " 0.0.0.0:0 1 0 0 1 21 4\n"
- + " (summary) 1 0 0 1 21 4\n\n";
+ + " connectCount disconnectCount rejectByLimit connections send(Bps) receive(Bps) listen\n"
+ + " 1 0 0 1 21 4 0.0.0.0:0\n"
+ + " 1 0 0 1 21 4 (summary)\n\n";
Assert.assertEquals(expect, actual);
}
}