CAMEL-9014: More endpoint usage statitics on the runtime endpoint mbean
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/e2076051 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/e2076051 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/e2076051 Branch: refs/heads/master Commit: e20760513d54a66b46ddf0cd7df51c9bc500e22b Parents: 3ab2cd6 Author: Claus Ibsen <[email protected]> Authored: Mon Jul 27 10:41:33 2015 +0200 Committer: Claus Ibsen <[email protected]> Committed: Mon Jul 27 10:41:33 2015 +0200 ---------------------------------------------------------------------- .../ManagedRuntimeEndpointRegistryMBean.java | 3 ++ .../impl/DefaultRuntimeEndpointRegistry.java | 48 ++++++++++++++++---- .../mbean/ManagedRuntimeEndpointRegistry.java | 5 ++ .../camel/spi/RuntimeEndpointRegistry.java | 5 ++ 4 files changed, 52 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/e2076051/camel-core/src/main/java/org/apache/camel/api/management/mbean/ManagedRuntimeEndpointRegistryMBean.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/api/management/mbean/ManagedRuntimeEndpointRegistryMBean.java b/camel-core/src/main/java/org/apache/camel/api/management/mbean/ManagedRuntimeEndpointRegistryMBean.java index 3e00a6e..78a460b 100644 --- a/camel-core/src/main/java/org/apache/camel/api/management/mbean/ManagedRuntimeEndpointRegistryMBean.java +++ b/camel-core/src/main/java/org/apache/camel/api/management/mbean/ManagedRuntimeEndpointRegistryMBean.java @@ -27,6 +27,9 @@ public interface ManagedRuntimeEndpointRegistryMBean extends ManagedServiceMBean @ManagedOperation(description = "Clears the registry") void clear(); + @ManagedOperation(description = "Reset the statistic counters") + void reset(); + @ManagedAttribute(description = "Whether gathering runtime usage is enabled or not") boolean isEnabled(); http://git-wip-us.apache.org/repos/asf/camel/blob/e2076051/camel-core/src/main/java/org/apache/camel/impl/DefaultRuntimeEndpointRegistry.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/impl/DefaultRuntimeEndpointRegistry.java b/camel-core/src/main/java/org/apache/camel/impl/DefaultRuntimeEndpointRegistry.java index 9d1fed0..ac08630 100644 --- a/camel-core/src/main/java/org/apache/camel/impl/DefaultRuntimeEndpointRegistry.java +++ b/camel-core/src/main/java/org/apache/camel/impl/DefaultRuntimeEndpointRegistry.java @@ -111,9 +111,12 @@ public class DefaultRuntimeEndpointRegistry extends EventNotifierSupport impleme for (String uri : entry.getValue()) { Long hits = 0L; if (extended) { - hits = inputUtilization.getStatistics().get(uri); - if (hits == null) { - hits = 0L; + String key = asUtilizationKey(routeId, uri); + if (key != null) { + hits = inputUtilization.getStatistics().get(key); + if (hits == null) { + hits = 0L; + } } } answer.add(new EndpointRuntimeStatistics(uri, routeId, "in", hits)); @@ -126,9 +129,12 @@ public class DefaultRuntimeEndpointRegistry extends EventNotifierSupport impleme for (String uri : entry.getValue().keySet()) { Long hits = 0L; if (extended) { - hits = outputUtilization.getStatistics().get(uri); - if (hits == null) { - hits = 0L; + String key = asUtilizationKey(routeId, uri); + if (key != null) { + hits = outputUtilization.getStatistics().get(key); + if (hits == null) { + hits = 0L; + } } } answer.add(new EndpointRuntimeStatistics(uri, routeId, "out", hits)); @@ -152,6 +158,12 @@ public class DefaultRuntimeEndpointRegistry extends EventNotifierSupport impleme public void clear() { inputs.clear(); outputs.clear(); + reset(); + } + + @Override + public void reset() { + // its safe to call clear as reset if (inputUtilization != null) { inputUtilization.clear(); } @@ -214,13 +226,20 @@ public class DefaultRuntimeEndpointRegistry extends EventNotifierSupport impleme outputs.remove(routeId); if (extended) { String uri = rse.getRoute().getEndpoint().getEndpointUri(); - inputUtilization.remove(uri); + String key = asUtilizationKey(routeId, uri); + if (key != null) { + inputUtilization.remove(key); + } } } else if (extended && event instanceof ExchangeCreatedEvent) { ExchangeCreatedEvent ece = (ExchangeCreatedEvent) event; Endpoint endpoint = ece.getExchange().getFromEndpoint(); + String routeId = ece.getExchange().getFromRouteId(); String uri = endpoint.getEndpointUri(); - inputUtilization.onHit(uri); + String key = asUtilizationKey(routeId, uri); + if (key != null) { + inputUtilization.onHit(key); + } } else { ExchangeSendingEvent ese = (ExchangeSendingEvent) event; Endpoint endpoint = ese.getEndpoint(); @@ -232,7 +251,10 @@ public class DefaultRuntimeEndpointRegistry extends EventNotifierSupport impleme uris.put(uri, uri); } if (extended) { - outputUtilization.onHit(uri); + String key = asUtilizationKey(routeId, uri); + if (key != null) { + outputUtilization.onHit(key); + } } } } @@ -259,6 +281,14 @@ public class DefaultRuntimeEndpointRegistry extends EventNotifierSupport impleme || event instanceof RouteRemovedEvent; } + private static String asUtilizationKey(String routeId, String uri) { + if (routeId == null || uri == null) { + return null; + } else { + return routeId + "|" + uri; + } + } + private static class EndpointRuntimeStatistics implements Statistic { private final String uri; http://git-wip-us.apache.org/repos/asf/camel/blob/e2076051/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedRuntimeEndpointRegistry.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedRuntimeEndpointRegistry.java b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedRuntimeEndpointRegistry.java index de589d6..e490d4a 100644 --- a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedRuntimeEndpointRegistry.java +++ b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedRuntimeEndpointRegistry.java @@ -55,6 +55,11 @@ public class ManagedRuntimeEndpointRegistry extends ManagedService implements Ma } @Override + public void reset() { + registry.reset(); + } + + @Override public boolean isEnabled() { return registry.isEnabled(); } http://git-wip-us.apache.org/repos/asf/camel/blob/e2076051/camel-core/src/main/java/org/apache/camel/spi/RuntimeEndpointRegistry.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/spi/RuntimeEndpointRegistry.java b/camel-core/src/main/java/org/apache/camel/spi/RuntimeEndpointRegistry.java index d09b5e5..6ac3e0f 100644 --- a/camel-core/src/main/java/org/apache/camel/spi/RuntimeEndpointRegistry.java +++ b/camel-core/src/main/java/org/apache/camel/spi/RuntimeEndpointRegistry.java @@ -84,6 +84,11 @@ public interface RuntimeEndpointRegistry extends StaticService { void clear(); /** + * Reset the statistic counters + */ + void reset(); + + /** * Number of endpoints currently in the cache. */ int size();
