CAMEL-7696: camel-metrics - Add a route policy to expose route stats as codehale metrics. 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/9b7852b4 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/9b7852b4 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/9b7852b4 Branch: refs/heads/master Commit: 9b7852b401899281c8913bddc64656bb281968d0 Parents: 2ff43ad Author: Claus Ibsen <davscl...@apache.org> Authored: Fri Aug 15 14:37:05 2014 +0200 Committer: Claus Ibsen <davscl...@apache.org> Committed: Fri Aug 15 14:37:05 2014 +0200 ---------------------------------------------------------------------- .../routepolicy/MetricsRegistryService.java | 3 +- .../metrics/routepolicy/MetricsRoutePolicy.java | 2 +- .../ManagedMetricsRoutePolicyTest.java | 89 ++++++++++++++++++++ .../routepolicy/MetricsRoutePolicyTest.java | 2 +- 4 files changed, 92 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/9b7852b4/components/camel-metrics/src/main/java/org/apache/camel/component/metrics/routepolicy/MetricsRegistryService.java ---------------------------------------------------------------------- diff --git a/components/camel-metrics/src/main/java/org/apache/camel/component/metrics/routepolicy/MetricsRegistryService.java b/components/camel-metrics/src/main/java/org/apache/camel/component/metrics/routepolicy/MetricsRegistryService.java index 07a494f..4562da0 100644 --- a/components/camel-metrics/src/main/java/org/apache/camel/component/metrics/routepolicy/MetricsRegistryService.java +++ b/components/camel-metrics/src/main/java/org/apache/camel/component/metrics/routepolicy/MetricsRegistryService.java @@ -79,8 +79,7 @@ public final class MetricsRegistryService extends ServiceSupport implements Came if (agent != null) { MBeanServer server = agent.getMBeanServer(); if (server != null) { - String domain = jmxDomain + "." + getCamelContext().getManagementName(); - reporter = JmxReporter.forRegistry(registry).registerWith(server).inDomain(domain).build(); + reporter = JmxReporter.forRegistry(registry).registerWith(server).inDomain(jmxDomain).build(); reporter.start(); } } else { http://git-wip-us.apache.org/repos/asf/camel/blob/9b7852b4/components/camel-metrics/src/main/java/org/apache/camel/component/metrics/routepolicy/MetricsRoutePolicy.java ---------------------------------------------------------------------- diff --git a/components/camel-metrics/src/main/java/org/apache/camel/component/metrics/routepolicy/MetricsRoutePolicy.java b/components/camel-metrics/src/main/java/org/apache/camel/component/metrics/routepolicy/MetricsRoutePolicy.java index ff1de91..53a6914 100644 --- a/components/camel-metrics/src/main/java/org/apache/camel/component/metrics/routepolicy/MetricsRoutePolicy.java +++ b/components/camel-metrics/src/main/java/org/apache/camel/component/metrics/routepolicy/MetricsRoutePolicy.java @@ -125,7 +125,7 @@ public class MetricsRoutePolicy extends RoutePolicySupport { private String createName(String type) { CamelContext context = route.getRouteContext().getCamelContext(); String name = context.getManagementName() != null ? context.getManagementName() : context.getName(); - return name + "-" + route.getId() + "-" + type; + return name + ":" + route.getId() + ":" + type; } @Override http://git-wip-us.apache.org/repos/asf/camel/blob/9b7852b4/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/routepolicy/ManagedMetricsRoutePolicyTest.java ---------------------------------------------------------------------- diff --git a/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/routepolicy/ManagedMetricsRoutePolicyTest.java b/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/routepolicy/ManagedMetricsRoutePolicyTest.java new file mode 100644 index 0000000..786caa3 --- /dev/null +++ b/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/routepolicy/ManagedMetricsRoutePolicyTest.java @@ -0,0 +1,89 @@ +/** + * 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.routepolicy; + +import java.util.Set; +import javax.management.MBeanServer; +import javax.management.ObjectName; + +import com.codahale.metrics.MetricRegistry; +import org.apache.camel.CamelContext; +import org.apache.camel.builder.RouteBuilder; +import org.apache.camel.test.junit4.CamelTestSupport; +import org.junit.Test; + +public class ManagedMetricsRoutePolicyTest extends CamelTestSupport { + + private MetricRegistry registry = new MetricRegistry(); + + @Override + protected boolean useJmx() { + return true; + } + + protected MBeanServer getMBeanServer() { + return context.getManagementStrategy().getManagementAgent().getMBeanServer(); + } + + @Override + protected CamelContext createCamelContext() throws Exception { + CamelContext context = super.createCamelContext(); + + MetricsRoutePolicyFactory factory = new MetricsRoutePolicyFactory(); + factory.setUseJmx(true); + factory.setRegistry(registry); + context.addRoutePolicyFactory(factory); + + return context; + } + + @Test + public void testMetricsRoutePolicy() throws Exception { + getMockEndpoint("mock:result").expectedMessageCount(10); + + 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 2x4 names + assertEquals(8, registry.getNames().size()); + + // there should be 8 mbeans + Set<ObjectName> set = getMBeanServer().queryNames(new ObjectName("org.apache.camel.metrics:*"), null); + assertEquals(8, set.size()); + } + + @Override + protected RouteBuilder createRouteBuilder() throws Exception { + return new RouteBuilder() { + @Override + public void configure() throws Exception { + from("seda:foo").routeId("foo") + .to("mock:result"); + + from("seda:bar").routeId("bar") + .to("mock:result"); + } + }; + } +} http://git-wip-us.apache.org/repos/asf/camel/blob/9b7852b4/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/routepolicy/MetricsRoutePolicyTest.java ---------------------------------------------------------------------- diff --git a/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/routepolicy/MetricsRoutePolicyTest.java b/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/routepolicy/MetricsRoutePolicyTest.java index cd01b73..7b2b164 100644 --- a/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/routepolicy/MetricsRoutePolicyTest.java +++ b/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/routepolicy/MetricsRoutePolicyTest.java @@ -42,7 +42,7 @@ public class MetricsRoutePolicyTest extends CamelTestSupport { public void testMetricsRoutePolicy() throws Exception { getMockEndpoint("mock:result").expectedMessageCount(10); - for (int i = 0; i < 50; i++) { + for (int i = 0; i < 10; i++) { if (i % 2 == 0) { template.sendBody("seda:foo", "Hello " + i); } else {
