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 2020/10/13 07:57:18 UTC
[camel] branch master updated: CAMEL-15675: Remove erroneously
shadowed metricsRegistry variable (#4426)
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new 8fc8240 CAMEL-15675: Remove erroneously shadowed metricsRegistry variable (#4426)
8fc8240 is described below
commit 8fc8240967eccf418b47c3a9aa5a16e5ac978291
Author: James Netherton <ja...@users.noreply.github.com>
AuthorDate: Tue Oct 13 08:56:49 2020 +0100
CAMEL-15675: Remove erroneously shadowed metricsRegistry variable (#4426)
---
.../route/policy/MicroProfileMetricsRoutePolicy.java | 2 +-
.../MicroProfileMetricsExchangeEventNotifierTest.java | 1 -
.../route/MicroProfileMetricsRouteEventNotifierTest.java | 1 -
...roProfileMetricsExceptionInRouteMessageHistoryTest.java | 5 +----
.../history/MicroProfileMetricsMessageHistoryTest.java | 1 -
...icroProfileMetricsRoutePolicyMulticastSubRouteTest.java | 5 +----
.../policy/MicroProfileMetricsRoutePolicySubRouteTest.java | 5 +----
.../route/policy/MicroProfileMetricsRoutePolicyTest.java | 14 ++++++++++----
8 files changed, 14 insertions(+), 20 deletions(-)
diff --git a/components/camel-microprofile-metrics/src/main/java/org/apache/camel/component/microprofile/metrics/route/policy/MicroProfileMetricsRoutePolicy.java b/components/camel-microprofile-metrics/src/main/java/org/apache/camel/component/microprofile/metrics/route/policy/MicroProfileMetricsRoutePolicy.java
index 09cbeb2..a966cbe 100644
--- a/components/camel-microprofile-metrics/src/main/java/org/apache/camel/component/microprofile/metrics/route/policy/MicroProfileMetricsRoutePolicy.java
+++ b/components/camel-microprofile-metrics/src/main/java/org/apache/camel/component/microprofile/metrics/route/policy/MicroProfileMetricsRoutePolicy.java
@@ -92,7 +92,7 @@ public class MicroProfileMetricsRoutePolicy extends RoutePolicySupport implement
@Override
public void onInit(Route route) {
super.onInit(route);
- MetricRegistry metricRegistry = getMetricRegistry();
+
if (metricRegistry == null) {
metricRegistry = MicroProfileMetricsHelper.getMetricRegistry(route.getCamelContext());
}
diff --git a/components/camel-microprofile-metrics/src/test/java/org/apache/camel/component/microprofile/metrics/event/notifier/exchange/MicroProfileMetricsExchangeEventNotifierTest.java b/components/camel-microprofile-metrics/src/test/java/org/apache/camel/component/microprofile/metrics/event/notifier/exchange/MicroProfileMetricsExchangeEventNotifierTest.java
index d695db2..a1b9001 100644
--- a/components/camel-microprofile-metrics/src/test/java/org/apache/camel/component/microprofile/metrics/event/notifier/exchange/MicroProfileMetricsExchangeEventNotifierTest.java
+++ b/components/camel-microprofile-metrics/src/test/java/org/apache/camel/component/microprofile/metrics/event/notifier/exchange/MicroProfileMetricsExchangeEventNotifierTest.java
@@ -113,7 +113,6 @@ public class MicroProfileMetricsExchangeEventNotifierTest extends MicroProfileMe
protected CamelContext createCamelContext() throws Exception {
eventNotifier = new MicroProfileMetricsExchangeEventNotifier();
eventNotifier.setNamingStrategy((exchange, endpoint) -> endpoint.getEndpointUri());
- eventNotifier.setMetricRegistry(metricRegistry);
CamelContext camelContext = super.createCamelContext();
camelContext.getManagementStrategy().addEventNotifier(eventNotifier);
diff --git a/components/camel-microprofile-metrics/src/test/java/org/apache/camel/component/microprofile/metrics/event/notifier/route/MicroProfileMetricsRouteEventNotifierTest.java b/components/camel-microprofile-metrics/src/test/java/org/apache/camel/component/microprofile/metrics/event/notifier/route/MicroProfileMetricsRouteEventNotifierTest.java
index 8159cf5..46c211f 100644
--- a/components/camel-microprofile-metrics/src/test/java/org/apache/camel/component/microprofile/metrics/event/notifier/route/MicroProfileMetricsRouteEventNotifierTest.java
+++ b/components/camel-microprofile-metrics/src/test/java/org/apache/camel/component/microprofile/metrics/event/notifier/route/MicroProfileMetricsRouteEventNotifierTest.java
@@ -70,7 +70,6 @@ public class MicroProfileMetricsRouteEventNotifierTest extends MicroProfileMetri
@Override
protected CamelContext createCamelContext() throws Exception {
eventNotifier = new MicroProfileMetricsRouteEventNotifier();
- eventNotifier.setMetricRegistry(metricRegistry);
CamelContext camelContext = super.createCamelContext();
camelContext.getManagementStrategy().addEventNotifier(eventNotifier);
diff --git a/components/camel-microprofile-metrics/src/test/java/org/apache/camel/component/microprofile/metrics/message/history/MicroProfileMetricsExceptionInRouteMessageHistoryTest.java b/components/camel-microprofile-metrics/src/test/java/org/apache/camel/component/microprofile/metrics/message/history/MicroProfileMetricsExceptionInRouteMessageHistoryTest.java
index e621d28..d5a4b21 100644
--- a/components/camel-microprofile-metrics/src/test/java/org/apache/camel/component/microprofile/metrics/message/history/MicroProfileMetricsExceptionInRouteMessageHistoryTest.java
+++ b/components/camel-microprofile-metrics/src/test/java/org/apache/camel/component/microprofile/metrics/message/history/MicroProfileMetricsExceptionInRouteMessageHistoryTest.java
@@ -87,11 +87,8 @@ public class MicroProfileMetricsExceptionInRouteMessageHistoryTest extends Micro
@Override
protected CamelContext createCamelContext() throws Exception {
- MicroProfileMetricsMessageHistoryFactory factory = new MicroProfileMetricsMessageHistoryFactory();
- factory.setMetricRegistry(metricRegistry);
-
CamelContext context = super.createCamelContext();
- context.setMessageHistoryFactory(factory);
+ context.setMessageHistoryFactory(new MicroProfileMetricsMessageHistoryFactory());
return context;
}
}
diff --git a/components/camel-microprofile-metrics/src/test/java/org/apache/camel/component/microprofile/metrics/message/history/MicroProfileMetricsMessageHistoryTest.java b/components/camel-microprofile-metrics/src/test/java/org/apache/camel/component/microprofile/metrics/message/history/MicroProfileMetricsMessageHistoryTest.java
index 9bcfd16..5f335be 100644
--- a/components/camel-microprofile-metrics/src/test/java/org/apache/camel/component/microprofile/metrics/message/history/MicroProfileMetricsMessageHistoryTest.java
+++ b/components/camel-microprofile-metrics/src/test/java/org/apache/camel/component/microprofile/metrics/message/history/MicroProfileMetricsMessageHistoryTest.java
@@ -114,7 +114,6 @@ public class MicroProfileMetricsMessageHistoryTest extends MicroProfileMetricsTe
@Override
protected CamelContext createCamelContext() throws Exception {
factory = new MicroProfileMetricsMessageHistoryFactory();
- factory.setMetricRegistry(metricRegistry);
CamelContext context = super.createCamelContext();
context.setMessageHistoryFactory(factory);
diff --git a/components/camel-microprofile-metrics/src/test/java/org/apache/camel/component/microprofile/metrics/route/policy/MicroProfileMetricsRoutePolicyMulticastSubRouteTest.java b/components/camel-microprofile-metrics/src/test/java/org/apache/camel/component/microprofile/metrics/route/policy/MicroProfileMetricsRoutePolicyMulticastSubRouteTest.java
index b67baf6..9ee30ee 100644
--- a/components/camel-microprofile-metrics/src/test/java/org/apache/camel/component/microprofile/metrics/route/policy/MicroProfileMetricsRoutePolicyMulticastSubRouteTest.java
+++ b/components/camel-microprofile-metrics/src/test/java/org/apache/camel/component/microprofile/metrics/route/policy/MicroProfileMetricsRoutePolicyMulticastSubRouteTest.java
@@ -66,11 +66,8 @@ public class MicroProfileMetricsRoutePolicyMulticastSubRouteTest extends MicroPr
@Override
protected CamelContext createCamelContext() throws Exception {
- MicroProfileMetricsRoutePolicyFactory factory = new MicroProfileMetricsRoutePolicyFactory();
- factory.setMetricRegistry(metricRegistry);
-
CamelContext camelContext = super.createCamelContext();
- camelContext.addRoutePolicyFactory(factory);
+ camelContext.addRoutePolicyFactory(new MicroProfileMetricsRoutePolicyFactory());
return camelContext;
}
}
diff --git a/components/camel-microprofile-metrics/src/test/java/org/apache/camel/component/microprofile/metrics/route/policy/MicroProfileMetricsRoutePolicySubRouteTest.java b/components/camel-microprofile-metrics/src/test/java/org/apache/camel/component/microprofile/metrics/route/policy/MicroProfileMetricsRoutePolicySubRouteTest.java
index 3243ccc..56ff459 100644
--- a/components/camel-microprofile-metrics/src/test/java/org/apache/camel/component/microprofile/metrics/route/policy/MicroProfileMetricsRoutePolicySubRouteTest.java
+++ b/components/camel-microprofile-metrics/src/test/java/org/apache/camel/component/microprofile/metrics/route/policy/MicroProfileMetricsRoutePolicySubRouteTest.java
@@ -62,11 +62,8 @@ public class MicroProfileMetricsRoutePolicySubRouteTest extends MicroProfileMetr
@Override
protected CamelContext createCamelContext() throws Exception {
- MicroProfileMetricsRoutePolicyFactory factory = new MicroProfileMetricsRoutePolicyFactory();
- factory.setMetricRegistry(metricRegistry);
-
CamelContext camelContext = super.createCamelContext();
- camelContext.addRoutePolicyFactory(factory);
+ camelContext.addRoutePolicyFactory(new MicroProfileMetricsRoutePolicyFactory());
return camelContext;
}
}
diff --git a/components/camel-microprofile-metrics/src/test/java/org/apache/camel/component/microprofile/metrics/route/policy/MicroProfileMetricsRoutePolicyTest.java b/components/camel-microprofile-metrics/src/test/java/org/apache/camel/component/microprofile/metrics/route/policy/MicroProfileMetricsRoutePolicyTest.java
index 8a7379f..191abd8 100644
--- a/components/camel-microprofile-metrics/src/test/java/org/apache/camel/component/microprofile/metrics/route/policy/MicroProfileMetricsRoutePolicyTest.java
+++ b/components/camel-microprofile-metrics/src/test/java/org/apache/camel/component/microprofile/metrics/route/policy/MicroProfileMetricsRoutePolicyTest.java
@@ -20,6 +20,7 @@ import java.util.Arrays;
import io.smallrye.metrics.TagsUtils;
import org.apache.camel.CamelContext;
+import org.apache.camel.builder.AdviceWithRouteBuilder;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.microprofile.metrics.MicroProfileMetricsHelper;
import org.apache.camel.component.microprofile.metrics.MicroProfileMetricsTestSupport;
@@ -100,6 +101,14 @@ public class MicroProfileMetricsRoutePolicyTest extends MicroProfileMetricsTestS
assertEquals(6, countRouteMetrics("bar"));
}
+ @Test
+ public void adviceWithTest() throws Exception {
+ AdviceWithRouteBuilder.adviceWith(context, "foo", advisor -> {
+ advisor.replaceFromWith("direct:replaced");
+ });
+ assertEquals(6, countRouteMetrics("foo"));
+ }
+
private long countRouteMetrics(String routeId) {
return metricRegistry.getMetricIDs()
.stream()
@@ -166,11 +175,8 @@ public class MicroProfileMetricsRoutePolicyTest extends MicroProfileMetricsTestS
@Override
protected CamelContext createCamelContext() throws Exception {
- MicroProfileMetricsRoutePolicyFactory factory = new MicroProfileMetricsRoutePolicyFactory();
- factory.setMetricRegistry(metricRegistry);
-
CamelContext camelContext = super.createCamelContext();
- camelContext.addRoutePolicyFactory(factory);
+ camelContext.addRoutePolicyFactory(new MicroProfileMetricsRoutePolicyFactory());
return camelContext;
}
}