Workaround AdviceWithRouteBuilder and MicroprofileMetrics conflict

Relates #1894
apache · Oct 14, 2020 · 4517ace · 4517ace
1 parent c5e3e0c
commit 4517ace
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 5 deletions.
diff --git a/...amel/quarkus/component/microprofile/metrics/runtime/CamelMicroProfileMetricsRecorder.java b/...amel/quarkus/component/microprofile/metrics/runtime/CamelMicroProfileMetricsRecorder.java
@@ -55,7 +55,11 @@ public MicroProfileMetricsContextCustomizer(CamelMicroProfileMetricsConfig confi
         @Override
         public void customize(CamelContext camelContext) {
             if (config.enableRoutePolicy) {
-                camelContext.addRoutePolicyFactory(new MicroProfileMetricsRoutePolicyFactory());
+                MicroProfileMetricsRoutePolicyFactory routePolicyFactory = new MicroProfileMetricsRoutePolicyFactory();
+                // TODO: Remove this after upgrade to Camel >= 3.6.0
+                // https://github.com/apache/camel-quarkus/issues/1894
+                routePolicyFactory.setMetricRegistry(MetricRegistries.get(MetricRegistry.Type.APPLICATION));
+                camelContext.addRoutePolicyFactory(routePolicyFactory);
             }
 
             ManagementStrategy managementStrategy = camelContext.getManagementStrategy();

diff --git a/...g/apache/camel/quarkus/component/microprofile/it/metrics/MicroProfileMetricsResource.java b/...g/apache/camel/quarkus/component/microprofile/it/metrics/MicroProfileMetricsResource.java
@@ -23,7 +23,9 @@
 import javax.ws.rs.QueryParam;
 import javax.ws.rs.core.Response;
 
+import org.apache.camel.CamelContext;
 import org.apache.camel.ProducerTemplate;
+import org.apache.camel.builder.AdviceWithRouteBuilder;
 
 @Path("/microprofile-metrics")
 @ApplicationScoped
@@ -32,6 +34,9 @@ public class MicroProfileMetricsResource {
     @Inject
     ProducerTemplate template;
 
+    @Inject
+    CamelContext context;
+
     @Path("/counter")
     @GET
     public Response counterIncrement() throws Exception {
@@ -87,4 +92,13 @@ public Response logMessage() throws Exception {
         template.sendBody("log:message", "Test log message");
         return Response.ok().build();
     }
+
+    @Path("/advicewith")
+    @GET
+    public Response adviceWith() throws Exception {
+        AdviceWithRouteBuilder.adviceWith(context, "log", advisor -> {
+            advisor.replaceFromWith("direct:replaced");
+        });
+        return Response.ok().build();
+    }
 }
diff --git a/...ache/camel/quarkus/component/microprofile/it/metrics/MicroProfileMetricsRouteBuilder.java b/...ache/camel/quarkus/component/microprofile/it/metrics/MicroProfileMetricsRouteBuilder.java
@@ -51,5 +51,8 @@ public void configure() {
                 .to("microprofile-metrics:timer:camel-quarkus-timer?action=start")
                 .delay(100)
                 .to("microprofile-metrics:timer:camel-quarkus-timer?action=stop");
+
+        from("direct:log").routeId("log")
+                .log("Camel Quarkus MicroProfile Metrics");
     }
 }
diff --git a/...a/org/apache/camel/quarkus/component/microprofile/it/metrics/MicroProfileMetricsTest.java b/...a/org/apache/camel/quarkus/component/microprofile/it/metrics/MicroProfileMetricsTest.java
@@ -131,6 +131,15 @@ public void testMicroProfileMetricsCamelContextEventNotifier() {
         assertTrue(getMetricIntValue("camel.context.uptime") > 0);
     }
 
+    @Test
+    public void testAdviceWith() {
+        RestAssured.get("/microprofile-metrics/advicewith")
+                .then()
+                .statusCode(200);
+        assertTrue(getMetricIntValue("camel.route.count") >= 7);
+        assertTrue(getMetricIntValue("camel.route.running.count") >= 7);
+    }
+
     private int getMetricIntValue(String metricName, String... tags) {
         return getApplicationMetrics().getInt(sanitizeMetricName(metricName, tags));
     }
@@ -139,10 +148,6 @@ private float getMetricFloatValue(String metricName, String... tags) {
         return getApplicationMetrics().getFloat(sanitizeMetricName(metricName, tags));
     }
 
-    private Map<String, Object> getMetricMapValue(String metricName, String... tags) {
-        return getApplicationMetrics().getMap(sanitizeMetricName(metricName, tags));
-    }
-
     private String sanitizeMetricName(String metricName, String... tags) {
         if (tags.length == 0) {
             tags = new String[] { CAMEL_CONTEXT_METRIC_TAG };