Apache/activemq
1
0
Fork 0
mirror of https://github.com/apache/activemq.git synced 2025-02-18 07:56:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

added enqueue/dequeue statistics at the Connection/Connector level in JMX

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@357683 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
James Strachan 2005-12-19 12:22:09 +00:00
parent 0bf5ab3724
commit 384e290b7f
21 changed files with 452 additions and 110 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
activemq-core/src/main/java/org/activemq/broker/AbstractConnection.java
View File

@ -26,6 +26,7 @@ import java.util.LinkedList;
import java.util.List;
import org.activemq.Service;
import org.activemq.broker.region.ConnectionStatistics;
import org.activemq.command.ActiveMQDestination;
import org.activemq.command.BrokerInfo;
import org.activemq.command.Command;
@ -78,12 +79,14 @@ public abstract class AbstractConnection implements Service, Connection, Task, C
protected final TaskRunner taskRunner;
protected final Connector connector;
protected boolean demandForwardingBridge;
private ConnectionStatistics statistics = new ConnectionStatistics();
protected final ConcurrentHashMap connectionStates = new ConcurrentHashMap();
private WireFormatInfo wireFormatInfo;
protected boolean disposed=false;
static class ConnectionState extends org.activemq.state.ConnectionState {
private final ConnectionContext context;
@ -108,13 +111,17 @@ public abstract class AbstractConnection implements Service, Connection, Task, C
this.connector = connector;
this.broker = broker;
this.statistics.setParent(connector.getStatistics());
if( taskRunnerFactory != null )
if( taskRunnerFactory != null ) {
taskRunner = taskRunnerFactory.createTaskRunner( this );
else
}
else {
taskRunner = null;
}
}
/**
* Returns the number of messages to be dispatched to this connection
*/
@ -561,4 +568,11 @@ public abstract class AbstractConnection implements Service, Connection, Task, C
abstract protected void dispatch(Command command);
/**
* Returns the statistics for this connection
*/
public ConnectionStatistics getStatistics() {
return statistics;
}
}

7
activemq-core/src/main/java/org/activemq/broker/Connection.java
View File

@ -19,6 +19,7 @@
package org.activemq.broker;
import org.activemq.Service;
import org.activemq.broker.region.ConnectionStatistics;
import org.activemq.command.Command;
import org.activemq.command.Response;
@ -86,4 +87,10 @@ public interface Connection extends Service {
* Returns the number of messages to be dispatched to this connection
*/
public int getDispatchQueueSize();
/**
* Returns the statistics for this connection
*/
public ConnectionStatistics getStatistics();
}

5
activemq-core/src/main/java/org/activemq/broker/Connector.java
View File

@ -19,6 +19,7 @@
package org.activemq.broker;
import org.activemq.Service;
import org.activemq.broker.region.ConnectorStatistics;
import org.activemq.command.BrokerInfo;
/**
@ -34,4 +35,8 @@ public interface Connector extends Service {
*/
public BrokerInfo getBrokerInfo();
/**
* @return the statistics for this connector
*/
public ConnectorStatistics getStatistics();
}

2
activemq-core/src/main/java/org/activemq/broker/TransportConnection.java
View File

@ -81,6 +81,7 @@ public class TransportConnection extends AbstractConnection {
super.stop();
}
/**
* @return Returns the blockedCandidate.
*/
@ -186,6 +187,7 @@ public class TransportConnection extends AbstractConnection {
try{
setMarkedCandidate(true);
transport.oneway(command);
getStatistics().onCommand(command);
}catch(IOException e){
serviceException(e);
}finally{

10
activemq-core/src/main/java/org/activemq/broker/TransportConnector.java
View File

@ -27,6 +27,7 @@ import javax.management.MBeanServer;
import javax.management.ObjectName;
import org.activemq.broker.jmx.ManagedTransportConnector;
import org.activemq.broker.region.ConnectorStatistics;
import org.activemq.command.BrokerInfo;
import org.activemq.command.ConnectionInfo;
import org.activemq.thread.TaskRunnerFactory;
@ -60,8 +61,8 @@ public class TransportConnector implements Connector {
protected CopyOnWriteArrayList connections = new CopyOnWriteArrayList();
protected TransportStatusDetector statusDector;
private DiscoveryAgent discoveryAgent;
private ConnectorStatistics statistics = new ConnectorStatistics();
private URI discoveryUri;
private URI connectUri;
/**
@ -164,6 +165,13 @@ public class TransportConnector implements Connector {
this.taskRunnerFactory = taskRunnerFactory;
}
/**
* @return the statistics for this connector
*/
public ConnectorStatistics getStatistics() {
return statistics;
}
public void start() throws Exception {
getServer().start();
log.info("Accepting connection on: "+getServer().getConnectURI());

27
activemq-core/src/main/java/org/activemq/broker/jmx/ConnectionView.java
View File

@ -72,4 +72,31 @@ public class ConnectionView implements ConnectionViewMBean {
public int getDispatchQueueSize() {
return connection.getDispatchQueueSize();
}
/**
* Resets the statistics
*/
public void resetStatistics() {
connection.getStatistics().reset();
}
/**
* Returns the number of messages enqueued on this connection
*
* @return the number of messages enqueued on this connection
*/
public long getEnqueueCount() {
return connection.getStatistics().getEnqueues().getCount();
}
/**
* Returns the number of messages dequeued on this connection
*
* @return the number of messages dequeued on this connection
*/
public long getDequeueCount() {
return connection.getStatistics().getDequeues().getCount();
}
}

20
activemq-core/src/main/java/org/activemq/broker/jmx/ConnectionViewMBean.java
View File

@ -45,4 +45,24 @@ public interface ConnectionViewMBean extends Service {
* Returns the number of messages to be dispatched to this connection
*/
public int getDispatchQueueSize();
/**
* Resets the statistics
*/
public void resetStatistics();
/**
* Returns the number of messages enqueued on this connection
*
* @return the number of messages enqueued on this connection
*/
public long getEnqueueCount();
/**
* Returns the number of messages dequeued on this connection
*
* @return the number of messages dequeued on this connection
*/
public long getDequeueCount();
}

26
activemq-core/src/main/java/org/activemq/broker/jmx/ConnectorView.java
View File

@ -91,4 +91,30 @@ public class ConnectorView implements ConnectorViewMBean {
return redeliveryPolicy;
}
/**
* Resets the statistics
*/
public void resetStatistics() {
connector.getStatistics().reset();
}
/**
* Returns the number of messages enqueued on this connector
*
* @return the number of messages enqueued on this connector
*/
public long getEnqueueCount() {
return connector.getStatistics().getEnqueues().getCount();
}
/**
* Returns the number of messages dequeued on this connector
*
* @return the number of messages dequeued on this connector
*/
public long getDequeueCount() {
return connector.getStatistics().getDequeues().getCount();
}
}

21
activemq-core/src/main/java/org/activemq/broker/jmx/ConnectorViewMBean.java
View File

@ -19,8 +19,6 @@
package org.activemq.broker.jmx;
import org.activemq.Service;
import org.activemq.command.BrokerInfo;
import org.activemq.command.RedeliveryPolicy;
public interface ConnectorViewMBean extends Service {
@ -40,4 +38,23 @@ public interface ConnectorViewMBean extends Service {
public void setUseExponentialBackOff(boolean useExponentialBackOff);
/**
* Resets the statistics
*/
public void resetStatistics();
/**
* Returns the number of messages enqueued on this connector
*
* @return the number of messages enqueued on this connector
*/
public long getEnqueueCount();
/**
* Returns the number of messages dequeued on this connector
*
* @return the number of messages dequeued on this connector
*/
public long getDequeueCount();
}

83
activemq-core/src/main/java/org/activemq/broker/region/ConnectionStatistics.java Normal file
View File

@ -0,0 +1,83 @@
/**
* <a href="http://activemq.org">ActiveMQ: The Open Source Message Fabric</a>
*
* Copyright 2005 (C) LogicBlaze, Inc. http://www.logicblaze.com
*
* Licensed 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.activemq.broker.region;
import org.activemq.command.Command;
import org.activemq.command.Message;
import org.activemq.management.CountStatisticImpl;
import org.activemq.management.StatsImpl;
/**
* The J2EE Statistics for the Connection.
*
* @version $Revision$
*/
public class ConnectionStatistics extends StatsImpl {
private CountStatisticImpl enqueues;
private CountStatisticImpl dequeues;
public ConnectionStatistics() {
enqueues = new CountStatisticImpl("enqueues", "The number of messages that have been sent to the connection");
dequeues = new CountStatisticImpl("dequeues", "The number of messages that have been dispatched from the connection");
addStatistic("enqueues", enqueues);
addStatistic("dequeues", dequeues);
}
public CountStatisticImpl getEnqueues() {
return enqueues;
}
public CountStatisticImpl getDequeues() {
return dequeues;
}
public void reset() {
super.reset();
enqueues.reset();
dequeues.reset();
}
public void setParent(ConnectorStatistics parent) {
if (parent != null) {
enqueues.setParent(parent.getEnqueues());
dequeues.setParent(parent.getDequeues());
}
else {
enqueues.setParent(null);
dequeues.setParent(null);
}
}
/**
* Updates the statistics as a command is dispatched into the connection
*/
public void onCommand(Command command) {
if (command.isMessageDispatch()) {
enqueues.increment();
}
}
public void onMessageDequeue(Message message) {
dequeues.increment();
}
}

94
activemq-core/src/main/java/org/activemq/broker/region/ConnectorStatistics.java Normal file
View File

@ -0,0 +1,94 @@
/**
* <a href="http://activemq.org">ActiveMQ: The Open Source Message Fabric</a>
*
* Copyright 2005 (C) LogicBlaze, Inc. http://www.logicblaze.com
*
* Licensed 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.activemq.broker.region;
import org.activemq.management.CountStatisticImpl;
import org.activemq.management.PollCountStatisticImpl;
import org.activemq.management.StatsImpl;
/**
* The J2EE Statistics for the a Destination.
*
* @version $Revision$
*/
public class ConnectorStatistics extends StatsImpl {
protected CountStatisticImpl enqueues;
protected CountStatisticImpl dequeues;
protected CountStatisticImpl consumers;
protected CountStatisticImpl messages;
protected PollCountStatisticImpl messagesCached;
public ConnectorStatistics() {
enqueues = new CountStatisticImpl("enqueues", "The number of messages that have been sent to the destination");
dequeues = new CountStatisticImpl("dequeues", "The number of messages that have been dispatched from the destination");
consumers = new CountStatisticImpl("consumers", "The number of consumers that that are subscribing to messages from the destination");
messages = new CountStatisticImpl("messages", "The number of messages that that are being held by the destination");
messagesCached = new PollCountStatisticImpl("messagesCached", "The number of messages that are held in the destination's memory cache");
addStatistic("enqueues", enqueues);
addStatistic("dequeues", dequeues);
addStatistic("consumers", consumers);
addStatistic("messages", messages);
addStatistic("messagesCached", messagesCached);
}
public CountStatisticImpl getEnqueues() {
return enqueues;
}
public CountStatisticImpl getDequeues() {
return dequeues;
}
public CountStatisticImpl getConsumers() {
return consumers;
}
public PollCountStatisticImpl getMessagesCached() {
return messagesCached;
}
public CountStatisticImpl getMessages() {
return messages;
}
public void reset() {
super.reset();
enqueues.reset();
dequeues.reset();
}
public void setParent(ConnectorStatistics parent) {
if( parent!=null ) {
enqueues.setParent(parent.enqueues);
dequeues.setParent(parent.dequeues);
consumers.setParent(parent.consumers);
messagesCached.setParent(parent.messagesCached);
messages.setParent(parent.messages);
} else {
enqueues.setParent(null);
dequeues.setParent(null);
consumers.setParent(null);
messagesCached.setParent(null);
messages.setParent(null);
}
}
public void setMessagesCached(PollCountStatisticImpl messagesCached) {
this.messagesCached = messagesCached;
}
}

21
activemq-core/src/main/java/org/activemq/broker/region/DestinationStatistics.java
View File

@ -18,6 +18,8 @@
**/
package org.activemq.broker.region;
import org.activemq.command.Message;
import org.activemq.management.CountStatisticImpl;
import org.activemq.management.PollCountStatisticImpl;
import org.activemq.management.StatsImpl;
@ -53,15 +55,19 @@ public class DestinationStatistics extends StatsImpl {
public CountStatisticImpl getEnqueues() {
return enqueues;
}
public CountStatisticImpl getDequeues() {
return dequeues;
}
public CountStatisticImpl getConsumers() {
return consumers;
}
public PollCountStatisticImpl getMessagesCached() {
return messagesCached;
}
public CountStatisticImpl getMessages() {
return messages;
}
@ -79,7 +85,8 @@ public class DestinationStatistics extends StatsImpl {
consumers.setParent(parent.consumers);
messagesCached.setParent(parent.messagesCached);
messages.setParent(parent.messages);
} else {
}
else {
enqueues.setParent(null);
dequeues.setParent(null);
consumers.setParent(null);
@ -91,4 +98,16 @@ public class DestinationStatistics extends StatsImpl {
public void setMessagesCached(PollCountStatisticImpl messagesCached) {
this.messagesCached = messagesCached;
}
/**
* Called when a message is enqueued to update the statistics.
*/
public void onMessageEnqueue(Message message) {
getEnqueues().increment();
getMessages().increment();
}
public void onMessageDequeue(Message message) {
getDequeues().increment();
}
}

3
activemq-core/src/main/java/org/activemq/broker/region/PrefetchSubscription.java
View File

@ -277,7 +277,8 @@ abstract public class PrefetchSubscription extends AbstractSubscription {
node.decrementReferenceCount();
if( node.getRegionDestination() !=null ) {
node.getRegionDestination().getDestinationStatistics().getDequeues().increment();
node.getRegionDestination().getDestinationStatistics().onMessageDequeue(message);
context.getConnection().getStatistics().onMessageDequeue(message);
if( wasFull && !isFull() ) {
try {

3
activemq-core/src/main/java/org/activemq/broker/region/Queue.java
View File

@ -344,8 +344,7 @@ public class Queue implements Destination {
dispatchValve.increment();
MessageEvaluationContext msgContext = context.getMessageEvaluationContext();
try {
destinationStatistics.getEnqueues().increment();
destinationStatistics.getMessages().increment();
destinationStatistics.onMessageEnqueue(message);
synchronized (messages) {
messages.add(node);
}

4
activemq-core/src/main/java/org/activemq/command/BaseCommand.java
View File

@ -61,6 +61,10 @@ abstract public class BaseCommand implements Command {
return false;
}
public boolean isMessageAck() {
return false;
}
/**
* @openwire:property version=1
*/

1
activemq-core/src/main/java/org/activemq/command/Command.java
View File

@ -43,6 +43,7 @@ public interface Command extends DataStructure {
boolean isBrokerInfo();
boolean isWireFormatInfo();
boolean isMessage();
boolean isMessageAck();
Response visit( CommandVisitor visitor) throws Throwable;
}

4
activemq-core/src/main/java/org/activemq/command/KeepAliveInfo.java
View File

@ -58,6 +58,10 @@ public class KeepAliveInfo implements Command {
return false;
}
public boolean isMessageAck() {
return false;
}
public boolean isBrokerInfo() {
return false;
}

4
activemq-core/src/main/java/org/activemq/command/MessageAck.java
View File

@ -85,6 +85,10 @@ public class MessageAck extends BaseCommand {
return DATA_STRUCTURE_TYPE;
}
public boolean isMessageAck() {
return true;
}
public boolean isPoisonAck() {
return ackType==POSION_ACK_TYPE;
}

22
activemq-core/src/main/java/org/activemq/command/WireFormatInfo.java
View File

@ -18,10 +18,10 @@
**/
package org.activemq.command;
import java.util.Arrays;
import org.activemq.state.CommandVisitor;
import java.util.Arrays;
/**
*
* @openwire:marshaller
@ -55,6 +55,7 @@ public class WireFormatInfo implements Command {
public byte[] getMagic() {
return magic;
}
public void setMagic(byte[] magic) {
this.magic = magic;
}
@ -96,10 +97,14 @@ public class WireFormatInfo implements Command {
public boolean isMessageDispatch() {
return false;
}
public boolean isMessage() {
return false;
}
public boolean isMessageAck() {
return false;
}
public void setResponseRequired(boolean responseRequired) {
}
@ -119,14 +124,15 @@ public class WireFormatInfo implements Command {
this.options = options;
}
public boolean isStackTraceEnabled() {
return (options & STACK_TRACE_MASK) != 0;
}
public void setStackTraceEnabled(boolean enable) {
if (enable) {
options |= STACK_TRACE_MASK;
} else {
}
else {
options &= ~STACK_TRACE_MASK;
}
}
@ -134,10 +140,12 @@ public class WireFormatInfo implements Command {
public boolean isTcpNoDelayEnabled() {
return (options & TCP_NO_DELAY_MASK) != 0;
}
public void setTcpNoDelayEnabled(boolean enable) {
if (enable) {
options |= TCP_NO_DELAY_MASK;
} else {
}
else {
options &= ~TCP_NO_DELAY_MASK;
}
}
@ -145,10 +153,12 @@ public class WireFormatInfo implements Command {
public boolean isCacheEnabled() {
return (options & CACHE_MASK) != 0;
}
public void setCacheEnabled(boolean enable) {
if (enable) {
options |= CACHE_MASK;
} else {
}
else {
options &= ~CACHE_MASK;
}
}

2
activemq-core/src/main/java/org/activemq/jndi/ActiveMQInitialContextFactory.java
View File

@ -62,8 +62,6 @@ public class ActiveMQInitialContextFactory implements InitialContextFactory {
public Context getInitialContext(Hashtable environment) throws NamingException {
// lets create a factory
Map data = new ConcurrentHashMap();
Broker broker = null;
String[] names = getConnectionFactoryNames(environment);
for (int i = 0; i < names.length; i++) {
ActiveMQConnectionFactory factory =null;

5
activemq-core/src/main/java/org/activemq/management/JMSConnectionStatsImpl.java
View File

@ -18,11 +18,10 @@
**/
package org.activemq.management;
import java.util.List;
import org.activemq.ActiveMQSession;
import org.activemq.util.IndentPrinter;
import javax.management.j2ee.statistics.Statistic;
import java.util.List;
/**
* Statistics for a JMS connection
*