(camel-quarkus) branch main updated: Revert "Disable Micrometer JMX tests due to #6984"

[jamesnetherton]

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

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


The following commit(s) were added to refs/heads/main by this push:
     new 5ecde32558 Revert "Disable Micrometer JMX tests due to #6984"
5ecde32558 is described below

commit 5ecde3255858dcd227a9fc77622dfab1144ea420
Author: James Netherton <jamesnether...@gmail.com>
AuthorDate: Tue Mar 4 11:52:22 2025 +0000

    Revert "Disable Micrometer JMX tests due to #6984"
    
    This reverts commit e64b7285929bb8a138017db3c7713d2daf5e99e6.
---
 integration-tests/micrometer/pom.xml                  |  2 --
 .../component/micrometer/it/MicrometerProducers.java  | 19 ++++++++++++-------
 .../component/micrometer/it/MicrometerTest.java       |  2 --
 3 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/integration-tests/micrometer/pom.xml 
b/integration-tests/micrometer/pom.xml
index 66b1854bdc..013fac0270 100644
--- a/integration-tests/micrometer/pom.xml
+++ b/integration-tests/micrometer/pom.xml
@@ -67,12 +67,10 @@
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-resteasy-jsonb</artifactId>
         </dependency>
-        <!-- TODO: https://github.com/apache/camel-quarkus/issues/6984
         <dependency>
             <groupId>io.quarkiverse.micrometer.registry</groupId>
             <artifactId>quarkus-micrometer-registry-jmx</artifactId>
         </dependency>
-        -->
         <!-- test dependencies -->
         <dependency>
             <groupId>io.quarkus</groupId>
diff --git 
a/integration-tests/micrometer/src/main/java/org/apache/camel/quarkus/component/micrometer/it/MicrometerProducers.java
 
b/integration-tests/micrometer/src/main/java/org/apache/camel/quarkus/component/micrometer/it/MicrometerProducers.java
index 37efcb542c..a4779e71ed 100644
--- 
a/integration-tests/micrometer/src/main/java/org/apache/camel/quarkus/component/micrometer/it/MicrometerProducers.java
+++ 
b/integration-tests/micrometer/src/main/java/org/apache/camel/quarkus/component/micrometer/it/MicrometerProducers.java
@@ -18,26 +18,31 @@ package org.apache.camel.quarkus.component.micrometer.it;
 
 import java.util.List;
 
+import io.micrometer.core.instrument.Clock;
 import io.micrometer.core.instrument.Meter;
+import io.micrometer.core.instrument.MeterRegistry;
 import io.micrometer.core.instrument.Tag;
 import io.micrometer.core.instrument.config.MeterFilter;
 import io.micrometer.core.instrument.simple.SimpleMeterRegistry;
+import io.micrometer.core.instrument.util.HierarchicalNameMapper;
+import io.micrometer.jmx.JmxMeterRegistry;
 import io.micrometer.prometheus.PrometheusMeterRegistry;
+import io.quarkus.arc.profile.IfBuildProfile;
 import io.quarkus.micrometer.runtime.MeterFilterConstraint;
 import jakarta.enterprise.inject.Produces;
 import jakarta.inject.Named;
 import jakarta.inject.Singleton;
+import org.apache.camel.component.micrometer.CamelJmxConfig;
 import org.apache.camel.component.micrometer.MicrometerComponent;
 
 public class MicrometerProducers {
 
-    // TODO: https://github.com/apache/camel-quarkus/issues/6984
-    // @Produces
-    // @Singleton
-    // @IfBuildProfile("test")
-    // public MeterRegistry registry() {
-    //    return new JmxMeterRegistry(CamelJmxConfig.DEFAULT, Clock.SYSTEM, 
HierarchicalNameMapper.DEFAULT);
-    // }
+    @Produces
+    @Singleton
+    @IfBuildProfile("test")
+    public MeterRegistry registry() {
+        return new JmxMeterRegistry(CamelJmxConfig.DEFAULT, Clock.SYSTEM, 
HierarchicalNameMapper.DEFAULT);
+    }
 
     @Produces
     @Singleton
diff --git 
a/integration-tests/micrometer/src/test/java/org/apache/camel/quarkus/component/micrometer/it/MicrometerTest.java
 
b/integration-tests/micrometer/src/test/java/org/apache/camel/quarkus/component/micrometer/it/MicrometerTest.java
index a6c930d7c8..ec18e5aa14 100644
--- 
a/integration-tests/micrometer/src/test/java/org/apache/camel/quarkus/component/micrometer/it/MicrometerTest.java
+++ 
b/integration-tests/micrometer/src/test/java/org/apache/camel/quarkus/component/micrometer/it/MicrometerTest.java
@@ -34,7 +34,6 @@ import io.restassured.RestAssured;
 import io.restassured.path.json.JsonPath;
 import org.awaitility.Awaitility;
 import org.hamcrest.Matchers;
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.ValueSource;
@@ -211,7 +210,6 @@ class MicrometerTest extends AbstractMicrometerTest {
                 Matchers.is("1"));
     }
 
-    @Disabled("https://github.com/apache/camel-quarkus/issues/6984";)
     @ParameterizedTest
     @ValueSource(strings = { "metrics", "org.apache.camel.micrometer" }) 
//test uses domains from both default and custom JMX registries
     
@DisabledOnIntegrationTest("https://github.com/apache/camel-quarkus/issues/5209";)