From cbd641524a2b022560238c27278b18c5e80417b4 Mon Sep 17 00:00:00 2001
From: James Netherton <jamesnetherton@gmail.com>
Date: Fri, 7 Feb 2025 07:46:53 +0000
Subject: [PATCH] Disable Micrometer JMX tests due to #6984

---
 integration-tests/micrometer/pom.xml          |  2 ++
 .../micrometer/it/MicrometerProducers.java    | 19 +++++++------------
 .../micrometer/it/MicrometerTest.java         |  2 ++
 3 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/integration-tests/micrometer/pom.xml b/integration-tests/micrometer/pom.xml
index 629271296933..4537ad400e22 100644
--- a/integration-tests/micrometer/pom.xml
+++ b/integration-tests/micrometer/pom.xml
@@ -67,10 +67,12 @@
             <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 a4779e71ed8c..37efcb542c1f 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,31 +18,26 @@
 
 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 {
 
-    @Produces
-    @Singleton
-    @IfBuildProfile("test")
-    public MeterRegistry registry() {
-        return new JmxMeterRegistry(CamelJmxConfig.DEFAULT, Clock.SYSTEM, HierarchicalNameMapper.DEFAULT);
-    }
+    // 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
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 ec18e5aa14ad..a6c930d7c8c6 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,6 +34,7 @@
 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;
@@ -210,6 +211,7 @@ public void testDumpAsJson() {
                 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")