This is an automated email from the ASF dual-hosted git repository. jamesnetherton pushed a commit to branch quarkus-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit d0d5b3d87c27773b4f10f38398a0195cb8336e42 Author: James Netherton <jamesnether...@gmail.com> AuthorDate: Fri Feb 7 07:46:53 2025 +0000 Disable Micrometer JMX tests due to #6984 --- integration-tests/micrometer/pom.xml | 2 ++ .../component/micrometer/it/MicrometerProducers.java | 19 +++++++------------ .../component/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 6292712969..4537ad400e 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 a4779e71ed..37efcb542c 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 @@ 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 { - @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 ec18e5aa14..a6c930d7c8 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.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; @@ -210,6 +211,7 @@ 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")