Update to Vert.x 5 (#11374)

ppatierno · web-flow · commit 7b7e772ef39c · 2025-05-29T15:28:04.000+02:00
Signed-off-by: Paolo Patierno &lt;ppatierno@live.com&gt;
diff --git a/cluster-operator/src/main/java/io/strimzi/operator/cluster/Main.java b/cluster-operator/src/main/java/io/strimzi/operator/cluster/Main.java
@@ -6,7 +6,7 @@
 
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import io.fabric8.kubernetes.client.KubernetesClient;
-import io.micrometer.prometheus.PrometheusMeterRegistry;
+import io.micrometer.prometheusmetrics.PrometheusMeterRegistry;
 import io.strimzi.certs.OpenSslCertManager;
 import io.strimzi.operator.cluster.leaderelection.LeaderElectionManager;
 import io.strimzi.operator.cluster.model.securityprofiles.PodSecurityProviderFactory;
diff --git a/operator-common/src/main/java/io/strimzi/operator/common/http/HealthCheckAndMetricsServer.java b/operator-common/src/main/java/io/strimzi/operator/common/http/HealthCheckAndMetricsServer.java
@@ -4,7 +4,7 @@
  */
 package io.strimzi.operator.common.http;
 
-import io.micrometer.prometheus.PrometheusMeterRegistry;
+import io.micrometer.prometheusmetrics.PrometheusMeterRegistry;
 import io.strimzi.operator.common.MetricsProvider;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
diff --git a/operator-common/src/test/java/io/strimzi/operator/common/http/HealthCheckAndMetricsServerTest.java b/operator-common/src/test/java/io/strimzi/operator/common/http/HealthCheckAndMetricsServerTest.java
@@ -6,8 +6,8 @@
 
 import io.micrometer.core.instrument.MeterRegistry;
 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.strimzi.operator.common.MetricsProvider;
 import io.strimzi.operator.common.MicrometerMetricsProvider;
 import io.strimzi.test.TestUtils;
diff --git a/pom.xml b/pom.xml
@@ -153,8 +153,8 @@
         <fasterxml.jackson-annotations.version>2.18.3</fasterxml.jackson-annotations.version>
         <fasterxml.jackson-datatype.version>2.18.3</fasterxml.jackson-datatype.version>
         <fasterxml.jackson-jaxrs.version>2.18.3</fasterxml.jackson-jaxrs.version>
-        <vertx.version>4.5.14</vertx.version>
-        <vertx-junit5.version>4.5.14</vertx-junit5.version>
+        <vertx.version>5.0.0</vertx.version>
+        <vertx-junit5.version>5.0.0</vertx-junit5.version>
         <kafka.version>4.0.0</kafka.version>
         <yammer-metrics.version>2.2.0</yammer-metrics.version>
         <snappy.version>1.1.10.5</snappy.version>
@@ -172,18 +172,18 @@
         <jetty-old-kafka.version>9.4.56.v20240826</jetty-old-kafka.version>
         <javax-servlet.version>3.1.0</javax-servlet.version>
         <strimzi-oauth.version>0.16.2</strimzi-oauth.version>
-        <netty.version>4.1.118.Final</netty.version>
-        <micrometer.version>1.12.13</micrometer.version>
+        <netty.version>4.2.1.Final</netty.version>
+        <micrometer.version>1.14.5</micrometer.version>
         <jayway-jsonpath.version>2.9.0</jayway-jsonpath.version>
         <registry.version>1.3.2.Final</registry.version>
         <commons-codec.version>1.13</commons-codec.version>
 
         <!-- Test only dependencies -->
         <hamcrest.version>2.2</hamcrest.version>
         <mockito.version>4.11.0</mockito.version>
-        <junit.platform.version>1.8.2</junit.platform.version>
+        <junit.platform.version>1.9.3</junit.platform.version>
         <opentest4j.version>1.2.0</opentest4j.version>
-        <jupiter.version>5.8.2</jupiter.version>
+        <jupiter.version>5.9.3</jupiter.version>
         <strimzi-test-container.version>0.110.0</strimzi-test-container.version>
         <mockserver.version>5.13.2</mockserver.version>
         <mockwebserver.version>3.14.7</mockwebserver.version>
diff --git a/systemtest/src/main/java/io/strimzi/systemtest/listeners/ExecutionListener.java b/systemtest/src/main/java/io/strimzi/systemtest/listeners/ExecutionListener.java
@@ -10,6 +10,7 @@
 import org.apache.logging.log4j.Logger;
 import org.junit.jupiter.api.extension.ExtensionContext;
 import org.junit.platform.engine.TestTag;
+import org.junit.platform.engine.UniqueId;
 import org.junit.platform.launcher.TestExecutionListener;
 import org.junit.platform.launcher.TestIdentifier;
 import org.junit.platform.launcher.TestPlan;
@@ -58,7 +59,7 @@ private void printSelectedTestClasses(TestPlan plan) {
      * @return                  true if test suite contains Parallel or Isolated test case. Otherwise, false.
      */
     public static boolean requiresSharedNamespace(final ExtensionContext extensionContext) {
-        Set<TestIdentifier> testCases = testPlan.getChildren(extensionContext.getUniqueId());
+        Set<TestIdentifier> testCases = testPlan.getChildren(UniqueId.parse(extensionContext.getUniqueId()));
 
         // name of suites or tags which indicates need of creation of shared namespace test-suite-namespace
         final Set<String> identifiersRequiringSharedNamespace = Set.of(
diff --git a/systemtest/src/main/java/io/strimzi/systemtest/performance/gather/collectors/BaseMetricsCollector.java b/systemtest/src/main/java/io/strimzi/systemtest/performance/gather/collectors/BaseMetricsCollector.java
@@ -126,7 +126,7 @@ public List<Double> getSystemLoadAverage1m() {
      * @return              A list of {@link Double} values collected based on the specified metric name and selector.
      */
     protected List<Double> collectMetricValues(String metricName, String selector) {
-        Pattern pattern = Pattern.compile(metricName + "\\{kind=\"" + KafkaTopic.RESOURCE_KIND + "\",namespace=\"" + this.getNamespaceName() + "\",selector=\"" + selector + "\",.*\\}\\s(\\d+\\.?\\d*)");
+        Pattern pattern = Pattern.compile(metricName + "\\{kind=\"" + KafkaTopic.RESOURCE_KIND + "\",namespace=\"" + this.getNamespaceName() + "\",selector=\"" + selector + "\".*\\}\\s(\\d+\\.?\\d*)");
         return collectSpecificMetric(pattern);
     }
 
diff --git a/systemtest/src/main/java/io/strimzi/systemtest/utils/specific/MetricsUtils.java b/systemtest/src/main/java/io/strimzi/systemtest/utils/specific/MetricsUtils.java
@@ -80,12 +80,12 @@ public static void assertCoMetricResourceNotNull(BaseMetricsCollector collector,
     }
 
     public static void assertMetricResourceNotNull(BaseMetricsCollector collector, String metric, String kind) {
-        String metrics = metric + "\\{kind=\"" + kind + "\",.*}";
+        String metrics = metric + "\\{kind=\"" + kind + "\".*}";
         assertMetricValueNotNull(collector, metrics);
     }
 
     public static void assertCoMetricResourceStateNotExists(String namespaceName, String kind, String name, BaseMetricsCollector collector) {
-        String metric = "strimzi_resource_state\\{kind=\"" + kind + "\",name=\"" + name + "\",resource_namespace=\"" + namespaceName + "\",}";
+        String metric = "strimzi_resource_state\\{kind=\"" + kind + "\",name=\"" + name + "\",resource_namespace=\"" + namespaceName + "\"}";
         List<Double> values = createPatternAndCollectWithoutWait(collector, metric);
         assertThat(values.isEmpty(), is(true));
     }
@@ -95,7 +95,7 @@ public static void assertCoMetricResourceState(String namespaceName, String kind
     }
 
     public static void assertMetricResourceState(String namespaceName, String kind, String name, BaseMetricsCollector collector, double value, String reason) {
-        String metric = "strimzi_resource_state\\{kind=\"" + kind + "\",name=\"" + name + "\",reason=\"" + reason + ".*\",resource_namespace=\"" + namespaceName + "\",}";
+        String metric = "strimzi_resource_state\\{kind=\"" + kind + "\",name=\"" + name + "\",reason=\"" + reason + ".*\",resource_namespace=\"" + namespaceName + "\"}";
         assertMetricValue(collector, metric, value);
     }
 
@@ -115,8 +115,8 @@ public static void assertCoMetricResourcesNullOrZero(String namespaceName, Strin
     }
 
     public static String getResourceMetricPattern(String namespaceName, String kind) {
-        String metric = "strimzi_resources\\{kind=\"" + kind + "\",";
-        metric += namespaceName == null ? ".*}" : "namespace=\"" + namespaceName + "\",.*}";
+        String metric = "strimzi_resources\\{kind=\"" + kind + "\"";
+        metric += namespaceName == null ? ".*}" : ",namespace=\"" + namespaceName + "\".*}";
         return metric;
     }
 
@@ -133,7 +133,7 @@ public static void assertMetricResourcesLowerThanOrEqualTo(BaseMetricsCollector
     }
 
     public static void assertMetricResourcesIs(BaseMetricsCollector collector, String kind, Predicate<Double> predicate, String message) {
-        String metric = "strimzi_resources\\{kind=\"" + kind + "\",.*}";
+        String metric = "strimzi_resources\\{kind=\"" + kind + "\".*}";
         TestUtils.waitFor("metric " + metric + "is " + message, TestConstants.POLL_INTERVAL_FOR_RESOURCE_READINESS, TestConstants.GLOBAL_TIMEOUT_SHORT, () -> {
             collector.collectMetricsFromPods(TestConstants.METRICS_COLLECT_TIMEOUT);
             List<Double> values = createPatternAndCollect(collector, metric);
@@ -185,12 +185,12 @@ public static void assertContainsMetric(List<Metric> metrics, String metricName)
     }
 
     private static List<Double> createPatternAndCollect(BaseMetricsCollector collector, String metric) {
-        Pattern pattern = Pattern.compile(metric + " ([\\d.][^\\n]+)", Pattern.CASE_INSENSITIVE);
+        Pattern pattern = Pattern.compile(metric + " ([\\d.^\\n]+)", Pattern.CASE_INSENSITIVE);
         return collector.waitForSpecificMetricAndCollect(pattern);
     }
 
     private static List<Double> createPatternAndCollectWithoutWait(BaseMetricsCollector collector, String metric) {
-        Pattern pattern = Pattern.compile(metric + " ([\\d.][^\\n]+)", Pattern.CASE_INSENSITIVE);
+        Pattern pattern = Pattern.compile(metric + " ([\\d.^\\n]+)", Pattern.CASE_INSENSITIVE);
         return collector.collectSpecificMetric(pattern);
     }
 
diff --git a/systemtest/src/test/java/io/strimzi/systemtest/metrics/MetricsST.java b/systemtest/src/test/java/io/strimzi/systemtest/metrics/MetricsST.java
@@ -267,7 +267,7 @@ void testKafkaExporterMetrics() {
 
         kubeClient().listPods(namespaceFirst, brokerPodsSelector).forEach(pod -> {
             String address = pod.getMetadata().getName() + "." + kafkaClusterFirstName + "-kafka-brokers." + namespaceFirst + ".svc";
-            Pattern pattern = Pattern.compile("kafka_broker_info\\{address=\"" + address + ".*\",.*} ([\\d])");
+            Pattern pattern = Pattern.compile("kafka_broker_info\\{address=\"" + address + ".*\".*} ([\\d])");
             List<Double> values = kafkaExporterCollector.waitForSpecificMetricAndCollect(pattern);
             assertThat(String.format("metric %s is not null", pattern), values, notNullValue());
         });
diff --git a/systemtest/src/test/java/io/strimzi/systemtest/operators/topic/TopicST.java b/systemtest/src/test/java/io/strimzi/systemtest/operators/topic/TopicST.java
@@ -376,7 +376,7 @@ void testKafkaTopicDifferentStatesInUTOMode() {
         KafkaTopicUtils.waitForKafkaTopicReady(Environment.TEST_SUITE_NAMESPACE, testStorage.getTopicName());
 
         assertKafkaTopicStatus(Environment.TEST_SUITE_NAMESPACE, testStorage.getTopicName(), Ready, True, ++expectedObservedGeneration);
-        assertMetricValueHigherThanOrEqualTo(toMetricsCollector, "strimzi_reconciliations_failed_total\\{kind=\"" + KafkaTopic.RESOURCE_KIND + "\",.*}", 3);
+        assertMetricValueHigherThanOrEqualTo(toMetricsCollector, "strimzi_reconciliations_failed_total\\{kind=\"" + KafkaTopic.RESOURCE_KIND + "\".*}", 3);
     }
 
     @ParallelTest
diff --git a/systemtest/src/test/java/io/strimzi/systemtest/rollingupdate/AlternativeReconcileTriggersST.java b/systemtest/src/test/java/io/strimzi/systemtest/rollingupdate/AlternativeReconcileTriggersST.java
@@ -170,7 +170,6 @@ void testManualTriggeringRollingUpdate() {
     }
 
     // This test is affected by https://github.com/strimzi/strimzi-kafka-operator/issues/3913 so it needs longer operation timeout set in CO
-
     /**
      * Test for checking that overriding of bootstrap server, triggers the rolling update and verifying that,
      * new bootstrap DNS is appended inside certificate in subject alternative names property.
diff --git a/topic-operator/src/main/java/io/strimzi/operator/topic/TopicOperatorMain.java b/topic-operator/src/main/java/io/strimzi/operator/topic/TopicOperatorMain.java
@@ -15,8 +15,8 @@
 import io.micrometer.core.instrument.binder.jvm.JvmMemoryMetrics;
 import io.micrometer.core.instrument.binder.jvm.JvmThreadMetrics;
 import io.micrometer.core.instrument.binder.system.ProcessorMetrics;
-import io.micrometer.prometheus.PrometheusConfig;
-import io.micrometer.prometheus.PrometheusMeterRegistry;
+import io.micrometer.prometheusmetrics.PrometheusConfig;
+import io.micrometer.prometheusmetrics.PrometheusMeterRegistry;
 import io.strimzi.api.kafka.Crds;
 import io.strimzi.api.kafka.model.topic.KafkaTopic;
 import io.strimzi.operator.common.OperatorKubernetesClientBuilder;
diff --git a/user-operator/src/main/java/io/strimzi/operator/user/Main.java b/user-operator/src/main/java/io/strimzi/operator/user/Main.java
@@ -12,8 +12,8 @@
 import io.micrometer.core.instrument.binder.jvm.JvmMemoryMetrics;
 import io.micrometer.core.instrument.binder.jvm.JvmThreadMetrics;
 import io.micrometer.core.instrument.binder.system.ProcessorMetrics;
-import io.micrometer.prometheus.PrometheusConfig;
-import io.micrometer.prometheus.PrometheusMeterRegistry;
+import io.micrometer.prometheusmetrics.PrometheusConfig;
+import io.micrometer.prometheusmetrics.PrometheusMeterRegistry;
 import io.strimzi.api.kafka.model.user.KafkaUser;
 import io.strimzi.api.kafka.model.user.KafkaUserList;
 import io.strimzi.certs.OpenSslCertManager;

Original file line number	Diff line number	Diff line change
`@@ -126,7 +126,7 @@ public List<Double> getSystemLoadAverage1m() {`
`126`	`126`	`* @return A list of {@link Double} values collected based on the specified metric name and selector.`
`127`	`127`	`*/`
`128`	`128`	`protected List<Double> collectMetricValues(String metricName, String selector) {`
`129`		`- Pattern pattern = Pattern.compile(metricName + "\\{kind=\"" + KafkaTopic.RESOURCE_KIND + "\",namespace=\"" + this.getNamespaceName() + "\",selector=\"" + selector + "\",.\\}\\s(\\d+\\.?\\d)");`
	`129`	`+ Pattern pattern = Pattern.compile(metricName + "\\{kind=\"" + KafkaTopic.RESOURCE_KIND + "\",namespace=\"" + this.getNamespaceName() + "\",selector=\"" + selector + "\".\\}\\s(\\d+\\.?\\d)");`
`130`	`130`	`return collectSpecificMetric(pattern);`
`131`	`131`	`}`
`132`	`132`
Original file line number	Diff line number	Diff line change
`@@ -80,12 +80,12 @@ public static void assertCoMetricResourceNotNull(BaseMetricsCollector collector,`
`80`	`80`	`}`
`81`	`81`
`82`	`82`	`public static void assertMetricResourceNotNull(BaseMetricsCollector collector, String metric, String kind) {`
`83`		`- String metrics = metric + "\\{kind=\"" + kind + "\",.*}";`
	`83`	`+ String metrics = metric + "\\{kind=\"" + kind + "\".*}";`
`84`	`84`	`assertMetricValueNotNull(collector, metrics);`
`85`	`85`	`}`
`86`	`86`
`87`	`87`	`public static void assertCoMetricResourceStateNotExists(String namespaceName, String kind, String name, BaseMetricsCollector collector) {`
`88`		`- String metric = "strimzi_resource_state\\{kind=\"" + kind + "\",name=\"" + name + "\",resource_namespace=\"" + namespaceName + "\",}";`
	`88`	`+ String metric = "strimzi_resource_state\\{kind=\"" + kind + "\",name=\"" + name + "\",resource_namespace=\"" + namespaceName + "\"}";`
`89`	`89`	`List<Double> values = createPatternAndCollectWithoutWait(collector, metric);`
`90`	`90`	`assertThat(values.isEmpty(), is(true));`
`91`	`91`	`}`
`@@ -95,7 +95,7 @@ public static void assertCoMetricResourceState(String namespaceName, String kind`
`95`	`95`	`}`
`96`	`96`
`97`	`97`	`public static void assertMetricResourceState(String namespaceName, String kind, String name, BaseMetricsCollector collector, double value, String reason) {`
`98`		`- String metric = "strimzi_resource_state\\{kind=\"" + kind + "\",name=\"" + name + "\",reason=\"" + reason + ".*\",resource_namespace=\"" + namespaceName + "\",}";`
	`98`	`+ String metric = "strimzi_resource_state\\{kind=\"" + kind + "\",name=\"" + name + "\",reason=\"" + reason + ".*\",resource_namespace=\"" + namespaceName + "\"}";`
`99`	`99`	`assertMetricValue(collector, metric, value);`
`100`	`100`	`}`
`101`	`101`
`@@ -115,8 +115,8 @@ public static void assertCoMetricResourcesNullOrZero(String namespaceName, Strin`
`115`	`115`	`}`
`116`	`116`
`117`	`117`	`public static String getResourceMetricPattern(String namespaceName, String kind) {`
`118`		`- String metric = "strimzi_resources\\{kind=\"" + kind + "\",";`
`119`		`- metric += namespaceName == null ? ".}" : "namespace=\"" + namespaceName + "\",.}";`
	`118`	`+ String metric = "strimzi_resources\\{kind=\"" + kind + "\"";`
	`119`	`+ metric += namespaceName == null ? ".}" : ",namespace=\"" + namespaceName + "\".}";`
`120`	`120`	`return metric;`
`121`	`121`	`}`
`122`	`122`
`@@ -133,7 +133,7 @@ public static void assertMetricResourcesLowerThanOrEqualTo(BaseMetricsCollector`
`133`	`133`	`}`
`134`	`134`
`135`	`135`	`public static void assertMetricResourcesIs(BaseMetricsCollector collector, String kind, Predicate<Double> predicate, String message) {`
`136`		`- String metric = "strimzi_resources\\{kind=\"" + kind + "\",.*}";`
	`136`	`+ String metric = "strimzi_resources\\{kind=\"" + kind + "\".*}";`
`137`	`137`	`TestUtils.waitFor("metric " + metric + "is " + message, TestConstants.POLL_INTERVAL_FOR_RESOURCE_READINESS, TestConstants.GLOBAL_TIMEOUT_SHORT, () -> {`
`138`	`138`	`collector.collectMetricsFromPods(TestConstants.METRICS_COLLECT_TIMEOUT);`
`139`	`139`	`List<Double> values = createPatternAndCollect(collector, metric);`
`@@ -185,12 +185,12 @@ public static void assertContainsMetric(List<Metric> metrics, String metricName)`
`185`	`185`	`}`
`186`	`186`
`187`	`187`	`private static List<Double> createPatternAndCollect(BaseMetricsCollector collector, String metric) {`
`188`		`- Pattern pattern = Pattern.compile(metric + " ([\\d.][^\\n]+)", Pattern.CASE_INSENSITIVE);`
	`188`	`+ Pattern pattern = Pattern.compile(metric + " ([\\d.^\\n]+)", Pattern.CASE_INSENSITIVE);`
`189`	`189`	`return collector.waitForSpecificMetricAndCollect(pattern);`
`190`	`190`	`}`
`191`	`191`
`192`	`192`	`private static List<Double> createPatternAndCollectWithoutWait(BaseMetricsCollector collector, String metric) {`
`193`		`- Pattern pattern = Pattern.compile(metric + " ([\\d.][^\\n]+)", Pattern.CASE_INSENSITIVE);`
	`193`	`+ Pattern pattern = Pattern.compile(metric + " ([\\d.^\\n]+)", Pattern.CASE_INSENSITIVE);`
`194`	`194`	`return collector.collectSpecificMetric(pattern);`
`195`	`195`	`}`
`196`	`196`
Original file line number	Diff line number	Diff line change
`@@ -376,7 +376,7 @@ void testKafkaTopicDifferentStatesInUTOMode() {`
`376`	`376`	`KafkaTopicUtils.waitForKafkaTopicReady(Environment.TEST_SUITE_NAMESPACE, testStorage.getTopicName());`
`377`	`377`
`378`	`378`	`assertKafkaTopicStatus(Environment.TEST_SUITE_NAMESPACE, testStorage.getTopicName(), Ready, True, ++expectedObservedGeneration);`
`379`		`- assertMetricValueHigherThanOrEqualTo(toMetricsCollector, "strimzi_reconciliations_failed_total\\{kind=\"" + KafkaTopic.RESOURCE_KIND + "\",.*}", 3);`
	`379`	`+ assertMetricValueHigherThanOrEqualTo(toMetricsCollector, "strimzi_reconciliations_failed_total\\{kind=\"" + KafkaTopic.RESOURCE_KIND + "\".*}", 3);`
`380`	`380`	`}`
`381`	`381`
`382`	`382`	`@ParallelTest`
Original file line number	Diff line number	Diff line change
`@@ -170,7 +170,6 @@ void testManualTriggeringRollingUpdate() {`
`170`	`170`	`}`
`171`	`171`
`172`	`172`	`// This test is affected by https://github.com/strimzi/strimzi-kafka-operator/issues/3913 so it needs longer operation timeout set in CO`
`173`		`-`
`174`	`173`	`/**`
`175`	`174`	`* Test for checking that overriding of bootstrap server, triggers the rolling update and verifying that,`
`176`	`175`	`* new bootstrap DNS is appended inside certificate in subject alternative names property.`