Fixes #131 - Improve Connector Statistic names and values.

examples/embedded/src/main/java/org/eclipse/jetty/embedded/LikeJettyXml.java

@@ -30,7 +30,6 @@ import org.eclipse.jetty.http.HttpVersion;
 import org.eclipse.jetty.jmx.MBeanContainer;
 import org.eclipse.jetty.rewrite.handler.RewriteHandler;
 import org.eclipse.jetty.security.HashLoginService;
-import org.eclipse.jetty.server.ConnectorStatistics;
 import org.eclipse.jetty.server.DebugListener;
 import org.eclipse.jetty.server.Handler;
 import org.eclipse.jetty.server.HttpConfiguration;
@@ -39,6 +38,7 @@ import org.eclipse.jetty.server.LowResourceMonitor;
 import org.eclipse.jetty.server.NCSARequestLog;
 import org.eclipse.jetty.server.SecureRequestCustomizer;
 import org.eclipse.jetty.server.Server;
+import org.eclipse.jetty.server.ServerConnectionStatistics;
 import org.eclipse.jetty.server.ServerConnector;
 import org.eclipse.jetty.server.SslConnectionFactory;
 import org.eclipse.jetty.server.handler.ContextHandlerCollection;
@@ -193,7 +193,7 @@ public class LikeJettyXml
         StatisticsHandler stats = new StatisticsHandler();
         stats.setHandler(server.getHandler());
         server.setHandler(stats);
-        ConnectorStatistics.addToAllConnectors(server);
+        ServerConnectionStatistics.addToAllConnectors(server);
 
         // === Rewrite Handler
         RewriteHandler rewrite = new RewriteHandler();

examples/embedded/src/main/java/org/eclipse/jetty/embedded/OneServletContextJmxStats.java

@@ -21,8 +21,8 @@ package org.eclipse.jetty.embedded;
 import java.lang.management.ManagementFactory;
 
 import org.eclipse.jetty.jmx.MBeanContainer;
-import org.eclipse.jetty.server.ConnectorStatistics;
 import org.eclipse.jetty.server.Server;
+import org.eclipse.jetty.server.ServerConnectionStatistics;
 import org.eclipse.jetty.servlet.DefaultServlet;
 import org.eclipse.jetty.servlet.ServletContextHandler;
 
@@ -44,7 +44,7 @@ public class OneServletContextJmxStats
         context.addServlet(DefaultServlet.class, "/");
 
         // Add Connector Statistics tracking to all connectors
-        ConnectorStatistics.addToAllConnectors(server);
+        ServerConnectionStatistics.addToAllConnectors(server);
 
         server.start();
         server.join();

jetty-io/src/main/java/org/eclipse/jetty/io/ConnectionStatistics.java

@@ -0,0 +1,233 @@
+//
+//  ========================================================================
+//  Copyright (c) 1995-2016 Mort Bay Consulting Pty. Ltd.
+//  ------------------------------------------------------------------------
+//  All rights reserved. This program and the accompanying materials
+//  are made available under the terms of the Eclipse Public License v1.0
+//  and Apache License v2.0 which accompanies this distribution.
+//
+//      The Eclipse Public License is available at
+//      http://www.eclipse.org/legal/epl-v10.html
+//
+//      The Apache License v2.0 is available at
+//      http://www.opensource.org/licenses/apache2.0.php
+//
+//  You may elect to redistribute this code under either of these licenses.
+//  ========================================================================
+//
+
+package org.eclipse.jetty.io;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicLong;
+import java.util.concurrent.atomic.LongAdder;
+
+import org.eclipse.jetty.util.annotation.ManagedAttribute;
+import org.eclipse.jetty.util.annotation.ManagedObject;
+import org.eclipse.jetty.util.annotation.ManagedOperation;
+import org.eclipse.jetty.util.component.AbstractLifeCycle;
+import org.eclipse.jetty.util.component.ContainerLifeCycle;
+import org.eclipse.jetty.util.component.Dumpable;
+import org.eclipse.jetty.util.statistic.CounterStatistic;
+import org.eclipse.jetty.util.statistic.SampleStatistic;
+
+/**
+ * <p>A {@link Connection.Listener} that tracks connection statistics.</p>
+ * <p>Adding an instance of this class as a bean to a server Connector
+ * (for the server) or to HttpClient (for the client) will trigger the
+ * tracking of the connection statistics for all connections managed
+ * by the server Connector or by HttpClient.</p>
+ */
+@ManagedObject("Tracks statistics on connections")
+public class ConnectionStatistics extends AbstractLifeCycle implements Connection.Listener, Dumpable
+{
+    private final CounterStatistic _connections = new CounterStatistic();
+    private final SampleStatistic _connectionsDuration = new SampleStatistic();
+    private final LongAdder _rcvdBytes = new LongAdder();
+    private final AtomicLong _bytesInStamp = new AtomicLong();
+    private final LongAdder _sentBytes = new LongAdder();
+    private final AtomicLong _bytesOutStamp = new AtomicLong();
+    private final LongAdder _messagesIn = new LongAdder();
+    private final AtomicLong _messagesInStamp = new AtomicLong();
+    private final LongAdder _messagesOut = new LongAdder();
+    private final AtomicLong _messagesOutStamp = new AtomicLong();
+
+    @ManagedOperation(value = "Resets the statistics", impact = "ACTION")
+    public void reset()
+    {
+        _connections.reset();
+        _connectionsDuration.reset();
+        _rcvdBytes.reset();
+        _bytesInStamp.set(System.nanoTime());
+        _sentBytes.reset();
+        _bytesOutStamp.set(System.nanoTime());
+        _messagesIn.reset();
+        _messagesInStamp.set(System.nanoTime());
+        _messagesOut.reset();
+        _messagesOutStamp.set(System.nanoTime());
+    }
+
+    @Override
+    protected void doStart() throws Exception
+    {
+        reset();
+    }
+
+    @Override
+    public void onOpened(Connection connection)
+    {
+        if (!isStarted())
+            return;
+
+        _connections.increment();
+    }
+
+    @Override
+    public void onClosed(Connection connection)
+    {
+        if (!isStarted())
+            return;
+
+        _connections.decrement();
+
+        long elapsed = System.currentTimeMillis() - connection.getCreatedTimeStamp();
+        _connectionsDuration.set(elapsed);
+
+        long bytesIn = connection.getBytesIn();
+        if (bytesIn > 0)
+            _rcvdBytes.add(bytesIn);
+        long bytesOut = connection.getBytesOut();
+        if (bytesOut > 0)
+            _sentBytes.add(bytesOut);
+
+        long messagesIn = connection.getMessagesIn();
+        if (messagesIn > 0)
+            _messagesIn.add(messagesIn);
+        long messagesOut = connection.getMessagesOut();
+        if (messagesOut > 0)
+            _messagesOut.add(messagesOut);
+    }
+
+    @ManagedAttribute("Total number of bytes received by tracked connections")
+    public long getReceivedBytes()
+    {
+        return _rcvdBytes.sum();
+    }
+
+    @ManagedAttribute("Total number of bytes received per second since the last invocation of this method")
+    public long getReceivedBytesRate()
+    {
+        long now = System.nanoTime();
+        long then = _bytesInStamp.getAndSet(now);
+        long elapsed = TimeUnit.NANOSECONDS.toMillis(now - then);
+        return elapsed == 0 ? 0 : getReceivedBytes() * 1000 / elapsed;
+    }
+
+    @ManagedAttribute("Total number of bytes sent by tracked connections")
+    public long getSentBytes()
+    {
+        return _sentBytes.sum();
+    }
+
+    @ManagedAttribute("Total number of bytes sent per second since the last invocation of this method")
+    public long getSentBytesRate()
+    {
+        long now = System.nanoTime();
+        long then = _bytesOutStamp.getAndSet(now);
+        long elapsed = TimeUnit.NANOSECONDS.toMillis(now - then);
+        return elapsed == 0 ? 0 : getSentBytes() * 1000 / elapsed;
+    }
+
+    @ManagedAttribute("The max duration of a connection in ms")
+    public long getConnectionDurationMax()
+    {
+        return _connectionsDuration.getMax();
+    }
+
+    @ManagedAttribute("The mean duration of a connection in ms")
+    public double getConnectionDurationMean()
+    {
+        return _connectionsDuration.getMean();
+    }
+
+    @ManagedAttribute("The standard deviation of the duration of a connection")
+    public double getConnectionDurationStdDev()
+    {
+        return _connectionsDuration.getStdDev();
+    }
+
+    @ManagedAttribute("The total number of connections opened")
+    public long getConnectionsTotal()
+    {
+        return _connections.getTotal();
+    }
+
+    @ManagedAttribute("The current number of open connections")
+    public long getConnections()
+    {
+        return _connections.getCurrent();
+    }
+
+    @ManagedAttribute("The max number of open connections")
+    public long getConnectionsMax()
+    {
+        return _connections.getMax();
+    }
+
+    @ManagedAttribute("The total number of messages received")
+    public long getReceivedMessages()
+    {
+        return _messagesIn.sum();
+    }
+
+    @ManagedAttribute("Total number of messages received per second since the last invocation of this method")
+    public long getReceivedMessagesRate()
+    {
+        long now = System.nanoTime();
+        long then = _messagesInStamp.getAndSet(now);
+        long elapsed = TimeUnit.NANOSECONDS.toMillis(now - then);
+        return elapsed == 0 ? 0 : getReceivedMessages() * 1000 / elapsed;
+    }
+
+    @ManagedAttribute("The total number of messages sent")
+    public long getSentMessages()
+    {
+        return _messagesOut.sum();
+    }
+
+    @ManagedAttribute("Total number of messages sent per second since the last invocation of this method")
+    public long getSentMessagesRate()
+    {
+        long now = System.nanoTime();
+        long then = _messagesOutStamp.getAndSet(now);
+        long elapsed = TimeUnit.NANOSECONDS.toMillis(now - then);
+        return elapsed == 0 ? 0 : getSentMessages() * 1000 / elapsed;
+    }
+
+    @Override
+    public String dump()
+    {
+        return ContainerLifeCycle.dump(this);
+    }
+
+    @Override
+    public void dump(Appendable out, String indent) throws IOException
+    {
+        ContainerLifeCycle.dumpObject(out, this);
+        List<String> children = new ArrayList<>();
+        children.add(String.format("connections=%s", _connections));
+        children.add(String.format("durations=%s", _connectionsDuration));
+        children.add(String.format("bytes in/out=%s/%s", getReceivedBytes(), getSentBytes()));
+        children.add(String.format("messages in/out=%s/%s", getReceivedMessages(), getSentMessages()));
+        ContainerLifeCycle.dump(out, indent, children);
+    }
+
+    @Override
+    public String toString()
+    {
+        return String.format("%s@%x", getClass().getSimpleName(), hashCode());
+    }
+}

jetty-server/src/main/config/etc/jetty-stats.xml

@@ -12,7 +12,7 @@
       </New>
     </Arg>
   </Call>
-  <Call class="org.eclipse.jetty.server.ConnectorStatistics" name="addToAllConnectors">
+  <Call class="org.eclipse.jetty.server.ServerConnectionStatistics" name="addToAllConnectors">
     <Arg><Ref refid="Server"/></Arg>
   </Call>
 </Configure>

jetty-server/src/main/java/org/eclipse/jetty/server/ConnectorStatistics.java

@@ -43,7 +43,10 @@ import org.eclipse.jetty.util.statistic.SampleStatistic;
 /** A Connector.Listener that gathers Connector and Connections Statistics.
  * Adding an instance of this class as with {@link AbstractConnector#addBean(Object)} 
  * will register the listener with all connections accepted by that connector.
+ *
+ * @deprecated use {@link ServerConnectionStatistics} instead.
  */
+@Deprecated
 @ManagedObject("Connector Statistics")
 public class ConnectorStatistics extends AbstractLifeCycle implements Dumpable, Connection.Listener
 {

jetty-server/src/main/java/org/eclipse/jetty/server/ServerConnectionStatistics.java

@@ -0,0 +1,34 @@
+//
+//  ========================================================================
+//  Copyright (c) 1995-2016 Mort Bay Consulting Pty. Ltd.
+//  ------------------------------------------------------------------------
+//  All rights reserved. This program and the accompanying materials
+//  are made available under the terms of the Eclipse Public License v1.0
+//  and Apache License v2.0 which accompanies this distribution.
+//
+//      The Eclipse Public License is available at
+//      http://www.eclipse.org/legal/epl-v10.html
+//
+//      The Apache License v2.0 is available at
+//      http://www.opensource.org/licenses/apache2.0.php
+//
+//  You may elect to redistribute this code under either of these licenses.
+//  ========================================================================
+//
+
+package org.eclipse.jetty.server;
+
+import org.eclipse.jetty.io.ConnectionStatistics;
+import org.eclipse.jetty.util.component.Container;
+
+public class ServerConnectionStatistics extends ConnectionStatistics
+{
+    public static void addToAllConnectors(Server server)
+    {
+        for (Connector connector : server.getConnectors())
+        {
+            if (connector instanceof Container)
+                ((Container)connector).addBean(new ConnectionStatistics());
+        }
+    }
+}