Author: davsclaus
Date: Wed Jun 25 22:13:35 2008
New Revision: 671751
URL: http://svn.apache.org/viewvc?rev=671751&view=rev
Log:
CAMEL-619: Fixed tracer not outputting node ids. Added unit test for tracer.
Breadcrum is outputtet to be used for correlation for poor end users looking
into the log files
Added:
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/DebugInterceptorTest.java
- copied, changed from r671715,
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/TraceInterceptorTest.java
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/management/InstrumentationProcessor.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/Debugger.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/TraceFormatter.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/Tracer.java
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/TraceInterceptorTest.java
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/management/InstrumentationProcessor.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/management/InstrumentationProcessor.java?rev=671751&r1=671750&r2=671751&view=diff
==============================================================================
---
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/management/InstrumentationProcessor.java
(original)
+++
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/management/InstrumentationProcessor.java
Wed Jun 25 22:13:35 2008
@@ -80,8 +80,8 @@
}
protected void recordTime(Exchange exchange, double duration) {
- if (LOG.isDebugEnabled()) {
- LOG.debug("Recording duration: " + duration + " millis for
exchange: " + exchange);
+ if (LOG.isTraceEnabled()) {
+ LOG.trace("Recording duration: " + duration + " millis for
exchange: " + exchange);
}
if (!exchange.isFailed() && exchange.getException() == null) {
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/Debugger.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/Debugger.java?rev=671751&r1=671750&r2=671751&view=diff
==============================================================================
---
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/Debugger.java
(original)
+++
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/Debugger.java
Wed Jun 25 22:13:35 2008
@@ -100,7 +100,7 @@
DebugInterceptor interceptor = new DebugInterceptor(processorType,
target, createExchangeList(), createExceptionsList());
interceptors.put(id, interceptor);
if (LOG.isDebugEnabled()) {
- LOG.debug("adding interceptor: " + interceptor);
+ LOG.debug("Adding " + id + " interceptor: " + interceptor);
}
return interceptor;
}
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/TraceFormatter.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/TraceFormatter.java?rev=671751&r1=671750&r2=671751&view=diff
==============================================================================
---
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/TraceFormatter.java
(original)
+++
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/TraceFormatter.java
Wed Jun 25 22:13:35 2008
@@ -24,12 +24,12 @@
* @version $Revision: 1.1 $
*/
public class TraceFormatter {
+ private boolean showBreadCrumb = true;
private boolean showNode = true;
+ private boolean showExchangeId;
private boolean showProperties = true;
private boolean showHeaders = true;
private boolean showBody = true;
- private boolean showExchangeId;
- private boolean showBreadCrumb;
public Object format(TraceInterceptor interceptor, Exchange exchange) {
Message in = exchange.getIn();
@@ -45,7 +45,6 @@
+ (exception != null ? " Exception: " + exception : "");
}
-
public boolean isShowBody() {
return showBody;
}
@@ -109,8 +108,8 @@
return answer;
}
-
protected String getNodeMessage(TraceInterceptor interceptor) {
return interceptor.getNode().getId();
}
+
}
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/Tracer.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/Tracer.java?rev=671751&r1=671750&r2=671751&view=diff
==============================================================================
---
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/Tracer.java
(original)
+++
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/Tracer.java
Wed Jun 25 22:13:35 2008
@@ -30,6 +30,10 @@
private TraceFormatter formatter = new TraceFormatter();
public Processor wrapProcessorInInterceptors(ProcessorType processorType,
Processor target) throws Exception {
+ // Force the creation of an id, otherwise the id is not available when
the trace formatter is
+ // outputting trace information
+ String id = processorType.idOrCreate();
return new TraceInterceptor(processorType, target, formatter);
}
+
}
\ No newline at end of file
Copied:
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/DebugInterceptorTest.java
(from r671715,
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/TraceInterceptorTest.java)
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/DebugInterceptorTest.java?p2=activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/DebugInterceptorTest.java&p1=activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/TraceInterceptorTest.java&r1=671715&r2=671751&rev=671751&view=diff
==============================================================================
---
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/TraceInterceptorTest.java
(original)
+++
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/DebugInterceptorTest.java
Wed Jun 25 22:13:35 2008
@@ -23,19 +23,18 @@
import org.apache.camel.processor.interceptor.Debugger;
/**
- * @version $Revision: 1.1 $
+ * @version $Revision$
*/
-public class TraceInterceptorTest extends ContextTestSupport {
+public class DebugInterceptorTest extends ContextTestSupport {
+
public void testSendingSomeMessages() throws Exception {
- template.sendBodyAndHeader("direct:start", "body1", "header1",
"value1");
- template.sendBodyAndHeader("direct:start", "body2", "header1",
"value2");
+ template.sendBodyAndHeader("direct:start", "Hello London", "to",
"James");
+ template.sendBodyAndHeader("direct:start", "This is Copenhagen
calling", "from", "Claus");
}
-
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
public void configure() throws Exception {
- // lets add the debugger which traces by default
getContext().addInterceptStrategy(new Debugger());
from("direct:start").
@@ -54,4 +53,5 @@
}
};
}
-}
+
+}
\ No newline at end of file
Modified:
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/TraceInterceptorTest.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/TraceInterceptorTest.java?rev=671751&r1=671750&r2=671751&view=diff
==============================================================================
---
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/TraceInterceptorTest.java
(original)
+++
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/TraceInterceptorTest.java
Wed Jun 25 22:13:35 2008
@@ -21,22 +21,22 @@
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.processor.interceptor.Debugger;
+import org.apache.camel.processor.interceptor.Tracer;
/**
* @version $Revision: 1.1 $
*/
public class TraceInterceptorTest extends ContextTestSupport {
+
public void testSendingSomeMessages() throws Exception {
- template.sendBodyAndHeader("direct:start", "body1", "header1",
"value1");
- template.sendBodyAndHeader("direct:start", "body2", "header1",
"value2");
+ template.sendBodyAndHeader("direct:start", "Hello London", "to",
"James");
+ template.sendBodyAndHeader("direct:start", "This is Copenhagen
calling", "from", "Claus");
}
-
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
public void configure() throws Exception {
- // lets add the debugger which traces by default
- getContext().addInterceptStrategy(new Debugger());
+ getContext().addInterceptStrategy(new Tracer());
from("direct:start").
process(new Processor() {
@@ -54,4 +54,5 @@
}
};
}
+
}
