Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[AMQ-9548] Add attributes to retrieve number of total, non-suppressed and temporary queues and topics #1288

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -280,11 +280,41 @@ public ObjectName[] getTopics() {
return safeGetBroker().getTopicsNonSuppressed();
}

@Override
public int getTotalTopicsCount() {
return safeGetBroker().getTopicRegion().getDestinationMap().size();
}

@Override
public int getTotalNonSuppressedTopicsCount() {
return safeGetBroker().getTopicViews().size();
}

@Override
public int getTotalTemporaryTopicsCount() {
return safeGetBroker().getTempTopicRegion().getDestinationMap().size();
}

@Override
public ObjectName[] getQueues() {
return safeGetBroker().getQueuesNonSuppressed();
}

@Override
public int getTotalQueuesCount() {
return safeGetBroker().getQueueRegion().getDestinationMap().size();
}

@Override
public int getTotalNonSuppressedQueuesCount() {
return safeGetBroker().getQueueViews().size();
}

@Override
public int getTotalTemporaryQueuesCount() {
return safeGetBroker().getTempQueueRegion().getDestinationMap().size();
}

@Override
public String queryQueues(String filter, int page, int pageSize) throws IOException {
return DestinationsViewFilter.create(filter)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -179,9 +179,27 @@ public interface BrokerViewMBean extends Service {
@MBeanInfo("Topics (broadcasted 'queues'); generally system information.")
ObjectName[] getTopics();

@MBeanInfo("Total number of topics")
int getTotalTopicsCount();

@MBeanInfo("Total number of non suppressed topics")
int getTotalNonSuppressedTopicsCount();

@MBeanInfo("Total number of temporary topics")
int getTotalTemporaryTopicsCount();

@MBeanInfo("Standard Queues containing AIE messages.")
ObjectName[] getQueues();

@MBeanInfo("Total number of queues")
int getTotalQueuesCount();

@MBeanInfo("Total number of non suppressed queues")
int getTotalNonSuppressedQueuesCount();

@MBeanInfo("Total number of temporary queues")
int getTotalTemporaryQueuesCount();

kenliao94 marked this conversation as resolved.
Show resolved Hide resolved
/**
* Queue Query API, take a look at {@link DestinationsViewFilter} for more information
*/
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
/**
* 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.activemq.broker.jmx;

import jakarta.jms.*;
import org.apache.activemq.ActiveMQConnectionFactory;
import org.apache.activemq.broker.BrokerRegistry;
import org.apache.activemq.broker.BrokerService;
import org.apache.activemq.util.Wait;
import org.junit.Test;

import static org.junit.Assert.assertTrue;

public class BrokerViewTest {
@Test(timeout=120000)
public void testBrokerViewRetrieveQueuesAndTopicsCount() throws Exception {
BrokerService brokerService = new BrokerService();
brokerService.setPersistent(false);
brokerService.start();

ActiveMQConnectionFactory factory = new ActiveMQConnectionFactory(BrokerRegistry.getInstance().findFirst().getVmConnectorURI());
Connection producerConnection = factory.createConnection();
producerConnection.start();
// Create non-suppressed queue
Session producerSession = producerConnection.createSession(false, Session.AUTO_ACKNOWLEDGE);
Queue queue = producerSession.createQueue("testQueue");
MessageProducer producer = producerSession.createProducer(queue);
producer.send(producerSession.createTextMessage("testMessage"));
// Create temporary queue
Session tempProducerSession = producerConnection.createSession(false, Session.AUTO_ACKNOWLEDGE);
Queue tempQueue = tempProducerSession.createTemporaryQueue();
MessageProducer tempProducer = tempProducerSession.createProducer(tempQueue);
tempProducer.send(tempProducerSession.createTextMessage("testMessage"));
// Create non-suppressed topic
Session topicProducerSession = producerConnection.createSession(false, Session.AUTO_ACKNOWLEDGE);
Topic topic = topicProducerSession.createTopic("testTopic");
MessageProducer topicProducer = topicProducerSession.createProducer(topic);
topicProducer.send(topicProducerSession.createTextMessage("testMessage"));
// Create temporary topic
Session tempTopicProducerSession = producerConnection.createSession(false, Session.AUTO_ACKNOWLEDGE);
Topic tempTopic = tempTopicProducerSession.createTemporaryTopic();
MessageProducer tempTopicProducer = tempTopicProducerSession.createProducer(tempTopic);
tempTopicProducer.send(tempTopicProducerSession.createTextMessage("testMessage"));

assertTrue(Wait.waitFor(() -> (brokerService.getAdminView()) != null));
final BrokerView view = brokerService.getAdminView();
assert(view.getTotalTopicsCount() == 11); // Including advisory topics
assert(view.getTotalNonSuppressedTopicsCount() == 11);
assert(view.getTotalTemporaryTopicsCount() == 1);
assert(view.getTotalQueuesCount() == 1);
assert(view.getTotalNonSuppressedQueuesCount() == 1);
assert(view.getTotalTemporaryQueuesCount() == 1);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

  1. Please use the more appropriate assert* methods.

  2. These tests are dodgy. The value expect is 1 and the same across the different types.

  3. Multiple commits need to be squashed for this change

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'll just point out that squashing commits is fine but it is also not necessary. I know I've mentioned before but I prefer it if people do not force push and just push new commits so you can see the difference easier between versions. It's easy to do a squash merge several commits at the end into 1 commit when merging back to main.

}
}