-
Notifications
You must be signed in to change notification settings - Fork 1.5k
[AMQ-9548] Add BrokerView attributes to retrieve number of total, managed, and temporary queues and topics #1288
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
Merged
Merged
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
15186e8
Add attributes to display total number of queues and topics
kenliao94 4faf9ea
Addressed comments and add metrics for temporary queues and topics
kenliao94 b805c03
Use assertEquals and make the test more accurate
kenliao94 6e1b559
renamed NonSuppreseed to Managed
kenliao94 a04341d
fixed logic for counting ManagedTopic and ManagedQueue
kenliao94 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
90 changes: 90 additions & 0 deletions
90
activemq-unit-tests/src/test/java/org/apache/activemq/broker/jmx/BrokerViewTest.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,90 @@ | ||
| /** | ||
| * 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.assertEquals; | ||
| import static org.junit.Assert.assertTrue; | ||
|
|
||
|
|
||
| public class BrokerViewTest { | ||
| @Test(timeout=120000) | ||
| public void testBrokerViewRetrieveQueuesAndTopicsCount() throws Exception { | ||
| BrokerService brokerService = new BrokerService(); | ||
| brokerService.setPersistent(false); | ||
|
|
||
| // Create and configure ManagementContext with suppressed destinations | ||
| ManagementContext managementContext = new ManagementContext(); | ||
| managementContext.setCreateConnector(false); | ||
| managementContext.setSuppressMBean("endpoint=dynamicProducer,destinationName=suppressedQueue,destinationName=suppressedTopic"); | ||
| brokerService.setManagementContext(managementContext); | ||
| 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 suppressed queue | ||
| Queue suppressedQueue = producerSession.createQueue("suppressedQueue"); | ||
| MessageProducer suppressedProducer = producerSession.createProducer(suppressedQueue); | ||
| suppressedProducer.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")); | ||
| Session tempProducerSession2 = producerConnection.createSession(false, Session.AUTO_ACKNOWLEDGE); | ||
| Queue tempQueue2 = tempProducerSession2.createTemporaryQueue(); | ||
| MessageProducer tempProducer2 = tempProducerSession2.createProducer(tempQueue2); | ||
| tempProducer2.send(tempProducerSession2.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 suppressed topic | ||
| Session suppressedTopicProducerSession = producerConnection.createSession(false, Session.AUTO_ACKNOWLEDGE); | ||
| Topic suppressedTopic = suppressedTopicProducerSession.createTopic("suppressedTopic"); | ||
| MessageProducer suppressedTopicProducer = topicProducerSession.createProducer(suppressedTopic); | ||
| topicProducer.send(suppressedTopicProducerSession.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(); | ||
| assertEquals(15, view.getTotalTopicsCount()); | ||
| assertEquals(14, view.getTotalManagedTopicsCount()); | ||
| assertEquals(1, view.getTotalTemporaryTopicsCount()); | ||
| assertEquals(1, view.getQueues().length); | ||
| assertEquals(2, view.getTotalQueuesCount()); | ||
| assertEquals(1, view.getTotalManagedQueuesCount()); | ||
| assertEquals(view.getTotalTemporaryQueuesCount(), 2); | ||
| } | ||
| } |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.