From 401a09e8ba830a4dd193f81b87e65b0317426b01 Mon Sep 17 00:00:00 2001 From: Guillaume Smet Date: Tue, 24 Oct 2023 17:33:04 +0200 Subject: [PATCH 1/2] Remove a duplicate dependency from Micrometer extension --- extensions/micrometer/runtime/pom.xml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/extensions/micrometer/runtime/pom.xml b/extensions/micrometer/runtime/pom.xml index c4f1679c24b20..ba26155dabbb3 100644 --- a/extensions/micrometer/runtime/pom.xml +++ b/extensions/micrometer/runtime/pom.xml @@ -113,12 +113,6 @@ true - - io.quarkus - quarkus-redis-client - true - - io.quarkus quarkus-smallrye-stork From 2b2869a5b6470d23644052ad494ab259722b15f9 Mon Sep 17 00:00:00 2001 From: Guillaume Smet Date: Tue, 24 Oct 2023 17:33:25 +0200 Subject: [PATCH 2/2] Avoid relying on Docker for Stork tests We don't need the Redis Dev Services so let's not start them. --- .../micrometer/deployment/binder/StorkMetricsDisabledTest.java | 1 + .../deployment/binder/StorkMetricsLoadBalancerFailTest.java | 1 + .../deployment/binder/StorkMetricsServiceDiscoveryFailTest.java | 1 + .../quarkus/micrometer/deployment/binder/StorkMetricsTest.java | 1 + 4 files changed, 4 insertions(+) diff --git a/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/deployment/binder/StorkMetricsDisabledTest.java b/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/deployment/binder/StorkMetricsDisabledTest.java index 8264018946251..73e4eb713927b 100644 --- a/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/deployment/binder/StorkMetricsDisabledTest.java +++ b/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/deployment/binder/StorkMetricsDisabledTest.java @@ -19,6 +19,7 @@ public class StorkMetricsDisabledTest { .overrideConfigKey("quarkus.micrometer.binder.stork.enabled", "false") .overrideConfigKey("quarkus.micrometer.binder-enabled-default", "false") .overrideConfigKey("quarkus.micrometer.registry-enabled-default", "false") + .overrideConfigKey("quarkus.redis.devservices.enabled", "false") .withEmptyApplication(); @Inject diff --git a/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/deployment/binder/StorkMetricsLoadBalancerFailTest.java b/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/deployment/binder/StorkMetricsLoadBalancerFailTest.java index 0f39211a8bd18..ab80ef83b8e2d 100644 --- a/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/deployment/binder/StorkMetricsLoadBalancerFailTest.java +++ b/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/deployment/binder/StorkMetricsLoadBalancerFailTest.java @@ -43,6 +43,7 @@ public class StorkMetricsLoadBalancerFailTest { .overrideConfigKey("quarkus.stork.greeting-service.service-discovery.type", "static") .overrideConfigKey("quarkus.stork.greeting-service.service-discovery.address-list", "${test.url}") .overrideConfigKey("quarkus.stork.greeting-service.load-balancer.type", "mock") + .overrideConfigKey("quarkus.redis.devservices.enabled", "false") .withApplicationRoot((jar) -> jar .addClasses(PingPongResource.class, PingPongResource.PingPongRestClient.class, MockServiceSelectorProvider.class, MockServiceSelectorConfiguration.class, diff --git a/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/deployment/binder/StorkMetricsServiceDiscoveryFailTest.java b/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/deployment/binder/StorkMetricsServiceDiscoveryFailTest.java index 164209cd05681..e9e4437bda7d9 100644 --- a/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/deployment/binder/StorkMetricsServiceDiscoveryFailTest.java +++ b/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/deployment/binder/StorkMetricsServiceDiscoveryFailTest.java @@ -41,6 +41,7 @@ public class StorkMetricsServiceDiscoveryFailTest { .overrideConfigKey("pingpong/mp-rest/url", "stork://pingpong-service") .overrideConfigKey("greeting/mp-rest/url", "stork://greeting-service/greeting") .overrideConfigKey("quarkus.stork.greeting-service.service-discovery.type", "mock") + .overrideConfigKey("quarkus.redis.devservices.enabled", "false") .withApplicationRoot((jar) -> jar .addClasses(PingPongResource.class, PingPongResource.PingPongRestClient.class, MockServiceDiscoveryProvider.class, MockServiceDiscoveryConfiguration.class, diff --git a/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/deployment/binder/StorkMetricsTest.java b/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/deployment/binder/StorkMetricsTest.java index 146ffa74aedb8..317dbaa8e9151 100644 --- a/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/deployment/binder/StorkMetricsTest.java +++ b/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/deployment/binder/StorkMetricsTest.java @@ -36,6 +36,7 @@ public class StorkMetricsTest { .overrideConfigKey("greeting/mp-rest/url", "stork://greeting-service/greeting") .overrideConfigKey("quarkus.stork.greeting-service.service-discovery.type", "static") .overrideConfigKey("quarkus.stork.greeting-service.service-discovery.address-list", "${test.url}") + .overrideConfigKey("quarkus.redis.devservices.enabled", "false") .withApplicationRoot((jar) -> jar .addClasses(PingPongResource.class, PingPongResource.PingPongRestClient.class, GreetingResource.class, GreetingResource.GreetingRestClient.class, Util.class));