JAVA:613: Added ConnectionPoolStat class with cmd line interface

  Clarified in doc that some public classes are not part of the public API
  Added a few more stats for in use connections: durationMS and threadName

Author: jyemin

src/main/com/mongodb/DBPort.java

@@ -110,7 +110,7 @@ private synchronized Response go(OutMessage msg, DBCollection coll, boolean forc
             throw new IllegalStateException( "_out shouldn't be null" );
 
         try {
-            _activeOutMessage = msg;
+            _activeState = new ActiveState(msg);
             msg.prepare();
             msg.pipe( _out );
 
@@ -128,7 +128,7 @@ private synchronized Response go(OutMessage msg, DBCollection coll, boolean forc
             throw ioe;
         }
         finally {
-            _activeOutMessage = null;
+            _activeState = null;
             _processingResponse = false;
         }
     }
@@ -145,7 +145,7 @@ synchronized private Response findOne( DB db , String coll , DBObject q ) throws
     }
 
     synchronized CommandResult runCommand( DB db , DBObject cmd ) throws IOException {
-        Response res = findOne( db , "$cmd" , cmd );
+        Response res = findOne(db, "$cmd", cmd);
         return convertToCommandResult(cmd, res);
     }
 
@@ -168,7 +168,7 @@ synchronized CommandResult tryGetLastError( DB db , long last, WriteConcern conc
         if ( last != _calls )
             return null;
 
-        return getLastError( db , concern );
+        return getLastError(db, concern);
     }
 
     /**
@@ -265,8 +265,8 @@ protected void finalize() throws Throwable{
         close();
     }
 
-    OutMessage getOutMessageBeingProcessed() {
-        return _activeOutMessage;
+    ActiveState getActiveState() {
+        return _activeState;
     }
 
     int getLocalPort() {
@@ -338,7 +338,18 @@ public DBPortPool getPool() {
     private Map<DB,Boolean> _authed = new ConcurrentHashMap<DB, Boolean>( );
     int _lastThread;
     long _calls = 0;
-    private volatile OutMessage _activeOutMessage;
+    private volatile ActiveState _activeState;
+
+    class ActiveState {
+       ActiveState(final OutMessage outMessage) {
+           this.outMessage = outMessage;
+           this.startTime = System.nanoTime();
+           this.threadName = Thread.currentThread().getName();
+       }
+       final OutMessage outMessage;
+       final long startTime;
+       final String threadName;
+    }
 
     private static Logger _rootLogger = Logger.getLogger( "com.mongodb.port" );
 }

src/main/com/mongodb/DBPortPool.java

@@ -31,25 +31,21 @@
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.logging.Level;
 
+/**
+ * This class is NOT part of the public API.  Be prepared for non-binary compatible changes in minor releases.
+ */
 public class DBPortPool extends SimplePool<DBPort> implements MongoConnectionPoolMXBean {
 
-    public MongoConnection[] getInUseConnections() {
-        List<MongoConnection> connectionList = new ArrayList<MongoConnection>();
+    public InUseConnectionInfo[] getInUseConnections() {
+        List<InUseConnectionInfo> inUseConnectionInfoList = new ArrayList<InUseConnectionInfo>();
         synchronized (_avail) {
             for (DBPort port : _all) {
                 if (!_avail.contains(port)) {
-                    OutMessage curOutMessage = port.getOutMessageBeingProcessed();
-                    if (curOutMessage != null) {
-                        connectionList.add(new MongoConnection(port.getLocalPort(), curOutMessage.getNamespace(),
-                                curOutMessage.getOpCode(),
-                                curOutMessage.getQuery() != null ? curOutMessage.getQuery().toString() : null));
-                    } else {
-                        connectionList.add(new MongoConnection(port.getLocalPort()));
-                    }
+                    inUseConnectionInfoList.add(new InUseConnectionInfo(port));
                 }
             }
         }
-        return connectionList.toArray(new MongoConnection[connectionList.size()]);
+        return inUseConnectionInfoList.toArray(new InUseConnectionInfo[inUseConnectionInfoList.size()]);
     }
 
     @Override

src/main/com/mongodb/MongoConnection.java …ain/com/mongodb/InUseConnectionInfo.javasrc/main/com/mongodb/MongoConnection.java renamed to src/main/com/mongodb/InUseConnectionInfo.java src/main/com/mongodb/MongoConnection.java renamed to src/main/com/mongodb/InUseConnectionInfo.java

@@ -15,17 +15,28 @@
  */
 package com.mongodb;
 
-public class MongoConnection {
-
-    public MongoConnection(final int localPort, final String namespace, final OutMessage.OpCode opCode, final String query) {
-        this.localPort = localPort;
-        this.namespace = namespace;
-        this.opCode = opCode;
-        this.query = query;
-    }
+/**
+ * This class is NOT part of the public API.  Be prepared for non-binary compatible changes in minor releases.
+ */
+public class InUseConnectionInfo {
 
-    public MongoConnection(final int localPort) {
-        this(localPort, null, null, null);
+    InUseConnectionInfo(final DBPort port) {
+        DBPort.ActiveState activeState = port.getActiveState();
+        if (activeState == null) {
+            durationMS = 0;
+            namespace = null;
+            opCode = null;
+            query = null;
+            threadName = null;
+        }
+        else {
+            durationMS = (System.nanoTime() - activeState.startTime) / 1000000;
+            namespace = activeState.outMessage.getNamespace();
+            opCode = activeState.outMessage.getOpCode();
+            query = activeState.outMessage.getQuery() != null ? activeState.outMessage.getQuery().toString() : null;
+            threadName = activeState.threadName;
+        }
+        localPort = port.getLocalPort();
     }
 
     public String getNamespace() {
@@ -44,9 +55,18 @@ public int getLocalPort() {
         return localPort;
     }
 
+    public long getDurationMS() {
+        return durationMS;
+    }
+
+    public String getThreadName() {
+        return threadName;
+    }
 
     private final String namespace;
     private final OutMessage.OpCode opCode;
     private final String query;
     private final int localPort;
+    private final long durationMS;
+    private final String threadName;
 }

src/main/com/mongodb/MongoConnectionPoolMXBean.java

@@ -18,8 +18,11 @@
 
 import com.mongodb.util.SimplePoolMXBean;
 
+/**
+ * This interface is NOT part of the public API.  Be prepared for non-binary compatible changes in minor releases.
+ */
 public interface MongoConnectionPoolMXBean extends SimplePoolMXBean {
-    public MongoConnection[] getInUseConnections();
+    public InUseConnectionInfo[] getInUseConnections();
     public String getHost();
     public int getPort();
 }