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 2016/11/10 09:32:51 UTC
camel git commit: CAMEL-10460: Fixed NPE in
MetricsMessageHistoryFactory. Thanks to Philippe Godot for the unit test.
Repository: camel
Updated Branches:
refs/heads/camel-2.18.x 2f4eb12bc -> 629f0815b
CAMEL-10460: Fixed NPE in MetricsMessageHistoryFactory. Thanks to Philippe Godot for the unit test.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/629f0815
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/629f0815
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/629f0815
Branch: refs/heads/camel-2.18.x
Commit: 629f0815b01f8e6bb789935a37224ada92b354a0
Parents: 2f4eb12
Author: Claus Ibsen <da...@apache.org>
Authored: Thu Nov 10 10:32:09 2016 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Thu Nov 10 10:32:35 2016 +0100
----------------------------------------------------------------------
.../camel/processor/CamelInternalProcessor.java | 13 ++-
...ExceptionRouteMetricsMessageHistoryTest.java | 100 +++++++++++++++++++
2 files changed, 112 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/629f0815/camel-core/src/main/java/org/apache/camel/processor/CamelInternalProcessor.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/processor/CamelInternalProcessor.java b/camel-core/src/main/java/org/apache/camel/processor/CamelInternalProcessor.java
index a726b2f..50f2af4 100644
--- a/camel-core/src/main/java/org/apache/camel/processor/CamelInternalProcessor.java
+++ b/camel-core/src/main/java/org/apache/camel/processor/CamelInternalProcessor.java
@@ -748,7 +748,18 @@ public class CamelInternalProcessor extends DelegateAsyncProcessor {
list = new LinkedList<>();
exchange.setProperty(Exchange.MESSAGE_HISTORY, list);
}
- MessageHistory history = factory.newMessageHistory(routeId, definition, new Date());
+
+ // we may be routing outside a route in an onException or interceptor and if so then grab
+ // route id from the exchange UoW state
+ String targetRouteId = this.routeId;
+ if (targetRouteId == null) {
+ UnitOfWork uow = exchange.getUnitOfWork();
+ if (uow != null && uow.getRouteContext() != null) {
+ targetRouteId = uow.getRouteContext().getRoute().getId();
+ }
+ }
+
+ MessageHistory history = factory.newMessageHistory(targetRouteId, definition, new Date());
list.add(history);
return history;
}
http://git-wip-us.apache.org/repos/asf/camel/blob/629f0815/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/messagehistory/ExceptionRouteMetricsMessageHistoryTest.java
----------------------------------------------------------------------
diff --git a/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/messagehistory/ExceptionRouteMetricsMessageHistoryTest.java b/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/messagehistory/ExceptionRouteMetricsMessageHistoryTest.java
new file mode 100644
index 0000000..7ddf242
--- /dev/null
+++ b/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/messagehistory/ExceptionRouteMetricsMessageHistoryTest.java
@@ -0,0 +1,100 @@
+/**
+ * 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.component.metrics.messagehistory;
+
+import com.codahale.metrics.MetricRegistry;
+import org.apache.camel.CamelContext;
+import org.apache.camel.Exchange;
+import org.apache.camel.Processor;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.Test;
+
+public class ExceptionRouteMetricsMessageHistoryTest extends CamelTestSupport {
+
+ private MetricRegistry registry = new MetricRegistry();
+
+ @Override
+ protected CamelContext createCamelContext() throws Exception {
+ CamelContext context = super.createCamelContext();
+
+ MetricsMessageHistoryFactory factory = new MetricsMessageHistoryFactory();
+ factory.setUseJmx(false);
+ factory.setMetricsRegistry(registry);
+ context.setMessageHistoryFactory(factory);
+
+ return context;
+ }
+
+ @Test
+ public void testMetricsHistory() throws Exception {
+ getMockEndpoint("mock:foo").expectedMessageCount(5);
+ getMockEndpoint("mock:bar").expectedMessageCount(5);
+ getMockEndpoint("mock:baz").expectedMessageCount(0);
+ getMockEndpoint("mock:exception").expectedMessageCount(5);
+
+ for (int i = 0; i < 10; i++) {
+ if (i % 2 == 0) {
+ template.sendBody("seda:foo", "Hello " + i);
+ } else {
+ template.sendBody("seda:bar", "Hello " + i);
+ }
+ }
+
+ assertMockEndpointsSatisfied();
+
+ // there should be 3 names
+ assertEquals(5, registry.getNames().size());
+
+ // get the message history service
+ MetricsMessageHistoryService service = context.hasService(MetricsMessageHistoryService.class);
+ assertNotNull(service);
+ String json = service.dumpStatisticsAsJson();
+ assertNotNull(json);
+ log.info(json);
+
+ assertTrue(json.contains("foo.history"));
+ assertTrue(json.contains("bar.history"));
+ assertTrue(json.contains("exception.history"));
+ }
+
+ @Override
+ protected RouteBuilder createRouteBuilder() throws Exception {
+ return new RouteBuilder() {
+ @Override
+ public void configure() throws Exception {
+ onException(Exception.class)
+ .routeId("ExceptionRoute")
+ .log("Exception received.")
+ .to("mock:exception").id("exception");
+
+ from("seda:foo")
+ .to("mock:foo").id("foo");
+
+ from("seda:bar")
+ .to("mock:bar").id("bar")
+ .process(new Processor() {
+ @Override
+ public void process(Exchange exchange) throws Exception {
+ throw new Exception("Metrics Exception");
+ }
+ })
+ .to("mock:baz").id("baz");
+ }
+ };
+ }
+}