[camel-quarkus] branch master updated: Move MicroProfile metrics camel context configuration to static init

[ja...@apache.org]

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


The following commit(s) were added to refs/heads/master by this push:
     new 93591c3  Move MicroProfile metrics camel context configuration to static init
93591c3 is described below

commit 93591c37ae4eaa8f67f30f7b73d551227a087aa9
Author: James Netherton <ja...@gmail.com>
AuthorDate: Fri Jan 3 09:54:26 2020 +0000

    Move MicroProfile metrics camel context configuration to static init
---
 .../metrics/deployment/MicroProfileMetricsProcessor.java          | 8 ++++----
 .../metrics/runtime/CamelMicroProfileMetricsRecorder.java         | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/extensions/microprofile-metrics/deployment/src/main/java/org/apache/camel/quarkus/component/microprofile/metrics/deployment/MicroProfileMetricsProcessor.java b/extensions/microprofile-metrics/deployment/src/main/java/org/apache/camel/quarkus/component/microprofile/metrics/deployment/MicroProfileMetricsProcessor.java
index a0b8f0e..c859387 100644
--- a/extensions/microprofile-metrics/deployment/src/main/java/org/apache/camel/quarkus/component/microprofile/metrics/deployment/MicroProfileMetricsProcessor.java
+++ b/extensions/microprofile-metrics/deployment/src/main/java/org/apache/camel/quarkus/component/microprofile/metrics/deployment/MicroProfileMetricsProcessor.java
@@ -20,9 +20,9 @@ import org.apache.camel.component.microprofile.metrics.MicroProfileMetricsConsta
 import org.apache.camel.quarkus.component.microprofile.metrics.runtime.CamelMicroProfileMetricsConfig;
 import org.apache.camel.quarkus.component.microprofile.metrics.runtime.CamelMicroProfileMetricsRecorder;
 import org.apache.camel.quarkus.core.deployment.CamelBeanBuildItem;
+import org.apache.camel.quarkus.core.deployment.CamelContextBuildItem;
 import org.eclipse.microprofile.metrics.MetricRegistry;
 
-import io.quarkus.arc.deployment.BeanContainerBuildItem;
 import io.quarkus.deployment.annotations.BuildStep;
 import io.quarkus.deployment.annotations.ExecutionTime;
 import io.quarkus.deployment.annotations.Record;
@@ -46,10 +46,10 @@ class MicroProfileMetricsProcessor {
                 recorder.createApplicationRegistry());
     }
 
-    @Record(ExecutionTime.RUNTIME_INIT)
+    @Record(ExecutionTime.STATIC_INIT)
     @BuildStep
     public void configureCamelContext(CamelMicroProfileMetricsRecorder recorder, CamelMicroProfileMetricsConfig config,
-            BeanContainerBuildItem beanContainer) {
-        recorder.configureCamelContext(config, beanContainer.getValue());
+            CamelContextBuildItem camelContextBuildItem) {
+        recorder.configureCamelContext(config, camelContextBuildItem.getCamelContext());
     }
 }
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 6120855..77c5878 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
@@ -25,7 +25,6 @@ import org.apache.camel.component.microprofile.metrics.route.policy.MicroProfile
 import org.apache.camel.spi.ManagementStrategy;
 import org.eclipse.microprofile.metrics.MetricRegistry;
 
-import io.quarkus.arc.runtime.BeanContainer;
 import io.quarkus.runtime.RuntimeValue;
 import io.quarkus.runtime.annotations.Recorder;
 import io.smallrye.metrics.MetricRegistries;
@@ -37,8 +36,9 @@ public class CamelMicroProfileMetricsRecorder {
         return new RuntimeValue<>(MetricRegistries.get(MetricRegistry.Type.APPLICATION));
     }
 
-    public void configureCamelContext(CamelMicroProfileMetricsConfig config, BeanContainer beanContainer) {
-        CamelContext camelContext = beanContainer.instance(CamelContext.class);
+    public void configureCamelContext(CamelMicroProfileMetricsConfig config,
+            RuntimeValue<CamelContext> camelContextRuntimeValue) {
+        CamelContext camelContext = camelContextRuntimeValue.getValue();
         ManagementStrategy managementStrategy = camelContext.getManagementStrategy();
 
         if (config.enableRoutePolicy) {