This is an automated email from the ASF dual-hosted git repository.
clebertsuconic pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git
The following commit(s) were added to refs/heads/master by this push:
new 61d2f58 ARTEMIS-2828 Fixing ManagementServiceImplTest
61d2f58 is described below
commit 61d2f58aab712ed6fd4bc748277a7e7ae3073962
Author: Clebert Suconic <[email protected]>
AuthorDate: Tue Jul 7 21:35:04 2020 -0400
ARTEMIS-2828 Fixing ManagementServiceImplTest
---
.../management/impl/ManagementServiceImpl.java | 50 +++++++++++-----------
1 file changed, 26 insertions(+), 24 deletions(-)
diff --git
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/management/impl/ManagementServiceImpl.java
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/management/impl/ManagementServiceImpl.java
index 0ae387f..8af940b 100644
---
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/management/impl/ManagementServiceImpl.java
+++
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/management/impl/ManagementServiceImpl.java
@@ -330,30 +330,32 @@ public class ManagementServiceImpl implements
ManagementService {
}
private void registerQueueMeters(final Queue queue) {
- MetricsManager metricsManager = messagingServer.getMetricsManager();
- if (metricsManager != null) {
- metricsManager.registerQueueGauge(queue.getAddress().toString(),
queue.getName().toString(), (builder) -> {
- builder.register(QueueMetricNames.MESSAGE_COUNT, this, metrics ->
Double.valueOf(queue.getMessageCount()),
QueueControl.MESSAGE_COUNT_DESCRIPTION);
- builder.register(QueueMetricNames.DURABLE_MESSAGE_COUNT, this,
metrics -> Double.valueOf(queue.getDurableMessageCount()),
QueueControl.DURABLE_MESSAGE_COUNT_DESCRIPTION);
- builder.register(QueueMetricNames.PERSISTENT_SIZE, this, metrics
-> Double.valueOf(queue.getPersistentSize()),
QueueControl.PERSISTENT_SIZE_DESCRIPTION);
- builder.register(QueueMetricNames.DURABLE_PERSISTENT_SIZE, this,
metrics -> Double.valueOf(queue.getDurablePersistentSize()),
QueueControl.DURABLE_PERSISTENT_SIZE_DESCRIPTION);
-
- builder.register(QueueMetricNames.DELIVERING_MESSAGE_COUNT, this,
metrics -> Double.valueOf(queue.getDeliveringCount()),
QueueControl.DELIVERING_MESSAGE_COUNT_DESCRIPTION);
-
builder.register(QueueMetricNames.DELIVERING_DURABLE_MESSAGE_COUNT, this,
metrics -> Double.valueOf(queue.getDurableDeliveringCount()),
QueueControl.DURABLE_DELIVERING_MESSAGE_COUNT_DESCRIPTION);
- builder.register(QueueMetricNames.DELIVERING_PERSISTENT_SIZE,
this, metrics -> Double.valueOf(queue.getDeliveringSize()),
QueueControl.DELIVERING_SIZE_DESCRIPTION);
-
builder.register(QueueMetricNames.DELIVERING_DURABLE_PERSISTENT_SIZE, this,
metrics -> Double.valueOf(queue.getDurableDeliveringSize()),
QueueControl.DURABLE_DELIVERING_SIZE_DESCRIPTION);
-
- builder.register(QueueMetricNames.SCHEDULED_MESSAGE_COUNT, this,
metrics -> Double.valueOf(queue.getScheduledCount()),
QueueControl.SCHEDULED_MESSAGE_COUNT_DESCRIPTION);
- builder.register(QueueMetricNames.SCHEDULED_DURABLE_MESSAGE_COUNT,
this, metrics -> Double.valueOf(queue.getDurableScheduledCount()),
QueueControl.DURABLE_SCHEDULED_MESSAGE_COUNT_DESCRIPTION);
- builder.register(QueueMetricNames.SCHEDULED_PERSISTENT_SIZE, this,
metrics -> Double.valueOf(queue.getScheduledSize()),
QueueControl.SCHEDULED_SIZE_DESCRIPTION);
-
builder.register(QueueMetricNames.SCHEDULED_DURABLE_PERSISTENT_SIZE, this,
metrics -> Double.valueOf(queue.getDurableScheduledSize()),
QueueControl.DURABLE_SCHEDULED_SIZE_DESCRIPTION);
-
- builder.register(QueueMetricNames.MESSAGES_ACKNOWLEDGED, this,
metrics -> Double.valueOf(queue.getMessagesAcknowledged()),
QueueControl.MESSAGES_ACKNOWLEDGED_DESCRIPTION);
- builder.register(QueueMetricNames.MESSAGES_ADDED, this, metrics ->
Double.valueOf(queue.getMessagesAdded()),
QueueControl.MESSAGES_ADDED_DESCRIPTION);
- builder.register(QueueMetricNames.MESSAGES_KILLED, this, metrics
-> Double.valueOf(queue.getMessagesKilled()),
QueueControl.MESSAGES_KILLED_DESCRIPTION);
- builder.register(QueueMetricNames.MESSAGES_EXPIRED, this, metrics
-> Double.valueOf(queue.getMessagesExpired()),
QueueControl.MESSAGES_EXPIRED_DESCRIPTION);
- builder.register(QueueMetricNames.CONSUMER_COUNT, this, metrics ->
Double.valueOf(queue.getConsumerCount()),
QueueControl.CONSUMER_COUNT_DESCRIPTION);
- });
+ if (messagingServer != null) { // messagingServer could be null on
certain unit tests where metrics are not relevant
+ MetricsManager metricsManager = messagingServer.getMetricsManager();
+ if (metricsManager != null) {
+ metricsManager.registerQueueGauge(queue.getAddress().toString(),
queue.getName().toString(), (builder) -> {
+ builder.register(QueueMetricNames.MESSAGE_COUNT, this, metrics
-> Double.valueOf(queue.getMessageCount()),
QueueControl.MESSAGE_COUNT_DESCRIPTION);
+ builder.register(QueueMetricNames.DURABLE_MESSAGE_COUNT, this,
metrics -> Double.valueOf(queue.getDurableMessageCount()),
QueueControl.DURABLE_MESSAGE_COUNT_DESCRIPTION);
+ builder.register(QueueMetricNames.PERSISTENT_SIZE, this,
metrics -> Double.valueOf(queue.getPersistentSize()),
QueueControl.PERSISTENT_SIZE_DESCRIPTION);
+ builder.register(QueueMetricNames.DURABLE_PERSISTENT_SIZE,
this, metrics -> Double.valueOf(queue.getDurablePersistentSize()),
QueueControl.DURABLE_PERSISTENT_SIZE_DESCRIPTION);
+
+ builder.register(QueueMetricNames.DELIVERING_MESSAGE_COUNT,
this, metrics -> Double.valueOf(queue.getDeliveringCount()),
QueueControl.DELIVERING_MESSAGE_COUNT_DESCRIPTION);
+
builder.register(QueueMetricNames.DELIVERING_DURABLE_MESSAGE_COUNT, this,
metrics -> Double.valueOf(queue.getDurableDeliveringCount()),
QueueControl.DURABLE_DELIVERING_MESSAGE_COUNT_DESCRIPTION);
+ builder.register(QueueMetricNames.DELIVERING_PERSISTENT_SIZE,
this, metrics -> Double.valueOf(queue.getDeliveringSize()),
QueueControl.DELIVERING_SIZE_DESCRIPTION);
+
builder.register(QueueMetricNames.DELIVERING_DURABLE_PERSISTENT_SIZE, this,
metrics -> Double.valueOf(queue.getDurableDeliveringSize()),
QueueControl.DURABLE_DELIVERING_SIZE_DESCRIPTION);
+
+ builder.register(QueueMetricNames.SCHEDULED_MESSAGE_COUNT,
this, metrics -> Double.valueOf(queue.getScheduledCount()),
QueueControl.SCHEDULED_MESSAGE_COUNT_DESCRIPTION);
+
builder.register(QueueMetricNames.SCHEDULED_DURABLE_MESSAGE_COUNT, this,
metrics -> Double.valueOf(queue.getDurableScheduledCount()),
QueueControl.DURABLE_SCHEDULED_MESSAGE_COUNT_DESCRIPTION);
+ builder.register(QueueMetricNames.SCHEDULED_PERSISTENT_SIZE,
this, metrics -> Double.valueOf(queue.getScheduledSize()),
QueueControl.SCHEDULED_SIZE_DESCRIPTION);
+
builder.register(QueueMetricNames.SCHEDULED_DURABLE_PERSISTENT_SIZE, this,
metrics -> Double.valueOf(queue.getDurableScheduledSize()),
QueueControl.DURABLE_SCHEDULED_SIZE_DESCRIPTION);
+
+ builder.register(QueueMetricNames.MESSAGES_ACKNOWLEDGED, this,
metrics -> Double.valueOf(queue.getMessagesAcknowledged()),
QueueControl.MESSAGES_ACKNOWLEDGED_DESCRIPTION);
+ builder.register(QueueMetricNames.MESSAGES_ADDED, this, metrics
-> Double.valueOf(queue.getMessagesAdded()),
QueueControl.MESSAGES_ADDED_DESCRIPTION);
+ builder.register(QueueMetricNames.MESSAGES_KILLED, this,
metrics -> Double.valueOf(queue.getMessagesKilled()),
QueueControl.MESSAGES_KILLED_DESCRIPTION);
+ builder.register(QueueMetricNames.MESSAGES_EXPIRED, this,
metrics -> Double.valueOf(queue.getMessagesExpired()),
QueueControl.MESSAGES_EXPIRED_DESCRIPTION);
+ builder.register(QueueMetricNames.CONSUMER_COUNT, this, metrics
-> Double.valueOf(queue.getConsumerCount()),
QueueControl.CONSUMER_COUNT_DESCRIPTION);
+ });
+ }
}
}
