Doing a version bump to 3.15 quarkus and friends

However, stuck at okhttp, since the zipkin-report uses a different version (4.x) than the fabric8 k8s client (3.xx) Signed-off-by: Matthias Wessendorf <[email protected]>
knative-extensions · Jan 14, 2025 · 2b93906 · 2b93906
1 parent 0b4e723
commit 2b93906
Show file tree

Hide file tree

Showing 16 changed files with 189 additions and 180 deletions.
diff --git a/data-plane/THIRD-PARTY.txt b/data-plane/THIRD-PARTY.txt
diff --git a/data-plane/core/src/main/java/dev/knative/eventing/kafka/broker/core/metrics/Metrics.java b/data-plane/core/src/main/java/dev/knative/eventing/kafka/broker/core/metrics/Metrics.java
@@ -27,8 +27,8 @@
 import io.micrometer.core.instrument.binder.BaseUnits;
 import io.micrometer.core.instrument.binder.kafka.KafkaClientMetrics;
 import io.micrometer.core.instrument.search.Search;
-import io.micrometer.prometheus.PrometheusConfig;
-import io.micrometer.prometheus.PrometheusMeterRegistry;
+import io.micrometer.prometheusmetrics.PrometheusConfig;
+import io.micrometer.prometheusmetrics.PrometheusMeterRegistry;
 import io.vertx.core.Future;
 import io.vertx.core.Promise;
 import io.vertx.core.http.HttpServerOptions;

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,7 @@
 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
@@ -42,8 +42,8 @@
 import dev.knative.eventing.kafka.broker.dispatcher.main.FakeConsumerVerticleContext;
 import io.cloudevents.CloudEvent;
 import io.micrometer.core.instrument.search.MeterNotFoundException;
-import io.micrometer.prometheus.PrometheusConfig;
-import io.micrometer.prometheus.PrometheusMeterRegistry;
+import io.micrometer.prometheusmetrics.PrometheusConfig;
+import io.micrometer.prometheusmetrics.PrometheusMeterRegistry;
 import io.vertx.core.Future;
 import io.vertx.core.MultiMap;
 import io.vertx.core.buffer.Buffer;
@@ -75,7 +75,7 @@ public class RecordDispatcherTest {
     static {
         BackendRegistries.setupBackend(new MicrometerMetricsOptions()
                 .setMicrometerRegistry(new PrometheusMeterRegistry(PrometheusConfig.DEFAULT))
-                .setRegistryName(Metrics.METRICS_REGISTRY_NAME));
+                .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,7 @@
 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,7 @@ 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
@@ -32,8 +32,8 @@
 import dev.knative.eventing.kafka.broker.dispatcher.main.FakeConsumerVerticleContext;
 import io.cloudevents.core.builder.CloudEventBuilder;
 import io.micrometer.core.instrument.Tags;
-import io.micrometer.prometheus.PrometheusConfig;
-import io.micrometer.prometheus.PrometheusMeterRegistry;
+import io.micrometer.prometheusmetrics.PrometheusConfig;
+import io.micrometer.prometheusmetrics.PrometheusMeterRegistry;
 import io.vertx.core.Vertx;
 import io.vertx.ext.web.client.WebClient;
 import io.vertx.junit5.VertxExtension;
@@ -61,7 +61,7 @@ public class WebClientCloudEventSenderTest {
     static {
         BackendRegistries.setupBackend(new MicrometerMetricsOptions()
                 .setMicrometerRegistry(new PrometheusMeterRegistry(PrometheusConfig.DEFAULT))
-                .setRegistryName(Metrics.METRICS_REGISTRY_NAME));
+                .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,7 @@
 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,7 @@
 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,10 +42,10 @@
     <spotless.plugin.version>2.38.0</spotless.plugin.version>
 
     <!-- dependencies version -->
-    <vertx.version>4.5.7</vertx.version>
+    <vertx.version>4.5.11</vertx.version>
     <cloudevents.sdk.version>4.0.0</cloudevents.sdk.version>
-    <micrometer.version>1.12.5</micrometer.version>
-    <opentelemetry.version>1.32.0</opentelemetry.version>
+    <micrometer.version>1.13.5</micrometer.version>
+    <opentelemetry.version>1.39.0</opentelemetry.version>
     <jackson.version>2.14.1</jackson.version>
     <protobuf.version>3.25.2</protobuf.version>
     <bucket4j.version>7.6.0</bucket4j.version>
@@ -56,11 +56,11 @@
     <awaitility.version>4.2.0</awaitility.version>
     <junit.jupiter.version>5.10.1</junit.jupiter.version>
     <mokito.junit.jupiter.version>5.12.0</mokito.junit.jupiter.version>
-    <fabric8.kubernetes.version>6.10.0</fabric8.kubernetes.version>
+    <fabric8.kubernetes.version>6.13.4</fabric8.kubernetes.version>
     <kafka.version>3.7.1</kafka.version>
     <debezium.version>2.6.1.Final</debezium.version>
     <jib.version>3.4.4</jib.version>
-    <quarkus.version>3.10.2</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>
@@ -209,6 +209,10 @@
             <artifactId>okhttp</artifactId>
             <groupId>com.squareup.okhttp3</groupId>
           </exclusion>
+          <exclusion>
+            <artifactId>mockwebserver</artifactId>
+            <groupId>com.squareup.okhttp3</groupId>
+          </exclusion>
           <exclusion>
             <artifactId>builder-annotations</artifactId>
             <groupId>io.sundr</groupId>

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,7 @@
 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
@@ -50,8 +50,8 @@
 import io.micrometer.core.instrument.Counter;
 import io.micrometer.core.instrument.Measurement;
 import io.micrometer.core.instrument.search.MeterNotFoundException;
-import io.micrometer.prometheus.PrometheusConfig;
-import io.micrometer.prometheus.PrometheusMeterRegistry;
+import io.micrometer.prometheusmetrics.PrometheusConfig;
+import io.micrometer.prometheusmetrics.PrometheusMeterRegistry;
 import io.vertx.core.Future;
 import io.vertx.core.Vertx;
 import io.vertx.core.buffer.Buffer;
@@ -113,7 +113,7 @@ public class ReceiverVerticleTest {
     static {
         BackendRegistries.setupBackend(new MicrometerMetricsOptions()
                 .setMicrometerRegistry(new PrometheusMeterRegistry(PrometheusConfig.DEFAULT))
-                .setRegistryName(Metrics.METRICS_REGISTRY_NAME));
+                .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,7 @@ 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
@@ -32,8 +32,8 @@
 import dev.knative.eventing.kafka.broker.receiver.impl.auth.EventPolicy;
 import io.cloudevents.CloudEvent;
 import io.fabric8.kubernetes.client.informers.cache.Lister;
-import io.micrometer.prometheus.PrometheusConfig;
-import io.micrometer.prometheus.PrometheusMeterRegistry;
+import io.micrometer.prometheusmetrics.PrometheusConfig;
+import io.micrometer.prometheusmetrics.PrometheusMeterRegistry;
 import io.vertx.core.Future;
 import io.vertx.core.http.HttpMethod;
 import io.vertx.core.http.HttpServerRequest;
@@ -52,7 +52,7 @@ public class IngressRequestHandlerImplTest {
     static {
         BackendRegistries.setupBackend(new MicrometerMetricsOptions()
                 .setMicrometerRegistry(new PrometheusMeterRegistry(PrometheusConfig.DEFAULT))
-                .setRegistryName(Metrics.METRICS_REGISTRY_NAME));
+                .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,7 @@
 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,7 @@ 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;