Updated Branches: refs/heads/master b5c6dbe66 -> 7cdf1203f
CAMEL-6384: Added BacklogDebugger MBean for live debugging of Camel routes. Work in progress. Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/7cdf1203 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/7cdf1203 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/7cdf1203 Branch: refs/heads/master Commit: 7cdf1203f84d65a105ce68229dffef72f1f1e502 Parents: b5c6dbe Author: Claus Ibsen <[email protected]> Authored: Thu May 23 09:22:16 2013 +0200 Committer: Claus Ibsen <[email protected]> Committed: Thu May 23 09:34:29 2013 +0200 ---------------------------------------------------------------------- .../processor/interceptor/BacklogDebugger.java | 21 +- .../camel/management/BacklogDebuggerTest.java | 216 ++++++++++++++- 2 files changed, 225 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/7cdf1203/camel-core/src/main/java/org/apache/camel/processor/interceptor/BacklogDebugger.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/processor/interceptor/BacklogDebugger.java b/camel-core/src/main/java/org/apache/camel/processor/interceptor/BacklogDebugger.java index ecf9bb4..a54a4ed 100644 --- a/camel-core/src/main/java/org/apache/camel/processor/interceptor/BacklogDebugger.java +++ b/camel-core/src/main/java/org/apache/camel/processor/interceptor/BacklogDebugger.java @@ -29,7 +29,6 @@ import java.util.concurrent.atomic.AtomicLong; import org.apache.camel.CamelContext; import org.apache.camel.Exchange; -import org.apache.camel.Expression; import org.apache.camel.LoggingLevel; import org.apache.camel.Predicate; import org.apache.camel.Processor; @@ -169,10 +168,14 @@ public class BacklogDebugger extends ServiceSupport implements InterceptStrategy logger.log("Adding conditional breakpoint " + nodeId + " [" + predicate + "]"); breakpoint = new NodeBreakpoint(nodeId, condition); breakpoints.put(nodeId, breakpoint); - debugger.addBreakpoint(breakpoint); - } else { + debugger.addBreakpoint(breakpoint, breakpoint); + } else if (breakpoint.getCondition() == null) { + logger.log("Updating to conditional breakpoint " + nodeId + " [" + predicate + "]"); + debugger.removeBreakpoint(breakpoint); + breakpoints.put(nodeId, breakpoint); + debugger.addBreakpoint(breakpoint, breakpoint); + } else if (breakpoint.getCondition() != null) { logger.log("Updating conditional breakpoint " + nodeId + " [" + predicate + "]"); - // update condition breakpoint.setCondition(condition); } } @@ -281,7 +284,7 @@ public class BacklogDebugger extends ServiceSupport implements InterceptStrategy logger.log("Dump trace message from breakpoint " + nodeId); BacklogTracerEventMessage msg = suspendedBreakpointMessages.get(nodeId); if (msg != null) { - return msg.toXml(4); + return msg.toXml(0); } else { return null; } @@ -329,6 +332,10 @@ public class BacklogDebugger extends ServiceSupport implements InterceptStrategy return nodeId; } + public Predicate getCondition() { + return condition; + } + public void setCondition(Predicate predicate) { this.condition = predicate; } @@ -340,7 +347,7 @@ public class BacklogDebugger extends ServiceSupport implements InterceptStrategy String toNode = nodeId; String routeId = ProcessorDefinitionHelper.getRouteId(definition); String exchangeId = exchange.getExchangeId(); - String messageAsXml = MessageHelper.dumpAsXml(exchange.getIn(), true, 4, false, false, 1000); + String messageAsXml = MessageHelper.dumpAsXml(exchange.getIn(), true, 2, false, false, 1000); long uid = debugCounter.incrementAndGet(); BacklogTracerEventMessage msg = new DefaultBacklogTracerEventMessage(uid, timestamp, routeId, toNode, exchangeId, messageAsXml); @@ -389,7 +396,7 @@ public class BacklogDebugger extends ServiceSupport implements InterceptStrategy String toNode = definition.getId(); String routeId = ProcessorDefinitionHelper.getRouteId(definition); String exchangeId = exchange.getExchangeId(); - String messageAsXml = MessageHelper.dumpAsXml(exchange.getIn(), true, 4, false, false, 1000); + String messageAsXml = MessageHelper.dumpAsXml(exchange.getIn(), true, 2, false, false, 1000); long uid = debugCounter.incrementAndGet(); BacklogTracerEventMessage msg = new DefaultBacklogTracerEventMessage(uid, timestamp, routeId, toNode, exchangeId, messageAsXml); http://git-wip-us.apache.org/repos/asf/camel/blob/7cdf1203/camel-core/src/test/java/org/apache/camel/management/BacklogDebuggerTest.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/management/BacklogDebuggerTest.java b/camel-core/src/test/java/org/apache/camel/management/BacklogDebuggerTest.java index f154572..c2302cd 100644 --- a/camel-core/src/test/java/org/apache/camel/management/BacklogDebuggerTest.java +++ b/camel-core/src/test/java/org/apache/camel/management/BacklogDebuggerTest.java @@ -16,13 +16,16 @@ */ package org.apache.camel.management; +import java.util.Set; import javax.management.MBeanServer; import javax.management.ObjectName; import org.apache.camel.builder.RouteBuilder; +import org.apache.camel.component.mock.MockEndpoint; public class BacklogDebuggerTest extends ManagementTestSupport { + @SuppressWarnings("unchecked") public void testBacklogDebugger() throws Exception { MBeanServer mbeanServer = getMBeanServer(); ObjectName on = new ObjectName("org.apache.camel:context=localhost/camel-1,type=tracer,name=BacklogDebugger"); @@ -32,8 +35,212 @@ public class BacklogDebuggerTest extends ManagementTestSupport { Boolean enabled = (Boolean) mbeanServer.getAttribute(on, "Enabled"); assertEquals("Should not be enabled", Boolean.FALSE, enabled); - // TODO: add more to this test - //Thread.sleep(999999); + // enable debugger + mbeanServer.invoke(on, "enableDebugger", null, null); + + enabled = (Boolean) mbeanServer.getAttribute(on, "Enabled"); + assertEquals("Should be enabled", Boolean.TRUE, enabled); + + // add breakpoint at bar + mbeanServer.invoke(on, "addBreakpoint", new Object[]{"bar"}, new String[]{"java.lang.String"}); + + MockEndpoint mock = getMockEndpoint("mock:result"); + mock.expectedMessageCount(0); + mock.setSleepForEmptyTest(1000); + + template.sendBody("seda:start", "Hello World"); + + assertMockEndpointsSatisfied(); + + // add breakpoint at bar + Set<String> nodes = (Set<String>) mbeanServer.invoke(on, "getSuspendedBreakpointNodeIds", null, null); + assertNotNull(nodes); + assertEquals(1, nodes.size()); + assertEquals("bar", nodes.iterator().next()); + + // the message should be ours + String xml = (String) mbeanServer.invoke(on, "dumpTracedMessagesAsXml", new Object[]{"bar"}, new String[]{"java.lang.String"}); + assertNotNull(xml); + log.info(xml); + + assertTrue("Should contain our body", xml.contains("Hello World")); + assertTrue("Should contain bar node", xml.contains("<toNode>bar</toNode>")); + + resetMocks(); + mock.expectedMessageCount(1); + + // resume breakpoint + mbeanServer.invoke(on, "resumeBreakpoint", new Object[]{"bar"}, new String[]{"java.lang.String"}); + + assertMockEndpointsSatisfied(); + + // and no suspended anymore + nodes = (Set<String>) mbeanServer.invoke(on, "getSuspendedBreakpointNodeIds", null, null); + assertNotNull(nodes); + assertEquals(0, nodes.size()); + } + + @SuppressWarnings("unchecked") + public void testBacklogDebuggerConditional() throws Exception { + MBeanServer mbeanServer = getMBeanServer(); + ObjectName on = new ObjectName("org.apache.camel:context=localhost/camel-1,type=tracer,name=BacklogDebugger"); + assertNotNull(on); + mbeanServer.isRegistered(on); + + Boolean enabled = (Boolean) mbeanServer.getAttribute(on, "Enabled"); + assertEquals("Should not be enabled", Boolean.FALSE, enabled); + + // enable debugger + mbeanServer.invoke(on, "enableDebugger", null, null); + + enabled = (Boolean) mbeanServer.getAttribute(on, "Enabled"); + assertEquals("Should be enabled", Boolean.TRUE, enabled); + + // add breakpoint at bar + mbeanServer.invoke(on, "addConditionalBreakpoint", new Object[]{"bar", "simple", "${body} contains 'Camel'"}, new String[]{"java.lang.String", "java.lang.String", "java.lang.String"}); + + MockEndpoint mock = getMockEndpoint("mock:result"); + mock.expectedMessageCount(1); + + template.sendBody("seda:start", "Hello World"); + + assertMockEndpointsSatisfied(); + + // add not breakpoint at bar as condition did not match + Set<String> nodes = (Set<String>) mbeanServer.invoke(on, "getSuspendedBreakpointNodeIds", null, null); + assertNotNull(nodes); + assertEquals(0, nodes.size()); + + resetMocks(); + + mock.expectedMessageCount(0); + mock.setSleepForEmptyTest(1000); + + template.sendBody("seda:start", "Hello Camel"); + + assertMockEndpointsSatisfied(); + + nodes = (Set<String>) mbeanServer.invoke(on, "getSuspendedBreakpointNodeIds", null, null); + assertNotNull(nodes); + assertEquals(1, nodes.size()); + assertEquals("bar", nodes.iterator().next()); + + // the message should be ours + String xml = (String) mbeanServer.invoke(on, "dumpTracedMessagesAsXml", new Object[]{"bar"}, new String[]{"java.lang.String"}); + assertNotNull(xml); + log.info(xml); + + assertTrue("Should contain our body", xml.contains("Hello Camel")); + assertTrue("Should contain bar node", xml.contains("<toNode>bar</toNode>")); + + resetMocks(); + mock.expectedMessageCount(1); + + // resume breakpoint + mbeanServer.invoke(on, "resumeBreakpoint", new Object[]{"bar"}, new String[]{"java.lang.String"}); + + assertMockEndpointsSatisfied(); + + // and no suspended anymore + nodes = (Set<String>) mbeanServer.invoke(on, "getSuspendedBreakpointNodeIds", null, null); + assertNotNull(nodes); + assertEquals(0, nodes.size()); + } + + @SuppressWarnings("unchecked") + public void testBacklogDebuggerStep() throws Exception { + MBeanServer mbeanServer = getMBeanServer(); + ObjectName on = new ObjectName("org.apache.camel:context=localhost/camel-1,type=tracer,name=BacklogDebugger"); + assertNotNull(on); + mbeanServer.isRegistered(on); + + Boolean enabled = (Boolean) mbeanServer.getAttribute(on, "Enabled"); + assertEquals("Should not be enabled", Boolean.FALSE, enabled); + + // enable debugger + mbeanServer.invoke(on, "enableDebugger", null, null); + + enabled = (Boolean) mbeanServer.getAttribute(on, "Enabled"); + assertEquals("Should be enabled", Boolean.TRUE, enabled); + + // add breakpoint at bar + mbeanServer.invoke(on, "addBreakpoint", new Object[]{"foo"}, new String[]{"java.lang.String"}); + + MockEndpoint mock = getMockEndpoint("mock:result"); + mock.expectedMessageCount(0); + mock.setSleepForEmptyTest(1000); + + template.sendBody("seda:start", "Hello World"); + + assertMockEndpointsSatisfied(); + + // add breakpoint at bar + Set<String> nodes = (Set<String>) mbeanServer.invoke(on, "getSuspendedBreakpointNodeIds", null, null); + assertNotNull(nodes); + assertEquals(1, nodes.size()); + assertEquals("foo", nodes.iterator().next()); + + Boolean stepMode = (Boolean) mbeanServer.getAttribute(on, "SingleStepMode"); + assertEquals("Should not be in step mode", Boolean.FALSE, stepMode); + + // step breakpoint + mbeanServer.invoke(on, "stepBreakpoint", new Object[]{"foo"}, new String[]{"java.lang.String"}); + + // then at bar now + Thread.sleep(1000); + nodes = (Set<String>) mbeanServer.invoke(on, "getSuspendedBreakpointNodeIds", null, null); + assertNotNull(nodes); + assertEquals(1, nodes.size()); + assertEquals("bar", nodes.iterator().next()); + stepMode = (Boolean) mbeanServer.getAttribute(on, "SingleStepMode"); + assertEquals("Should be in step mode", Boolean.TRUE, stepMode); + + // step + mbeanServer.invoke(on, "step", null, null); + + // then at transform now + Thread.sleep(1000); + nodes = (Set<String>) mbeanServer.invoke(on, "getSuspendedBreakpointNodeIds", null, null); + assertNotNull(nodes); + assertEquals(1, nodes.size()); + assertEquals("transform", nodes.iterator().next()); + stepMode = (Boolean) mbeanServer.getAttribute(on, "SingleStepMode"); + assertEquals("Should be in step mode", Boolean.TRUE, stepMode); + + // step + mbeanServer.invoke(on, "step", null, null); + + // then at cheese now + Thread.sleep(1000); + nodes = (Set<String>) mbeanServer.invoke(on, "getSuspendedBreakpointNodeIds", null, null); + assertNotNull(nodes); + assertEquals(1, nodes.size()); + assertEquals("cheese", nodes.iterator().next()); + stepMode = (Boolean) mbeanServer.getAttribute(on, "SingleStepMode"); + assertEquals("Should be in step mode", Boolean.TRUE, stepMode); + + // step + mbeanServer.invoke(on, "step", null, null); + + // then at result now + Thread.sleep(1000); + nodes = (Set<String>) mbeanServer.invoke(on, "getSuspendedBreakpointNodeIds", null, null); + assertNotNull(nodes); + assertEquals(1, nodes.size()); + assertEquals("result", nodes.iterator().next()); + stepMode = (Boolean) mbeanServer.getAttribute(on, "SingleStepMode"); + assertEquals("Should be in step mode", Boolean.TRUE, stepMode); + + // step + mbeanServer.invoke(on, "step", null, null); + + // then the exchange is completed + Thread.sleep(1000); + nodes = (Set<String>) mbeanServer.invoke(on, "getSuspendedBreakpointNodeIds", null, null); + assertNotNull(nodes); + assertEquals(0, nodes.size()); + stepMode = (Boolean) mbeanServer.getAttribute(on, "SingleStepMode"); + assertEquals("Should not be in step mode", Boolean.FALSE, stepMode); } @Override @@ -43,13 +250,12 @@ public class BacklogDebuggerTest extends ManagementTestSupport { public void configure() throws Exception { context.setUseBreadcrumb(false); - // from("timer:foo?period=10s").setBody().constant("Hello World").to("seda:start"); - from("seda:start") .to("log:foo").id("foo") .to("log:bar").id("bar") .transform().constant("Bye World").id("transform") - .to("log:cheese").id("cheese"); + .to("log:cheese").id("cheese") + .to("mock:result").id("result"); } }; }
