You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@qpid.apache.org by GitBox <gi...@apache.org> on 2020/08/30 22:17:39 UTC
[GitHub] [qpid-broker-j] alex-rufous commented on a change in pull request #56: QPID-8454 Add prometheus metrics
alex-rufous commented on a change in pull request #56:
URL: https://github.com/apache/qpid-broker-j/pull/56#discussion_r479818471
##########
File path: broker-core/src/main/java/org/apache/qpid/server/model/Broker.java
##########
@@ -257,58 +273,71 @@
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.POINT_IN_TIME,
- units = StatisticUnit.COUNT,
- label = "Live threads",
- description = "Number of live threads")
+ units = StatisticUnit.COUNT,
+ label = "Live threads",
+ description = "Number of live threads",
+ metricName = "live_threads_total",
+ metricDisabled = true)
int getNumberOfLiveThreads();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.POINT_IN_TIME,
- units = StatisticUnit.BYTES,
- label = "Used Heap Memory Size",
- description = "Size of used heap memory")
+ units = StatisticUnit.BYTES,
+ label = "Used Heap Memory Size",
+ description = "Size of used heap memory",
+ metricName = "used_heap_memory_size_bytes_total",
+ metricDisabled = true)
long getUsedHeapMemorySize();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.POINT_IN_TIME,
- units = StatisticUnit.BYTES,
- label = "Used Direct Memory Size",
- description = "Size of used direct memory")
+ units = StatisticUnit.BYTES,
+ label = "Used Direct Memory Size",
+ description = "Size of used direct memory",
+ metricName = "used_direct_memory_size_bytes_total",
+ metricDisabled = true)
long getUsedDirectMemorySize();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.POINT_IN_TIME,
- units = StatisticUnit.BYTES,
- label = "Direct Memory Total Capacity",
- description = "Total capacity of direct memory allocated for the Broker process")
+ units = StatisticUnit.BYTES,
+ label = "Direct Memory Total Capacity",
+ description = "Total capacity of direct memory allocated for the Broker process",
+ metricName = "direct_memory_total_capacity_bytes_total",
+ metricDisabled = true)
long getDirectMemoryTotalCapacity();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.POINT_IN_TIME,
- units = StatisticUnit.COUNT,
- label = "Number Of Object Pending Finalization",
- description = "Number of objects pending finalization")
+ units = StatisticUnit.COUNT,
+ label = "Number Of Object Pending Finalization",
+ description = "Number of objects pending finalization",
+ metricName = "number_of_objects_pending_finalization_total",
+ metricDisabled = true)
int getNumberOfObjectsPendingFinalization();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.POINT_IN_TIME,
units = StatisticUnit.COUNT,
label = "Number of Buffers In-Use",
- description = "Number of direct memory buffers currently in-use.")
+ description = "Number of direct memory buffers currently in-use.",
+ metricName = "number_of_buffers_in_use_total")
long getNumberOfBuffersInUse();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.POINT_IN_TIME,
units = StatisticUnit.COUNT,
label = "Number of Pooled Buffers",
- description = "Number of unused direct memory buffers currently in the pool.")
+ description = "Number of unused direct memory buffers currently in the pool.",
+ metricName = "number_of_buffers_in_pool_total")
Review comment:
The metric name "number_of_buffers_in_pool_total" can be inherited from a statistics name "numberOfBuffersInPool" using the metric name auto-generation functionality implemented in QpidCollector class. It seems that setting this metric name explicitly is redundant.
##########
File path: doc/java-broker/src/docbkx/management/channels/Java-Broker-Management-Metrics.xml
##########
@@ -0,0 +1,48 @@
+<?xml version="1.0"?>
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one
+ ~ or more contributor license agreements. See the NOTICE file
+ ~ distributed with this work for additional information
+ ~ regarding copyright ownership. The ASF licenses this file
+ ~ to you under the Apache License, Version 2.0 (the
+ ~ "License"); you may not use this file except in compliance
+ ~ with the License. You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing,
+ ~ software distributed under the License is distributed on an
+ ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ ~ KIND, either express or implied. See the License for the
+ ~ specific language governing permissions and limitations
+ ~ under the License.
+ ~
+ -->
+
+<section xmlns="http://docbook.org/ns/docbook" version="5.0" xml:id="Java-Broker-Management-Metrics">
+ <title>Prometheus Metrics</title>
+ <para>This section describes the metrics endpoints exposing broker statistics in
+ <link xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="https://prometheus.io/">Prometheus format</link>.
+ The metrics endpoint is intended for scraping by Prometheus server to collect the Broker telemetry.</para>
+ <para>The Prometheus metric endpoints are mapped under /metrics path and /metrics/*.
+ The latter allows to get the Virtual Host statistics by specify the path to the virtual host as
+ /metrics/<virtual host node name>/< virtual host name>.
+ The former allow to get all Broker statistics or Virtual Host statistics when called with HOST header
+ set to the Virtual Host name</para>
+ <para>
+ The metrics endpoints allow anonymous access by default. If required, an authentication can be enabled for the
+ metrics endpoints by setting http management context variable
+ <literal>qpid.httpManagement.enableMetricContentAuthentication</literal> to <literal>true</literal>.
+ </para>
+
+ <para>This Broker JVM statistics are disabled by default. The metrics endpoints can be called with parameter
Review comment:
This should be replaced with The
##########
File path: broker-core/src/main/java/org/apache/qpid/server/model/Queue.java
##########
@@ -390,133 +390,133 @@
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.POINT_IN_TIME, units = StatisticUnit.COUNT, label = "Bindings",
- description = "Current number of bindings to this queue.")
+ description = "Current number of bindings to this queue.", metricName = "binding_total")
int getBindingCount();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.POINT_IN_TIME, units = StatisticUnit.COUNT, label = "Consumers",
- description = "Current number of consumers attached to this queue.")
+ description = "Current number of consumers attached to this queue.", metricName = "consumers_total")
int getConsumerCount();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.POINT_IN_TIME, units = StatisticUnit.COUNT, label = "Consumers with credit",
- description = "Current number of consumers attached to this queue with credit")
+ description = "Current number of consumers attached to this queue with credit", metricName = "consumers_with_credit_total")
int getConsumerCountWithCredit();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.CUMULATIVE, units = StatisticUnit.BYTES, label = "Delivered (Persistent)",
- description = "Total size of all persistent messages delivered by this queue.")
+ description = "Total size of all persistent messages delivered by this queue.", metricName = "persistent_dequeued_bytes_count")
long getPersistentDequeuedBytes();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.CUMULATIVE, units = StatisticUnit.MESSAGES, label = "Delivered (Persistent)",
- description = "Total number of persistent messages delivered by this queue.")
+ description = "Total number of persistent messages delivered by this queue.", metricName = "persistent_dequeued_messages_count")
long getPersistentDequeuedMessages();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.CUMULATIVE, units = StatisticUnit.BYTES, label = "Enqueued (Persistent)",
- description = "Total size of all persistent messages received by this queue.")
+ description = "Total size of all persistent messages received by this queue.", metricName = "persistent_enqueue_bytes_count")
long getPersistentEnqueuedBytes();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.CUMULATIVE, units = StatisticUnit.MESSAGES, label = "Enqueued (Persistent)",
- description = "Total number of persistent messages received by this queue.")
+ description = "Total number of persistent messages received by this queue.", metricName = "persistent_enqueued_messages_count")
long getPersistentEnqueuedMessages();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.POINT_IN_TIME, units = StatisticUnit.BYTES, label = "Queue Depth",
- description = "Current size of all messages enqueued by this queue.")
+ description = "Current size of all messages enqueued by this queue.", metricName = "depth_bytes_total")
long getQueueDepthBytes();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.POINT_IN_TIME, units = StatisticUnit.MESSAGES, label = "Queue Depth",
- description = "Current number of messages enqueued by this queue.")
+ description = "Current number of messages enqueued by this queue.", metricName = "depth_messages_total")
int getQueueDepthMessages();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.CUMULATIVE, units = StatisticUnit.BYTES, label = "Delivered",
- description = "Total size of all messages delivered by this queue.")
+ description = "Total size of all messages delivered by this queue.", metricName = "total_dequeued_bytes_count")
Review comment:
The queue metric name total_dequeued_bytes_count can be renamed into "dequeued_bytes_count". IMHO, total is usually used with gauge metrics in prometheus. Just to make thing simpler let's remove total from the beginning of the name of counter metrics.
##########
File path: broker-core/src/main/java/org/apache/qpid/server/model/Broker.java
##########
@@ -257,58 +273,71 @@
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.POINT_IN_TIME,
- units = StatisticUnit.COUNT,
- label = "Live threads",
- description = "Number of live threads")
+ units = StatisticUnit.COUNT,
+ label = "Live threads",
+ description = "Number of live threads",
+ metricName = "live_threads_total",
+ metricDisabled = true)
int getNumberOfLiveThreads();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.POINT_IN_TIME,
- units = StatisticUnit.BYTES,
- label = "Used Heap Memory Size",
- description = "Size of used heap memory")
+ units = StatisticUnit.BYTES,
+ label = "Used Heap Memory Size",
+ description = "Size of used heap memory",
+ metricName = "used_heap_memory_size_bytes_total",
+ metricDisabled = true)
long getUsedHeapMemorySize();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.POINT_IN_TIME,
- units = StatisticUnit.BYTES,
- label = "Used Direct Memory Size",
- description = "Size of used direct memory")
+ units = StatisticUnit.BYTES,
+ label = "Used Direct Memory Size",
+ description = "Size of used direct memory",
+ metricName = "used_direct_memory_size_bytes_total",
+ metricDisabled = true)
long getUsedDirectMemorySize();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.POINT_IN_TIME,
- units = StatisticUnit.BYTES,
- label = "Direct Memory Total Capacity",
- description = "Total capacity of direct memory allocated for the Broker process")
+ units = StatisticUnit.BYTES,
+ label = "Direct Memory Total Capacity",
+ description = "Total capacity of direct memory allocated for the Broker process",
+ metricName = "direct_memory_total_capacity_bytes_total",
+ metricDisabled = true)
long getDirectMemoryTotalCapacity();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.POINT_IN_TIME,
- units = StatisticUnit.COUNT,
- label = "Number Of Object Pending Finalization",
- description = "Number of objects pending finalization")
+ units = StatisticUnit.COUNT,
+ label = "Number Of Object Pending Finalization",
+ description = "Number of objects pending finalization",
+ metricName = "number_of_objects_pending_finalization_total",
Review comment:
The metric name "number_of_objects_pending_finalization_total" can be inherited from a statistics name "numberOfObjectsPendingFinalization" using the metric name auto-generation functionality implemented in QpidCollector class. It seems that setting this metric name explicitly is redundant.
##########
File path: broker-core/src/main/java/org/apache/qpid/server/model/VirtualHostLogger.java
##########
@@ -25,9 +25,9 @@
{
void stopLogging();
- @ManagedStatistic(statisticType = StatisticType.CUMULATIVE, units = StatisticUnit.COUNT, label = "Errors")
+ @ManagedStatistic(statisticType = StatisticType.CUMULATIVE, units = StatisticUnit.COUNT, label = "Errors", metricName = "logger_errors_count")
long getErrorCount();
- @ManagedStatistic(statisticType = StatisticType.CUMULATIVE, units = StatisticUnit.COUNT, label = "Warnings")
+ @ManagedStatistic(statisticType = StatisticType.CUMULATIVE, units = StatisticUnit.COUNT, label = "Warnings", metricName = "logger_warnings_count")
Review comment:
The virtual host logger metrics logger_warnings_count should be renamed into warnings_count
##########
File path: broker-core/src/main/java/org/apache/qpid/server/model/Queue.java
##########
@@ -390,133 +390,133 @@
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.POINT_IN_TIME, units = StatisticUnit.COUNT, label = "Bindings",
- description = "Current number of bindings to this queue.")
+ description = "Current number of bindings to this queue.", metricName = "binding_total")
int getBindingCount();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.POINT_IN_TIME, units = StatisticUnit.COUNT, label = "Consumers",
- description = "Current number of consumers attached to this queue.")
+ description = "Current number of consumers attached to this queue.", metricName = "consumers_total")
int getConsumerCount();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.POINT_IN_TIME, units = StatisticUnit.COUNT, label = "Consumers with credit",
- description = "Current number of consumers attached to this queue with credit")
+ description = "Current number of consumers attached to this queue with credit", metricName = "consumers_with_credit_total")
int getConsumerCountWithCredit();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.CUMULATIVE, units = StatisticUnit.BYTES, label = "Delivered (Persistent)",
- description = "Total size of all persistent messages delivered by this queue.")
+ description = "Total size of all persistent messages delivered by this queue.", metricName = "persistent_dequeued_bytes_count")
long getPersistentDequeuedBytes();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.CUMULATIVE, units = StatisticUnit.MESSAGES, label = "Delivered (Persistent)",
- description = "Total number of persistent messages delivered by this queue.")
+ description = "Total number of persistent messages delivered by this queue.", metricName = "persistent_dequeued_messages_count")
long getPersistentDequeuedMessages();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.CUMULATIVE, units = StatisticUnit.BYTES, label = "Enqueued (Persistent)",
- description = "Total size of all persistent messages received by this queue.")
+ description = "Total size of all persistent messages received by this queue.", metricName = "persistent_enqueue_bytes_count")
long getPersistentEnqueuedBytes();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.CUMULATIVE, units = StatisticUnit.MESSAGES, label = "Enqueued (Persistent)",
- description = "Total number of persistent messages received by this queue.")
+ description = "Total number of persistent messages received by this queue.", metricName = "persistent_enqueued_messages_count")
long getPersistentEnqueuedMessages();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.POINT_IN_TIME, units = StatisticUnit.BYTES, label = "Queue Depth",
- description = "Current size of all messages enqueued by this queue.")
+ description = "Current size of all messages enqueued by this queue.", metricName = "depth_bytes_total")
long getQueueDepthBytes();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.POINT_IN_TIME, units = StatisticUnit.MESSAGES, label = "Queue Depth",
- description = "Current number of messages enqueued by this queue.")
+ description = "Current number of messages enqueued by this queue.", metricName = "depth_messages_total")
int getQueueDepthMessages();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.CUMULATIVE, units = StatisticUnit.BYTES, label = "Delivered",
- description = "Total size of all messages delivered by this queue.")
+ description = "Total size of all messages delivered by this queue.", metricName = "total_dequeued_bytes_count")
long getTotalDequeuedBytes();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.CUMULATIVE, units = StatisticUnit.MESSAGES, label = "Delivered",
- description = "Total number of messages delivered by this queue.")
+ description = "Total number of messages delivered by this queue.", metricName = "total_dequeued_messages_count")
Review comment:
Let's remove total from the beginning of the name of counter metrics. It should be dequeued_messages_count
##########
File path: broker-core/src/main/java/org/apache/qpid/server/model/Queue.java
##########
@@ -390,133 +390,133 @@
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.POINT_IN_TIME, units = StatisticUnit.COUNT, label = "Bindings",
- description = "Current number of bindings to this queue.")
+ description = "Current number of bindings to this queue.", metricName = "binding_total")
int getBindingCount();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.POINT_IN_TIME, units = StatisticUnit.COUNT, label = "Consumers",
- description = "Current number of consumers attached to this queue.")
+ description = "Current number of consumers attached to this queue.", metricName = "consumers_total")
int getConsumerCount();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.POINT_IN_TIME, units = StatisticUnit.COUNT, label = "Consumers with credit",
- description = "Current number of consumers attached to this queue with credit")
+ description = "Current number of consumers attached to this queue with credit", metricName = "consumers_with_credit_total")
int getConsumerCountWithCredit();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.CUMULATIVE, units = StatisticUnit.BYTES, label = "Delivered (Persistent)",
- description = "Total size of all persistent messages delivered by this queue.")
+ description = "Total size of all persistent messages delivered by this queue.", metricName = "persistent_dequeued_bytes_count")
long getPersistentDequeuedBytes();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.CUMULATIVE, units = StatisticUnit.MESSAGES, label = "Delivered (Persistent)",
- description = "Total number of persistent messages delivered by this queue.")
+ description = "Total number of persistent messages delivered by this queue.", metricName = "persistent_dequeued_messages_count")
long getPersistentDequeuedMessages();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.CUMULATIVE, units = StatisticUnit.BYTES, label = "Enqueued (Persistent)",
- description = "Total size of all persistent messages received by this queue.")
+ description = "Total size of all persistent messages received by this queue.", metricName = "persistent_enqueue_bytes_count")
long getPersistentEnqueuedBytes();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.CUMULATIVE, units = StatisticUnit.MESSAGES, label = "Enqueued (Persistent)",
- description = "Total number of persistent messages received by this queue.")
+ description = "Total number of persistent messages received by this queue.", metricName = "persistent_enqueued_messages_count")
long getPersistentEnqueuedMessages();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.POINT_IN_TIME, units = StatisticUnit.BYTES, label = "Queue Depth",
- description = "Current size of all messages enqueued by this queue.")
+ description = "Current size of all messages enqueued by this queue.", metricName = "depth_bytes_total")
long getQueueDepthBytes();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.POINT_IN_TIME, units = StatisticUnit.MESSAGES, label = "Queue Depth",
- description = "Current number of messages enqueued by this queue.")
+ description = "Current number of messages enqueued by this queue.", metricName = "depth_messages_total")
int getQueueDepthMessages();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.CUMULATIVE, units = StatisticUnit.BYTES, label = "Delivered",
- description = "Total size of all messages delivered by this queue.")
+ description = "Total size of all messages delivered by this queue.", metricName = "total_dequeued_bytes_count")
long getTotalDequeuedBytes();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.CUMULATIVE, units = StatisticUnit.MESSAGES, label = "Delivered",
- description = "Total number of messages delivered by this queue.")
+ description = "Total number of messages delivered by this queue.", metricName = "total_dequeued_messages_count")
long getTotalDequeuedMessages();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.CUMULATIVE, units = StatisticUnit.BYTES, label = "Enqueued",
- description = "Total size of all messages received by this queue.")
+ description = "Total size of all messages received by this queue.", metricName = "total_enqueue_bytes_count")
long getTotalEnqueuedBytes();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.CUMULATIVE, units = StatisticUnit.MESSAGES, label = "Enqueued",
- description = "Total number of messages received by this queue.")
+ description = "Total number of messages received by this queue.", metricName = "total_enqueued_messages_count")
long getTotalEnqueuedMessages();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.CUMULATIVE, units = StatisticUnit.BYTES, label = "Expired",
- description = "Total size of all messages expired by message time-to-live on this queue.")
+ description = "Total size of all messages expired by message time-to-live on this queue.", metricName = "total_expired_bytes_count")
long getTotalExpiredBytes();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.CUMULATIVE, units = StatisticUnit.MESSAGES, label = "Expired",
- description = "Total number of messages expired by message time-to-live on this queue.")
+ description = "Total number of messages expired by message time-to-live on this queue.", metricName = "total_expired_messages_count")
long getTotalExpiredMessages();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.POINT_IN_TIME, units = StatisticUnit.BYTES, label = "Prefetched",
- description = "Total size of all messages currently prefetched by consumers.")
+ description = "Total size of all messages currently prefetched by consumers.", metricName = "unacknowledged_bytes_total")
Review comment:
The metric name could be made auto-generated
##########
File path: broker-core/src/main/java/org/apache/qpid/server/virtualhost/QueueManagingVirtualHost.java
##########
@@ -215,81 +215,81 @@
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.POINT_IN_TIME, units = StatisticUnit.COUNT, label = "Queues",
- description = "Current number of queues on this virtualhost.")
+ description = "Current number of queues on this virtualhost.", metricName = "queues_total")
long getQueueCount();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.POINT_IN_TIME, units = StatisticUnit.COUNT, label = "Exchanges",
- description = "Current number of exchanges on this virtualhost.")
+ description = "Current number of exchanges on this virtualhost.", metricName = "exchanges_total")
long getExchangeCount();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.POINT_IN_TIME, units = StatisticUnit.COUNT, label = "Connections",
- description = "Current number of messaging connections made to this virtualhost.")
+ description = "Current number of messaging connections made to this virtualhost.", metricName = "connections_total")
long getConnectionCount();
@ManagedStatistic(statisticType = StatisticType.CUMULATIVE, units = StatisticUnit.COUNT, label = "Total Connections",
- description = "Total number of messaging connections made to this virtualhost since broker startup")
+ description = "Total number of messaging connections made to this virtualhost since broker startup", metricName = "connections_since_startup_count")
long getTotalConnectionCount();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.CUMULATIVE, units = StatisticUnit.BYTES, label = "Inbound",
- description = "Total size of all messages received by this virtualhost.")
+ description = "Total size of all messages received by this virtualhost.", metricName = "inbound_bytes_count")
long getBytesIn();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.CUMULATIVE, units = StatisticUnit.BYTES, label = "Outbound",
- description = "Total size of all messages delivered by this virtualhost.")
+ description = "Total size of all messages delivered by this virtualhost.", metricName = "outbound_bytes_count")
long getBytesOut();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.CUMULATIVE, units = StatisticUnit.MESSAGES, label = "Inbound",
- description = "Total number of messages received by this virtualhost.")
+ description = "Total number of messages received by this virtualhost.", metricName = "inbound_messages_count")
long getMessagesIn();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.CUMULATIVE, units = StatisticUnit.MESSAGES, label = "Outbound",
- description = "Total number of messages delivered by this virtualhost.")
+ description = "Total number of messages delivered by this virtualhost.", metricName = "outbound_messages_count")
long getMessagesOut();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.CUMULATIVE, units = StatisticUnit.MESSAGES,
label = "Transacted Inbound",
- description = "Total number of messages delivered by this virtualhost within a transaction.")
+ description = "Total number of messages delivered by this virtualhost within a transaction.", metricName = "inbound_transacted_messages_count")
long getTransactedMessagesIn();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.CUMULATIVE, units = StatisticUnit.MESSAGES,
label = "Transacted Outbound",
- description = "Total number of messages received by this virtualhost within a transaction.")
+ description = "Total number of messages received by this virtualhost within a transaction.", metricName = "outbound_transacted_messages_count")
long getTransactedMessagesOut();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.POINT_IN_TIME, units = StatisticUnit.BYTES, label = "Queue Depth",
- description = "Current size of all messages enqueued by this virtualhost.")
+ description = "Current size of all messages enqueued by this virtualhost.", metricName = "total_queue_depth_bytes_total")
long getTotalDepthOfQueuesBytes();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.POINT_IN_TIME, units = StatisticUnit.MESSAGES, label = "Queue Depth",
- description = "Current number of messages enqueued by this virtualhost.")
+ description = "Current number of messages enqueued by this virtualhost.", metricName = "total_queue_depth_messages_total")
long getTotalDepthOfQueuesMessages();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.POINT_IN_TIME, units = StatisticUnit.BYTES, label = "In-Memory Message Bytes",
- description="Current size of all messages cached in-memory.")
+ description="Current size of all messages cached in-memory.", metricName = "in_memory_message_size_bytes_total")
long getInMemoryMessageSize();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.CUMULATIVE, units = StatisticUnit.BYTES, label = "Evacuated Message Bytes",
- description = "Total Number of Bytes Evacuated from Memory Due to Flow to Disk.")
+ description = "Total Number of Bytes Evacuated from Memory Due to Flow to Disk.", metricName = "evacuated_messages_bytes_count")
long getBytesEvacuatedFromMemory();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.POINT_IN_TIME,
units = StatisticUnit.BYTES,
label = "Maximum recorded size of inbound messages",
- description = "Maximum size of message published into the Virtual Host since start-up.")
+ description = "Maximum size of message published into the Virtual Host since start-up.", metricName = "high_water_mark_inbound_messages_total")
Review comment:
Total needs to be removed from water mark metric. The name inbound_message_size_high_watermark would work better here
##########
File path: broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java
##########
@@ -181,6 +184,8 @@
@ManagedAttributeField
private boolean _compressResponses;
+ private String _metric;
Review comment:
Unused field
##########
File path: broker-core/src/main/java/org/apache/qpid/server/model/Broker.java
##########
@@ -257,58 +273,71 @@
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.POINT_IN_TIME,
- units = StatisticUnit.COUNT,
- label = "Live threads",
- description = "Number of live threads")
+ units = StatisticUnit.COUNT,
+ label = "Live threads",
+ description = "Number of live threads",
+ metricName = "live_threads_total",
+ metricDisabled = true)
int getNumberOfLiveThreads();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.POINT_IN_TIME,
- units = StatisticUnit.BYTES,
- label = "Used Heap Memory Size",
- description = "Size of used heap memory")
+ units = StatisticUnit.BYTES,
+ label = "Used Heap Memory Size",
+ description = "Size of used heap memory",
+ metricName = "used_heap_memory_size_bytes_total",
Review comment:
The metric name "used_heap_memory_size_bytes_total" can be inherited from a statistics name "usedHeapMemorySize" using the metric name auto-generation functionality implemented in QpidCollector class. It seems that setting metric name explicitly is redundant.
##########
File path: broker-plugins/prometheus-exporter/src/main/java/org/apache/qpid/server/prometheus/QpidCollector.java
##########
@@ -0,0 +1,251 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+package org.apache.qpid.server.prometheus;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Predicate;
+
+import io.prometheus.client.Collector;
+import io.prometheus.client.CounterMetricFamily;
+import io.prometheus.client.GaugeMetricFamily;
+
+import org.apache.qpid.server.model.ConfiguredObject;
+import org.apache.qpid.server.model.ConfiguredObjectStatistic;
+import org.apache.qpid.server.model.Model;
+import org.apache.qpid.server.model.StatisticType;
+import org.apache.qpid.server.model.StatisticUnit;
+
+public class QpidCollector extends Collector
+{
+ private final static MetricFamilySamples IGNORED = new MetricFamilySamples(null, null, null, null);
+ static final String COUNT_SUFFIX = "count";
+ static final String TOTAL_SUFFIX = "total";
+ private final Predicate<ConfiguredObjectStatistic<?,?>> _includeStatisticFilter;
+ private final Predicate<String> _includeMetricFilter;
+ private ConfiguredObject<?> _root;
+ private Model _model;
+
+
+ QpidCollector(final ConfiguredObject<?> root,
+ final Predicate<ConfiguredObjectStatistic<?,?>> includeStatisticFilter,
+ final Predicate<String> includeMetricFilter)
+ {
+ _root = root;
+ _model = _root.getModel();
+ _includeStatisticFilter = includeStatisticFilter;
+ _includeMetricFilter = includeMetricFilter;
+ }
+
+ @Override
+ public List<MetricFamilySamples> collect()
+ {
+ final List<MetricFamilySamples> metricFamilySamples = new ArrayList<>();
+ addObjectMetrics(_root, Collections.emptyList(), new HashMap<>(), metricFamilySamples);
+ addChildrenMetrics(metricFamilySamples, _root, Collections.singletonList("name"));
+ return metricFamilySamples;
+ }
+
+ private void addObjectMetrics(final ConfiguredObject<?> object,
+ final List<String> labelNames,
+ final Map<String, MetricFamilySamples> metricFamilyMap,
+ final List<MetricFamilySamples> metricFamilySamples)
+ {
+ final Map<String, Object> statsMap = object.getStatistics();
+ for (final Map.Entry<String, Object> entry : statsMap.entrySet())
+ {
+ MetricFamilySamples family = metricFamilyMap.get(entry.getKey());
+ if (family == null)
+ {
+ family = createMetricFamilySamples(entry.getKey(), object, labelNames);
+ metricFamilyMap.put(entry.getKey(), family);
+ if (family != IGNORED)
+ {
+ metricFamilySamples.add(family);
+ }
+ }
+ if (family != IGNORED)
+ {
+ final List<String> labelsValues = buildLabelValues(object);
+ final double doubleValue = toDoubleValue(entry.getValue());
+ family.samples.add(new MetricFamilySamples.Sample(family.name, labelNames, labelsValues, doubleValue));
+ }
+ }
+ }
+
+ private MetricFamilySamples createMetricFamilySamples(final String statisticName,
+ final ConfiguredObject<?> object,
+ final List<String> labelNames)
+ {
+ final ConfiguredObjectStatistic<?, ?> configuredObjectStatistic =
+ findConfiguredObjectStatistic(statisticName, object.getTypeClass());
+ if (configuredObjectStatistic == null || !_includeStatisticFilter.test(configuredObjectStatistic))
+ {
+ return IGNORED;
+ }
+ final StatisticType type = configuredObjectStatistic.getStatisticType();
+ final String familyName = getFamilyName(object.getCategoryClass(), configuredObjectStatistic);
+
+ if (!_includeMetricFilter.test(familyName))
+ {
+ return IGNORED;
+ }
+
+ if (type == StatisticType.CUMULATIVE)
+ {
+ return new CounterMetricFamily(familyName, configuredObjectStatistic.getDescription(), labelNames);
+ }
+ else
+ {
+ return new GaugeMetricFamily(familyName, configuredObjectStatistic.getDescription(), labelNames);
+ }
+ }
+
+ private ConfiguredObjectStatistic<?, ?> findConfiguredObjectStatistic(final String statisticName,
+ final Class<? extends ConfiguredObject> typeClass)
+ {
+ final Collection<ConfiguredObjectStatistic<?, ?>> statisticsDefinitions =
+ _model.getTypeRegistry().getStatistics(typeClass);
+ return statisticsDefinitions.stream()
+ .filter(s -> statisticName.equals(s.getName()))
+ .findFirst()
+ .orElse(null);
+ }
+
+ private List<String> buildLabelValues(final ConfiguredObject<?> object)
+ {
+ final List<String> labelsValues = new ArrayList<>();
+ ConfiguredObject o = object;
+ while (o != null && o != _root)
+ {
+ labelsValues.add(o.getName());
+ o = o.getParent();
+ }
+ return labelsValues;
+ }
+
+ private void addChildrenMetrics(final List<MetricFamilySamples> metricFamilySamples,
+ final ConfiguredObject<?> object,
+ final List<String> childLabelNames)
+ {
+ final Class<? extends ConfiguredObject> category = object.getCategoryClass();
+ for (final Class<? extends ConfiguredObject> childClass : _model.getChildTypes(category))
+ {
+ final Collection<? extends ConfiguredObject> children = object.getChildren(childClass);
+ if (children != null && !children.isEmpty())
+ {
+ final Map<String, MetricFamilySamples> childrenMetricFamilyMap = new HashMap<>();
+ for (final ConfiguredObject<?> child : children)
+ {
+ addObjectMetrics(child, childLabelNames, childrenMetricFamilyMap, metricFamilySamples);
+ final List<String> labelNames = new ArrayList<>(childLabelNames);
+ final String label = String.format("%s_name", toSnakeCase(childClass.getSimpleName()));
+ labelNames.add(label);
+ addChildrenMetrics(metricFamilySamples, child, labelNames);
+ }
+ }
+ }
+ }
+
+ static String toSnakeCase(final String simpleName)
+ {
+ final StringBuilder sb = new StringBuilder();
+ final char[] chars = simpleName.toCharArray();
+ for (int i = 0; i < chars.length; i++)
+ {
+ final char ch = chars[i];
+ if (Character.isUpperCase(ch))
+ {
+ if (i > 0)
+ {
+ sb.append('_');
+ }
+ sb.append(Character.toLowerCase(ch));
+ }
+ else
+ {
+ sb.append(ch);
+ }
+ }
+ return sb.toString();
+ }
+
+ private double toDoubleValue(final Object value)
+ {
+ if (value instanceof Number)
+ {
+ return ((Number) value).doubleValue();
+ }
+ return 0;
+ }
+
+ static String getFamilyName(final Class<? extends ConfiguredObject> categoryClass,
+ ConfiguredObjectStatistic<?, ?> statistics)
+ {
+ String metricName = statistics.getMetricName();
+ if (metricName == null || metricName.isEmpty())
+ {
+ metricName = generateMetricName(statistics);
+ }
+
+ return String.format("qpid_%s_%s",
+ toSnakeCase(categoryClass.getSimpleName()),
+ metricName);
+ }
+
+ private static String generateMetricName(final ConfiguredObjectStatistic<?, ?> statistics)
+ {
+ String metricName = toSnakeCase(statistics.getName());
+ String suffix;
+ switch (statistics.getStatisticType())
+ {
+ case CUMULATIVE:
+ suffix = generateMetricSuffix(statistics, COUNT_SUFFIX);
+ break;
+ case POINT_IN_TIME:
+ suffix = generateMetricSuffix(statistics, TOTAL_SUFFIX);
+ break;
+ default:
+ suffix = "";
+ }
+
+ return metricName + suffix;
+ }
+
+ private static String generateMetricSuffix(final ConfiguredObjectStatistic<?, ?> statistics, String typeSuffix)
+ {
+ String suffix = "";
+ if (!statistics.getName().toLowerCase().contains(typeSuffix)
+ && statistics.getUnits() != StatisticUnit.ABSOLUTE_TIME
+ && statistics.getUnits() != StatisticUnit.TIME_DURATION)
+ {
+ if (statistics.getUnits() == StatisticUnit.MESSAGES || statistics.getUnits() == StatisticUnit.BYTES)
+ {
+ suffix = "_" + statistics.getUnits().toString() + "s";
Review comment:
The metric name functionality can be improved to check whether metric name already ends with unit names. When units are there, skip the unit addition to the suffix
##########
File path: broker-core/src/main/java/org/apache/qpid/server/model/Broker.java
##########
@@ -257,58 +273,71 @@
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.POINT_IN_TIME,
- units = StatisticUnit.COUNT,
- label = "Live threads",
- description = "Number of live threads")
+ units = StatisticUnit.COUNT,
+ label = "Live threads",
+ description = "Number of live threads",
+ metricName = "live_threads_total",
+ metricDisabled = true)
int getNumberOfLiveThreads();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.POINT_IN_TIME,
- units = StatisticUnit.BYTES,
- label = "Used Heap Memory Size",
- description = "Size of used heap memory")
+ units = StatisticUnit.BYTES,
+ label = "Used Heap Memory Size",
+ description = "Size of used heap memory",
+ metricName = "used_heap_memory_size_bytes_total",
+ metricDisabled = true)
long getUsedHeapMemorySize();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.POINT_IN_TIME,
- units = StatisticUnit.BYTES,
- label = "Used Direct Memory Size",
- description = "Size of used direct memory")
+ units = StatisticUnit.BYTES,
+ label = "Used Direct Memory Size",
+ description = "Size of used direct memory",
+ metricName = "used_direct_memory_size_bytes_total",
+ metricDisabled = true)
long getUsedDirectMemorySize();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.POINT_IN_TIME,
- units = StatisticUnit.BYTES,
- label = "Direct Memory Total Capacity",
- description = "Total capacity of direct memory allocated for the Broker process")
+ units = StatisticUnit.BYTES,
+ label = "Direct Memory Total Capacity",
+ description = "Total capacity of direct memory allocated for the Broker process",
+ metricName = "direct_memory_total_capacity_bytes_total",
Review comment:
The "total" appears twice in the metric name. IMHO, we should name the metric as "direct_memory_capacity_bytes_total"
##########
File path: broker-core/src/main/java/org/apache/qpid/server/model/Broker.java
##########
@@ -257,58 +273,71 @@
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.POINT_IN_TIME,
- units = StatisticUnit.COUNT,
- label = "Live threads",
- description = "Number of live threads")
+ units = StatisticUnit.COUNT,
+ label = "Live threads",
+ description = "Number of live threads",
+ metricName = "live_threads_total",
+ metricDisabled = true)
int getNumberOfLiveThreads();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.POINT_IN_TIME,
- units = StatisticUnit.BYTES,
- label = "Used Heap Memory Size",
- description = "Size of used heap memory")
+ units = StatisticUnit.BYTES,
+ label = "Used Heap Memory Size",
+ description = "Size of used heap memory",
+ metricName = "used_heap_memory_size_bytes_total",
+ metricDisabled = true)
long getUsedHeapMemorySize();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.POINT_IN_TIME,
- units = StatisticUnit.BYTES,
- label = "Used Direct Memory Size",
- description = "Size of used direct memory")
+ units = StatisticUnit.BYTES,
+ label = "Used Direct Memory Size",
+ description = "Size of used direct memory",
+ metricName = "used_direct_memory_size_bytes_total",
+ metricDisabled = true)
long getUsedDirectMemorySize();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.POINT_IN_TIME,
- units = StatisticUnit.BYTES,
- label = "Direct Memory Total Capacity",
- description = "Total capacity of direct memory allocated for the Broker process")
+ units = StatisticUnit.BYTES,
+ label = "Direct Memory Total Capacity",
+ description = "Total capacity of direct memory allocated for the Broker process",
+ metricName = "direct_memory_total_capacity_bytes_total",
+ metricDisabled = true)
long getDirectMemoryTotalCapacity();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.POINT_IN_TIME,
- units = StatisticUnit.COUNT,
- label = "Number Of Object Pending Finalization",
- description = "Number of objects pending finalization")
+ units = StatisticUnit.COUNT,
+ label = "Number Of Object Pending Finalization",
+ description = "Number of objects pending finalization",
+ metricName = "number_of_objects_pending_finalization_total",
+ metricDisabled = true)
int getNumberOfObjectsPendingFinalization();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.POINT_IN_TIME,
units = StatisticUnit.COUNT,
label = "Number of Buffers In-Use",
- description = "Number of direct memory buffers currently in-use.")
+ description = "Number of direct memory buffers currently in-use.",
+ metricName = "number_of_buffers_in_use_total")
Review comment:
The metric name "number_of_buffers_in_use_total" can be inherited from a statistics name "numberOfBuffersInUse" using the metric name auto-generation functionality implemented in QpidCollector class. It seems that setting this metric name explicitly is redundant.
##########
File path: broker-core/src/main/java/org/apache/qpid/server/model/Broker.java
##########
@@ -257,58 +273,71 @@
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.POINT_IN_TIME,
- units = StatisticUnit.COUNT,
- label = "Live threads",
- description = "Number of live threads")
+ units = StatisticUnit.COUNT,
+ label = "Live threads",
+ description = "Number of live threads",
+ metricName = "live_threads_total",
+ metricDisabled = true)
int getNumberOfLiveThreads();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.POINT_IN_TIME,
- units = StatisticUnit.BYTES,
- label = "Used Heap Memory Size",
- description = "Size of used heap memory")
+ units = StatisticUnit.BYTES,
+ label = "Used Heap Memory Size",
+ description = "Size of used heap memory",
+ metricName = "used_heap_memory_size_bytes_total",
+ metricDisabled = true)
long getUsedHeapMemorySize();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.POINT_IN_TIME,
- units = StatisticUnit.BYTES,
- label = "Used Direct Memory Size",
- description = "Size of used direct memory")
+ units = StatisticUnit.BYTES,
+ label = "Used Direct Memory Size",
+ description = "Size of used direct memory",
+ metricName = "used_direct_memory_size_bytes_total",
+ metricDisabled = true)
long getUsedDirectMemorySize();
Review comment:
The metric name "used_direct_memory_size_bytes_total" can be inherited from a statistics name "usedDirectMemorySize" using the metric name auto-generation functionality implemented in QpidCollector class. It seems that setting metric name explicitly is redundant.
##########
File path: broker-core/src/main/java/org/apache/qpid/server/model/Connection.java
##########
@@ -162,22 +162,22 @@
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.POINT_IN_TIME, units = StatisticUnit.COUNT, label = "Sessions",
- description = "Current number of sessions belonging to this connection.")
+ description = "Current number of sessions belonging to this connection.", metricName = "sessions_total")
int getSessionCount();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.CUMULATIVE, units = StatisticUnit.COUNT,
- label = "Transactions", description = "Total number of transactions started.")
+ label = "Transactions", description = "Total number of transactions started.", metricName = "local_transaction_started_count")
Review comment:
The connection metric name local_transaction_started_count can be derived from the statistic name localTransactionBegins and it can be auto-generated as "local_transaction_begins_count"
##########
File path: broker-core/src/main/java/org/apache/qpid/server/model/Queue.java
##########
@@ -390,133 +390,133 @@
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.POINT_IN_TIME, units = StatisticUnit.COUNT, label = "Bindings",
- description = "Current number of bindings to this queue.")
+ description = "Current number of bindings to this queue.", metricName = "binding_total")
int getBindingCount();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.POINT_IN_TIME, units = StatisticUnit.COUNT, label = "Consumers",
- description = "Current number of consumers attached to this queue.")
+ description = "Current number of consumers attached to this queue.", metricName = "consumers_total")
int getConsumerCount();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.POINT_IN_TIME, units = StatisticUnit.COUNT, label = "Consumers with credit",
- description = "Current number of consumers attached to this queue with credit")
+ description = "Current number of consumers attached to this queue with credit", metricName = "consumers_with_credit_total")
int getConsumerCountWithCredit();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.CUMULATIVE, units = StatisticUnit.BYTES, label = "Delivered (Persistent)",
- description = "Total size of all persistent messages delivered by this queue.")
+ description = "Total size of all persistent messages delivered by this queue.", metricName = "persistent_dequeued_bytes_count")
Review comment:
The metric name can be potentially auto-generated in QpidCollector
##########
File path: broker-core/src/main/java/org/apache/qpid/server/model/Connection.java
##########
@@ -162,22 +162,22 @@
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.POINT_IN_TIME, units = StatisticUnit.COUNT, label = "Sessions",
- description = "Current number of sessions belonging to this connection.")
+ description = "Current number of sessions belonging to this connection.", metricName = "sessions_total")
int getSessionCount();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.CUMULATIVE, units = StatisticUnit.COUNT,
- label = "Transactions", description = "Total number of transactions started.")
+ label = "Transactions", description = "Total number of transactions started.", metricName = "local_transaction_started_count")
long getLocalTransactionBegins();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.CUMULATIVE, units = StatisticUnit.COUNT,
- label = "Rolled-back Transactions", description = "Total number of rolled-back transactions.")
+ label = "Rolled-back Transactions", description = "Total number of rolled-back transactions.", metricName = "local_transaction_rollback_count")
long getLocalTransactionRollbacks();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.POINT_IN_TIME, units = StatisticUnit.COUNT,
- label = "Open Transactions", description = "Current number of open transactions.")
+ label = "Open Transactions", description = "Current number of open transactions.", metricName = "local_transaction_open_total")
Review comment:
For a consistency with the suggested above metric names local_transaction_begins_count and local_transaction_rollbacks_count, I would like to rename this metric into local_transaction_opens_total
##########
File path: broker-core/src/main/java/org/apache/qpid/server/model/Queue.java
##########
@@ -390,133 +390,133 @@
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.POINT_IN_TIME, units = StatisticUnit.COUNT, label = "Bindings",
- description = "Current number of bindings to this queue.")
+ description = "Current number of bindings to this queue.", metricName = "binding_total")
int getBindingCount();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.POINT_IN_TIME, units = StatisticUnit.COUNT, label = "Consumers",
- description = "Current number of consumers attached to this queue.")
+ description = "Current number of consumers attached to this queue.", metricName = "consumers_total")
int getConsumerCount();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.POINT_IN_TIME, units = StatisticUnit.COUNT, label = "Consumers with credit",
- description = "Current number of consumers attached to this queue with credit")
+ description = "Current number of consumers attached to this queue with credit", metricName = "consumers_with_credit_total")
int getConsumerCountWithCredit();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.CUMULATIVE, units = StatisticUnit.BYTES, label = "Delivered (Persistent)",
- description = "Total size of all persistent messages delivered by this queue.")
+ description = "Total size of all persistent messages delivered by this queue.", metricName = "persistent_dequeued_bytes_count")
long getPersistentDequeuedBytes();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.CUMULATIVE, units = StatisticUnit.MESSAGES, label = "Delivered (Persistent)",
- description = "Total number of persistent messages delivered by this queue.")
+ description = "Total number of persistent messages delivered by this queue.", metricName = "persistent_dequeued_messages_count")
long getPersistentDequeuedMessages();
Review comment:
The metric name can be potentially auto-generated in QpidCollector
##########
File path: broker-core/src/main/java/org/apache/qpid/server/model/Consumer.java
##########
@@ -69,16 +69,16 @@
+ "consumers. Priority 2147483647 is the highest priority.")
int getPriority();
- @ManagedStatistic(statisticType = StatisticType.CUMULATIVE, units = StatisticUnit.BYTES, label = "Outbound")
+ @ManagedStatistic(statisticType = StatisticType.CUMULATIVE, units = StatisticUnit.BYTES, label = "Outbound", metricName = "outbound_bytes_count")
long getBytesOut();
- @ManagedStatistic(statisticType = StatisticType.CUMULATIVE, units = StatisticUnit.MESSAGES, label = "Outbound")
+ @ManagedStatistic(statisticType = StatisticType.CUMULATIVE, units = StatisticUnit.MESSAGES, label = "Outbound", metricName = "outbound_messages_count")
long getMessagesOut();
- @ManagedStatistic(statisticType = StatisticType.POINT_IN_TIME, units = StatisticUnit.BYTES, label = "Prefetch")
+ @ManagedStatistic(statisticType = StatisticType.POINT_IN_TIME, units = StatisticUnit.BYTES, label = "Prefetch", metricName = "unacknowledged_bytes_total")
long getUnacknowledgedBytes();
- @ManagedStatistic(statisticType = StatisticType.POINT_IN_TIME, units = StatisticUnit.MESSAGES, label = "Prefetch")
+ @ManagedStatistic(statisticType = StatisticType.POINT_IN_TIME, units = StatisticUnit.MESSAGES, label = "Prefetch", metricName = "unacknowledged_messages_total")
Review comment:
It seems that metric name can be made auto-generated. Though, the auto-generation functionality would need to check whether statistics units are already included into a statistic name. Thus, when the statistics name ends with a unit name, the naming algorithm should not append the unit
##########
File path: broker-core/src/main/java/org/apache/qpid/server/model/Queue.java
##########
@@ -390,133 +390,133 @@
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.POINT_IN_TIME, units = StatisticUnit.COUNT, label = "Bindings",
- description = "Current number of bindings to this queue.")
+ description = "Current number of bindings to this queue.", metricName = "binding_total")
int getBindingCount();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.POINT_IN_TIME, units = StatisticUnit.COUNT, label = "Consumers",
- description = "Current number of consumers attached to this queue.")
+ description = "Current number of consumers attached to this queue.", metricName = "consumers_total")
int getConsumerCount();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.POINT_IN_TIME, units = StatisticUnit.COUNT, label = "Consumers with credit",
- description = "Current number of consumers attached to this queue with credit")
+ description = "Current number of consumers attached to this queue with credit", metricName = "consumers_with_credit_total")
int getConsumerCountWithCredit();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.CUMULATIVE, units = StatisticUnit.BYTES, label = "Delivered (Persistent)",
- description = "Total size of all persistent messages delivered by this queue.")
+ description = "Total size of all persistent messages delivered by this queue.", metricName = "persistent_dequeued_bytes_count")
long getPersistentDequeuedBytes();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.CUMULATIVE, units = StatisticUnit.MESSAGES, label = "Delivered (Persistent)",
- description = "Total number of persistent messages delivered by this queue.")
+ description = "Total number of persistent messages delivered by this queue.", metricName = "persistent_dequeued_messages_count")
long getPersistentDequeuedMessages();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.CUMULATIVE, units = StatisticUnit.BYTES, label = "Enqueued (Persistent)",
- description = "Total size of all persistent messages received by this queue.")
+ description = "Total size of all persistent messages received by this queue.", metricName = "persistent_enqueue_bytes_count")
long getPersistentEnqueuedBytes();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.CUMULATIVE, units = StatisticUnit.MESSAGES, label = "Enqueued (Persistent)",
- description = "Total number of persistent messages received by this queue.")
+ description = "Total number of persistent messages received by this queue.", metricName = "persistent_enqueued_messages_count")
long getPersistentEnqueuedMessages();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.POINT_IN_TIME, units = StatisticUnit.BYTES, label = "Queue Depth",
- description = "Current size of all messages enqueued by this queue.")
+ description = "Current size of all messages enqueued by this queue.", metricName = "depth_bytes_total")
long getQueueDepthBytes();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.POINT_IN_TIME, units = StatisticUnit.MESSAGES, label = "Queue Depth",
- description = "Current number of messages enqueued by this queue.")
+ description = "Current number of messages enqueued by this queue.", metricName = "depth_messages_total")
int getQueueDepthMessages();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.CUMULATIVE, units = StatisticUnit.BYTES, label = "Delivered",
- description = "Total size of all messages delivered by this queue.")
+ description = "Total size of all messages delivered by this queue.", metricName = "total_dequeued_bytes_count")
long getTotalDequeuedBytes();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.CUMULATIVE, units = StatisticUnit.MESSAGES, label = "Delivered",
- description = "Total number of messages delivered by this queue.")
+ description = "Total number of messages delivered by this queue.", metricName = "total_dequeued_messages_count")
long getTotalDequeuedMessages();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.CUMULATIVE, units = StatisticUnit.BYTES, label = "Enqueued",
- description = "Total size of all messages received by this queue.")
+ description = "Total size of all messages received by this queue.", metricName = "total_enqueue_bytes_count")
long getTotalEnqueuedBytes();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.CUMULATIVE, units = StatisticUnit.MESSAGES, label = "Enqueued",
- description = "Total number of messages received by this queue.")
+ description = "Total number of messages received by this queue.", metricName = "total_enqueued_messages_count")
long getTotalEnqueuedMessages();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.CUMULATIVE, units = StatisticUnit.BYTES, label = "Expired",
- description = "Total size of all messages expired by message time-to-live on this queue.")
+ description = "Total size of all messages expired by message time-to-live on this queue.", metricName = "total_expired_bytes_count")
long getTotalExpiredBytes();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.CUMULATIVE, units = StatisticUnit.MESSAGES, label = "Expired",
- description = "Total number of messages expired by message time-to-live on this queue.")
+ description = "Total number of messages expired by message time-to-live on this queue.", metricName = "total_expired_messages_count")
long getTotalExpiredMessages();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.POINT_IN_TIME, units = StatisticUnit.BYTES, label = "Prefetched",
- description = "Total size of all messages currently prefetched by consumers.")
+ description = "Total size of all messages currently prefetched by consumers.", metricName = "unacknowledged_bytes_total")
long getUnacknowledgedBytes();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.POINT_IN_TIME, units = StatisticUnit.MESSAGES, label = "Prefetched",
- description = "Total number of messages currently prefetched by consumers.")
+ description = "Total number of messages currently prefetched by consumers.", metricName = "unacknowledged_messages_total")
long getUnacknowledgedMessages();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.POINT_IN_TIME, units = StatisticUnit.BYTES, label = "Available",
- description = "Total size of all messages currently available.")
+ description = "Total size of all messages currently available.", metricName = "available_bytes_total")
long getAvailableBytes();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.POINT_IN_TIME, units = StatisticUnit.MESSAGES, label = "Available",
- description = "Total number of messages currently available.")
+ description = "Total number of messages currently available.", metricName = "available_messages_total")
int getAvailableMessages();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.POINT_IN_TIME, units = StatisticUnit.BYTES, label = "Available HWM",
- description = "Maximum recorded size of available messages.")
+ description = "Maximum recorded size of available messages.", metricName = "available_high_water_mark_bytes_total")
Review comment:
Inconsistent metric name 'available_high_water_mark_bytes_total'. The broker water mark statistics do not have suffix "total". IMHO, all water mark statistics should be named in a similar manner. Though, it is a gauge metric. I think suffix total makes water mark statistics less readble. Thus, I would remove it.
##########
File path: broker-core/src/main/java/org/apache/qpid/server/model/Connection.java
##########
@@ -162,22 +162,22 @@
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.POINT_IN_TIME, units = StatisticUnit.COUNT, label = "Sessions",
- description = "Current number of sessions belonging to this connection.")
+ description = "Current number of sessions belonging to this connection.", metricName = "sessions_total")
int getSessionCount();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.CUMULATIVE, units = StatisticUnit.COUNT,
- label = "Transactions", description = "Total number of transactions started.")
+ label = "Transactions", description = "Total number of transactions started.", metricName = "local_transaction_started_count")
long getLocalTransactionBegins();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.CUMULATIVE, units = StatisticUnit.COUNT,
- label = "Rolled-back Transactions", description = "Total number of rolled-back transactions.")
+ label = "Rolled-back Transactions", description = "Total number of rolled-back transactions.", metricName = "local_transaction_rollback_count")
Review comment:
The connection metric name local_transaction_rollback_count can be auto-generated from the statistic name localTransactionRollbacks. IMHO setting it explicitly is redundant.
##########
File path: broker-core/src/main/java/org/apache/qpid/server/model/Consumer.java
##########
@@ -69,16 +69,16 @@
+ "consumers. Priority 2147483647 is the highest priority.")
int getPriority();
- @ManagedStatistic(statisticType = StatisticType.CUMULATIVE, units = StatisticUnit.BYTES, label = "Outbound")
+ @ManagedStatistic(statisticType = StatisticType.CUMULATIVE, units = StatisticUnit.BYTES, label = "Outbound", metricName = "outbound_bytes_count")
long getBytesOut();
- @ManagedStatistic(statisticType = StatisticType.CUMULATIVE, units = StatisticUnit.MESSAGES, label = "Outbound")
+ @ManagedStatistic(statisticType = StatisticType.CUMULATIVE, units = StatisticUnit.MESSAGES, label = "Outbound", metricName = "outbound_messages_count")
long getMessagesOut();
- @ManagedStatistic(statisticType = StatisticType.POINT_IN_TIME, units = StatisticUnit.BYTES, label = "Prefetch")
+ @ManagedStatistic(statisticType = StatisticType.POINT_IN_TIME, units = StatisticUnit.BYTES, label = "Prefetch", metricName = "unacknowledged_bytes_total")
Review comment:
It seems that metric name can be made auto-generated. Though, the auto-generation functionality would need to check whether statistics units are already included into a statistic name. Thus, when the statistics name ends with a unit name, the naming algorithm should not append the unit
##########
File path: broker-core/src/main/java/org/apache/qpid/server/model/Queue.java
##########
@@ -390,133 +390,133 @@
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.POINT_IN_TIME, units = StatisticUnit.COUNT, label = "Bindings",
- description = "Current number of bindings to this queue.")
+ description = "Current number of bindings to this queue.", metricName = "binding_total")
Review comment:
The queue metric name binding_total should be renamed into "bindings_total" for a consistency sake. The plural is used for the same metric in Exchange and it seems that majority of metrics are expressed in plural form
##########
File path: broker-core/src/main/java/org/apache/qpid/server/virtualhost/QueueManagingVirtualHost.java
##########
@@ -215,81 +215,81 @@
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.POINT_IN_TIME, units = StatisticUnit.COUNT, label = "Queues",
- description = "Current number of queues on this virtualhost.")
+ description = "Current number of queues on this virtualhost.", metricName = "queues_total")
long getQueueCount();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.POINT_IN_TIME, units = StatisticUnit.COUNT, label = "Exchanges",
- description = "Current number of exchanges on this virtualhost.")
+ description = "Current number of exchanges on this virtualhost.", metricName = "exchanges_total")
long getExchangeCount();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.POINT_IN_TIME, units = StatisticUnit.COUNT, label = "Connections",
- description = "Current number of messaging connections made to this virtualhost.")
+ description = "Current number of messaging connections made to this virtualhost.", metricName = "connections_total")
long getConnectionCount();
@ManagedStatistic(statisticType = StatisticType.CUMULATIVE, units = StatisticUnit.COUNT, label = "Total Connections",
- description = "Total number of messaging connections made to this virtualhost since broker startup")
+ description = "Total number of messaging connections made to this virtualhost since broker startup", metricName = "connections_since_startup_count")
Review comment:
The metric name is inconsistent with the same metric name on amqp port . Possibly, overall_connections_count or aggregate_connection_count could be a better name for the metric.
##########
File path: broker-core/src/main/java/org/apache/qpid/server/model/Queue.java
##########
@@ -390,133 +390,133 @@
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.POINT_IN_TIME, units = StatisticUnit.COUNT, label = "Bindings",
- description = "Current number of bindings to this queue.")
+ description = "Current number of bindings to this queue.", metricName = "binding_total")
int getBindingCount();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.POINT_IN_TIME, units = StatisticUnit.COUNT, label = "Consumers",
- description = "Current number of consumers attached to this queue.")
+ description = "Current number of consumers attached to this queue.", metricName = "consumers_total")
int getConsumerCount();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.POINT_IN_TIME, units = StatisticUnit.COUNT, label = "Consumers with credit",
- description = "Current number of consumers attached to this queue with credit")
+ description = "Current number of consumers attached to this queue with credit", metricName = "consumers_with_credit_total")
int getConsumerCountWithCredit();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.CUMULATIVE, units = StatisticUnit.BYTES, label = "Delivered (Persistent)",
- description = "Total size of all persistent messages delivered by this queue.")
+ description = "Total size of all persistent messages delivered by this queue.", metricName = "persistent_dequeued_bytes_count")
long getPersistentDequeuedBytes();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.CUMULATIVE, units = StatisticUnit.MESSAGES, label = "Delivered (Persistent)",
- description = "Total number of persistent messages delivered by this queue.")
+ description = "Total number of persistent messages delivered by this queue.", metricName = "persistent_dequeued_messages_count")
long getPersistentDequeuedMessages();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.CUMULATIVE, units = StatisticUnit.BYTES, label = "Enqueued (Persistent)",
- description = "Total size of all persistent messages received by this queue.")
+ description = "Total size of all persistent messages received by this queue.", metricName = "persistent_enqueue_bytes_count")
Review comment:
The metric name can be potentially auto-generated in QpidCollector
##########
File path: broker-core/src/main/java/org/apache/qpid/server/model/Queue.java
##########
@@ -390,133 +390,133 @@
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.POINT_IN_TIME, units = StatisticUnit.COUNT, label = "Bindings",
- description = "Current number of bindings to this queue.")
+ description = "Current number of bindings to this queue.", metricName = "binding_total")
int getBindingCount();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.POINT_IN_TIME, units = StatisticUnit.COUNT, label = "Consumers",
- description = "Current number of consumers attached to this queue.")
+ description = "Current number of consumers attached to this queue.", metricName = "consumers_total")
int getConsumerCount();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.POINT_IN_TIME, units = StatisticUnit.COUNT, label = "Consumers with credit",
- description = "Current number of consumers attached to this queue with credit")
+ description = "Current number of consumers attached to this queue with credit", metricName = "consumers_with_credit_total")
int getConsumerCountWithCredit();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.CUMULATIVE, units = StatisticUnit.BYTES, label = "Delivered (Persistent)",
- description = "Total size of all persistent messages delivered by this queue.")
+ description = "Total size of all persistent messages delivered by this queue.", metricName = "persistent_dequeued_bytes_count")
long getPersistentDequeuedBytes();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.CUMULATIVE, units = StatisticUnit.MESSAGES, label = "Delivered (Persistent)",
- description = "Total number of persistent messages delivered by this queue.")
+ description = "Total number of persistent messages delivered by this queue.", metricName = "persistent_dequeued_messages_count")
long getPersistentDequeuedMessages();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.CUMULATIVE, units = StatisticUnit.BYTES, label = "Enqueued (Persistent)",
- description = "Total size of all persistent messages received by this queue.")
+ description = "Total size of all persistent messages received by this queue.", metricName = "persistent_enqueue_bytes_count")
long getPersistentEnqueuedBytes();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.CUMULATIVE, units = StatisticUnit.MESSAGES, label = "Enqueued (Persistent)",
- description = "Total number of persistent messages received by this queue.")
+ description = "Total number of persistent messages received by this queue.", metricName = "persistent_enqueued_messages_count")
Review comment:
The metric name can be potentially auto-generated in QpidCollector
##########
File path: broker-core/src/main/java/org/apache/qpid/server/model/Queue.java
##########
@@ -390,133 +390,133 @@
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.POINT_IN_TIME, units = StatisticUnit.COUNT, label = "Bindings",
- description = "Current number of bindings to this queue.")
+ description = "Current number of bindings to this queue.", metricName = "binding_total")
int getBindingCount();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.POINT_IN_TIME, units = StatisticUnit.COUNT, label = "Consumers",
- description = "Current number of consumers attached to this queue.")
+ description = "Current number of consumers attached to this queue.", metricName = "consumers_total")
int getConsumerCount();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.POINT_IN_TIME, units = StatisticUnit.COUNT, label = "Consumers with credit",
- description = "Current number of consumers attached to this queue with credit")
+ description = "Current number of consumers attached to this queue with credit", metricName = "consumers_with_credit_total")
int getConsumerCountWithCredit();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.CUMULATIVE, units = StatisticUnit.BYTES, label = "Delivered (Persistent)",
- description = "Total size of all persistent messages delivered by this queue.")
+ description = "Total size of all persistent messages delivered by this queue.", metricName = "persistent_dequeued_bytes_count")
long getPersistentDequeuedBytes();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.CUMULATIVE, units = StatisticUnit.MESSAGES, label = "Delivered (Persistent)",
- description = "Total number of persistent messages delivered by this queue.")
+ description = "Total number of persistent messages delivered by this queue.", metricName = "persistent_dequeued_messages_count")
long getPersistentDequeuedMessages();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.CUMULATIVE, units = StatisticUnit.BYTES, label = "Enqueued (Persistent)",
- description = "Total size of all persistent messages received by this queue.")
+ description = "Total size of all persistent messages received by this queue.", metricName = "persistent_enqueue_bytes_count")
long getPersistentEnqueuedBytes();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.CUMULATIVE, units = StatisticUnit.MESSAGES, label = "Enqueued (Persistent)",
- description = "Total number of persistent messages received by this queue.")
+ description = "Total number of persistent messages received by this queue.", metricName = "persistent_enqueued_messages_count")
long getPersistentEnqueuedMessages();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.POINT_IN_TIME, units = StatisticUnit.BYTES, label = "Queue Depth",
- description = "Current size of all messages enqueued by this queue.")
+ description = "Current size of all messages enqueued by this queue.", metricName = "depth_bytes_total")
long getQueueDepthBytes();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.POINT_IN_TIME, units = StatisticUnit.MESSAGES, label = "Queue Depth",
- description = "Current number of messages enqueued by this queue.")
+ description = "Current number of messages enqueued by this queue.", metricName = "depth_messages_total")
int getQueueDepthMessages();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.CUMULATIVE, units = StatisticUnit.BYTES, label = "Delivered",
- description = "Total size of all messages delivered by this queue.")
+ description = "Total size of all messages delivered by this queue.", metricName = "total_dequeued_bytes_count")
long getTotalDequeuedBytes();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.CUMULATIVE, units = StatisticUnit.MESSAGES, label = "Delivered",
- description = "Total number of messages delivered by this queue.")
+ description = "Total number of messages delivered by this queue.", metricName = "total_dequeued_messages_count")
long getTotalDequeuedMessages();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.CUMULATIVE, units = StatisticUnit.BYTES, label = "Enqueued",
- description = "Total size of all messages received by this queue.")
+ description = "Total size of all messages received by this queue.", metricName = "total_enqueue_bytes_count")
long getTotalEnqueuedBytes();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.CUMULATIVE, units = StatisticUnit.MESSAGES, label = "Enqueued",
- description = "Total number of messages received by this queue.")
+ description = "Total number of messages received by this queue.", metricName = "total_enqueued_messages_count")
long getTotalEnqueuedMessages();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.CUMULATIVE, units = StatisticUnit.BYTES, label = "Expired",
- description = "Total size of all messages expired by message time-to-live on this queue.")
+ description = "Total size of all messages expired by message time-to-live on this queue.", metricName = "total_expired_bytes_count")
long getTotalExpiredBytes();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.CUMULATIVE, units = StatisticUnit.MESSAGES, label = "Expired",
- description = "Total number of messages expired by message time-to-live on this queue.")
+ description = "Total number of messages expired by message time-to-live on this queue.", metricName = "total_expired_messages_count")
long getTotalExpiredMessages();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.POINT_IN_TIME, units = StatisticUnit.BYTES, label = "Prefetched",
- description = "Total size of all messages currently prefetched by consumers.")
+ description = "Total size of all messages currently prefetched by consumers.", metricName = "unacknowledged_bytes_total")
long getUnacknowledgedBytes();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.POINT_IN_TIME, units = StatisticUnit.MESSAGES, label = "Prefetched",
- description = "Total number of messages currently prefetched by consumers.")
+ description = "Total number of messages currently prefetched by consumers.", metricName = "unacknowledged_messages_total")
long getUnacknowledgedMessages();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.POINT_IN_TIME, units = StatisticUnit.BYTES, label = "Available",
- description = "Total size of all messages currently available.")
+ description = "Total size of all messages currently available.", metricName = "available_bytes_total")
Review comment:
The metric name could be made auto-generated
##########
File path: broker-core/src/main/java/org/apache/qpid/server/model/Queue.java
##########
@@ -390,133 +390,133 @@
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.POINT_IN_TIME, units = StatisticUnit.COUNT, label = "Bindings",
- description = "Current number of bindings to this queue.")
+ description = "Current number of bindings to this queue.", metricName = "binding_total")
int getBindingCount();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.POINT_IN_TIME, units = StatisticUnit.COUNT, label = "Consumers",
- description = "Current number of consumers attached to this queue.")
+ description = "Current number of consumers attached to this queue.", metricName = "consumers_total")
int getConsumerCount();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.POINT_IN_TIME, units = StatisticUnit.COUNT, label = "Consumers with credit",
- description = "Current number of consumers attached to this queue with credit")
+ description = "Current number of consumers attached to this queue with credit", metricName = "consumers_with_credit_total")
int getConsumerCountWithCredit();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.CUMULATIVE, units = StatisticUnit.BYTES, label = "Delivered (Persistent)",
- description = "Total size of all persistent messages delivered by this queue.")
+ description = "Total size of all persistent messages delivered by this queue.", metricName = "persistent_dequeued_bytes_count")
long getPersistentDequeuedBytes();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.CUMULATIVE, units = StatisticUnit.MESSAGES, label = "Delivered (Persistent)",
- description = "Total number of persistent messages delivered by this queue.")
+ description = "Total number of persistent messages delivered by this queue.", metricName = "persistent_dequeued_messages_count")
long getPersistentDequeuedMessages();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.CUMULATIVE, units = StatisticUnit.BYTES, label = "Enqueued (Persistent)",
- description = "Total size of all persistent messages received by this queue.")
+ description = "Total size of all persistent messages received by this queue.", metricName = "persistent_enqueue_bytes_count")
long getPersistentEnqueuedBytes();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.CUMULATIVE, units = StatisticUnit.MESSAGES, label = "Enqueued (Persistent)",
- description = "Total number of persistent messages received by this queue.")
+ description = "Total number of persistent messages received by this queue.", metricName = "persistent_enqueued_messages_count")
long getPersistentEnqueuedMessages();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.POINT_IN_TIME, units = StatisticUnit.BYTES, label = "Queue Depth",
- description = "Current size of all messages enqueued by this queue.")
+ description = "Current size of all messages enqueued by this queue.", metricName = "depth_bytes_total")
long getQueueDepthBytes();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.POINT_IN_TIME, units = StatisticUnit.MESSAGES, label = "Queue Depth",
- description = "Current number of messages enqueued by this queue.")
+ description = "Current number of messages enqueued by this queue.", metricName = "depth_messages_total")
int getQueueDepthMessages();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.CUMULATIVE, units = StatisticUnit.BYTES, label = "Delivered",
- description = "Total size of all messages delivered by this queue.")
+ description = "Total size of all messages delivered by this queue.", metricName = "total_dequeued_bytes_count")
long getTotalDequeuedBytes();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.CUMULATIVE, units = StatisticUnit.MESSAGES, label = "Delivered",
- description = "Total number of messages delivered by this queue.")
+ description = "Total number of messages delivered by this queue.", metricName = "total_dequeued_messages_count")
long getTotalDequeuedMessages();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.CUMULATIVE, units = StatisticUnit.BYTES, label = "Enqueued",
- description = "Total size of all messages received by this queue.")
+ description = "Total size of all messages received by this queue.", metricName = "total_enqueue_bytes_count")
long getTotalEnqueuedBytes();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.CUMULATIVE, units = StatisticUnit.MESSAGES, label = "Enqueued",
- description = "Total number of messages received by this queue.")
+ description = "Total number of messages received by this queue.", metricName = "total_enqueued_messages_count")
long getTotalEnqueuedMessages();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.CUMULATIVE, units = StatisticUnit.BYTES, label = "Expired",
- description = "Total size of all messages expired by message time-to-live on this queue.")
+ description = "Total size of all messages expired by message time-to-live on this queue.", metricName = "total_expired_bytes_count")
long getTotalExpiredBytes();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.CUMULATIVE, units = StatisticUnit.MESSAGES, label = "Expired",
- description = "Total number of messages expired by message time-to-live on this queue.")
+ description = "Total number of messages expired by message time-to-live on this queue.", metricName = "total_expired_messages_count")
Review comment:
Let's remove total from the beginning of the name of counter metrics. It should be named expired_messages_count
##########
File path: broker-core/src/main/java/org/apache/qpid/server/model/Queue.java
##########
@@ -390,133 +390,133 @@
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.POINT_IN_TIME, units = StatisticUnit.COUNT, label = "Bindings",
- description = "Current number of bindings to this queue.")
+ description = "Current number of bindings to this queue.", metricName = "binding_total")
int getBindingCount();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.POINT_IN_TIME, units = StatisticUnit.COUNT, label = "Consumers",
- description = "Current number of consumers attached to this queue.")
+ description = "Current number of consumers attached to this queue.", metricName = "consumers_total")
int getConsumerCount();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.POINT_IN_TIME, units = StatisticUnit.COUNT, label = "Consumers with credit",
- description = "Current number of consumers attached to this queue with credit")
+ description = "Current number of consumers attached to this queue with credit", metricName = "consumers_with_credit_total")
int getConsumerCountWithCredit();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.CUMULATIVE, units = StatisticUnit.BYTES, label = "Delivered (Persistent)",
- description = "Total size of all persistent messages delivered by this queue.")
+ description = "Total size of all persistent messages delivered by this queue.", metricName = "persistent_dequeued_bytes_count")
long getPersistentDequeuedBytes();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.CUMULATIVE, units = StatisticUnit.MESSAGES, label = "Delivered (Persistent)",
- description = "Total number of persistent messages delivered by this queue.")
+ description = "Total number of persistent messages delivered by this queue.", metricName = "persistent_dequeued_messages_count")
long getPersistentDequeuedMessages();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.CUMULATIVE, units = StatisticUnit.BYTES, label = "Enqueued (Persistent)",
- description = "Total size of all persistent messages received by this queue.")
+ description = "Total size of all persistent messages received by this queue.", metricName = "persistent_enqueue_bytes_count")
long getPersistentEnqueuedBytes();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.CUMULATIVE, units = StatisticUnit.MESSAGES, label = "Enqueued (Persistent)",
- description = "Total number of persistent messages received by this queue.")
+ description = "Total number of persistent messages received by this queue.", metricName = "persistent_enqueued_messages_count")
long getPersistentEnqueuedMessages();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.POINT_IN_TIME, units = StatisticUnit.BYTES, label = "Queue Depth",
- description = "Current size of all messages enqueued by this queue.")
+ description = "Current size of all messages enqueued by this queue.", metricName = "depth_bytes_total")
long getQueueDepthBytes();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.POINT_IN_TIME, units = StatisticUnit.MESSAGES, label = "Queue Depth",
- description = "Current number of messages enqueued by this queue.")
+ description = "Current number of messages enqueued by this queue.", metricName = "depth_messages_total")
int getQueueDepthMessages();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.CUMULATIVE, units = StatisticUnit.BYTES, label = "Delivered",
- description = "Total size of all messages delivered by this queue.")
+ description = "Total size of all messages delivered by this queue.", metricName = "total_dequeued_bytes_count")
long getTotalDequeuedBytes();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.CUMULATIVE, units = StatisticUnit.MESSAGES, label = "Delivered",
- description = "Total number of messages delivered by this queue.")
+ description = "Total number of messages delivered by this queue.", metricName = "total_dequeued_messages_count")
long getTotalDequeuedMessages();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.CUMULATIVE, units = StatisticUnit.BYTES, label = "Enqueued",
- description = "Total size of all messages received by this queue.")
+ description = "Total size of all messages received by this queue.", metricName = "total_enqueue_bytes_count")
Review comment:
Let's remove total from the beginning of the name of counter metrics. It should be enqueue_bytes_count
##########
File path: broker-core/src/main/java/org/apache/qpid/server/model/Queue.java
##########
@@ -390,133 +390,133 @@
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.POINT_IN_TIME, units = StatisticUnit.COUNT, label = "Bindings",
- description = "Current number of bindings to this queue.")
+ description = "Current number of bindings to this queue.", metricName = "binding_total")
int getBindingCount();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.POINT_IN_TIME, units = StatisticUnit.COUNT, label = "Consumers",
- description = "Current number of consumers attached to this queue.")
+ description = "Current number of consumers attached to this queue.", metricName = "consumers_total")
int getConsumerCount();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.POINT_IN_TIME, units = StatisticUnit.COUNT, label = "Consumers with credit",
- description = "Current number of consumers attached to this queue with credit")
+ description = "Current number of consumers attached to this queue with credit", metricName = "consumers_with_credit_total")
int getConsumerCountWithCredit();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.CUMULATIVE, units = StatisticUnit.BYTES, label = "Delivered (Persistent)",
- description = "Total size of all persistent messages delivered by this queue.")
+ description = "Total size of all persistent messages delivered by this queue.", metricName = "persistent_dequeued_bytes_count")
long getPersistentDequeuedBytes();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.CUMULATIVE, units = StatisticUnit.MESSAGES, label = "Delivered (Persistent)",
- description = "Total number of persistent messages delivered by this queue.")
+ description = "Total number of persistent messages delivered by this queue.", metricName = "persistent_dequeued_messages_count")
long getPersistentDequeuedMessages();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.CUMULATIVE, units = StatisticUnit.BYTES, label = "Enqueued (Persistent)",
- description = "Total size of all persistent messages received by this queue.")
+ description = "Total size of all persistent messages received by this queue.", metricName = "persistent_enqueue_bytes_count")
long getPersistentEnqueuedBytes();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.CUMULATIVE, units = StatisticUnit.MESSAGES, label = "Enqueued (Persistent)",
- description = "Total number of persistent messages received by this queue.")
+ description = "Total number of persistent messages received by this queue.", metricName = "persistent_enqueued_messages_count")
long getPersistentEnqueuedMessages();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.POINT_IN_TIME, units = StatisticUnit.BYTES, label = "Queue Depth",
- description = "Current size of all messages enqueued by this queue.")
+ description = "Current size of all messages enqueued by this queue.", metricName = "depth_bytes_total")
long getQueueDepthBytes();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.POINT_IN_TIME, units = StatisticUnit.MESSAGES, label = "Queue Depth",
- description = "Current number of messages enqueued by this queue.")
+ description = "Current number of messages enqueued by this queue.", metricName = "depth_messages_total")
int getQueueDepthMessages();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.CUMULATIVE, units = StatisticUnit.BYTES, label = "Delivered",
- description = "Total size of all messages delivered by this queue.")
+ description = "Total size of all messages delivered by this queue.", metricName = "total_dequeued_bytes_count")
long getTotalDequeuedBytes();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.CUMULATIVE, units = StatisticUnit.MESSAGES, label = "Delivered",
- description = "Total number of messages delivered by this queue.")
+ description = "Total number of messages delivered by this queue.", metricName = "total_dequeued_messages_count")
long getTotalDequeuedMessages();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.CUMULATIVE, units = StatisticUnit.BYTES, label = "Enqueued",
- description = "Total size of all messages received by this queue.")
+ description = "Total size of all messages received by this queue.", metricName = "total_enqueue_bytes_count")
long getTotalEnqueuedBytes();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.CUMULATIVE, units = StatisticUnit.MESSAGES, label = "Enqueued",
- description = "Total number of messages received by this queue.")
+ description = "Total number of messages received by this queue.", metricName = "total_enqueued_messages_count")
Review comment:
Let's remove total from the beginning of the name of counter metrics. It should be enqueued_messages_count
##########
File path: broker-core/src/main/java/org/apache/qpid/server/virtualhost/QueueManagingVirtualHost.java
##########
@@ -215,81 +215,81 @@
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.POINT_IN_TIME, units = StatisticUnit.COUNT, label = "Queues",
- description = "Current number of queues on this virtualhost.")
+ description = "Current number of queues on this virtualhost.", metricName = "queues_total")
long getQueueCount();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.POINT_IN_TIME, units = StatisticUnit.COUNT, label = "Exchanges",
- description = "Current number of exchanges on this virtualhost.")
+ description = "Current number of exchanges on this virtualhost.", metricName = "exchanges_total")
long getExchangeCount();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.POINT_IN_TIME, units = StatisticUnit.COUNT, label = "Connections",
- description = "Current number of messaging connections made to this virtualhost.")
+ description = "Current number of messaging connections made to this virtualhost.", metricName = "connections_total")
long getConnectionCount();
@ManagedStatistic(statisticType = StatisticType.CUMULATIVE, units = StatisticUnit.COUNT, label = "Total Connections",
- description = "Total number of messaging connections made to this virtualhost since broker startup")
+ description = "Total number of messaging connections made to this virtualhost since broker startup", metricName = "connections_since_startup_count")
long getTotalConnectionCount();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.CUMULATIVE, units = StatisticUnit.BYTES, label = "Inbound",
- description = "Total size of all messages received by this virtualhost.")
+ description = "Total size of all messages received by this virtualhost.", metricName = "inbound_bytes_count")
long getBytesIn();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.CUMULATIVE, units = StatisticUnit.BYTES, label = "Outbound",
- description = "Total size of all messages delivered by this virtualhost.")
+ description = "Total size of all messages delivered by this virtualhost.", metricName = "outbound_bytes_count")
long getBytesOut();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.CUMULATIVE, units = StatisticUnit.MESSAGES, label = "Inbound",
- description = "Total number of messages received by this virtualhost.")
+ description = "Total number of messages received by this virtualhost.", metricName = "inbound_messages_count")
long getMessagesIn();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.CUMULATIVE, units = StatisticUnit.MESSAGES, label = "Outbound",
- description = "Total number of messages delivered by this virtualhost.")
+ description = "Total number of messages delivered by this virtualhost.", metricName = "outbound_messages_count")
long getMessagesOut();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.CUMULATIVE, units = StatisticUnit.MESSAGES,
label = "Transacted Inbound",
- description = "Total number of messages delivered by this virtualhost within a transaction.")
+ description = "Total number of messages delivered by this virtualhost within a transaction.", metricName = "inbound_transacted_messages_count")
long getTransactedMessagesIn();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.CUMULATIVE, units = StatisticUnit.MESSAGES,
label = "Transacted Outbound",
- description = "Total number of messages received by this virtualhost within a transaction.")
+ description = "Total number of messages received by this virtualhost within a transaction.", metricName = "outbound_transacted_messages_count")
long getTransactedMessagesOut();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.POINT_IN_TIME, units = StatisticUnit.BYTES, label = "Queue Depth",
- description = "Current size of all messages enqueued by this virtualhost.")
+ description = "Current size of all messages enqueued by this virtualhost.", metricName = "total_queue_depth_bytes_total")
Review comment:
The Virtual Host metric total_queue_depth_bytes_total contains "total" twice. It should be renamed into queue_depth_bytes_total
##########
File path: broker-core/src/main/java/org/apache/qpid/server/model/VirtualHostLogger.java
##########
@@ -25,9 +25,9 @@
{
void stopLogging();
- @ManagedStatistic(statisticType = StatisticType.CUMULATIVE, units = StatisticUnit.COUNT, label = "Errors")
+ @ManagedStatistic(statisticType = StatisticType.CUMULATIVE, units = StatisticUnit.COUNT, label = "Errors", metricName = "logger_errors_count")
Review comment:
The virtual host logger metric logger_errors_count should be renamed into errors_count
##########
File path: broker-core/src/main/java/org/apache/qpid/server/model/Session.java
##########
@@ -55,10 +55,10 @@
boolean isProducerFlowBlocked();
- @ManagedStatistic(statisticType = StatisticType.POINT_IN_TIME, units = StatisticUnit.COUNT, label = "Consumers")
+ @ManagedStatistic(statisticType = StatisticType.POINT_IN_TIME, units = StatisticUnit.COUNT, label = "Consumers", metricName = "consumer_total")
Review comment:
The session metrics consumer_total should be consumers_total for a consistency sake with the same metric on queue
##########
File path: broker-core/src/main/java/org/apache/qpid/server/model/Queue.java
##########
@@ -390,133 +390,133 @@
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.POINT_IN_TIME, units = StatisticUnit.COUNT, label = "Bindings",
- description = "Current number of bindings to this queue.")
+ description = "Current number of bindings to this queue.", metricName = "binding_total")
int getBindingCount();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.POINT_IN_TIME, units = StatisticUnit.COUNT, label = "Consumers",
- description = "Current number of consumers attached to this queue.")
+ description = "Current number of consumers attached to this queue.", metricName = "consumers_total")
int getConsumerCount();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.POINT_IN_TIME, units = StatisticUnit.COUNT, label = "Consumers with credit",
- description = "Current number of consumers attached to this queue with credit")
+ description = "Current number of consumers attached to this queue with credit", metricName = "consumers_with_credit_total")
int getConsumerCountWithCredit();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.CUMULATIVE, units = StatisticUnit.BYTES, label = "Delivered (Persistent)",
- description = "Total size of all persistent messages delivered by this queue.")
+ description = "Total size of all persistent messages delivered by this queue.", metricName = "persistent_dequeued_bytes_count")
long getPersistentDequeuedBytes();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.CUMULATIVE, units = StatisticUnit.MESSAGES, label = "Delivered (Persistent)",
- description = "Total number of persistent messages delivered by this queue.")
+ description = "Total number of persistent messages delivered by this queue.", metricName = "persistent_dequeued_messages_count")
long getPersistentDequeuedMessages();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.CUMULATIVE, units = StatisticUnit.BYTES, label = "Enqueued (Persistent)",
- description = "Total size of all persistent messages received by this queue.")
+ description = "Total size of all persistent messages received by this queue.", metricName = "persistent_enqueue_bytes_count")
long getPersistentEnqueuedBytes();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.CUMULATIVE, units = StatisticUnit.MESSAGES, label = "Enqueued (Persistent)",
- description = "Total number of persistent messages received by this queue.")
+ description = "Total number of persistent messages received by this queue.", metricName = "persistent_enqueued_messages_count")
long getPersistentEnqueuedMessages();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.POINT_IN_TIME, units = StatisticUnit.BYTES, label = "Queue Depth",
- description = "Current size of all messages enqueued by this queue.")
+ description = "Current size of all messages enqueued by this queue.", metricName = "depth_bytes_total")
long getQueueDepthBytes();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.POINT_IN_TIME, units = StatisticUnit.MESSAGES, label = "Queue Depth",
- description = "Current number of messages enqueued by this queue.")
+ description = "Current number of messages enqueued by this queue.", metricName = "depth_messages_total")
int getQueueDepthMessages();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.CUMULATIVE, units = StatisticUnit.BYTES, label = "Delivered",
- description = "Total size of all messages delivered by this queue.")
+ description = "Total size of all messages delivered by this queue.", metricName = "total_dequeued_bytes_count")
long getTotalDequeuedBytes();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.CUMULATIVE, units = StatisticUnit.MESSAGES, label = "Delivered",
- description = "Total number of messages delivered by this queue.")
+ description = "Total number of messages delivered by this queue.", metricName = "total_dequeued_messages_count")
long getTotalDequeuedMessages();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.CUMULATIVE, units = StatisticUnit.BYTES, label = "Enqueued",
- description = "Total size of all messages received by this queue.")
+ description = "Total size of all messages received by this queue.", metricName = "total_enqueue_bytes_count")
long getTotalEnqueuedBytes();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.CUMULATIVE, units = StatisticUnit.MESSAGES, label = "Enqueued",
- description = "Total number of messages received by this queue.")
+ description = "Total number of messages received by this queue.", metricName = "total_enqueued_messages_count")
long getTotalEnqueuedMessages();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.CUMULATIVE, units = StatisticUnit.BYTES, label = "Expired",
- description = "Total size of all messages expired by message time-to-live on this queue.")
+ description = "Total size of all messages expired by message time-to-live on this queue.", metricName = "total_expired_bytes_count")
Review comment:
Let's remove total from the beginning of the name of counter metrics. It should be named expired_bytes_count
##########
File path: broker-core/src/main/java/org/apache/qpid/server/model/Queue.java
##########
@@ -390,133 +390,133 @@
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.POINT_IN_TIME, units = StatisticUnit.COUNT, label = "Bindings",
- description = "Current number of bindings to this queue.")
+ description = "Current number of bindings to this queue.", metricName = "binding_total")
int getBindingCount();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.POINT_IN_TIME, units = StatisticUnit.COUNT, label = "Consumers",
- description = "Current number of consumers attached to this queue.")
+ description = "Current number of consumers attached to this queue.", metricName = "consumers_total")
int getConsumerCount();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.POINT_IN_TIME, units = StatisticUnit.COUNT, label = "Consumers with credit",
- description = "Current number of consumers attached to this queue with credit")
+ description = "Current number of consumers attached to this queue with credit", metricName = "consumers_with_credit_total")
int getConsumerCountWithCredit();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.CUMULATIVE, units = StatisticUnit.BYTES, label = "Delivered (Persistent)",
- description = "Total size of all persistent messages delivered by this queue.")
+ description = "Total size of all persistent messages delivered by this queue.", metricName = "persistent_dequeued_bytes_count")
long getPersistentDequeuedBytes();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.CUMULATIVE, units = StatisticUnit.MESSAGES, label = "Delivered (Persistent)",
- description = "Total number of persistent messages delivered by this queue.")
+ description = "Total number of persistent messages delivered by this queue.", metricName = "persistent_dequeued_messages_count")
long getPersistentDequeuedMessages();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.CUMULATIVE, units = StatisticUnit.BYTES, label = "Enqueued (Persistent)",
- description = "Total size of all persistent messages received by this queue.")
+ description = "Total size of all persistent messages received by this queue.", metricName = "persistent_enqueue_bytes_count")
long getPersistentEnqueuedBytes();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.CUMULATIVE, units = StatisticUnit.MESSAGES, label = "Enqueued (Persistent)",
- description = "Total number of persistent messages received by this queue.")
+ description = "Total number of persistent messages received by this queue.", metricName = "persistent_enqueued_messages_count")
long getPersistentEnqueuedMessages();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.POINT_IN_TIME, units = StatisticUnit.BYTES, label = "Queue Depth",
- description = "Current size of all messages enqueued by this queue.")
+ description = "Current size of all messages enqueued by this queue.", metricName = "depth_bytes_total")
long getQueueDepthBytes();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.POINT_IN_TIME, units = StatisticUnit.MESSAGES, label = "Queue Depth",
- description = "Current number of messages enqueued by this queue.")
+ description = "Current number of messages enqueued by this queue.", metricName = "depth_messages_total")
int getQueueDepthMessages();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.CUMULATIVE, units = StatisticUnit.BYTES, label = "Delivered",
- description = "Total size of all messages delivered by this queue.")
+ description = "Total size of all messages delivered by this queue.", metricName = "total_dequeued_bytes_count")
long getTotalDequeuedBytes();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.CUMULATIVE, units = StatisticUnit.MESSAGES, label = "Delivered",
- description = "Total number of messages delivered by this queue.")
+ description = "Total number of messages delivered by this queue.", metricName = "total_dequeued_messages_count")
long getTotalDequeuedMessages();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.CUMULATIVE, units = StatisticUnit.BYTES, label = "Enqueued",
- description = "Total size of all messages received by this queue.")
+ description = "Total size of all messages received by this queue.", metricName = "total_enqueue_bytes_count")
long getTotalEnqueuedBytes();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.CUMULATIVE, units = StatisticUnit.MESSAGES, label = "Enqueued",
- description = "Total number of messages received by this queue.")
+ description = "Total number of messages received by this queue.", metricName = "total_enqueued_messages_count")
long getTotalEnqueuedMessages();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.CUMULATIVE, units = StatisticUnit.BYTES, label = "Expired",
- description = "Total size of all messages expired by message time-to-live on this queue.")
+ description = "Total size of all messages expired by message time-to-live on this queue.", metricName = "total_expired_bytes_count")
long getTotalExpiredBytes();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.CUMULATIVE, units = StatisticUnit.MESSAGES, label = "Expired",
- description = "Total number of messages expired by message time-to-live on this queue.")
+ description = "Total number of messages expired by message time-to-live on this queue.", metricName = "total_expired_messages_count")
long getTotalExpiredMessages();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.POINT_IN_TIME, units = StatisticUnit.BYTES, label = "Prefetched",
- description = "Total size of all messages currently prefetched by consumers.")
+ description = "Total size of all messages currently prefetched by consumers.", metricName = "unacknowledged_bytes_total")
long getUnacknowledgedBytes();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.POINT_IN_TIME, units = StatisticUnit.MESSAGES, label = "Prefetched",
- description = "Total number of messages currently prefetched by consumers.")
+ description = "Total number of messages currently prefetched by consumers.", metricName = "unacknowledged_messages_total")
long getUnacknowledgedMessages();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.POINT_IN_TIME, units = StatisticUnit.BYTES, label = "Available",
- description = "Total size of all messages currently available.")
+ description = "Total size of all messages currently available.", metricName = "available_bytes_total")
long getAvailableBytes();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.POINT_IN_TIME, units = StatisticUnit.MESSAGES, label = "Available",
- description = "Total number of messages currently available.")
+ description = "Total number of messages currently available.", metricName = "available_messages_total")
int getAvailableMessages();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.POINT_IN_TIME, units = StatisticUnit.BYTES, label = "Available HWM",
- description = "Maximum recorded size of available messages.")
+ description = "Maximum recorded size of available messages.", metricName = "available_high_water_mark_bytes_total")
long getAvailableBytesHighWatermark();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.POINT_IN_TIME, units = StatisticUnit.MESSAGES, label = "Available HWM",
- description = "Maximum recorded number of available messages.")
+ description = "Maximum recorded number of available messages.", metricName = "available_high_water_mark_messages_total")
int getAvailableMessagesHighWatermark();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.POINT_IN_TIME, units = StatisticUnit.BYTES, label = "Queue Depth HWM",
- description = "Maximum recorded size of enqueued messages.")
+ description = "Maximum recorded size of enqueued messages.", metricName = "depth_high_water_mark_bytes_total")
long getQueueDepthBytesHighWatermark();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.POINT_IN_TIME, units = StatisticUnit.MESSAGES, label = "Queue Depth HWM",
- description = "Maximum recorded number of enqueued messages.")
+ description = "Maximum recorded number of enqueued messages.", metricName = "depth_high_water_mark_messages_total")
Review comment:
Suffix total needs removal
##########
File path: broker-core/src/main/java/org/apache/qpid/server/model/Queue.java
##########
@@ -390,133 +390,133 @@
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.POINT_IN_TIME, units = StatisticUnit.COUNT, label = "Bindings",
- description = "Current number of bindings to this queue.")
+ description = "Current number of bindings to this queue.", metricName = "binding_total")
int getBindingCount();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.POINT_IN_TIME, units = StatisticUnit.COUNT, label = "Consumers",
- description = "Current number of consumers attached to this queue.")
+ description = "Current number of consumers attached to this queue.", metricName = "consumers_total")
int getConsumerCount();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.POINT_IN_TIME, units = StatisticUnit.COUNT, label = "Consumers with credit",
- description = "Current number of consumers attached to this queue with credit")
+ description = "Current number of consumers attached to this queue with credit", metricName = "consumers_with_credit_total")
int getConsumerCountWithCredit();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.CUMULATIVE, units = StatisticUnit.BYTES, label = "Delivered (Persistent)",
- description = "Total size of all persistent messages delivered by this queue.")
+ description = "Total size of all persistent messages delivered by this queue.", metricName = "persistent_dequeued_bytes_count")
long getPersistentDequeuedBytes();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.CUMULATIVE, units = StatisticUnit.MESSAGES, label = "Delivered (Persistent)",
- description = "Total number of persistent messages delivered by this queue.")
+ description = "Total number of persistent messages delivered by this queue.", metricName = "persistent_dequeued_messages_count")
long getPersistentDequeuedMessages();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.CUMULATIVE, units = StatisticUnit.BYTES, label = "Enqueued (Persistent)",
- description = "Total size of all persistent messages received by this queue.")
+ description = "Total size of all persistent messages received by this queue.", metricName = "persistent_enqueue_bytes_count")
long getPersistentEnqueuedBytes();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.CUMULATIVE, units = StatisticUnit.MESSAGES, label = "Enqueued (Persistent)",
- description = "Total number of persistent messages received by this queue.")
+ description = "Total number of persistent messages received by this queue.", metricName = "persistent_enqueued_messages_count")
long getPersistentEnqueuedMessages();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.POINT_IN_TIME, units = StatisticUnit.BYTES, label = "Queue Depth",
- description = "Current size of all messages enqueued by this queue.")
+ description = "Current size of all messages enqueued by this queue.", metricName = "depth_bytes_total")
long getQueueDepthBytes();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.POINT_IN_TIME, units = StatisticUnit.MESSAGES, label = "Queue Depth",
- description = "Current number of messages enqueued by this queue.")
+ description = "Current number of messages enqueued by this queue.", metricName = "depth_messages_total")
int getQueueDepthMessages();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.CUMULATIVE, units = StatisticUnit.BYTES, label = "Delivered",
- description = "Total size of all messages delivered by this queue.")
+ description = "Total size of all messages delivered by this queue.", metricName = "total_dequeued_bytes_count")
long getTotalDequeuedBytes();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.CUMULATIVE, units = StatisticUnit.MESSAGES, label = "Delivered",
- description = "Total number of messages delivered by this queue.")
+ description = "Total number of messages delivered by this queue.", metricName = "total_dequeued_messages_count")
long getTotalDequeuedMessages();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.CUMULATIVE, units = StatisticUnit.BYTES, label = "Enqueued",
- description = "Total size of all messages received by this queue.")
+ description = "Total size of all messages received by this queue.", metricName = "total_enqueue_bytes_count")
long getTotalEnqueuedBytes();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.CUMULATIVE, units = StatisticUnit.MESSAGES, label = "Enqueued",
- description = "Total number of messages received by this queue.")
+ description = "Total number of messages received by this queue.", metricName = "total_enqueued_messages_count")
long getTotalEnqueuedMessages();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.CUMULATIVE, units = StatisticUnit.BYTES, label = "Expired",
- description = "Total size of all messages expired by message time-to-live on this queue.")
+ description = "Total size of all messages expired by message time-to-live on this queue.", metricName = "total_expired_bytes_count")
long getTotalExpiredBytes();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.CUMULATIVE, units = StatisticUnit.MESSAGES, label = "Expired",
- description = "Total number of messages expired by message time-to-live on this queue.")
+ description = "Total number of messages expired by message time-to-live on this queue.", metricName = "total_expired_messages_count")
long getTotalExpiredMessages();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.POINT_IN_TIME, units = StatisticUnit.BYTES, label = "Prefetched",
- description = "Total size of all messages currently prefetched by consumers.")
+ description = "Total size of all messages currently prefetched by consumers.", metricName = "unacknowledged_bytes_total")
long getUnacknowledgedBytes();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.POINT_IN_TIME, units = StatisticUnit.MESSAGES, label = "Prefetched",
- description = "Total number of messages currently prefetched by consumers.")
+ description = "Total number of messages currently prefetched by consumers.", metricName = "unacknowledged_messages_total")
long getUnacknowledgedMessages();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.POINT_IN_TIME, units = StatisticUnit.BYTES, label = "Available",
- description = "Total size of all messages currently available.")
+ description = "Total size of all messages currently available.", metricName = "available_bytes_total")
long getAvailableBytes();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.POINT_IN_TIME, units = StatisticUnit.MESSAGES, label = "Available",
- description = "Total number of messages currently available.")
+ description = "Total number of messages currently available.", metricName = "available_messages_total")
int getAvailableMessages();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.POINT_IN_TIME, units = StatisticUnit.BYTES, label = "Available HWM",
- description = "Maximum recorded size of available messages.")
+ description = "Maximum recorded size of available messages.", metricName = "available_high_water_mark_bytes_total")
long getAvailableBytesHighWatermark();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.POINT_IN_TIME, units = StatisticUnit.MESSAGES, label = "Available HWM",
- description = "Maximum recorded number of available messages.")
+ description = "Maximum recorded number of available messages.", metricName = "available_high_water_mark_messages_total")
Review comment:
Suffix total needs removal
##########
File path: broker-core/src/main/java/org/apache/qpid/server/model/Queue.java
##########
@@ -390,133 +390,133 @@
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.POINT_IN_TIME, units = StatisticUnit.COUNT, label = "Bindings",
- description = "Current number of bindings to this queue.")
+ description = "Current number of bindings to this queue.", metricName = "binding_total")
int getBindingCount();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.POINT_IN_TIME, units = StatisticUnit.COUNT, label = "Consumers",
- description = "Current number of consumers attached to this queue.")
+ description = "Current number of consumers attached to this queue.", metricName = "consumers_total")
int getConsumerCount();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.POINT_IN_TIME, units = StatisticUnit.COUNT, label = "Consumers with credit",
- description = "Current number of consumers attached to this queue with credit")
+ description = "Current number of consumers attached to this queue with credit", metricName = "consumers_with_credit_total")
int getConsumerCountWithCredit();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.CUMULATIVE, units = StatisticUnit.BYTES, label = "Delivered (Persistent)",
- description = "Total size of all persistent messages delivered by this queue.")
+ description = "Total size of all persistent messages delivered by this queue.", metricName = "persistent_dequeued_bytes_count")
long getPersistentDequeuedBytes();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.CUMULATIVE, units = StatisticUnit.MESSAGES, label = "Delivered (Persistent)",
- description = "Total number of persistent messages delivered by this queue.")
+ description = "Total number of persistent messages delivered by this queue.", metricName = "persistent_dequeued_messages_count")
long getPersistentDequeuedMessages();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.CUMULATIVE, units = StatisticUnit.BYTES, label = "Enqueued (Persistent)",
- description = "Total size of all persistent messages received by this queue.")
+ description = "Total size of all persistent messages received by this queue.", metricName = "persistent_enqueue_bytes_count")
long getPersistentEnqueuedBytes();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.CUMULATIVE, units = StatisticUnit.MESSAGES, label = "Enqueued (Persistent)",
- description = "Total number of persistent messages received by this queue.")
+ description = "Total number of persistent messages received by this queue.", metricName = "persistent_enqueued_messages_count")
long getPersistentEnqueuedMessages();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.POINT_IN_TIME, units = StatisticUnit.BYTES, label = "Queue Depth",
- description = "Current size of all messages enqueued by this queue.")
+ description = "Current size of all messages enqueued by this queue.", metricName = "depth_bytes_total")
long getQueueDepthBytes();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.POINT_IN_TIME, units = StatisticUnit.MESSAGES, label = "Queue Depth",
- description = "Current number of messages enqueued by this queue.")
+ description = "Current number of messages enqueued by this queue.", metricName = "depth_messages_total")
int getQueueDepthMessages();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.CUMULATIVE, units = StatisticUnit.BYTES, label = "Delivered",
- description = "Total size of all messages delivered by this queue.")
+ description = "Total size of all messages delivered by this queue.", metricName = "total_dequeued_bytes_count")
long getTotalDequeuedBytes();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.CUMULATIVE, units = StatisticUnit.MESSAGES, label = "Delivered",
- description = "Total number of messages delivered by this queue.")
+ description = "Total number of messages delivered by this queue.", metricName = "total_dequeued_messages_count")
long getTotalDequeuedMessages();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.CUMULATIVE, units = StatisticUnit.BYTES, label = "Enqueued",
- description = "Total size of all messages received by this queue.")
+ description = "Total size of all messages received by this queue.", metricName = "total_enqueue_bytes_count")
long getTotalEnqueuedBytes();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.CUMULATIVE, units = StatisticUnit.MESSAGES, label = "Enqueued",
- description = "Total number of messages received by this queue.")
+ description = "Total number of messages received by this queue.", metricName = "total_enqueued_messages_count")
long getTotalEnqueuedMessages();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.CUMULATIVE, units = StatisticUnit.BYTES, label = "Expired",
- description = "Total size of all messages expired by message time-to-live on this queue.")
+ description = "Total size of all messages expired by message time-to-live on this queue.", metricName = "total_expired_bytes_count")
long getTotalExpiredBytes();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.CUMULATIVE, units = StatisticUnit.MESSAGES, label = "Expired",
- description = "Total number of messages expired by message time-to-live on this queue.")
+ description = "Total number of messages expired by message time-to-live on this queue.", metricName = "total_expired_messages_count")
long getTotalExpiredMessages();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.POINT_IN_TIME, units = StatisticUnit.BYTES, label = "Prefetched",
- description = "Total size of all messages currently prefetched by consumers.")
+ description = "Total size of all messages currently prefetched by consumers.", metricName = "unacknowledged_bytes_total")
long getUnacknowledgedBytes();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.POINT_IN_TIME, units = StatisticUnit.MESSAGES, label = "Prefetched",
- description = "Total number of messages currently prefetched by consumers.")
+ description = "Total number of messages currently prefetched by consumers.", metricName = "unacknowledged_messages_total")
long getUnacknowledgedMessages();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.POINT_IN_TIME, units = StatisticUnit.BYTES, label = "Available",
- description = "Total size of all messages currently available.")
+ description = "Total size of all messages currently available.", metricName = "available_bytes_total")
long getAvailableBytes();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.POINT_IN_TIME, units = StatisticUnit.MESSAGES, label = "Available",
- description = "Total number of messages currently available.")
+ description = "Total number of messages currently available.", metricName = "available_messages_total")
int getAvailableMessages();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.POINT_IN_TIME, units = StatisticUnit.BYTES, label = "Available HWM",
- description = "Maximum recorded size of available messages.")
+ description = "Maximum recorded size of available messages.", metricName = "available_high_water_mark_bytes_total")
long getAvailableBytesHighWatermark();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.POINT_IN_TIME, units = StatisticUnit.MESSAGES, label = "Available HWM",
- description = "Maximum recorded number of available messages.")
+ description = "Maximum recorded number of available messages.", metricName = "available_high_water_mark_messages_total")
int getAvailableMessagesHighWatermark();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.POINT_IN_TIME, units = StatisticUnit.BYTES, label = "Queue Depth HWM",
- description = "Maximum recorded size of enqueued messages.")
+ description = "Maximum recorded size of enqueued messages.", metricName = "depth_high_water_mark_bytes_total")
Review comment:
Suffix total needs removal
##########
File path: broker-core/src/main/java/org/apache/qpid/server/model/port/AmqpPort.java
##########
@@ -159,12 +159,16 @@
@ManagedAttribute( defaultValue = "${" + PORT_MAX_OPEN_CONNECTIONS + "}" )
int getMaxOpenConnections();
- @ManagedStatistic(statisticType = StatisticType.POINT_IN_TIME, units = StatisticUnit.COUNT, label = "Open Connections",
- description = "Current number of connections made through this port")
+ @ManagedStatistic(statisticType = StatisticType.POINT_IN_TIME, units = StatisticUnit.COUNT,
+ label = "Open Connections",
+ description = "Current number of connections made through this port",
+ metricName = "open_connections_total")
int getConnectionCount();
- @ManagedStatistic(statisticType = StatisticType.CUMULATIVE, units = StatisticUnit.COUNT, label = "Total Connections",
- description = "Total number of connections made through this port since broker startup")
+ @ManagedStatistic(statisticType = StatisticType.CUMULATIVE, units = StatisticUnit.COUNT,
+ label = "Total Connections",
+ description = "Total number of connections made through this port since broker startup",
+ metricName = "total_connections_count")
long getTotalConnectionCount();
Review comment:
As total is used for gauges in prometheus, this metric can be called overall_connections_count or aggregate_connection_count
##########
File path: broker-core/src/main/java/org/apache/qpid/server/model/Queue.java
##########
@@ -390,133 +390,133 @@
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.POINT_IN_TIME, units = StatisticUnit.COUNT, label = "Bindings",
- description = "Current number of bindings to this queue.")
+ description = "Current number of bindings to this queue.", metricName = "binding_total")
int getBindingCount();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.POINT_IN_TIME, units = StatisticUnit.COUNT, label = "Consumers",
- description = "Current number of consumers attached to this queue.")
+ description = "Current number of consumers attached to this queue.", metricName = "consumers_total")
int getConsumerCount();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.POINT_IN_TIME, units = StatisticUnit.COUNT, label = "Consumers with credit",
- description = "Current number of consumers attached to this queue with credit")
+ description = "Current number of consumers attached to this queue with credit", metricName = "consumers_with_credit_total")
int getConsumerCountWithCredit();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.CUMULATIVE, units = StatisticUnit.BYTES, label = "Delivered (Persistent)",
- description = "Total size of all persistent messages delivered by this queue.")
+ description = "Total size of all persistent messages delivered by this queue.", metricName = "persistent_dequeued_bytes_count")
long getPersistentDequeuedBytes();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.CUMULATIVE, units = StatisticUnit.MESSAGES, label = "Delivered (Persistent)",
- description = "Total number of persistent messages delivered by this queue.")
+ description = "Total number of persistent messages delivered by this queue.", metricName = "persistent_dequeued_messages_count")
long getPersistentDequeuedMessages();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.CUMULATIVE, units = StatisticUnit.BYTES, label = "Enqueued (Persistent)",
- description = "Total size of all persistent messages received by this queue.")
+ description = "Total size of all persistent messages received by this queue.", metricName = "persistent_enqueue_bytes_count")
long getPersistentEnqueuedBytes();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.CUMULATIVE, units = StatisticUnit.MESSAGES, label = "Enqueued (Persistent)",
- description = "Total number of persistent messages received by this queue.")
+ description = "Total number of persistent messages received by this queue.", metricName = "persistent_enqueued_messages_count")
long getPersistentEnqueuedMessages();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.POINT_IN_TIME, units = StatisticUnit.BYTES, label = "Queue Depth",
- description = "Current size of all messages enqueued by this queue.")
+ description = "Current size of all messages enqueued by this queue.", metricName = "depth_bytes_total")
long getQueueDepthBytes();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.POINT_IN_TIME, units = StatisticUnit.MESSAGES, label = "Queue Depth",
- description = "Current number of messages enqueued by this queue.")
+ description = "Current number of messages enqueued by this queue.", metricName = "depth_messages_total")
int getQueueDepthMessages();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.CUMULATIVE, units = StatisticUnit.BYTES, label = "Delivered",
- description = "Total size of all messages delivered by this queue.")
+ description = "Total size of all messages delivered by this queue.", metricName = "total_dequeued_bytes_count")
long getTotalDequeuedBytes();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.CUMULATIVE, units = StatisticUnit.MESSAGES, label = "Delivered",
- description = "Total number of messages delivered by this queue.")
+ description = "Total number of messages delivered by this queue.", metricName = "total_dequeued_messages_count")
long getTotalDequeuedMessages();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.CUMULATIVE, units = StatisticUnit.BYTES, label = "Enqueued",
- description = "Total size of all messages received by this queue.")
+ description = "Total size of all messages received by this queue.", metricName = "total_enqueue_bytes_count")
long getTotalEnqueuedBytes();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.CUMULATIVE, units = StatisticUnit.MESSAGES, label = "Enqueued",
- description = "Total number of messages received by this queue.")
+ description = "Total number of messages received by this queue.", metricName = "total_enqueued_messages_count")
long getTotalEnqueuedMessages();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.CUMULATIVE, units = StatisticUnit.BYTES, label = "Expired",
- description = "Total size of all messages expired by message time-to-live on this queue.")
+ description = "Total size of all messages expired by message time-to-live on this queue.", metricName = "total_expired_bytes_count")
long getTotalExpiredBytes();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.CUMULATIVE, units = StatisticUnit.MESSAGES, label = "Expired",
- description = "Total number of messages expired by message time-to-live on this queue.")
+ description = "Total number of messages expired by message time-to-live on this queue.", metricName = "total_expired_messages_count")
long getTotalExpiredMessages();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.POINT_IN_TIME, units = StatisticUnit.BYTES, label = "Prefetched",
- description = "Total size of all messages currently prefetched by consumers.")
+ description = "Total size of all messages currently prefetched by consumers.", metricName = "unacknowledged_bytes_total")
long getUnacknowledgedBytes();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.POINT_IN_TIME, units = StatisticUnit.MESSAGES, label = "Prefetched",
- description = "Total number of messages currently prefetched by consumers.")
+ description = "Total number of messages currently prefetched by consumers.", metricName = "unacknowledged_messages_total")
Review comment:
The metric name could be made auto-generated
##########
File path: broker-core/src/main/java/org/apache/qpid/server/virtualhost/QueueManagingVirtualHost.java
##########
@@ -215,81 +215,81 @@
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.POINT_IN_TIME, units = StatisticUnit.COUNT, label = "Queues",
- description = "Current number of queues on this virtualhost.")
+ description = "Current number of queues on this virtualhost.", metricName = "queues_total")
long getQueueCount();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.POINT_IN_TIME, units = StatisticUnit.COUNT, label = "Exchanges",
- description = "Current number of exchanges on this virtualhost.")
+ description = "Current number of exchanges on this virtualhost.", metricName = "exchanges_total")
long getExchangeCount();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.POINT_IN_TIME, units = StatisticUnit.COUNT, label = "Connections",
- description = "Current number of messaging connections made to this virtualhost.")
+ description = "Current number of messaging connections made to this virtualhost.", metricName = "connections_total")
long getConnectionCount();
@ManagedStatistic(statisticType = StatisticType.CUMULATIVE, units = StatisticUnit.COUNT, label = "Total Connections",
- description = "Total number of messaging connections made to this virtualhost since broker startup")
+ description = "Total number of messaging connections made to this virtualhost since broker startup", metricName = "connections_since_startup_count")
long getTotalConnectionCount();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.CUMULATIVE, units = StatisticUnit.BYTES, label = "Inbound",
- description = "Total size of all messages received by this virtualhost.")
+ description = "Total size of all messages received by this virtualhost.", metricName = "inbound_bytes_count")
long getBytesIn();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.CUMULATIVE, units = StatisticUnit.BYTES, label = "Outbound",
- description = "Total size of all messages delivered by this virtualhost.")
+ description = "Total size of all messages delivered by this virtualhost.", metricName = "outbound_bytes_count")
long getBytesOut();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.CUMULATIVE, units = StatisticUnit.MESSAGES, label = "Inbound",
- description = "Total number of messages received by this virtualhost.")
+ description = "Total number of messages received by this virtualhost.", metricName = "inbound_messages_count")
long getMessagesIn();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.CUMULATIVE, units = StatisticUnit.MESSAGES, label = "Outbound",
- description = "Total number of messages delivered by this virtualhost.")
+ description = "Total number of messages delivered by this virtualhost.", metricName = "outbound_messages_count")
long getMessagesOut();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.CUMULATIVE, units = StatisticUnit.MESSAGES,
label = "Transacted Inbound",
- description = "Total number of messages delivered by this virtualhost within a transaction.")
+ description = "Total number of messages delivered by this virtualhost within a transaction.", metricName = "inbound_transacted_messages_count")
long getTransactedMessagesIn();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.CUMULATIVE, units = StatisticUnit.MESSAGES,
label = "Transacted Outbound",
- description = "Total number of messages received by this virtualhost within a transaction.")
+ description = "Total number of messages received by this virtualhost within a transaction.", metricName = "outbound_transacted_messages_count")
long getTransactedMessagesOut();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.POINT_IN_TIME, units = StatisticUnit.BYTES, label = "Queue Depth",
- description = "Current size of all messages enqueued by this virtualhost.")
+ description = "Current size of all messages enqueued by this virtualhost.", metricName = "total_queue_depth_bytes_total")
long getTotalDepthOfQueuesBytes();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.POINT_IN_TIME, units = StatisticUnit.MESSAGES, label = "Queue Depth",
- description = "Current number of messages enqueued by this virtualhost.")
+ description = "Current number of messages enqueued by this virtualhost.", metricName = "total_queue_depth_messages_total")
Review comment:
Total is included twice into metric name. It should be queue_depth_messages_total
##########
File path: broker-plugins/prometheus-exporter/src/main/java/org/apache/qpid/server/prometheus/PrometheusContentFactory.java
##########
@@ -0,0 +1,91 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+
+package org.apache.qpid.server.prometheus;
+
+import java.io.IOException;
+import java.io.OutputStream;
+import java.io.OutputStreamWriter;
+import java.io.Writer;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Map;
+
+import io.prometheus.client.exporter.common.TextFormat;
+
+import org.apache.qpid.server.model.ConfiguredObject;
+import org.apache.qpid.server.model.Content;
+import org.apache.qpid.server.model.RestContentHeader;
+import org.apache.qpid.server.plugin.ContentFactory;
+import org.apache.qpid.server.plugin.PluggableService;
+
+@PluggableService
+public class PrometheusContentFactory implements ContentFactory
+{
+ @Override
+ public Content createContent(final ConfiguredObject<?> object, final Map<String, String[]> filter)
+ {
+ final String[] includeDisabledValues = filter.get("includeDisabled");
+ final boolean includeDisabled = includeDisabledValues!= null && includeDisabledValues.length == 1 && Boolean.parseBoolean(includeDisabledValues[0]);
+ final String[] includedMetricNames = filter.get("name[]");
+
+ final IncludeMetricPredicate metricIncludeFilter =
+ new IncludeMetricPredicate(includedMetricNames == null || includedMetricNames.length == 0
+ ? Collections.emptySet()
+ : new HashSet<>(Arrays.asList(includedMetricNames)));
+ final QpidCollector qpidCollector = new QpidCollector(object,
+ new IncludeDisabledStatisticPredicate(includeDisabled),
Review comment:
The flag for inclusion of disabled metrics can be set via context variable. Potentially, the factory can check whether context variable like qpid.metrics.includeDisabled is set to true on the root object.
##########
File path: broker-core/src/main/java/org/apache/qpid/server/model/Queue.java
##########
@@ -390,133 +390,133 @@
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.POINT_IN_TIME, units = StatisticUnit.COUNT, label = "Bindings",
- description = "Current number of bindings to this queue.")
+ description = "Current number of bindings to this queue.", metricName = "binding_total")
int getBindingCount();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.POINT_IN_TIME, units = StatisticUnit.COUNT, label = "Consumers",
- description = "Current number of consumers attached to this queue.")
+ description = "Current number of consumers attached to this queue.", metricName = "consumers_total")
int getConsumerCount();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.POINT_IN_TIME, units = StatisticUnit.COUNT, label = "Consumers with credit",
- description = "Current number of consumers attached to this queue with credit")
+ description = "Current number of consumers attached to this queue with credit", metricName = "consumers_with_credit_total")
int getConsumerCountWithCredit();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.CUMULATIVE, units = StatisticUnit.BYTES, label = "Delivered (Persistent)",
- description = "Total size of all persistent messages delivered by this queue.")
+ description = "Total size of all persistent messages delivered by this queue.", metricName = "persistent_dequeued_bytes_count")
long getPersistentDequeuedBytes();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.CUMULATIVE, units = StatisticUnit.MESSAGES, label = "Delivered (Persistent)",
- description = "Total number of persistent messages delivered by this queue.")
+ description = "Total number of persistent messages delivered by this queue.", metricName = "persistent_dequeued_messages_count")
long getPersistentDequeuedMessages();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.CUMULATIVE, units = StatisticUnit.BYTES, label = "Enqueued (Persistent)",
- description = "Total size of all persistent messages received by this queue.")
+ description = "Total size of all persistent messages received by this queue.", metricName = "persistent_enqueue_bytes_count")
long getPersistentEnqueuedBytes();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.CUMULATIVE, units = StatisticUnit.MESSAGES, label = "Enqueued (Persistent)",
- description = "Total number of persistent messages received by this queue.")
+ description = "Total number of persistent messages received by this queue.", metricName = "persistent_enqueued_messages_count")
long getPersistentEnqueuedMessages();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.POINT_IN_TIME, units = StatisticUnit.BYTES, label = "Queue Depth",
- description = "Current size of all messages enqueued by this queue.")
+ description = "Current size of all messages enqueued by this queue.", metricName = "depth_bytes_total")
long getQueueDepthBytes();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.POINT_IN_TIME, units = StatisticUnit.MESSAGES, label = "Queue Depth",
- description = "Current number of messages enqueued by this queue.")
+ description = "Current number of messages enqueued by this queue.", metricName = "depth_messages_total")
int getQueueDepthMessages();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.CUMULATIVE, units = StatisticUnit.BYTES, label = "Delivered",
- description = "Total size of all messages delivered by this queue.")
+ description = "Total size of all messages delivered by this queue.", metricName = "total_dequeued_bytes_count")
long getTotalDequeuedBytes();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.CUMULATIVE, units = StatisticUnit.MESSAGES, label = "Delivered",
- description = "Total number of messages delivered by this queue.")
+ description = "Total number of messages delivered by this queue.", metricName = "total_dequeued_messages_count")
long getTotalDequeuedMessages();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.CUMULATIVE, units = StatisticUnit.BYTES, label = "Enqueued",
- description = "Total size of all messages received by this queue.")
+ description = "Total size of all messages received by this queue.", metricName = "total_enqueue_bytes_count")
long getTotalEnqueuedBytes();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.CUMULATIVE, units = StatisticUnit.MESSAGES, label = "Enqueued",
- description = "Total number of messages received by this queue.")
+ description = "Total number of messages received by this queue.", metricName = "total_enqueued_messages_count")
long getTotalEnqueuedMessages();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.CUMULATIVE, units = StatisticUnit.BYTES, label = "Expired",
- description = "Total size of all messages expired by message time-to-live on this queue.")
+ description = "Total size of all messages expired by message time-to-live on this queue.", metricName = "total_expired_bytes_count")
long getTotalExpiredBytes();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.CUMULATIVE, units = StatisticUnit.MESSAGES, label = "Expired",
- description = "Total number of messages expired by message time-to-live on this queue.")
+ description = "Total number of messages expired by message time-to-live on this queue.", metricName = "total_expired_messages_count")
long getTotalExpiredMessages();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.POINT_IN_TIME, units = StatisticUnit.BYTES, label = "Prefetched",
- description = "Total size of all messages currently prefetched by consumers.")
+ description = "Total size of all messages currently prefetched by consumers.", metricName = "unacknowledged_bytes_total")
long getUnacknowledgedBytes();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.POINT_IN_TIME, units = StatisticUnit.MESSAGES, label = "Prefetched",
- description = "Total number of messages currently prefetched by consumers.")
+ description = "Total number of messages currently prefetched by consumers.", metricName = "unacknowledged_messages_total")
long getUnacknowledgedMessages();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.POINT_IN_TIME, units = StatisticUnit.BYTES, label = "Available",
- description = "Total size of all messages currently available.")
+ description = "Total size of all messages currently available.", metricName = "available_bytes_total")
long getAvailableBytes();
@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.POINT_IN_TIME, units = StatisticUnit.MESSAGES, label = "Available",
- description = "Total number of messages currently available.")
+ description = "Total number of messages currently available.", metricName = "available_messages_total")
Review comment:
The metric name could be made auto-generated
##########
File path: broker-core/src/main/java/org/apache/qpid/server/model/Session.java
##########
@@ -55,10 +55,10 @@
boolean isProducerFlowBlocked();
- @ManagedStatistic(statisticType = StatisticType.POINT_IN_TIME, units = StatisticUnit.COUNT, label = "Consumers")
+ @ManagedStatistic(statisticType = StatisticType.POINT_IN_TIME, units = StatisticUnit.COUNT, label = "Consumers", metricName = "consumer_total")
long getConsumerCount();
- @ManagedStatistic(statisticType = StatisticType.POINT_IN_TIME, units = StatisticUnit.MESSAGES, label = "Prefetched")
+ @ManagedStatistic(statisticType = StatisticType.POINT_IN_TIME, units = StatisticUnit.MESSAGES, label = "Prefetched", metricName = "unacknowledged_messages_total")
Review comment:
The metric name can be potentially auto-generated
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@qpid.apache.org
For additional commands, e-mail: dev-help@qpid.apache.org