Merge pull request #36669 from gsmet/micrometer-stork

Some fixes for Micrometer extension and tests with Stork
quarkusio · Oct 24, 2023 · c6f697f · c6f697f
2 parents e68c822 + 2b2869a
commit c6f697f
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 6 deletions.
diff --git a/...yment/src/test/java/io/quarkus/micrometer/deployment/binder/StorkMetricsDisabledTest.java b/...yment/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/...c/test/java/io/quarkus/micrometer/deployment/binder/StorkMetricsLoadBalancerFailTest.java b/...c/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/...st/java/io/quarkus/micrometer/deployment/binder/StorkMetricsServiceDiscoveryFailTest.java b/...st/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/...er/deployment/src/test/java/io/quarkus/micrometer/deployment/binder/StorkMetricsTest.java b/...er/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));

diff --git a/extensions/micrometer/runtime/pom.xml b/extensions/micrometer/runtime/pom.xml
@@ -113,12 +113,6 @@
             <optional>true</optional>
         </dependency>
 
-        <dependency>
-            <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-redis-client</artifactId>
-            <optional>true</optional>
-        </dependency>
-
         <dependency>
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-smallrye-stork</artifactId>