You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ja...@apache.org on 2020/10/21 14:17:47 UTC

[camel-quarkus] 01/03: Remove workaround for AdviceWithRouteBuilder replaceFromWith and microprofile-metrics conflict

This is an automated email from the ASF dual-hosted git repository.

jamesnetherton pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git

commit df62fb36338e70accdeceffa29bbe6a33834df94
Author: James Netherton <ja...@gmail.com>
AuthorDate: Wed Oct 21 13:04:40 2020 +0100

    Remove workaround for AdviceWithRouteBuilder replaceFromWith and microprofile-metrics conflict
    
    Fixes #1894
---
 .../metrics/runtime/CamelMicroProfileMetricsRecorder.java           | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/extensions/microprofile-metrics/runtime/src/main/java/org/apache/camel/quarkus/component/microprofile/metrics/runtime/CamelMicroProfileMetricsRecorder.java b/extensions/microprofile-metrics/runtime/src/main/java/org/apache/camel/quarkus/component/microprofile/metrics/runtime/CamelMicroProfileMetricsRecorder.java
index 63ae0f3..8af93a4 100644
--- a/extensions/microprofile-metrics/runtime/src/main/java/org/apache/camel/quarkus/component/microprofile/metrics/runtime/CamelMicroProfileMetricsRecorder.java
+++ b/extensions/microprofile-metrics/runtime/src/main/java/org/apache/camel/quarkus/component/microprofile/metrics/runtime/CamelMicroProfileMetricsRecorder.java
@@ -55,11 +55,7 @@ public class CamelMicroProfileMetricsRecorder {
         @Override
         public void customize(CamelContext camelContext) {
             if (config.enableRoutePolicy) {
-                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);
+                camelContext.addRoutePolicyFactory(new MicroProfileMetricsRoutePolicyFactory());
             }
 
             ManagementStrategy managementStrategy = camelContext.getManagementStrategy();