You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2012/01/26 16:41:08 UTC
svn commit: r1236249 - in /camel/trunk/camel-core/src:
main/java/org/apache/camel/api/management/mbean/
main/java/org/apache/camel/management/mbean/
test/java/org/apache/camel/management/
Author: davsclaus
Date: Thu Jan 26 15:41:08 2012
New Revision: 1236249
URL: http://svn.apache.org/viewvc?rev=1236249&view=rev
Log:
CAMEL-4946: Added JMX methods to dump performance stats in one JMX call and output detail in XML format.
Added:
camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedCamelContextDumpStatsAsXmlTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedRouteDumpStatsAsXmlTest.java
- copied, changed from r1236063, camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedRoutePerformanceCounterTest.java
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/api/management/mbean/ManagedCamelContextMBean.java
camel/trunk/camel-core/src/main/java/org/apache/camel/api/management/mbean/ManagedPerformanceCounterMBean.java
camel/trunk/camel-core/src/main/java/org/apache/camel/api/management/mbean/ManagedRouteMBean.java
camel/trunk/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedCamelContext.java
camel/trunk/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedPerformanceCounter.java
camel/trunk/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedRoute.java
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/api/management/mbean/ManagedCamelContextMBean.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/api/management/mbean/ManagedCamelContextMBean.java?rev=1236249&r1=1236248&r2=1236249&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/api/management/mbean/ManagedCamelContextMBean.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/api/management/mbean/ManagedCamelContextMBean.java Thu Jan 26 15:41:08 2012
@@ -111,6 +111,9 @@ public interface ManagedCamelContextMBea
@ManagedOperation(description = "Adds or updates existing routes from XML")
void addOrUpdateRoutesFromXml(String xml) throws Exception;
+ @ManagedOperation(description = "Dumps the routes stats as XML")
+ String dumpRoutesStatsAsXml(boolean fullStats, boolean includeProcessors) throws Exception;
+
/**
* Creates the endpoint by the given uri
*
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/api/management/mbean/ManagedPerformanceCounterMBean.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/api/management/mbean/ManagedPerformanceCounterMBean.java?rev=1236249&r1=1236248&r2=1236249&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/api/management/mbean/ManagedPerformanceCounterMBean.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/api/management/mbean/ManagedPerformanceCounterMBean.java Thu Jan 26 15:41:08 2012
@@ -83,4 +83,7 @@ public interface ManagedPerformanceCount
@ManagedAttribute(description = "Statistics enabled")
void setStatisticsEnabled(boolean statisticsEnabled);
+ @ManagedOperation(description = "Dumps the statistics as XML")
+ String dumpStatsAsXml(boolean fullStats);
+
}
\ No newline at end of file
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/api/management/mbean/ManagedRouteMBean.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/api/management/mbean/ManagedRouteMBean.java?rev=1236249&r1=1236248&r2=1236249&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/api/management/mbean/ManagedRouteMBean.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/api/management/mbean/ManagedRouteMBean.java Thu Jan 26 15:41:08 2012
@@ -92,4 +92,7 @@ public interface ManagedRouteMBean exten
@ManagedOperation(description = "Updates the route from XML")
void updateRouteFromXml(String xml) throws Exception;
+ @ManagedOperation(description = "Dumps the routes stats as XML")
+ String dumpRouteStatsAsXml(boolean fullStats, boolean includeProcessors) throws Exception;
+
}
\ No newline at end of file
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedCamelContext.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedCamelContext.java?rev=1236249&r1=1236248&r2=1236249&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedCamelContext.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedCamelContext.java Thu Jan 26 15:41:08 2012
@@ -18,9 +18,13 @@ package org.apache.camel.management.mbea
import java.io.InputStream;
import java.util.Collection;
+import java.util.LinkedHashSet;
import java.util.List;
import java.util.Map;
+import java.util.Set;
import java.util.concurrent.TimeUnit;
+import javax.management.MBeanServer;
+import javax.management.MBeanServerInvocationHandler;
import javax.management.ObjectName;
import org.apache.camel.CamelContext;
@@ -30,6 +34,8 @@ import org.apache.camel.ServiceStatus;
import org.apache.camel.TimerListener;
import org.apache.camel.api.management.ManagedResource;
import org.apache.camel.api.management.mbean.ManagedCamelContextMBean;
+import org.apache.camel.api.management.mbean.ManagedProcessorMBean;
+import org.apache.camel.api.management.mbean.ManagedRouteMBean;
import org.apache.camel.model.ModelCamelContext;
import org.apache.camel.model.ModelHelper;
import org.apache.camel.model.RouteDefinition;
@@ -234,6 +240,59 @@ public class ManagedCamelContext impleme
context.addRouteDefinitions(def.getRoutes());
}
+ @Override
+ public String dumpRoutesStatsAsXml(boolean fullStats, boolean includeProcessors) throws Exception {
+ StringBuilder sb = new StringBuilder();
+ sb.append("<camelContextStat").append(String.format(" id=\"%s\"", getCamelId())).append(">\n");
+
+ MBeanServer server = getContext().getManagementStrategy().getManagementAgent().getMBeanServer();
+ if (server != null) {
+ // gather all the routes for this CamelContext, which requires JMX
+ ObjectName query = ObjectName.getInstance("org.apache.camel:context=*/" + getContext().getManagementName() + ",type=routes,*");
+ Set<ObjectName> routes = server.queryNames(query, null);
+
+ Set<ManagedProcessorMBean> processors = new LinkedHashSet<ManagedProcessorMBean>();
+ if (includeProcessors) {
+ // gather all the processors for this CamelContext, which requires JMX
+ query = ObjectName.getInstance("org.apache.camel:context=*/" + getContext().getManagementName() + ",type=processors,*");
+ Set<ObjectName> names = server.queryNames(query, null);
+ for (ObjectName on : names) {
+ ManagedProcessorMBean processor = MBeanServerInvocationHandler.newProxyInstance(server, on, ManagedProcessorMBean.class, true);
+ processors.add(processor);
+ }
+ }
+
+ // loop the routes, and append the processor stats if needed
+ sb.append(" <routeStats>\n");
+ for (ObjectName on : routes) {
+ ManagedRouteMBean route = MBeanServerInvocationHandler.newProxyInstance(server, on, ManagedRouteMBean.class, true);
+ sb.append(" <routeStat").append(String.format(" id=\"%s\"", route.getRouteId()));
+ // use substring as we only want the attributes
+ String stat = route.dumpStatsAsXml(fullStats);
+ sb.append(" ").append(stat.substring(7, stat.length() - 2)).append(">\n");
+
+ // add processor details if needed
+ if (includeProcessors) {
+ sb.append(" <processorStats>\n");
+ for (ManagedProcessorMBean processor : processors) {
+ // the processor must belong to this route
+ if (route.getRouteId().equals(processor.getRouteId())) {
+ sb.append(" <processorStat").append(String.format(" id=\"%s\"", processor.getProcessorId()));
+ // use substring as we only want the attributes
+ sb.append(" ").append(processor.dumpStatsAsXml(fullStats).substring(7)).append("\n");
+ }
+ }
+ sb.append(" </processorStats>\n");
+ }
+ sb.append(" </routeStat>\n");
+ }
+ sb.append(" </routeStats>\n");
+ }
+
+ sb.append("</camelContextStat>");
+ return sb.toString();
+ }
+
public boolean createEndpoint(String uri) throws Exception {
if (context.hasEndpoint(uri) != null) {
// endpoint already exists
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedPerformanceCounter.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedPerformanceCounter.java?rev=1236249&r1=1236248&r2=1236249&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedPerformanceCounter.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedPerformanceCounter.java Thu Jan 26 15:41:08 2012
@@ -16,6 +16,7 @@
*/
package org.apache.camel.management.mbean;
+import java.text.SimpleDateFormat;
import java.util.Date;
import org.apache.camel.Exchange;
@@ -27,6 +28,9 @@ import org.apache.camel.util.ExchangeHel
@ManagedResource(description = "PerformanceCounter")
public abstract class ManagedPerformanceCounter extends ManagedCounter implements PerformanceCounter, ManagedPerformanceCounterMBean {
+
+ public static final String TIMESTAMP_FORMAT = "yyyy-MM-dd'T'HH:mm:ss.SSSZ";
+
private Statistic exchangesCompleted;
private Statistic exchangesFailed;
private Statistic failuresHandled;
@@ -218,4 +222,42 @@ public abstract class ManagedPerformance
lastExchangeFailureExchangeId = exchange.getExchangeId();
}
+ public String dumpStatsAsXml(boolean fullStats) {
+ StringBuilder sb = new StringBuilder();
+ sb.append("<stats ");
+ sb.append(String.format("exchangesCompleted=\"%s\"", exchangesCompleted.getValue()));
+ sb.append(String.format(" exchangesFailed=\"%s\"", exchangesFailed.getValue()));
+ sb.append(String.format(" failuresHandled=\"%s\"", failuresHandled.getValue()));
+ sb.append(String.format(" redeliveries=\"%s\"", redeliveries.getValue()));
+ sb.append(String.format(" minProcessingTime=\"%s\"", minProcessingTime.getValue()));
+ sb.append(String.format(" maxProcessingTime=\"%s\"", maxProcessingTime.getValue()));
+ sb.append(String.format(" totalProcessingTime=\"%s\"", totalProcessingTime.getValue()));
+ sb.append(String.format(" lastProcessingTime=\"%s\"", lastProcessingTime.getValue()));
+ sb.append(String.format(" meanProcessingTime=\"%s\"", meanProcessingTime.getValue()));
+
+ if (fullStats) {
+ sb.append(String.format(" firstExchangeCompletedTimestamp=\"%s\"", dateAsString(firstExchangeCompletedTimestamp.getValue())));
+ sb.append(String.format(" firstExchangeCompletedExchangeId=\"%s\"", nullSafe(firstExchangeCompletedExchangeId)));
+ sb.append(String.format(" firstExchangeFailureTimestamp=\"%s\"", dateAsString(firstExchangeFailureTimestamp.getValue())));
+ sb.append(String.format(" firstExchangeFailureExchangeId=\"%s\"", nullSafe(firstExchangeFailureExchangeId)));
+ sb.append(String.format(" lastExchangeCompletedTimestamp=\"%s\"", dateAsString(lastExchangeCompletedTimestamp.getValue())));
+ sb.append(String.format(" lastExchangeCompletedExchangeId=\"%s\"", nullSafe(lastExchangeCompletedExchangeId)));
+ sb.append(String.format(" lastExchangeFailureTimestamp=\"%s\"", dateAsString(lastExchangeFailureTimestamp.getValue())));
+ sb.append(String.format(" lastExchangeFailureExchangeId=\"%s\"", nullSafe(lastExchangeFailureExchangeId)));
+ }
+ sb.append("/>");
+ return sb.toString();
+ }
+
+ private static String dateAsString(long value) {
+ if (value == 0) {
+ return "";
+ }
+ return new SimpleDateFormat(TIMESTAMP_FORMAT).format(value);
+ }
+
+ private static String nullSafe(String s) {
+ return s != null ? s : "";
+ }
+
}
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedRoute.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedRoute.java?rev=1236249&r1=1236248&r2=1236249&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedRoute.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedRoute.java Thu Jan 26 15:41:08 2012
@@ -17,7 +17,11 @@
package org.apache.camel.management.mbean;
import java.util.List;
+import java.util.Set;
import java.util.concurrent.TimeUnit;
+import javax.management.MBeanServer;
+import javax.management.MBeanServerInvocationHandler;
+import javax.management.ObjectName;
import org.apache.camel.CamelContext;
import org.apache.camel.Endpoint;
@@ -26,6 +30,7 @@ import org.apache.camel.Route;
import org.apache.camel.ServiceStatus;
import org.apache.camel.TimerListener;
import org.apache.camel.api.management.ManagedResource;
+import org.apache.camel.api.management.mbean.ManagedProcessorMBean;
import org.apache.camel.api.management.mbean.ManagedRouteMBean;
import org.apache.camel.model.ModelCamelContext;
import org.apache.camel.model.ModelHelper;
@@ -214,4 +219,36 @@ public class ManagedRoute extends Manage
context.addRouteDefinition(def);
}
+ public String dumpRouteStatsAsXml(boolean fullStats, boolean includeProcessors) throws Exception {
+ StringBuilder sb = new StringBuilder();
+
+ sb.append("<routeStat").append(String.format(" id=\"%s\"", route.getId()));
+ // use substring as we only want the attributes
+ String stat = dumpStatsAsXml(fullStats);
+ sb.append(" ").append(stat.substring(7, stat.length() - 2)).append(">\n");
+
+ // gather all the processors for this route, which requires JMX
+ if (includeProcessors) {
+ sb.append(" <processorStats>\n");
+ MBeanServer server = getContext().getManagementStrategy().getManagementAgent().getMBeanServer();
+ if (server != null) {
+ ObjectName query = ObjectName.getInstance("org.apache.camel:context=*/" + getContext().getManagementName() + ",type=processors,*");
+ Set<ObjectName> names = server.queryNames(query, null);
+ for (ObjectName on : names) {
+ ManagedProcessorMBean processor = MBeanServerInvocationHandler.newProxyInstance(server, on, ManagedProcessorMBean.class, true);
+ // the processor must belong to this route
+ if (getRouteId().equals(processor.getRouteId())) {
+ sb.append(" <processorStat").append(String.format(" id=\"%s\"", processor.getProcessorId()));
+ // use substring as we only want the attributes
+ sb.append(" ").append(processor.dumpStatsAsXml(fullStats).substring(7)).append("\n");
+ }
+ }
+ }
+ sb.append(" </processorStats>\n");
+ }
+
+ sb.append("</routeStat>");
+ return sb.toString();
+ }
+
}
Added: camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedCamelContextDumpStatsAsXmlTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedCamelContextDumpStatsAsXmlTest.java?rev=1236249&view=auto
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedCamelContextDumpStatsAsXmlTest.java (added)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedCamelContextDumpStatsAsXmlTest.java Thu Jan 26 15:41:08 2012
@@ -0,0 +1,70 @@
+/**
+ * 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.camel.management;
+
+import javax.management.MBeanServer;
+import javax.management.ObjectName;
+
+import org.w3c.dom.Document;
+import org.apache.camel.builder.RouteBuilder;
+
+/**
+ * @version
+ */
+public class ManagedCamelContextDumpStatsAsXmlTest extends ManagementTestSupport {
+
+ public void testPerformanceCounterStats() throws Exception {
+ // get the stats for the route
+ MBeanServer mbeanServer = getMBeanServer();
+ ObjectName on = ObjectName.getInstance("org.apache.camel:context=localhost/camel-1,type=context,name=\"camel-1\"");
+
+ getMockEndpoint("mock:foo").expectedMessageCount(1);
+ getMockEndpoint("mock:bar").expectedMessageCount(2);
+ template.asyncSendBody("direct:start", "Hello World");
+ template.asyncSendBody("direct:bar", "Hi World");
+ template.asyncSendBody("direct:bar", "Bye World");
+ assertMockEndpointsSatisfied();
+
+ String xml = (String) mbeanServer.invoke(on, "dumpRoutesStatsAsXml", new Object[]{false, true}, new String[]{"boolean", "boolean"});
+ log.info(xml);
+
+ // should be valid XML
+ Document doc = context.getTypeConverter().convertTo(Document.class, xml);
+ assertNotNull(doc);
+
+ int processors = doc.getDocumentElement().getElementsByTagName("processorStat").getLength();
+ assertEquals(5, processors);
+ }
+
+ @Override
+ protected RouteBuilder createRouteBuilder() throws Exception {
+ return new RouteBuilder() {
+ @Override
+ public void configure() throws Exception {
+ from("direct:start").routeId("foo")
+ .to("log:foo").id("a")
+ .delay(100).id("b")
+ .to("mock:foo").id("c");
+
+ from("direct:bar").routeId("bar")
+ .to("log:bar").id("d")
+ .to("mock:bar").id("e");
+ }
+ };
+ }
+
+}
Copied: camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedRouteDumpStatsAsXmlTest.java (from r1236063, camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedRoutePerformanceCounterTest.java)
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedRouteDumpStatsAsXmlTest.java?p2=camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedRouteDumpStatsAsXmlTest.java&p1=camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedRoutePerformanceCounterTest.java&r1=1236063&r2=1236249&rev=1236249&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedRoutePerformanceCounterTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedRouteDumpStatsAsXmlTest.java Thu Jan 26 15:41:08 2012
@@ -16,69 +16,37 @@
*/
package org.apache.camel.management;
-import java.util.Date;
import javax.management.MBeanServer;
import javax.management.ObjectName;
+import org.w3c.dom.Document;
import org.apache.camel.builder.RouteBuilder;
/**
* @version
*/
-public class ManagedRoutePerformanceCounterTest extends ManagementTestSupport {
+public class ManagedRouteDumpStatsAsXmlTest extends ManagementTestSupport {
public void testPerformanceCounterStats() throws Exception {
// get the stats for the route
MBeanServer mbeanServer = getMBeanServer();
- ObjectName on = ObjectName.getInstance("org.apache.camel:context=localhost/camel-1,type=routes,name=\"route1\"");
+ ObjectName on = ObjectName.getInstance("org.apache.camel:context=localhost/camel-1,type=routes,name=\"foo\"");
getMockEndpoint("mock:result").expectedMessageCount(1);
template.asyncSendBody("direct:start", "Hello World");
-
- // cater for slow boxes
- Integer inFlight = null;
- for (int i = 0; i < 10; i++) {
- Thread.sleep(500);
- inFlight = (Integer) mbeanServer.getAttribute(on, "InflightExchanges");
- if (inFlight.longValue() == 1) {
- break;
- }
- }
- assertNotNull("too slow server", inFlight);
- assertEquals(1, inFlight.longValue());
-
+
assertMockEndpointsSatisfied();
- Thread.sleep(3000);
-
- Long completed = (Long) mbeanServer.getAttribute(on, "ExchangesCompleted");
- assertEquals(1, completed.longValue());
-
- Long last = (Long) mbeanServer.getAttribute(on, "LastProcessingTime");
- Long total = (Long) mbeanServer.getAttribute(on, "TotalProcessingTime");
-
- assertTrue("Should take around 3 sec: was " + last, last > 2900);
- assertTrue("Should take around 3 sec: was " + total, total > 2900);
-
- // send in another message
- template.sendBody("direct:start", "Bye World");
-
- completed = (Long) mbeanServer.getAttribute(on, "ExchangesCompleted");
- assertEquals(2, completed.longValue());
- last = (Long) mbeanServer.getAttribute(on, "LastProcessingTime");
- total = (Long) mbeanServer.getAttribute(on, "TotalProcessingTime");
-
- assertTrue("Should take around 3 sec: was " + last, last > 2900);
- assertTrue("Should be around 5 sec now: was " + total, total > 4900);
+ String xml = (String) mbeanServer.invoke(on, "dumpRouteStatsAsXml", new Object[]{false, true}, new String[]{"boolean", "boolean"});
+ log.info(xml);
- Date lastFailed = (Date) mbeanServer.getAttribute(on, "LastExchangeFailureTimestamp");
- Date firstFailed = (Date) mbeanServer.getAttribute(on, "FirstExchangeFailureTimestamp");
- assertNull(lastFailed);
- assertNull(firstFailed);
+ // should be valid XML
+ Document doc = context.getTypeConverter().convertTo(Document.class, xml);
+ assertNotNull(doc);
- inFlight = (Integer) mbeanServer.getAttribute(on, "InflightExchanges");
- assertEquals(0, inFlight.longValue());
+ int processors = doc.getDocumentElement().getElementsByTagName("processorStat").getLength();
+ assertEquals(3, processors);
}
@Override
@@ -86,7 +54,8 @@ public class ManagedRoutePerformanceCoun
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- from("direct:start").to("log:foo").delay(3000).to("mock:result");
+ from("direct:start").routeId("foo")
+ .to("log:foo").delay(100).to("mock:result");
}
};
}