Author: robbie
Date: Wed Apr 25 15:32:00 2012
New Revision: 1330346
URL: http://svn.apache.org/viewvc?rev=1330346&view=rev
Log:
NO-JIRA: enable statistics by default, stop byte and message totals from being
periodic, begin a new systests for statistics
Added:
qpid/branches/java-config-and-management/qpid/java/systests/src/main/java/org/apache/qpid/management/jmx/NewStatisticsSystemTest.java
Modified:
qpid/branches/java-config-and-management/qpid/java/broker-plugins/jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/AbstractStatisticsGatheringMBean.java
qpid/branches/java-config-and-management/qpid/java/broker-plugins/jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/ConnectionMBean.java
qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/management/AMQBrokerManagerMBean.java
qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/management/AMQProtocolSessionMBean.java
qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/management/ServerConnectionMBean.java
qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/management/ServerInformationMBean.java
qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQProtocolEngine.java
qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/registry/ApplicationRegistry.java
qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/registry/IApplicationRegistry.java
qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/stats/StatisticsCounter.java
qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/stats/StatisticsGatherer.java
qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/transport/ServerConnection.java
qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/VirtualHostImpl.java
qpid/branches/java-config-and-management/qpid/java/broker/src/test/java/org/apache/qpid/server/subscription/MockSubscription.java
qpid/branches/java-config-and-management/qpid/java/broker/src/test/java/org/apache/qpid/server/virtualhost/MockVirtualHost.java
Modified:
qpid/branches/java-config-and-management/qpid/java/broker-plugins/jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/AbstractStatisticsGatheringMBean.java
URL:
http://svn.apache.org/viewvc/qpid/branches/java-config-and-management/qpid/java/broker-plugins/jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/AbstractStatisticsGatheringMBean.java?rev=1330346&r1=1330345&r2=1330346&view=diff
==============================================================================
---
qpid/branches/java-config-and-management/qpid/java/broker-plugins/jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/AbstractStatisticsGatheringMBean.java
(original)
+++
qpid/branches/java-config-and-management/qpid/java/broker-plugins/jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/AbstractStatisticsGatheringMBean.java
Wed Apr 25 15:32:00 2012
@@ -2,6 +2,7 @@ package org.apache.qpid.server.jmx.mbean
import javax.management.NotCompliantMBeanException;
import org.apache.qpid.server.model.ConfiguredObject;
+import org.apache.qpid.server.model.Connection;
import org.apache.qpid.server.jmx.AMQManagedObject;
import org.apache.qpid.server.jmx.ManagedObjectRegistry;
import org.apache.qpid.server.model.VirtualHost;
@@ -24,12 +25,12 @@ import org.apache.qpid.server.model.Virt
*/
abstract class AbstractStatisticsGatheringMBean<T extends ConfiguredObject>
extends AMQManagedObject
{
- private long _lastStatupDateTime;
+ private long _lastStatUpdateTime;
private long _statUpdatePeriod = 5000L;
- private long _messagesReceived;
- private long _messagesSent;
- private long _bytesReceived;
- private long _bytesSent;
+ private long _lastMessagesReceived;
+ private long _lastMessagesSent;
+ private long _lastBytesReceived;
+ private long _lastBytesSent;
private double _messageReceivedRate;
private double _messageSentRate;
private double _bytesReceivedRate;
@@ -52,18 +53,13 @@ abstract class AbstractStatisticsGatheri
protected void initStats()
{
- _lastStatupDateTime = System.currentTimeMillis();
-
- _messagesReceived = getStatistic(VirtualHost.MESSAGES_IN);
- _messagesSent = getStatistic(VirtualHost.MESSAGES_OUT);
- _bytesReceived = getStatistic(VirtualHost.BYTES_IN);
- _bytesSent = getStatistic(VirtualHost.BYTES_OUT);
+ _lastStatUpdateTime = System.currentTimeMillis();
}
protected synchronized void updateStats()
{
long time = System.currentTimeMillis();
- final long period = time - _lastStatupDateTime;
+ final long period = time - _lastStatUpdateTime;
if(period > _statUpdatePeriod)
{
long messagesReceived = getStatistic(VirtualHost.MESSAGES_IN);
@@ -71,15 +67,15 @@ abstract class AbstractStatisticsGatheri
long bytesReceived = getStatistic(VirtualHost.BYTES_IN);
long bytesSent = getStatistic(VirtualHost.BYTES_OUT);
- double messageReceivedRate = (double)(messagesReceived -
_messagesReceived) / (double)period;
- double messageSentRate = (double)(messagesSent - _messagesSent) /
(double)period;
- double bytesReceivedRate = (double)(bytesReceived -
_bytesReceived) / (double)period;
- double bytesSentRate = (double)(bytesSent - _bytesSent) /
(double)period;
-
- _messagesReceived = messagesReceived;
- _messagesSent = messagesSent;
- _bytesReceived = bytesReceived;
- _bytesSent = bytesSent;
+ double messageReceivedRate = (double)(messagesReceived -
_lastMessagesReceived) / (double)period;
+ double messageSentRate = (double)(messagesSent -
_lastMessagesSent) / (double)period;
+ double bytesReceivedRate = (double)(bytesReceived -
_lastBytesReceived) / (double)period;
+ double bytesSentRate = (double)(bytesSent - _lastBytesSent) /
(double)period;
+
+ _lastMessagesReceived = messagesReceived;
+ _lastMessagesSent = messagesSent;
+ _lastBytesReceived = bytesReceived;
+ _lastBytesSent = bytesSent;
_messageReceivedRate = messageReceivedRate;
_messageSentRate = messageSentRate;
@@ -147,13 +143,13 @@ abstract class AbstractStatisticsGatheri
public synchronized long getTotalMessagesDelivered()
{
updateStats();
- return _messagesSent;
+ return getStatistic(Connection.MESSAGES_OUT);
}
public synchronized long getTotalDataDelivered()
{
updateStats();
- return _bytesSent;
+ return getStatistic(Connection.BYTES_OUT);
}
protected final T getConfiguredObject()
@@ -188,13 +184,13 @@ abstract class AbstractStatisticsGatheri
public synchronized long getTotalMessagesReceived()
{
updateStats();
- return _messagesReceived;
+ return getStatistic(Connection.MESSAGES_IN);
}
public synchronized long getTotalDataReceived()
{
updateStats();
- return _bytesReceived;
+ return getStatistic(Connection.BYTES_IN);
}
}
Modified:
qpid/branches/java-config-and-management/qpid/java/broker-plugins/jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/ConnectionMBean.java
URL:
http://svn.apache.org/viewvc/qpid/branches/java-config-and-management/qpid/java/broker-plugins/jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/ConnectionMBean.java?rev=1330346&r1=1330345&r2=1330346&view=diff
==============================================================================
---
qpid/branches/java-config-and-management/qpid/java/broker-plugins/jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/ConnectionMBean.java
(original)
+++
qpid/branches/java-config-and-management/qpid/java/broker-plugins/jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/ConnectionMBean.java
Wed Apr 25 15:32:00 2012
@@ -167,8 +167,7 @@ public class ConnectionMBean extends Abs
public synchronized boolean isStatisticsEnabled()
{
- updateStats();
- return false; //TODO - implement isStatisticsEnabled
+ return true;
}
public void setStatisticsEnabled(boolean enabled)
Modified:
qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/management/AMQBrokerManagerMBean.java
URL:
http://svn.apache.org/viewvc/qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/management/AMQBrokerManagerMBean.java?rev=1330346&r1=1330345&r2=1330346&view=diff
==============================================================================
---
qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/management/AMQBrokerManagerMBean.java
(original)
+++
qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/management/AMQBrokerManagerMBean.java
Wed Apr 25 15:32:00 2012
@@ -405,6 +405,6 @@ public class AMQBrokerManagerMBean exten
public boolean isStatisticsEnabled()
{
- return getVirtualHost().isStatisticsEnabled();
+ return true;
}
}
Modified:
qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/management/AMQProtocolSessionMBean.java
URL:
http://svn.apache.org/viewvc/qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/management/AMQProtocolSessionMBean.java?rev=1330346&r1=1330345&r2=1330346&view=diff
==============================================================================
---
qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/management/AMQProtocolSessionMBean.java
(original)
+++
qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/management/AMQProtocolSessionMBean.java
Wed Apr 25 15:32:00 2012
@@ -335,11 +335,11 @@ public class AMQProtocolSessionMBean ext
public boolean isStatisticsEnabled()
{
- return _protocolSession.isStatisticsEnabled();
+ return true;
}
public void setStatisticsEnabled(boolean enabled)
{
- _protocolSession.setStatisticsEnabled(enabled);
+ //TODO decide to remove or not
}
}
Modified:
qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/management/ServerConnectionMBean.java
URL:
http://svn.apache.org/viewvc/qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/management/ServerConnectionMBean.java?rev=1330346&r1=1330345&r2=1330346&view=diff
==============================================================================
---
qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/management/ServerConnectionMBean.java
(original)
+++
qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/management/ServerConnectionMBean.java
Wed Apr 25 15:32:00 2012
@@ -230,11 +230,11 @@ public class ServerConnectionMBean exten
public boolean isStatisticsEnabled()
{
- return _serverConnection.isStatisticsEnabled();
+ return true;
}
public void setStatisticsEnabled(boolean enabled)
{
- _serverConnection.setStatisticsEnabled(enabled);
+ //TODO decide to deprecate and/or remove
}
}
Modified:
qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/management/ServerInformationMBean.java
URL:
http://svn.apache.org/viewvc/qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/management/ServerInformationMBean.java?rev=1330346&r1=1330345&r2=1330346&view=diff
==============================================================================
---
qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/management/ServerInformationMBean.java
(original)
+++
qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/management/ServerInformationMBean.java
Wed Apr 25 15:32:00 2012
@@ -139,7 +139,7 @@ public class ServerInformationMBean exte
public boolean isStatisticsEnabled()
{
- return registry.isStatisticsEnabled();
+ return true;
}
}
Modified:
qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQProtocolEngine.java
URL:
http://svn.apache.org/viewvc/qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQProtocolEngine.java?rev=1330346&r1=1330345&r2=1330346&view=diff
==============================================================================
---
qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQProtocolEngine.java
(original)
+++
qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQProtocolEngine.java
Wed Apr 25 15:32:00 2012
@@ -153,7 +153,6 @@ public class AMQProtocolEngine implement
private long _createTime = System.currentTimeMillis();
private ApplicationRegistry _registry;
- private boolean _statisticsEnabled = false;
private StatisticsCounter _messagesDelivered, _dataDelivered,
_messagesReceived, _dataReceived;
private NetworkConnection _network;
@@ -1366,21 +1365,15 @@ public class AMQProtocolEngine implement
public void registerMessageDelivered(long messageSize)
{
- if (isStatisticsEnabled())
- {
- _messagesDelivered.registerEvent(1L);
- _dataDelivered.registerEvent(messageSize);
- }
+ _messagesDelivered.registerEvent(1L);
+ _dataDelivered.registerEvent(messageSize);
_virtualHost.registerMessageDelivered(messageSize);
}
public void registerMessageReceived(long messageSize, long timestamp)
{
- if (isStatisticsEnabled())
- {
- _messagesReceived.registerEvent(1L, timestamp);
- _dataReceived.registerEvent(messageSize, timestamp);
- }
+ _messagesReceived.registerEvent(1L, timestamp);
+ _dataReceived.registerEvent(messageSize, timestamp);
_virtualHost.registerMessageReceived(messageSize, timestamp);
}
@@ -1414,25 +1407,12 @@ public class AMQProtocolEngine implement
public void initialiseStatistics()
{
- setStatisticsEnabled(!StatisticsCounter.DISABLE_STATISTICS &&
-
_registry.getConfiguration().isStatisticsGenerationConnectionsEnabled());
-
_messagesDelivered = new StatisticsCounter("messages-delivered-" +
getSessionID());
_dataDelivered = new StatisticsCounter("data-delivered-" +
getSessionID());
_messagesReceived = new StatisticsCounter("messages-received-" +
getSessionID());
_dataReceived = new StatisticsCounter("data-received-" +
getSessionID());
}
- public boolean isStatisticsEnabled()
- {
- return _statisticsEnabled;
- }
-
- public void setStatisticsEnabled(boolean enabled)
- {
- _statisticsEnabled = enabled;
- }
-
public boolean isSessionNameUnique(byte[] name)
{
// 0-8/0-9/0-9-1 sessions don't have names
Modified:
qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/registry/ApplicationRegistry.java
URL:
http://svn.apache.org/viewvc/qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/registry/ApplicationRegistry.java?rev=1330346&r1=1330345&r2=1330346&view=diff
==============================================================================
---
qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/registry/ApplicationRegistry.java
(original)
+++
qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/registry/ApplicationRegistry.java
Wed Apr 25 15:32:00 2012
@@ -117,7 +117,6 @@ public abstract class ApplicationRegistr
private ConfigStore _configStore;
private Timer _reportingTimer;
- private boolean _statisticsEnabled = false;
private StatisticsCounter _messagesDelivered, _dataDelivered,
_messagesReceived, _dataReceived;
private BundleContext _bundleContext;
@@ -697,20 +696,14 @@ public abstract class ApplicationRegistr
public void registerMessageDelivered(long messageSize)
{
- if (isStatisticsEnabled())
- {
- _messagesDelivered.registerEvent(1L);
- _dataDelivered.registerEvent(messageSize);
- }
+ _messagesDelivered.registerEvent(1L);
+ _dataDelivered.registerEvent(messageSize);
}
public void registerMessageReceived(long messageSize, long timestamp)
{
- if (isStatisticsEnabled())
- {
- _messagesReceived.registerEvent(1L, timestamp);
- _dataReceived.registerEvent(messageSize, timestamp);
- }
+ _messagesReceived.registerEvent(1L, timestamp);
+ _dataReceived.registerEvent(messageSize, timestamp);
}
public StatisticsCounter getMessageReceiptStatistics()
@@ -748,25 +741,12 @@ public abstract class ApplicationRegistr
public void initialiseStatistics()
{
- setStatisticsEnabled(!StatisticsCounter.DISABLE_STATISTICS &&
- getConfiguration().isStatisticsGenerationBrokerEnabled());
-
_messagesDelivered = new StatisticsCounter("messages-delivered");
_dataDelivered = new StatisticsCounter("bytes-delivered");
_messagesReceived = new StatisticsCounter("messages-received");
_dataReceived = new StatisticsCounter("bytes-received");
}
- public boolean isStatisticsEnabled()
- {
- return _statisticsEnabled;
- }
-
- public void setStatisticsEnabled(boolean enabled)
- {
- _statisticsEnabled = enabled;
- }
-
private void logStartupMessages(LogActor logActor)
{
logActor.message(BrokerMessages.STARTUP(QpidProperties.getReleaseVersion(),
QpidProperties.getBuildVersion()));
Modified:
qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/registry/IApplicationRegistry.java
URL:
http://svn.apache.org/viewvc/qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/registry/IApplicationRegistry.java?rev=1330346&r1=1330345&r2=1330346&view=diff
==============================================================================
---
qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/registry/IApplicationRegistry.java
(original)
+++
qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/registry/IApplicationRegistry.java
Wed Apr 25 15:32:00 2012
@@ -91,8 +91,6 @@ public interface IApplicationRegistry ex
BrokerConfig getBrokerConfig();
- void setBroker(Broker broker);
-
Broker getBroker();
VirtualHost createVirtualHost(VirtualHostConfiguration vhostConfig) throws
Exception;
Modified:
qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/stats/StatisticsCounter.java
URL:
http://svn.apache.org/viewvc/qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/stats/StatisticsCounter.java?rev=1330346&r1=1330345&r2=1330346&view=diff
==============================================================================
---
qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/stats/StatisticsCounter.java
(original)
+++
qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/stats/StatisticsCounter.java
Wed Apr 25 15:32:00 2012
@@ -33,8 +33,7 @@ public class StatisticsCounter
private static final Logger _log =
LoggerFactory.getLogger(StatisticsCounter.class);
public static final long DEFAULT_SAMPLE_PERIOD =
Long.getLong("qpid.statistics.samplePeriod", 2000L); // 2s
- public static final boolean DISABLE_STATISTICS =
Boolean.getBoolean("qpid.statistics.disable");
-
+
private static final String COUNTER = "counter";
private static final AtomicLong _counterIds = new AtomicLong(0L);
@@ -78,11 +77,6 @@ public class StatisticsCounter
public void registerEvent(long value, long timestamp)
{
- if (DISABLE_STATISTICS)
- {
- return;
- }
-
long thisSample = (timestamp / _period);
synchronized (this)
{
Modified:
qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/stats/StatisticsGatherer.java
URL:
http://svn.apache.org/viewvc/qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/stats/StatisticsGatherer.java?rev=1330346&r1=1330345&r2=1330346&view=diff
==============================================================================
---
qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/stats/StatisticsGatherer.java
(original)
+++
qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/stats/StatisticsGatherer.java
Wed Apr 25 15:32:00 2012
@@ -103,16 +103,4 @@ public interface StatisticsGatherer
* Reset the counters for this, and any child {@link StatisticsGatherer}s.
*/
void resetStatistics();
-
- /**
- * Check if this object has statistics generation enabled.
- *
- * @return true if statistics generation is enabled
- */
- boolean isStatisticsEnabled();
-
- /**
- * Enable or disable statistics generation for this object.
- */
- void setStatisticsEnabled(boolean enabled);
}
Modified:
qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/transport/ServerConnection.java
URL:
http://svn.apache.org/viewvc/qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/transport/ServerConnection.java?rev=1330346&r1=1330345&r2=1330346&view=diff
==============================================================================
---
qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/transport/ServerConnection.java
(original)
+++
qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/transport/ServerConnection.java
Wed Apr 25 15:32:00 2012
@@ -68,7 +68,6 @@ public class ServerConnection extends Co
private Subject _authorizedSubject = null;
private Principal _authorizedPrincipal = null;
- private boolean _statisticsEnabled = false;
private StatisticsCounter _messagesDelivered, _dataDelivered,
_messagesReceived, _dataReceived;
private final long _connectionId;
private final Object _reference = new Object();
@@ -299,21 +298,15 @@ public class ServerConnection extends Co
public void registerMessageDelivered(long messageSize)
{
- if (isStatisticsEnabled())
- {
- _messagesDelivered.registerEvent(1L);
- _dataDelivered.registerEvent(messageSize);
- }
+ _messagesDelivered.registerEvent(1L);
+ _dataDelivered.registerEvent(messageSize);
_virtualHost.registerMessageDelivered(messageSize);
}
public void registerMessageReceived(long messageSize, long timestamp)
{
- if (isStatisticsEnabled())
- {
- _messagesReceived.registerEvent(1L, timestamp);
- _dataReceived.registerEvent(messageSize, timestamp);
- }
+ _messagesReceived.registerEvent(1L, timestamp);
+ _dataReceived.registerEvent(messageSize, timestamp);
_virtualHost.registerMessageReceived(messageSize, timestamp);
}
@@ -347,25 +340,12 @@ public class ServerConnection extends Co
public void initialiseStatistics()
{
- setStatisticsEnabled(!StatisticsCounter.DISABLE_STATISTICS &&
-
_virtualHost.getApplicationRegistry().getConfiguration().isStatisticsGenerationConnectionsEnabled());
-
_messagesDelivered = new StatisticsCounter("messages-delivered-" +
getConnectionId());
_dataDelivered = new StatisticsCounter("data-delivered-" +
getConnectionId());
_messagesReceived = new StatisticsCounter("messages-received-" +
getConnectionId());
_dataReceived = new StatisticsCounter("data-received-" +
getConnectionId());
}
- public boolean isStatisticsEnabled()
- {
- return _statisticsEnabled;
- }
-
- public void setStatisticsEnabled(boolean enabled)
- {
- _statisticsEnabled = enabled;
- }
-
/**
* @return authorizedSubject
*/
Modified:
qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/VirtualHostImpl.java
URL:
http://svn.apache.org/viewvc/qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/VirtualHostImpl.java?rev=1330346&r1=1330345&r2=1330346&view=diff
==============================================================================
---
qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/VirtualHostImpl.java
(original)
+++
qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/VirtualHostImpl.java
Wed Apr 25 15:32:00 2012
@@ -121,8 +121,6 @@ public class VirtualHostImpl implements
private State _state = State.INITIALISING;
- private boolean _statisticsEnabled = false;
-
private StatisticsCounter _messagesDelivered, _dataDelivered,
_messagesReceived, _dataReceived;
private final Map<String, LinkRegistry> _linkRegistry = new
HashMap<String, LinkRegistry>();
@@ -558,21 +556,15 @@ public class VirtualHostImpl implements
public void registerMessageDelivered(long messageSize)
{
- if (isStatisticsEnabled())
- {
- _messagesDelivered.registerEvent(1L);
- _dataDelivered.registerEvent(messageSize);
- }
+ _messagesDelivered.registerEvent(1L);
+ _dataDelivered.registerEvent(messageSize);
_appRegistry.registerMessageDelivered(messageSize);
}
public void registerMessageReceived(long messageSize, long timestamp)
{
- if (isStatisticsEnabled())
- {
- _messagesReceived.registerEvent(1L, timestamp);
- _dataReceived.registerEvent(messageSize, timestamp);
- }
+ _messagesReceived.registerEvent(1L, timestamp);
+ _dataReceived.registerEvent(messageSize, timestamp);
_appRegistry.registerMessageReceived(messageSize, timestamp);
}
@@ -611,25 +603,12 @@ public class VirtualHostImpl implements
public void initialiseStatistics()
{
- setStatisticsEnabled(!StatisticsCounter.DISABLE_STATISTICS &&
-
_appRegistry.getConfiguration().isStatisticsGenerationVirtualhostsEnabled());
-
_messagesDelivered = new StatisticsCounter("messages-delivered-" +
getName());
_dataDelivered = new StatisticsCounter("bytes-delivered-" + getName());
_messagesReceived = new StatisticsCounter("messages-received-" +
getName());
_dataReceived = new StatisticsCounter("bytes-received-" + getName());
}
- public boolean isStatisticsEnabled()
- {
- return _statisticsEnabled;
- }
-
- public void setStatisticsEnabled(boolean enabled)
- {
- _statisticsEnabled = enabled;
- }
-
public BrokerLink createBrokerConnection(UUID id, long createTime,
Map<String,String> arguments)
{
BrokerLink blink = new BrokerLink(this, id, createTime, arguments);
Modified:
qpid/branches/java-config-and-management/qpid/java/broker/src/test/java/org/apache/qpid/server/subscription/MockSubscription.java
URL:
http://svn.apache.org/viewvc/qpid/branches/java-config-and-management/qpid/java/broker/src/test/java/org/apache/qpid/server/subscription/MockSubscription.java?rev=1330346&r1=1330345&r2=1330346&view=diff
==============================================================================
---
qpid/branches/java-config-and-management/qpid/java/broker/src/test/java/org/apache/qpid/server/subscription/MockSubscription.java
(original)
+++
qpid/branches/java-config-and-management/qpid/java/broker/src/test/java/org/apache/qpid/server/subscription/MockSubscription.java
Wed Apr 25 15:32:00 2012
@@ -474,18 +474,6 @@ public class MockSubscription implements
}
@Override
- public boolean isStatisticsEnabled()
- {
- return false;
- }
-
- @Override
- public void setStatisticsEnabled(boolean enabled)
- {
-
- }
-
- @Override
public UUID getId()
{
return null;
Modified:
qpid/branches/java-config-and-management/qpid/java/broker/src/test/java/org/apache/qpid/server/virtualhost/MockVirtualHost.java
URL:
http://svn.apache.org/viewvc/qpid/branches/java-config-and-management/qpid/java/broker/src/test/java/org/apache/qpid/server/virtualhost/MockVirtualHost.java?rev=1330346&r1=1330345&r2=1330346&view=diff
==============================================================================
---
qpid/branches/java-config-and-management/qpid/java/broker/src/test/java/org/apache/qpid/server/virtualhost/MockVirtualHost.java
(original)
+++
qpid/branches/java-config-and-management/qpid/java/broker/src/test/java/org/apache/qpid/server/virtualhost/MockVirtualHost.java
Wed Apr 25 15:32:00 2012
@@ -257,11 +257,6 @@ public class MockVirtualHost implements
}
- public boolean isStatisticsEnabled()
- {
- return false;
- }
-
public void registerMessageDelivered(long messageSize)
{
@@ -277,11 +272,6 @@ public class MockVirtualHost implements
}
- public void setStatisticsEnabled(boolean enabled)
- {
-
- }
-
@Override
public State getState()
{
Added:
qpid/branches/java-config-and-management/qpid/java/systests/src/main/java/org/apache/qpid/management/jmx/NewStatisticsSystemTest.java
URL:
http://svn.apache.org/viewvc/qpid/branches/java-config-and-management/qpid/java/systests/src/main/java/org/apache/qpid/management/jmx/NewStatisticsSystemTest.java?rev=1330346&view=auto
==============================================================================
---
qpid/branches/java-config-and-management/qpid/java/systests/src/main/java/org/apache/qpid/management/jmx/NewStatisticsSystemTest.java
(added)
+++
qpid/branches/java-config-and-management/qpid/java/systests/src/main/java/org/apache/qpid/management/jmx/NewStatisticsSystemTest.java
Wed Apr 25 15:32:00 2012
@@ -0,0 +1,113 @@
+/*
+ * 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.management.jmx;
+
+import java.util.List;
+
+import javax.jms.Connection;
+import javax.jms.Destination;
+import javax.jms.MessageConsumer;
+import javax.jms.Queue;
+import javax.jms.Session;
+
+import org.apache.qpid.client.AMQConnection;
+import org.apache.qpid.client.AMQSession;
+import org.apache.qpid.client.BasicMessageConsumer;
+import org.apache.qpid.management.common.mbeans.ManagedConnection;
+import org.apache.qpid.test.utils.JMXTestUtils;
+import org.apache.qpid.test.utils.QpidBrokerTestCase;
+
+/** NEW ONE */
+public class NewStatisticsSystemTest extends QpidBrokerTestCase
+{
+ private static final String TEST_USER = "admin";
+ private static final String TEST_PASSWORD = "admin";
+
+ private JMXTestUtils _jmxUtils;
+ private Connection _test1, _test2, _dev;
+
+ protected Destination _queue;
+ protected String _brokerUrl;
+
+ @Override
+ public void setUp() throws Exception
+ {
+ super.setUp();
+
+ _jmxUtils = new JMXTestUtils(this, TEST_USER, TEST_PASSWORD);
+ _jmxUtils.setUp();
+ _brokerUrl = getBroker().toString();
+
+ _test1 = new AMQConnection(_brokerUrl, TEST_USER, TEST_PASSWORD,
"clientid", "test");
+ //_test2 = new AMQConnection(_brokerUrl, TEST_USER, TEST_PASSWORD,
"clientid", "test");
+ _dev = new AMQConnection(_brokerUrl, TEST_USER, TEST_PASSWORD,
"clientid", "development");
+
+ _test1.start();
+ //_test2.start();
+ _dev.start();
+
+ _jmxUtils.open();
+ }
+
+ @Override
+ public void tearDown() throws Exception
+ {
+ _jmxUtils.close();
+
+ super.tearDown();
+ }
+
+ public void testStats() throws Exception
+ {
+ Session testSession = _test1.createSession(false,
Session.SESSION_TRANSACTED);
+ //Session devSession = _dev.createSession(false,
Session.SESSION_TRANSACTED);
+
+ //Create queue
+ Queue testQueue = testSession.createQueue(getTestQueueName());
+ MessageConsumer testConsumer = testSession.createConsumer(testQueue);
+ testConsumer.close();
+
+ //Check initial values
+ checkSingleConnectionOnVHostStatistics("test", 0, 0, 0, 0);
+ checkSingleConnectionOnVHostStatistics("development", 0, 0, 0, 0);
+
+ //Send messages via test session (test vhost) and sync
+ sendMessage(testSession, testQueue, 5);
+ ((AMQSession<?,?>)testSession).sync();
+
+ //Check values
+ checkSingleConnectionOnVHostStatistics("test", 5, 0, 5 *
DEFAULT_MESSAGE_SIZE, 0);
+ checkSingleConnectionOnVHostStatistics("development", 0, 0, 0, 0);
+ }
+
+ private void checkSingleConnectionOnVHostStatistics(String vHostName, long
messagesSent, long messagesReceived, long dataSent, long dataReceived)
+ {
+ List<ManagedConnection> managedConnections =
_jmxUtils.getManagedConnections(vHostName);
+ assertEquals(1, managedConnections.size());
+
+ ManagedConnection managedConnection = managedConnections.get(0);
+
+ assertEquals(messagesSent,
managedConnection.getTotalMessagesReceived());
+ assertEquals(messagesReceived,
managedConnection.getTotalMessagesDelivered());
+
+ assertEquals(dataSent, managedConnection.getTotalDataReceived());
+ assertEquals(dataReceived, managedConnection.getTotalDataDelivered());
+ }
+}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
