Align w/ Quarkus 3.15 and friends

Try with 3.15.2 We change the mircometer-prometheus client dependency, because the simpleclient is backwards compatible to the old APIs. While vertx-micrometer 4.5.10 is still on the 1.12 APIs, we do inherit the 1.13 micrometer APIs via the Quarkus BOM... And hence we really need the simpleclient, we are using that, to avoid clash Signed-off-by: Matthias Wessendorf <mwessend@redhat.com>
knative-extensions · Feb 4, 2025 · 741fc24 · 741fc24
1 parent 8bf8b30
commit 741fc24
Show file tree

Hide file tree

Showing 16 changed files with 125 additions and 102 deletions.
diff --git a/data-plane/THIRD-PARTY.txt b/data-plane/THIRD-PARTY.txt
diff --git a/data-plane/core/pom.xml b/data-plane/core/pom.xml
@@ -181,7 +181,7 @@
 
     <dependency>
       <groupId>io.micrometer</groupId>
-      <artifactId>micrometer-registry-prometheus</artifactId>
+      <artifactId>micrometer-registry-prometheus-simpleclient</artifactId>
     </dependency>
 
     <dependency>

diff --git a/...-plane/core/src/test/java/dev/knative/eventing/kafka/broker/core/metrics/MetricsTest.java b/...-plane/core/src/test/java/dev/knative/eventing/kafka/broker/core/metrics/MetricsTest.java
@@ -36,7 +36,8 @@
 public class MetricsTest {
 
     static {
-        BackendRegistries.setupBackend(new MicrometerMetricsOptions().setRegistryName(Metrics.METRICS_REGISTRY_NAME));
+        BackendRegistries.setupBackend(
+                new MicrometerMetricsOptions().setRegistryName(Metrics.METRICS_REGISTRY_NAME), null);
     }
 
     @Test

diff --git a/...src/test/java/dev/knative/eventing/kafka/broker/dispatcher/impl/RecordDispatcherTest.java b/...src/test/java/dev/knative/eventing/kafka/broker/dispatcher/impl/RecordDispatcherTest.java
@@ -73,9 +73,11 @@ public class RecordDispatcherTest {
                     .build());
 
     static {
-        BackendRegistries.setupBackend(new MicrometerMetricsOptions()
-                .setMicrometerRegistry(new PrometheusMeterRegistry(PrometheusConfig.DEFAULT))
-                .setRegistryName(Metrics.METRICS_REGISTRY_NAME));
+        BackendRegistries.setupBackend(
+                new MicrometerMetricsOptions()
+                        .setMicrometerRegistry(new PrometheusMeterRegistry(PrometheusConfig.DEFAULT))
+                        .setRegistryName(Metrics.METRICS_REGISTRY_NAME),
+                null);
     }
 
     private PrometheusMeterRegistry registry;

diff --git a/...va/dev/knative/eventing/kafka/broker/dispatcher/impl/ResponseToKafkaTopicHandlerTest.java b/...va/dev/knative/eventing/kafka/broker/dispatcher/impl/ResponseToKafkaTopicHandlerTest.java
@@ -52,7 +52,8 @@
 public class ResponseToKafkaTopicHandlerTest {
 
     static {
-        BackendRegistries.setupBackend(new MicrometerMetricsOptions().setRegistryName(Metrics.METRICS_REGISTRY_NAME));
+        BackendRegistries.setupBackend(
+                new MicrometerMetricsOptions().setRegistryName(Metrics.METRICS_REGISTRY_NAME), null);
     }
 
     private static final String TOPIC = "t1";

diff --git a/.../knative/eventing/kafka/broker/dispatcher/impl/consumer/AbstractConsumerVerticleTest.java b/.../knative/eventing/kafka/broker/dispatcher/impl/consumer/AbstractConsumerVerticleTest.java
@@ -62,7 +62,8 @@ public abstract class AbstractConsumerVerticleTest {
     private static final ConsumerVerticleContext resourceContext = FakeConsumerVerticleContext.get();
 
     static {
-        BackendRegistries.setupBackend(new MicrometerMetricsOptions().setRegistryName(Metrics.METRICS_REGISTRY_NAME));
+        BackendRegistries.setupBackend(
+                new MicrometerMetricsOptions().setRegistryName(Metrics.METRICS_REGISTRY_NAME), null);
     }
 
     @Test

diff --git a/...dev/knative/eventing/kafka/broker/dispatcher/impl/http/WebClientCloudEventSenderTest.java b/...dev/knative/eventing/kafka/broker/dispatcher/impl/http/WebClientCloudEventSenderTest.java
@@ -59,9 +59,11 @@
 public class WebClientCloudEventSenderTest {
 
     static {
-        BackendRegistries.setupBackend(new MicrometerMetricsOptions()
-                .setMicrometerRegistry(new PrometheusMeterRegistry(PrometheusConfig.DEFAULT))
-                .setRegistryName(Metrics.METRICS_REGISTRY_NAME));
+        BackendRegistries.setupBackend(
+                new MicrometerMetricsOptions()
+                        .setMicrometerRegistry(new PrometheusMeterRegistry(PrometheusConfig.DEFAULT))
+                        .setRegistryName(Metrics.METRICS_REGISTRY_NAME),
+                null);
     }
 
     @Test

diff --git a/.../java/dev/knative/eventing/kafka/broker/dispatcher/integration/UnorderedConsumerTest.java b/.../java/dev/knative/eventing/kafka/broker/dispatcher/integration/UnorderedConsumerTest.java
@@ -58,7 +58,8 @@
 public class UnorderedConsumerTest {
 
     static {
-        BackendRegistries.setupBackend(new MicrometerMetricsOptions().setRegistryName(Metrics.METRICS_REGISTRY_NAME));
+        BackendRegistries.setupBackend(
+                new MicrometerMetricsOptions().setRegistryName(Metrics.METRICS_REGISTRY_NAME), null);
     }
 
     private static final Logger logger = LoggerFactory.getLogger(UnorderedConsumerTest.class);

diff --git a/...va/dev/knative/eventing/kafka/broker/dispatcher/main/ConsumerVerticleFactoryImplTest.java b/...va/dev/knative/eventing/kafka/broker/dispatcher/main/ConsumerVerticleFactoryImplTest.java
@@ -52,7 +52,8 @@
 public class ConsumerVerticleFactoryImplTest {
 
     static {
-        BackendRegistries.setupBackend(new MicrometerMetricsOptions().setRegistryName(Metrics.METRICS_REGISTRY_NAME));
+        BackendRegistries.setupBackend(
+                new MicrometerMetricsOptions().setRegistryName(Metrics.METRICS_REGISTRY_NAME), null);
     }
 
     @Test

diff --git a/data-plane/pom.xml b/data-plane/pom.xml
@@ -42,9 +42,9 @@
     <spotless.plugin.version>2.38.0</spotless.plugin.version>
 
     <!-- dependencies version -->
-    <vertx.version>4.5.9</vertx.version>
+    <vertx.version>4.5.10</vertx.version>
     <cloudevents.sdk.version>4.0.1</cloudevents.sdk.version>
-    <micrometer.version>1.12.5</micrometer.version>
+    <micrometer.version>1.13.3</micrometer.version>
     <opentelemetry.version>1.39.0</opentelemetry.version>
     <jackson.version>2.14.1</jackson.version>
     <protobuf.version>3.25.2</protobuf.version>
@@ -60,7 +60,7 @@
     <kafka.version>3.9.0</kafka.version>
     <debezium.version>3.0.7.Final</debezium.version>
     <jib.version>3.4.4</jib.version>
-    <quarkus.version>3.13.3</quarkus.version>
+    <quarkus.version>3.15.2</quarkus.version>
     <antlr.version>4.9.2
     </antlr.version> <!-- Overwritting quarkus's antlr version. Reminder: antlr4-maven-plugin,antlr4-runtime, antlr4 need to have the same version -->
     <palantirJavaFormat.version>2.38.0</palantirJavaFormat.version>
@@ -223,6 +223,12 @@
           </exclusion>
         </exclusions>
       </dependency>
+      <dependency>
+        <artifactId>mockwebserver</artifactId>
+        <groupId>com.squareup.okhttp3</groupId>
+        <version>4.12.0</version>
+        <scope>test</scope>
+      </dependency>
 
       <dependency>
         <artifactId>mockwebserver</artifactId>

diff --git a/...dev/knative/eventing/kafka/broker/receiver/impl/IngressProducerReconcilableStoreTest.java b/...dev/knative/eventing/kafka/broker/receiver/impl/IngressProducerReconcilableStoreTest.java
@@ -50,7 +50,8 @@
 public class IngressProducerReconcilableStoreTest {
 
     static {
-        BackendRegistries.setupBackend(new MicrometerMetricsOptions().setRegistryName(Metrics.METRICS_REGISTRY_NAME));
+        BackendRegistries.setupBackend(
+                new MicrometerMetricsOptions().setRegistryName(Metrics.METRICS_REGISTRY_NAME), null);
     }
 
     @Test

diff --git a/...r/src/test/java/dev/knative/eventing/kafka/broker/receiver/impl/ReceiverVerticleTest.java b/...r/src/test/java/dev/knative/eventing/kafka/broker/receiver/impl/ReceiverVerticleTest.java
@@ -111,9 +111,11 @@ public class ReceiverVerticleTest {
     private static IngressProducerReconcilableStore store;
 
     static {
-        BackendRegistries.setupBackend(new MicrometerMetricsOptions()
-                .setMicrometerRegistry(new PrometheusMeterRegistry(PrometheusConfig.DEFAULT))
-                .setRegistryName(Metrics.METRICS_REGISTRY_NAME));
+        BackendRegistries.setupBackend(
+                new MicrometerMetricsOptions()
+                        .setMicrometerRegistry(new PrometheusMeterRegistry(PrometheusConfig.DEFAULT))
+                        .setRegistryName(Metrics.METRICS_REGISTRY_NAME),
+                null);
     }
 
     private PrometheusMeterRegistry registry;

diff --git a/...est/java/dev/knative/eventing/kafka/broker/receiver/impl/ReceiverVerticleTracingTest.java b/...est/java/dev/knative/eventing/kafka/broker/receiver/impl/ReceiverVerticleTracingTest.java
@@ -82,7 +82,8 @@ public abstract class ReceiverVerticleTracingTest {
     private IngressProducerReconcilableStore store;
 
     static {
-        BackendRegistries.setupBackend(new MicrometerMetricsOptions().setRegistryName(Metrics.METRICS_REGISTRY_NAME));
+        BackendRegistries.setupBackend(
+                new MicrometerMetricsOptions().setRegistryName(Metrics.METRICS_REGISTRY_NAME), null);
     }
 
     public abstract ReactiveKafkaProducer<String, CloudEvent> createKafkaProducer(

diff --git a/...ev/knative/eventing/kafka/broker/receiver/impl/handler/IngressRequestHandlerImplTest.java b/...ev/knative/eventing/kafka/broker/receiver/impl/handler/IngressRequestHandlerImplTest.java
@@ -50,9 +50,11 @@
 public class IngressRequestHandlerImplTest {
 
     static {
-        BackendRegistries.setupBackend(new MicrometerMetricsOptions()
-                .setMicrometerRegistry(new PrometheusMeterRegistry(PrometheusConfig.DEFAULT))
-                .setRegistryName(Metrics.METRICS_REGISTRY_NAME));
+        BackendRegistries.setupBackend(
+                new MicrometerMetricsOptions()
+                        .setMicrometerRegistry(new PrometheusMeterRegistry(PrometheusConfig.DEFAULT))
+                        .setRegistryName(Metrics.METRICS_REGISTRY_NAME),
+                null);
     }
 
     @Test

diff --git a/...est/java/dev/knative/eventing/kafka/broker/receiver/main/ReceiverVerticleFactoryTest.java b/...est/java/dev/knative/eventing/kafka/broker/receiver/main/ReceiverVerticleFactoryTest.java
@@ -40,7 +40,8 @@
 public class ReceiverVerticleFactoryTest {
 
     static {
-        BackendRegistries.setupBackend(new MicrometerMetricsOptions().setRegistryName(Metrics.METRICS_REGISTRY_NAME));
+        BackendRegistries.setupBackend(
+                new MicrometerMetricsOptions().setRegistryName(Metrics.METRICS_REGISTRY_NAME), null);
     }
 
     @Test

diff --git a/...ne/tests/src/test/java/dev/knative/eventing/kafka/broker/tests/AbstractDataPlaneTest.java b/...ne/tests/src/test/java/dev/knative/eventing/kafka/broker/tests/AbstractDataPlaneTest.java
@@ -106,7 +106,8 @@ public abstract class AbstractDataPlaneTest {
 
     static {
         assertThat(PATH_SERVICE_1).isNotEqualTo(PATH_SERVICE_2);
-        BackendRegistries.setupBackend(new MicrometerMetricsOptions().setRegistryName(Metrics.METRICS_REGISTRY_NAME));
+        BackendRegistries.setupBackend(
+                new MicrometerMetricsOptions().setRegistryName(Metrics.METRICS_REGISTRY_NAME), null);
     }
 
     private static File dataDir;