Separate Agent MBean from Output

jacoco-maven-plugin/src/org/jacoco/maven/AgentMojo.java

@@ -163,6 +163,13 @@ public class AgentMojo extends AbstractJacocoMojo {
 	 */
 	private File classDumpDir;
 
+	/**
+	 * If set to true the agent exposes functionality via JMX.
+	 * 
+	 * @parameter expression="${jacoco.jmx}"
+	 */
+	private Boolean jmx;
+
 	@Override
 	public void executeMojo() {
 		final String vmArgument = StringUtils.quoteAndEscape(
@@ -175,7 +182,7 @@ protected void skipMojo() {
 		prependProperty("");
 	}
 
-	private void prependProperty(String vmArgument) {
+	private void prependProperty(final String vmArgument) {
 		if (isPropertyNameSpecified()) {
 			prependProperty(propertyName, vmArgument);
 		} else if (isEclipseTestPluginPackaging()) {
@@ -228,6 +235,9 @@ private AgentOptions createAgentOptions() {
 		if (classDumpDir != null) {
 			agentOptions.setClassDumpDir(classDumpDir.getAbsolutePath());
 		}
+		if (jmx != null) {
+			agentOptions.setJmx(jmx.booleanValue());
+		}
 		return agentOptions;
 	}
 

org.jacoco.agent.rt.test/src/org/jacoco/agent/rt/internal/AgentTest.java

@@ -16,14 +16,19 @@
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertSame;
 import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
 
 import java.io.ByteArrayInputStream;
 import java.io.File;
 import java.io.IOException;
+import java.lang.management.ManagementFactory;
+
+import javax.management.InstanceNotFoundException;
+import javax.management.MBeanServer;
+import javax.management.ObjectName;
 
 import org.jacoco.agent.rt.internal.controller.IAgentController;
 import org.jacoco.agent.rt.internal.controller.LocalController;
-import org.jacoco.agent.rt.internal.controller.MBeanController;
 import org.jacoco.agent.rt.internal.controller.TcpClientController;
 import org.jacoco.agent.rt.internal.controller.TcpServerController;
 import org.jacoco.core.JaCoCo;
@@ -74,10 +79,6 @@ public void testCreateController() {
 		options.setOutput(OutputMode.tcpclient);
 		assertEquals(TcpClientController.class, agent.createAgentController()
 				.getClass());
-
-		options.setOutput(OutputMode.mbean);
-		assertEquals(MBeanController.class, agent.createAgentController()
-				.getClass());
 	}
 
 	@Test
@@ -247,6 +248,35 @@ public void writeExecutionData(boolean reset) {
 		assertTrue(called[0]);
 	}
 
+	@Test
+	public void testJmx() throws Exception {
+		options.setJmx(true);
+		Agent agent = new Agent(options, this);
+
+		agent.startup();
+
+		ObjectName objectName = new ObjectName("org.jacoco:type=Runtime");
+		final MBeanServer server = ManagementFactory.getPlatformMBeanServer();
+		assertEquals(JaCoCo.VERSION, server.getAttribute(objectName, "Version"));
+
+		agent.shutdown();
+
+		try {
+			server.getMBeanInfo(objectName);
+			fail("InstanceNotFoundException expected");
+		} catch (InstanceNotFoundException expected) {
+		}
+	}
+
+	@Test(expected = InstanceNotFoundException.class)
+	public void testNoJmx() throws Exception {
+		Agent agent = new Agent(options, this);
+		agent.startup();
+
+		ObjectName objectName = new ObjectName("org.jacoco:type=Runtime");
+		ManagementFactory.getPlatformMBeanServer().getMBeanInfo(objectName);
+	}
+
 	// === IExceptionLogger ===
 
 	public void logExeption(Exception ex) {

org.jacoco.agent.rt/src/org/jacoco/agent/rt/internal/Agent.java

@@ -13,13 +13,16 @@
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
+import java.lang.management.ManagementFactory;
 import java.net.InetAddress;
 import java.net.UnknownHostException;
 
+import javax.management.ObjectName;
+import javax.management.StandardMBean;
+
 import org.jacoco.agent.rt.IAgent;
 import org.jacoco.agent.rt.internal.controller.IAgentController;
 import org.jacoco.agent.rt.internal.controller.LocalController;
-import org.jacoco.agent.rt.internal.controller.MBeanController;
 import org.jacoco.agent.rt.internal.controller.TcpClientController;
 import org.jacoco.agent.rt.internal.controller.TcpServerController;
 import org.jacoco.core.JaCoCo;
@@ -34,6 +37,8 @@
  */
 public class Agent implements IAgent {
 
+	private static final String JMX_NAME = "org.jacoco:type=Runtime";
+
 	private static Agent singleton;
 
 	/**
@@ -118,6 +123,11 @@ public void startup() {
 			data.setSessionId(sessionId);
 			controller = createAgentController();
 			controller.startup(options, data);
+			if (options.getJmx()) {
+				ManagementFactory.getPlatformMBeanServer().registerMBean(
+						new StandardMBean(this, IAgent.class),
+						new ObjectName(JMX_NAME));
+			}
 		} catch (final Exception e) {
 			logger.logExeption(e);
 		}
@@ -132,6 +142,10 @@ public void shutdown() {
 				controller.writeExecutionData(false);
 			}
 			controller.shutdown();
+			if (options.getJmx()) {
+				ManagementFactory.getPlatformMBeanServer().unregisterMBean(
+						new ObjectName(JMX_NAME));
+			}
 		} catch (final Exception e) {
 			logger.logExeption(e);
 		}
@@ -151,8 +165,6 @@ IAgentController createAgentController() {
 			return new TcpServerController(logger);
 		case tcpclient:
 			return new TcpClientController(logger);
-		case mbean:
-			return new MBeanController();
 		default:
 			throw new AssertionError(controllerType);
 		}