You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@rocketmq.apache.org by aa...@apache.org on 2022/06/27 08:24:37 UTC
[rocketmq-clients] 01/02: Java: remove redundant metrics
This is an automated email from the ASF dual-hosted git repository.
aaronai pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/rocketmq-clients.git
commit 79928b1ccb310d1e049b63f1050f305e15590a6f
Author: Aaron Ai <ya...@gmail.com>
AuthorDate: Mon Jun 27 11:20:05 2022 +0800
Java: remove redundant metrics
---
.../rocketmq/client/java/metrics/MessageMeter.java | 25 ----------
.../java/metrics/MetricMessageInterceptor.java | 54 ----------------------
.../rocketmq/client/java/metrics/MetricName.java | 30 ++----------
3 files changed, 5 insertions(+), 104 deletions(-)
diff --git a/java/client/src/main/java/org/apache/rocketmq/client/java/metrics/MessageMeter.java b/java/client/src/main/java/org/apache/rocketmq/client/java/metrics/MessageMeter.java
index 5732516..12a55d2 100644
--- a/java/client/src/main/java/org/apache/rocketmq/client/java/metrics/MessageMeter.java
+++ b/java/client/src/main/java/org/apache/rocketmq/client/java/metrics/MessageMeter.java
@@ -82,11 +82,6 @@ public class MessageMeter {
this.messageCacheObserver = messageCacheObserver;
}
- LongCounter getSendSuccessTotalCounter() {
- return counterMap.computeIfAbsent(MetricName.SEND_SUCCESS_TOTAL,
- name -> meter.counterBuilder(name.getName()).build());
- }
-
LongCounter getSendFailureTotalCounter() {
return counterMap.computeIfAbsent(MetricName.SEND_FAILURE_TOTAL,
name -> meter.counterBuilder(name.getName()).build());
@@ -112,26 +107,6 @@ public class MessageMeter {
name -> meter.histogramBuilder(name.getName()).build());
}
- LongCounter getAckSuccessTotalCounter() {
- return counterMap.computeIfAbsent(MetricName.ACK_SUCCESS_TOTAL,
- name -> meter.counterBuilder(name.getName()).build());
- }
-
- LongCounter getAckFailureTotalCounter() {
- return counterMap.computeIfAbsent(MetricName.ACK_FAILURE_TOTAL,
- name -> meter.counterBuilder(name.getName()).build());
- }
-
- LongCounter getChangeInvisibleDurationSuccessCounter() {
- return counterMap.computeIfAbsent(MetricName.CHANGE_INVISIBLE_DURATION_SUCCESS_TOTAL,
- name -> meter.counterBuilder(name.getName()).build());
- }
-
- LongCounter getChangeInvisibleDurationFailureCounter() {
- return counterMap.computeIfAbsent(MetricName.CHANGE_INVISIBLE_DURATION_FAILURE_TOTAL,
- name -> meter.counterBuilder(name.getName()).build());
- }
-
DoubleHistogram getMessageDeliveryLatencyHistogram() {
return histogramMap.computeIfAbsent(MetricName.DELIVERY_LATENCY,
name -> meter.histogramBuilder(name.getName()).build());
diff --git a/java/client/src/main/java/org/apache/rocketmq/client/java/metrics/MetricMessageInterceptor.java b/java/client/src/main/java/org/apache/rocketmq/client/java/metrics/MetricMessageInterceptor.java
index 440f89d..9beb3e2 100644
--- a/java/client/src/main/java/org/apache/rocketmq/client/java/metrics/MetricMessageInterceptor.java
+++ b/java/client/src/main/java/org/apache/rocketmq/client/java/metrics/MetricMessageInterceptor.java
@@ -46,14 +46,12 @@ public class MetricMessageInterceptor implements MessageInterceptor {
private void doAfterSendMessage(List<MessageCommon> messageCommons, Duration duration,
MessageHookPointsStatus status) {
- final LongCounter sendSuccessCounter = messageMeter.getSendSuccessTotalCounter();
final LongCounter sendFailureCounter = messageMeter.getSendFailureTotalCounter();
final DoubleHistogram costTimeHistogram = messageMeter.getSendSuccessCostTimeHistogram();
for (MessageCommon messageCommon : messageCommons) {
Attributes attributes = Attributes.builder().put(RocketmqAttributes.TOPIC, messageCommon.getTopic())
.put(RocketmqAttributes.CLIENT_ID, messageMeter.getClient().getClientId()).build();
if (MessageHookPointsStatus.OK.equals(status)) {
- sendSuccessCounter.add(1, attributes);
costTimeHistogram.record(duration.toMillis(), attributes);
}
if (MessageHookPointsStatus.ERROR.equals(status)) {
@@ -136,52 +134,6 @@ public class MetricMessageInterceptor implements MessageInterceptor {
}
}
- private void doAfterAckMessage(List<MessageCommon> messageCommons, MessageHookPointsStatus status) {
- final LongCounter ackSuccessCounter = messageMeter.getAckSuccessTotalCounter();
- final LongCounter ackFailureCounter = messageMeter.getAckFailureTotalCounter();
- final Optional<String> optionalConsumerGroup = messageMeter.tryGetConsumerGroup();
- if (!optionalConsumerGroup.isPresent()) {
- LOGGER.error("[Bug] consumerGroup is not recognized, clientId={}", messageMeter.getClient());
- return;
- }
- final String consumerGroup = optionalConsumerGroup.get();
- for (MessageCommon messageCommon : messageCommons) {
- Attributes attributes = Attributes.builder().put(RocketmqAttributes.TOPIC, messageCommon.getTopic())
- .put(RocketmqAttributes.CONSUMER_GROUP, consumerGroup)
- .put(RocketmqAttributes.CLIENT_ID, messageMeter.getClient().getClientId()).build();
- if (MessageHookPointsStatus.OK.equals(status)) {
- ackSuccessCounter.add(1, attributes);
- }
- if (MessageHookPointsStatus.ERROR.equals(status)) {
- ackFailureCounter.add(1, attributes);
- }
- }
- }
-
- private void doAfterChangInvisibleDuration(List<MessageCommon> messageCommons, MessageHookPointsStatus status) {
- final LongCounter changeInvisibleDurationSuccessCounter =
- messageMeter.getChangeInvisibleDurationSuccessCounter();
- final LongCounter changeInvisibleDurationFailureCounter =
- messageMeter.getChangeInvisibleDurationFailureCounter();
- final Optional<String> optionalConsumerGroup = messageMeter.tryGetConsumerGroup();
- if (!optionalConsumerGroup.isPresent()) {
- LOGGER.error("[Bug] consumerGroup is not recognized, clientId={}", messageMeter.getClient());
- return;
- }
- final String consumerGroup = optionalConsumerGroup.get();
- for (MessageCommon message : messageCommons) {
- Attributes attributes = Attributes.builder().put(RocketmqAttributes.TOPIC, message.getTopic())
- .put(RocketmqAttributes.CONSUMER_GROUP, consumerGroup)
- .put(RocketmqAttributes.CLIENT_ID, messageMeter.getClient().getClientId()).build();
- if (MessageHookPointsStatus.OK.equals(status)) {
- changeInvisibleDurationSuccessCounter.add(1, attributes);
- }
- if (MessageHookPointsStatus.ERROR.equals(status)) {
- changeInvisibleDurationFailureCounter.add(1, attributes);
- }
- }
- }
-
@Override
public void doBefore(MessageHookPoints messageHookPoints, List<MessageCommon> messageCommons) {
final Meter meter = messageMeter.getMeter();
@@ -210,12 +162,6 @@ public class MetricMessageInterceptor implements MessageInterceptor {
case CONSUME:
doAfterProcessMessage(messageCommons, duration, status);
break;
- case ACK:
- doAfterAckMessage(messageCommons, status);
- break;
- case CHANGE_INVISIBLE_DURATION:
- doAfterChangInvisibleDuration(messageCommons, status);
- break;
default:
break;
}
diff --git a/java/client/src/main/java/org/apache/rocketmq/client/java/metrics/MetricName.java b/java/client/src/main/java/org/apache/rocketmq/client/java/metrics/MetricName.java
index 668028c..a4e984f 100644
--- a/java/client/src/main/java/org/apache/rocketmq/client/java/metrics/MetricName.java
+++ b/java/client/src/main/java/org/apache/rocketmq/client/java/metrics/MetricName.java
@@ -18,10 +18,6 @@
package org.apache.rocketmq.client.java.metrics;
public enum MetricName {
- /**
- * A counter that records the number of successful api calls of message publishing.
- */
- SEND_SUCCESS_TOTAL("rocketmq_send_success_total"),
/**
* A counter that records the number of failed api calls of message publishing.
*/
@@ -38,26 +34,6 @@ public enum MetricName {
* A counter that records the number of failed consumption of message.
*/
PROCESS_FAILURE_TOTAL("rocketmq_process_failure_total"),
- /**
- * A counter that records the process time of message consumption.
- */
- PROCESS_TIME("rocketmq_process_time"),
- /**
- * A counter that records the number of successful acknowledgement of message.
- */
- ACK_SUCCESS_TOTAL("rocketmq_ack_success_total"),
- /**
- * A counter that records the number of failed acknowledgement of message.
- */
- ACK_FAILURE_TOTAL("rocketmq_ack_failure_total"),
- /**
- * A counter that records the number of successful changing invisible duration of message.
- */
- CHANGE_INVISIBLE_DURATION_SUCCESS_TOTAL("rocketmq_change_invisible_duration_success_total"),
- /**
- * A counter that records the number of failed changing invisible duration of message.
- */
- CHANGE_INVISIBLE_DURATION_FAILURE_TOTAL("rocketmq_change_invisible_duration_failure_total"),
/**
* A gauge that records the cached message count of push consumer.
*/
@@ -73,7 +49,11 @@ public enum MetricName {
/**
* A histogram that records await time of message consumption.
*/
- AWAIT_TIME("rocketmq_await_time");
+ AWAIT_TIME("rocketmq_await_time"),
+ /**
+ * A counter that records the process time of message consumption.
+ */
+ PROCESS_TIME("rocketmq_process_time");
private final String name;